diff --git a/edexOsgi/com.raytheon.uf.edex.cpgsrv/modes/dat-modes.xml b/edexOsgi/com.raytheon.uf.edex.cpgsrv/modes/dat-modes.xml
deleted file mode 100644
index 35d0a4661b..0000000000
--- a/edexOsgi/com.raytheon.uf.edex.cpgsrv/modes/dat-modes.xml
+++ /dev/null
@@ -1,87 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-    <!--
-        This_software_was_developed_and_/_or_modified_by_Raytheon_Company,
-        pursuant_to_Contract_DG133W-05-CQ-1067_with_the_US_Government.
-        
-        U.S._EXPORT_CONTROLLED_TECHNICAL_DATA
-        This_software_product_contains_export-restricted_data_whose
-        export/transfer/disclosure_is_restricted_by_U.S._law._Dissemination
-        to_non-U.S._persons_whether_in_the_United_States_or_abroad_requires
-        an_export_license_or_other_authorization.
-        
-        Contractor_Name:________Raytheon_Company
-        Contractor_Address:_____6825_Pine_Street,_Suite_340
-        ________________________Mail_Stop_B8
-        ________________________Omaha,_NE_68106
-        ________________________402.291.0100
-        
-        See_the_AWIPS_II_Master_Rights_File_("Master_Rights_File.pdf")_for
-        further_licensing_information.
-    -->
-    
-<!-- 
-       Refer to edex/modes/README.txt for documentation
---> 
-<edexModes>
-	<mode name="ingest">
-	 	<!-- exclude DAT -->
-		<exclude>ffmp-ingest.xml</exclude>
-		<exclude>scan-ingest.xml</exclude>
-		<exclude>cwat-ingest.xml</exclude>
-		<exclude>fog-ingest.xml</exclude>
-		<exclude>vil-ingest.xml</exclude>
-		<exclude>preciprate-ingest.xml</exclude>
-		<exclude>qpf-ingest.xml</exclude>
-		<exclude>fssobs-ingest.xml</exclude>
-		<exclude>cpgsrv-spring.xml</exclude>
-	</mode>
-	<!-- Runs separate now, not just high mem -->
-	<mode name="ingestDat">
-        <!-- utility-common needed for localization notifications -->
-        <include>utility-common.xml</include>
-        <!-- geo-common needed for thrift adapter registration -->
-        <include>geo-common.xml</include>
-		<include>time-common.xml</include>
-		<include>ffmp-ingest.xml</include>
-		<include>ffmp-common.xml</include>
-		<include>scan-ingest.xml</include>
-		<include>scan-common.xml</include>
-		<include>cwat-ingest.xml</include>
-		<include>cwat-common.xml</include>
-		<include>fog-ingest.xml</include>
-		<include>fog-common.xml</include>
-		<include>vil-ingest.xml</include>
-		<include>vil-common.xml</include>
-		<include>preciprate-ingest.xml</include>
-		<include>preciprate-common.xml</include>
-		<include>qpf-ingest.xml</include>
-		<include>qpf-common.xml</include>
-		<include>cpgsrv-spring.xml</include>
-		<include>persist-ingest.xml</include>
-		<include>binlightning-common.xml</include>
-		<include>parameter-common.xml</include>
-		<include>gridcoverage-common.xml</include>
-		<include>grid-common.xml</include>
-		<include>database-common.xml</include>
-		<include>radar-common.xml</include>
-		<include>text-common.xml</include>
-        <include>level-common.xml</include>
-        <include>levelhandler-common.xml</include>
-		<include>pointdata-common.xml</include>
-		<include>bufrua-common.xml</include>
-		<include>shef-common.xml</include>
-		<include>satellite-common.xml</include>
-		<include>satellite-dataplugin-common.xml</include>
-        <include>ohd-common-database.xml</include>
-		<include>ohd-common.xml</include>
-		<include>management-common.xml</include>
-		<include>obs-common.xml</include>
-		<include>fssobs-ingest.xml</include>
-		<include>fssobs-common.xml</include>
-		<include>ldadmesonet-common.xml</include>
-		<include>manualIngest-common.xml</include>
-		<include>dataaccess-common.xml</include>
-		<exclude>nctext-common.xml</exclude>
-        <includeMode>statsTemplate</includeMode>
-	</mode>
-</edexModes>
diff --git a/edexOsgi/com.raytheon.uf.edex.ohd/modes/hydro-modes.xml b/edexOsgi/com.raytheon.uf.edex.ohd/modes/hydro-modes.xml
deleted file mode 100644
index 45e7578003..0000000000
--- a/edexOsgi/com.raytheon.uf.edex.ohd/modes/hydro-modes.xml
+++ /dev/null
@@ -1,98 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-    <!--
-        This_software_was_developed_and_/_or_modified_by_Raytheon_Company,
-        pursuant_to_Contract_DG133W-05-CQ-1067_with_the_US_Government.
-        
-        U.S._EXPORT_CONTROLLED_TECHNICAL_DATA
-        This_software_product_contains_export-restricted_data_whose
-        export/transfer/disclosure_is_restricted_by_U.S._law._Dissemination
-        to_non-U.S._persons_whether_in_the_United_States_or_abroad_requires
-        an_export_license_or_other_authorization.
-        
-        Contractor_Name:________Raytheon_Company
-        Contractor_Address:_____6825_Pine_Street,_Suite_340
-        ________________________Mail_Stop_B8
-        ________________________Omaha,_NE_68106
-        ________________________402.291.0100
-        
-        See_the_AWIPS_II_Master_Rights_File_("Master_Rights_File.pdf")_for
-        further_licensing_information.
-    -->
-    
-<!-- 
-       Refer to edex/modes/README.txt for documentation
---> 
-<edexModes>
-    <!-- this file is specifically for ALR/SJU -->
-    <mode name="ingest">
-        <exclude>obs-ingest-metarshef.xml</exclude>
-    </mode>
-    <mode name="ingestHydro">
-        <include>distribution-spring.xml</include>
-        <include>manualIngest-common.xml</include>
-        <include>manualIngest-spring.xml</include>
-        <include>shef-ingest.xml</include>
-        <include>persist-ingest.xml</include>
-        <include>obs-common.xml</include>
-        <include>obs-ingest.xml</include>
-        <include>obs-ingest-metarshef.xml</include>
-        <include>metartohmdb-plugin.xml</include>
-        <include>metartoclimate-plugin.xml</include>
-        <include>pointdata-common.xml</include>
-        <include>shef-common.xml</include>
-        <include>ohd-common-database.xml</include>
-        <include>ohd-common.xml</include>
-        <include>alarmWhfs-spring.xml</include>
-        <include>arealffgGenerator-spring.xml</include>
-        <include>arealQpeGen-spring.xml</include>
-        <include>DPADecoder-spring.xml</include>
-        <include>dqcPreprocessor-spring.xml</include>
-        <include>floodArchiver-spring.xml</include>
-        <include>freezingLevel-spring.xml</include>
-        <include>hpeDHRDecoder-spring.xml</include>
-        <include>ihfsDbPurge-spring.xml</include>
-        <include>logFilePurger-spring.xml</include>
-        <include>mpeFieldgen-spring.xml</include>
-        <include>mpeHpeFilePurge-spring.xml</include>
-        <include>mpeLightningSrv-ingest.xml</include>
-        <include>mpeProcessGrib-spring.xml</include>
-        <include>ohdSetupService-spring.xml</include>
-        <include>pointDataRetrievel-spring.xml</include>
-        <include>q2FileProcessor-spring.xml</include>
-        <include>sacStateUpdate-spring.xml</include>
-        <include>satpre-spring.xml</include>
-        <include>purge-logs.xml</include>
-        <exclude>fssobs-ingest.xml</exclude>
-        <exclude>fssobs-common.xml</exclude>
-        <include>ndm-ingest.xml</include>
-    </mode>
-    <mode name="requestHydro">
-        <include>localization-http-request.xml</include>
-        <include>ohd-common-database.xml</include>
-        <include>ohd-common.xml</include>
-        <include>database-common.xml</include>
-        <include>ohd-request.xml</include>
-        <include>alertviz-request.xml</include>
-        <include>auth-common.xml</include>
-        <include>auth-request.xml</include>
-        <include>persist-request.xml</include>
-        <include>menus-request.xml</include>
-        <include>utility-common.xml</include>
-        <include>utility-request.xml</include>
-        <include>management-common.xml</include>
-        <include>management-request.xml</include>
-        <include>manualIngest-common.xml</include>
-        <include>manualIngest-request.xml</include>
-        <include>auth-request.xml</include>
-        <include>persist-request.xml</include>
-        <include>site-common.xml</include>
-        <include>site-request.xml</include>
-        <include>time-common.xml</include>
-        <include>units-common.xml</include>
-        <include>event-common.xml</include>
-        <include>eventbus-common.xml</include>
-        <include>edex-request.xml</include>
-        <include>request-service.xml</include>
-        <include>request-service-common.xml</include>
-    </mode>
-</edexModes>
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.mpe/res/spring/mpe-db.xml b/edexOsgi/com.raytheon.uf.edex.plugin.mpe/res/spring/mpe-db.xml
deleted file mode 100644
index 015c44e39d..0000000000
--- a/edexOsgi/com.raytheon.uf.edex.plugin.mpe/res/spring/mpe-db.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<beans xmlns="http://www.springframework.org/schema/beans"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://www.springframework.org/schema/beans
-    http://www.springframework.org/schema/beans/spring-beans.xsd">
-
-    <!-- Utilizes session factories and transaction managers defined in: ohd-common-database.xml -->
-
-    <!-- Transaction templates -->
-
-    <bean id="ihfsTxTemplate"
-        class="org.springframework.transaction.support.TransactionTemplate"
-        depends-on="util">
-        <property name="transactionManager" ref="ihfsTxManager" />
-    </bean>
-
-    <bean id="damcatTxTemplate"
-        class="org.springframework.transaction.support.TransactionTemplate"
-        depends-on="util">
-        <property name="transactionManager" ref="damTxManager" />
-    </bean>
-
-</beans>
\ No newline at end of file