diff --git a/edexOsgi/com.raytheon.edex.plugin.grib/resources/com.raytheon.edex.plugin.grib.properties b/edexOsgi/com.raytheon.edex.plugin.grib/resources/com.raytheon.edex.plugin.grib.properties
index 3bd1b36930..e3d9547faf 100644
--- a/edexOsgi/com.raytheon.edex.plugin.grib/resources/com.raytheon.edex.plugin.grib.properties
+++ b/edexOsgi/com.raytheon.edex.plugin.grib/resources/com.raytheon.edex.plugin.grib.properties
@@ -3,34 +3,18 @@
 # on the number of cores in the system.  They are defined
 # in /awips2/edex/etc/ingestGrib.sh
 
-# the number of grib split threads, this value
-# is not dynamically updated based on core count
-GRIB_SPLIT_THREADS=2
-
-# Minimum coverage of a defined subgrid for the
-# grid to be accepted, this value is not dynamically
-# updated based on core count
+GRIB_SPLIT_THREADS=4
 SUB_GRID_COVERAGE_PERCENT=20
-
-# the number of grid records allowed in a bulk persist,
-# this value is not dynamically updated based on core count
-GRID_MAX_GRIDS_PER_PERSIST=100
-
-# the max amount of memory for grids in a bulk persist,
-# this value is not dynamically updated based on core count
-GRID_MAX_MEMORY_IN_MB_PER_PERSIST=10
-
-# the number of grib decode threads.
-GRIB_DECODE_THREADS=8
-
-# the number of grib persist threads.
-GRIB_PERSIST_THREADS=4
+GRID_MAX_PERSIST_MEMORY_IN_MB=2000
+GRID_MAX_GRIDS_PER_PERSIST=1000
+GRID_MAX_MEMORY_IN_MB_PER_PERSIST=1000
+GRID_DECODE_THREADS=8
+GRID_PERSIST_THREADS=8
 
 # Maximum number of grid points to decode at one time for all threads. Large
 # grib files may cause the decoder to reach this limit and then some threads
 # will have to wait. This can be used to control the amount of memory used by
 # the decoder.
-#GRIB_MAX_GRID_POINTS=8000000
-
+#GRID_MAX_GRID_POINTS=8000000
 # Maximum number of grids in MB that are allowed to be in memory waiting to be persisted.
 #grib-persister.count.mb=100
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.grid/modes/grid-modes.xml b/edexOsgi/com.raytheon.uf.edex.plugin.grid/modes/grid-modes.xml
index ad2470f061..5b1ed6d181 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.grid/modes/grid-modes.xml
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.grid/modes/grid-modes.xml
@@ -3,7 +3,6 @@
 <edexModes>
 	<mode name="ingest">
 		<exclude>grib-decode.xml</exclude>
-		<exclude>ncgrib-file-endpoint.xml</exclude>
 		<exclude>grid-staticdata-process.xml</exclude>
 	</mode>
 	<mode name="ingestGrib">
@@ -11,7 +10,6 @@
         	<include>auth-common.xml</include>
         	<include>python-common.xml</include>
         	<include>grib-decode.xml</include>
-        	<include>ncgrib-file-endpoint.xml</include>
         	<include>grid-staticdata-process.xml</include>
         	<include>level-common.xml</include>
         	<include>levelhandler-common.xml</include>