diff --git a/edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/iscMosaic.py b/edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/iscMosaic.py
index efa1451c05..7e28103f3c 100644
--- a/edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/iscMosaic.py
+++ b/edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/iscMosaic.py
@@ -87,7 +87,7 @@ from com.raytheon.uf.edex.database.cluster import ClusterTask
 # 
 
 
-BATCH_WRITE_COUNT = 10
+BATCH_WRITE_COUNT = 20
 BATCH_DELAY = 0.0
 
 ISC_USER="isc"
@@ -113,15 +113,20 @@ class WECache(object):
             for i in tokill:
                 del pyInv[i]
 
-        javaTRs = ArrayList()
-        for tr in pyInv:
-            javaTRs.add(iscUtil.toJavaTimeRange(tr))
-        gridsAndHist = self._we.get(javaTRs, True)
-        for idx, tr in enumerate(pyInv):
-            pair = gridsAndHist.get(idx)
-            g = self.__encodeGridSlice(pair.getFirst())
-            h = self.__encodeGridHistory(pair.getSecond())
-            self._inv[tr] = (g, h)
+        lst = list(pyInv)
+        while len(lst):
+            i = lst[:BATCH_WRITE_COUNT]
+            javaTRs = ArrayList()
+            for tr in i:
+                javaTRs.add(iscUtil.toJavaTimeRange(tr))
+            gridsAndHist = self._we.get(javaTRs, True)
+            for idx, tr in enumerate(i):
+                pair = gridsAndHist.get(idx)
+                g = self.__encodeGridSlice(pair.getFirst())
+                h = self.__encodeGridHistory(pair.getSecond())
+                self._inv[tr] = (g, h)
+            lst = lst[BATCH_WRITE_COUNT:]
+            time.sleep(BATCH_DELAY)
 
     def keys(self):
         if not self._invCache:
diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/geospatialConfig_ZONE.xml b/edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/geospatialConfig_ZONE.xml
index 8f531db6bc..f7665c33b8 100644
--- a/edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/geospatialConfig_ZONE.xml
+++ b/edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/geospatialConfig_ZONE.xml
@@ -198,10 +198,4 @@
   	</sortBy>
  </pointSource>
  
-<!-- Include Various geospatial XML files to create their objects. These are *NOT*
-turned on unless the corresponding .vm file is turned on in a given template's .vm file
--->  
-<include file="mileMarkers.xml"/>
-<!-- To enable, make sure mileMarkers.vm is added/uncommented in a WarnGen template's .vm file -->
-<include file="pointMarkers.xml"/>
-<!-- To enable, make sure pointMarkers.vm is added/uncommented in a WarnGen template's .vm file -->
+
diff --git a/pythonPackages/dynamicserialize/dstypes/gov/noaa/nws/ncep/common/dataplugin/gempak/request/GetGridDataRequest.py b/pythonPackages/dynamicserialize/dstypes/gov/noaa/nws/ncep/common/dataplugin/gempak/request/GetGridDataRequest.py
index 082dea578a..839d5fbfee 100644
--- a/pythonPackages/dynamicserialize/dstypes/gov/noaa/nws/ncep/common/dataplugin/gempak/request/GetGridDataRequest.py
+++ b/pythonPackages/dynamicserialize/dstypes/gov/noaa/nws/ncep/common/dataplugin/gempak/request/GetGridDataRequest.py
@@ -34,7 +34,7 @@ class GetGridDataRequest(object):
     def getFcstsec(self):
         return self.fcstsec
 
-    def setFcstSec(self, reftime):
+    def setFcstSec(self, fcstsec):
         self.fcstsec = fcstsec
 
     def getLevel1(self):
diff --git a/rpms/build/i386/build.sh b/rpms/build/i386/build.sh
index 878964bba4..07bd7129bf 100644
--- a/rpms/build/i386/build.sh
+++ b/rpms/build/i386/build.sh
@@ -143,7 +143,6 @@ if [ "${1}" = "-postgres" ]; then
 fi
 
 if [ "${1}" = "-delta" ]; then
-   buildRPM "awips2-common-base"
    buildCAVE
    if [ $? -ne 0 ]; then
       exit 1
@@ -162,7 +161,6 @@ if [ "${1}" = "-delta" ]; then
    buildRPM "awips2-python-ufpy"
    buildRPM "awips2-python-qpid"
 
-   buildRPM "awips2-adapt-native"
    buildRPM "awips2-aviation-shared"
    buildRPM "awips2-cli"
    buildRPM "awips2-database"
@@ -186,7 +184,6 @@ fi
 
 if [ "${1}" = "-full" ]; then
    buildRPM "awips2"
-   buildRPM "awips2-common-base"
    buildCAVE
    if [ $? -ne 0 ]; then
       exit 1
@@ -219,7 +216,6 @@ if [ "${1}" = "-full" ]; then
    buildRPM "awips2-python-pycairo"
    buildRPM "awips2-python-shapely"
 
-   buildRPM "awips2-adapt-native"
    buildRPM "awips2-aviation-shared"
    buildRPM "awips2-cli"
    buildRPM "awips2-database"
@@ -355,8 +351,6 @@ if [ "${1}" = "-viz" ]; then
 fi
 
 if [ "${1}" = "-edex" ]; then
-   buildRPM "awips2-gfesuite-client"
-   buildRPM "awips2-gfesuite-server"
    buildRPM "awips2-edex-environment"
    buildEDEX
    if [ $? -ne 0 ]; then
@@ -404,10 +398,13 @@ if [ "${1}" = "-custom" ]; then
    #   exit 1
    #fi
    #buildRPM "awips2-httpd-pypies"
+
    #buildRPM "awips2-ant"
-   buildRPM "awips2-adapt-native"
-   #buildRPM "awips2-common-base"
-   buildRPM "awips2-hydroapps-shared"
+   #buildRPM "awips2-adapt-native"
+   buildRPM "awips2-common-base"
+   buildRPM "awips2-gfesuite-client"
+   buildRPM "awips2-gfesuite-server"
+   #buildRPM "awips2-hydroapps-shared"
    #buildRPM "awips2-java"
    #buildRPM "awips2-python-dynamicserialize"
    #buildRPM "awips2-rcm"
diff --git a/rpms/build/i386/build.sh-keep-10212013 b/rpms/build/i386/build.sh-keep-10212013
deleted file mode 100644
index 9ee32c3e1c..0000000000
--- a/rpms/build/i386/build.sh-keep-10212013
+++ /dev/null
@@ -1,444 +0,0 @@
-#!/bin/bash
-
-function buildRPM()
-{
-   # Arguments:
-   #   ${1} == the name of the rpm.
-   lookupRPM "${1}"
-   if [ $? -ne 0 ]; then
-      echo "ERROR: '${1}' is not a recognized AWIPS II RPM."
-      exit 1
-   fi
-
-   /usr/bin/rpmbuild -ba \
-      --define '_topdir %(echo ${AWIPSII_TOP_DIR})' \
-      --define '_baseline_workspace %(echo ${WORKSPACE})' \
-      --define '_uframe_eclipse %(echo ${UFRAME_ECLIPSE})' \
-      --define '_awipscm_share %(echo ${AWIPSCM_SHARE})' \
-      --define '_build_root %(echo ${AWIPSII_BUILD_ROOT})' \
-      --define '_component_version %(echo ${AWIPSII_VERSION})' \
-      --define '_component_release %(echo ${AWIPSII_RELEASE})' \
-      --define '_component_build_date %(echo ${COMPONENT_BUILD_DATE})' \
-      --define '_component_build_time %(echo ${COMPONENT_BUILD_TIME})' \
-      --define '_component_build_system %(echo ${COMPONENT_BUILD_SYSTEM})' \
-      --buildroot ${AWIPSII_BUILD_ROOT} \
-      ${RPM_SPECIFICATION}/component.spec
-   if [ $? -ne 0 ]; then
-      echo "ERROR: Failed to build RPM ${1}."
-      exit 1
-   fi
-
-   return 0
-}
-
-# This script will build all of the 32-bit rpms.
-# Ensure that we are on a machine with the correct architecture.
-
-architecture=`uname -i`
-if [ ! "${architecture}" = "i386" ]; then
-   echo "ERROR: This build can only be performed on a 32-bit Operating System."
-   exit 1
-fi
-
-# Determine which directory we are running from.
-path_to_script=`readlink -f $0`
-dir=$(dirname $path_to_script)
-
-common_dir=`cd ${dir}/../common; pwd;`
-if [ $? -ne 0 ]; then
-   echo "ERROR: Unable to find the common functions directory."
-   exit 1
-fi
-# source the common functions.
-source ${common_dir}/lookupRPM.sh
-if [ $? -ne 0 ]; then
-   echo "ERROR: Unable to source the common functions."
-   exit 1
-fi
-source ${common_dir}/usage.sh
-if [ $? -ne 0 ]; then
-   echo "ERROR: Unable to source the common functions."
-   exit 1
-fi
-source ${common_dir}/rpms.sh
-if [ $? -ne 0 ]; then
-   echo "ERROR: Unable to source the common functions."
-   exit 1
-fi
-source ${common_dir}/systemInfo.sh
-if [ $? -ne 0 ]; then
-   echo "ERROR: Unable to retrieve the system information."
-   exit 1
-fi
-
-# prepare the build environment.
-source ${dir}/buildEnvironment.sh
-if [ $? -ne 0 ]; then
-   echo "ERROR: Unable to prepare the build environment."
-   exit 1
-fi
-
-export LIGHTNING=true
-# Determine if the optional '-nobinlightning' argument has been specified.
-if [ "${2}" = "-nobinlightning" ]; then
-   LIGHTNING=false
-fi
-
-if [ "${1}" = "-python-qpid" ]; then
-   buildRPM "awips2-python-qpid"
-   buildRPM "awips2-python"
-   buildRPM "awips2-python-cherrypy"
-   buildRPM "awips2-python-dynamicserialize"
-   buildRPM "awips2-python-nose"
-   buildRPM "awips2-python-numpy"
-   buildRPM "awips2-python-h5py"
-   buildRPM "awips2-python-jimporter"
-   buildRPM "awips2-python-matplotlib"
-   buildRPM "awips2-python-pil"
-   buildRPM "awips2-python-pmw"
-   buildRPM "awips2-python-pupynere"
-   buildRPM "awips2-python-scientific"
-   buildRPM "awips2-python-scipy"
-   buildRPM "awips2-python-tables"
-   buildRPM "awips2-python-thrift"
-   buildRPM "awips2-python-tpg"
-   buildRPM "awips2-python-ufpy"
-   buildRPM "awips2-python-werkzeug"
-   buildRPM "awips2-python-pygtk"
-   buildRPM "awips2-python-pycairo"
-   if [ $? -ne 0 ]; then
-      exit 1
-   fi
-
-   buildQPID
-   if [ $? -ne 0 ]; then
-      exit 1
-   fi
-
-   buildRPM "awips2-python-shapely"
-
-   exit 0
-fi
-
-if [ "${1}" = "-postgres" ]; then
-   buildRPM "awips2-postgres"
-   buildRPM "awips2-database-server-configuration"
-   buildRPM "awips2-database-standalone-configuration"
-   buildRPM "awips2-database"
-   buildRPM "awips2-maps-database"
-   buildRPM "awips2-pgadmin3"
-   buildRPM "awips2-data.hdf5-gfe.climo"
-   buildRPM "awips2-data.hdf5-topo"
-   buildRPM "awips2-notification"
-   buildRPM "awips2-tools"
-
-   exit 0
-fi
-
-if [ "${1}" = "-delta" ]; then
-   buildRPM "awips2-common-base"
-   buildCAVE
-   if [ $? -ne 0 ]; then
-      exit 1
-   fi
-   buildRPM "awips2-alertviz"
-   buildEDEX
-   if [ $? -ne 0 ]; then
-      exit 1
-   fi
-
-   buildRPM "awips2-ncep-database"
-   buildRPM "awips2-gfesuite-client"
-   buildRPM "awips2-gfesuite-server"
-   buildRPM "awips2-python"
-   buildRPM "awips2-python-dynamicserialize"
-   buildRPM "awips2-python-ufpy"
-   buildRPM "awips2-python-qpid"
-
-   buildRPM "awips2-adapt-native"
-   buildRPM "awips2-aviation-shared"
-   buildRPM "awips2-cli"
-   buildRPM "awips2-database"
-   buildRPM "awips2-database-server-configuration"
-   buildRPM "awips2-database-standalone-configuration"
-   buildRPM "awips2-data.hdf5-gfe.climo"
-   buildRPM "awips2-localapps-environment"
-   buildRPM "awips2-maps-database"
-   buildRPM "awips2-notification"
-   buildRPM "awips2-pypies"
-   buildRPM "awips2-data.hdf5-topo"
-   buildRPM "awips2-data.gfe"
-   buildRPM "awips2-rcm"
-   buildLocalizationRPMs
-   if [ $? -ne 0 ]; then
-      exit 1
-   fi
-
-   exit 0
-fi
-
-if [ "${1}" = "-full" ]; then
-   buildRPM "awips2-common-base"
-   buildCAVE
-   if [ $? -ne 0 ]; then
-      exit 1
-   fi
-   buildRPM "awips2-alertviz"
-   buildEDEX
-   if [ $? -ne 0 ]; then
-      exit 1
-   fi
-   buildRPM "awips2-python"
-   buildRPM "awips2-python-cherrypy"
-   buildRPM "awips2-python-dynamicserialize"
-   buildRPM "awips2-python-h5py"
-   buildRPM "awips2-python-jimporter"
-   buildRPM "awips2-python-matplotlib"
-   buildRPM "awips2-python-nose"
-   buildRPM "awips2-python-numpy"
-   buildRPM "awips2-python-pil"
-   buildRPM "awips2-python-pmw"
-   buildRPM "awips2-python-pupynere"
-   buildRPM "awips2-python-qpid"
-   buildRPM "awips2-python-scientific"
-   buildRPM "awips2-python-scipy"
-   buildRPM "awips2-python-tables"
-   buildRPM "awips2-python-thrift"
-   buildRPM "awips2-python-tpg"
-   buildRPM "awips2-python-ufpy"
-   buildRPM "awips2-python-werkzeug"
-   buildRPM "awips2-python-pygtk"
-   buildRPM "awips2-python-pycairo"
-   buildRPM "awips2-python-shapely"
-
-   buildRPM "awips2-adapt-native"
-   buildRPM "awips2-aviation-shared"
-   buildRPM "awips2-cli"
-   buildRPM "awips2-database"
-   buildRPM "awips2-database-server-configuration"
-   buildRPM "awips2-database-standalone-configuration"
-   buildRPM "awips2-data.hdf5-gfe.climo"
-   buildRPM "awips2-data.gfe"
-   buildRPM "awips2-gfesuite-client"
-   buildRPM "awips2-gfesuite-server"
-   buildRPM "awips2-hydroapps-shared"
-   buildRPM "awips2-localapps-environment"
-   buildRPM "awips2-ncep-database"
-   buildRPM "awips2-maps-database"
-   buildRPM "awips2-notification"
-   buildRPM "awips2-pypies"
-   buildRPM "awips2-data.hdf5-topo"
-   buildRPM "awips2-rcm"
-   buildLocalizationRPMs
-   if [ $? -ne 0 ]; then
-      exit 1
-   fi
-
-   buildQPID
-   if [ $? -ne 0 ]; then
-      exit 1
-   fi
-
-   buildRPM "awips2-ant"
-   unpackHttpdPypies
-   if [ $? -ne 0 ]; then
-      exit 1
-   fi
-   buildRPM "awips2-httpd-pypies"
-   buildJava
-   buildRPM "awips2-groovy"
-   buildRPM "awips2-postgres"
-   buildRPM "awips2-pgadmin3"
-   buildRPM "awips2-tools"
-   buildRPM "awips2-openfire"
-   buildRPM "awips2-httpd-collaboration"
-
-   exit 0
-fi
-
-if [ "${1}" = "-ade" ]; then
-   buildRPM "awips2-eclipse"
-   buildJava
-   buildRPM "awips2-ant"
-   buildRPM "awips2-python"
-   buildRPM "awips2-python-cherrypy"
-   buildRPM "awips2-python-dynamicserialize"
-   buildRPM "awips2-python-h5py"
-   buildRPM "awips2-python-jimporter"
-   buildRPM "awips2-python-matplotlib"
-   buildRPM "awips2-python-nose"
-   buildRPM "awips2-python-numpy"
-   buildRPM "awips2-python-pil"
-   buildRPM "awips2-python-pmw"
-   buildRPM "awips2-python-pupynere"
-   buildRPM "awips2-python-qpid"
-   buildRPM "awips2-python-scientific"
-   buildRPM "awips2-python-scipy"
-   buildRPM "awips2-python-tables"
-   buildRPM "awips2-python-thrift"
-   buildRPM "awips2-python-tpg"
-   buildRPM "awips2-python-ufpy"
-   buildRPM "awips2-python-werkzeug"
-   buildRPM "awips2-python-pygtk"
-   buildRPM "awips2-python-pycairo"
-   buildRPM "awips2-python-shapely"
-   buildQPID -ade
-   if [ $? -ne 0 ]; then
-      exit 1
-   fi
-
-   # Package the ade.
-   # Create the containing directory.
-   ade_directory="awips2-ade-${AWIPSII_VERSION}-${AWIPSII_RELEASE}"
-   if [ -d ${WORKSPACE}/${ade_directory} ]; then
-      rm -rf ${WORKSPACE}/${ade_directory}
-      if [ $? -ne 0 ]; then
-         exit 1
-      fi
-   fi
-   mkdir -p ${WORKSPACE}/${ade_directory}
-   if [ $? -ne 0 ]; then
-      exit 1
-   fi
-
-   # Copy the rpms to the directory.
-   cp -v ${AWIPSII_TOP_DIR}/RPMS/i386/* \
-      ${AWIPSII_TOP_DIR}/RPMS/noarch/* \
-      ${WORKSPACE}/${ade_directory}
-   if [ $? -ne 0 ]; then
-      exit 1
-   fi
-
-   awips2_ade_directory="${WORKSPACE}/rpms/awips2.ade"
-   # Copy the install and uninstall script to the directory.
-   cp -v ${awips2_ade_directory}/tar.ade/scripts/*.sh \
-      ${WORKSPACE}/${ade_directory}
-   if [ $? -ne 0 ]; then
-      exit 1
-   fi
-
-   # Tar the directory.
-   pushd . > /dev/null 2>&1
-   cd ${WORKSPACE}
-   tar -cvf ${ade_directory}.tar ${ade_directory}
-   popd > /dev/null 2>&1
-   RC=$?
-   if [ ${RC} -ne 0 ]; then
-      exit 1
-   fi
-
-   exit 0
-fi
-
-if [ "${1}" = "-viz" ]; then
-   buildCAVE
-   if [ $? -ne 0 ]; then
-      exit 1
-   fi
-   buildRPM "awips2-alertviz"
-
-   exit 0
-fi
-
-if [ "${1}" = "-edex" ]; then
-   buildRPM "awips2-gfesuite-client"
-   buildRPM "awips2-gfesuite-server"
-   buildRPM "awips2-edex-environment"
-   buildEDEX
-   if [ $? -ne 0 ]; then
-      exit 1
-   fi
-
-   exit 0
-fi
-
-if [ "${1}" = "-localization" ]; then
-   buildLocalizationRPMs
-   if [ $? -ne 0 ]; then
-      exit 1
-   fi
-
-   exit 0
-fi
-
-
-if [ "${1}" = "-qpid" ]; then
-   buildQPID
-   if [ $? -ne 0 ]; then
-      exit 1
-   fi
-
-   exit 0
-fi
-
-if [ "${1}" = "-ldm" ]; then
-   buildRPM "awips2-ldm"
-
-   exit 0
-fi
-
-if [ "${1}" = "-awips2" ]; then
-   buildRPM "awips2"
-
-   exit 0
-fi
-
-# Use the custom flag for selecting specific rpms to build
-if [ "${1}" = "-custom" ]; then
-   unpackHttpdPypies
-   if [ $? -ne 0 ]; then
-      exit 1
-   fi
-   buildRPM "awips2-httpd-pypies"
-   buildRPM "awips2-adapt-native"
-   buildRPM "awips2-hydroapps-shared"
-   buildRPM "awips2-common-base"
-   buildRPM "awips2-rcm"
-   #buildRPM "awips2-ant"
-   #buildRPM "awips2-java"
-   #buildRPM "awips2-tools"
-
-   exit 0
-fi
-
-if [ "${1}" = "-package" ]; then
-   repository_directory="awips2-repository-${AWIPSII_VERSION}-${AWIPSII_RELEASE}"
-   if [ -d ${WORKSPACE}/${repository_directory} ]; then
-      rm -rf ${WORKSPACE}/${repository_directory}
-      if [ $? -ne 0 ]; then
-         exit 1
-      fi
-   fi
-   mkdir -p ${WORKSPACE}/${repository_directory}/${AWIPSII_VERSION}-${AWIPSII_RELEASE}
-   if [ $? -ne 0 ]; then
-      exit 1
-   fi
-
-   cp -r ${AWIPSII_TOP_DIR}/RPMS/* \
-      ${WORKSPACE}/${repository_directory}/${AWIPSII_VERSION}-${AWIPSII_RELEASE}
-   if [ $? -ne 0 ]; then
-      exit 1
-   fi
-
-   rpms_directory="${WORKSPACE}/rpms"
-   comps_xml="${rpms_directory}/common/yum/arch.x86/comps.xml"
-   cp -v ${comps_xml} ${WORKSPACE}/${repository_directory}
-   if [ $? -ne 0 ]; then
-      exit 1
-   fi
-
-   pushd . > /dev/null
-   cd ${WORKSPACE}
-   tar -cvf ${repository_directory}.tar ${repository_directory}
-   RC=$?
-   popd > /dev/null
-   if [ ${RC} -ne 0 ]; then
-      exit 1
-   fi
-
-   exit 0
-fi
-
-
-usage
-exit 0
diff --git a/rpms/build/i386/build.sh-keep-10312013 b/rpms/build/i386/build.sh-keep-11012013
similarity index 98%
rename from rpms/build/i386/build.sh-keep-10312013
rename to rpms/build/i386/build.sh-keep-11012013
index 061f2699f7..81ce76f3e7 100644
--- a/rpms/build/i386/build.sh-keep-10312013
+++ b/rpms/build/i386/build.sh-keep-11012013
@@ -136,7 +136,6 @@ if [ "${1}" = "-postgres" ]; then
 fi
 
 if [ "${1}" = "-delta" ]; then
-   buildRPM "awips2-common-base"
    buildCAVE
    if [ $? -ne 0 ]; then
       exit 1
@@ -155,7 +154,6 @@ if [ "${1}" = "-delta" ]; then
    buildRPM "awips2-python-ufpy"
    buildRPM "awips2-python-qpid"
 
-   buildRPM "awips2-adapt-native"
    buildRPM "awips2-aviation-shared"
    buildRPM "awips2-cli"
    buildRPM "awips2-database"
@@ -178,7 +176,6 @@ if [ "${1}" = "-delta" ]; then
 fi
 
 if [ "${1}" = "-full" ]; then
-   buildRPM "awips2-common-base"
    buildCAVE
    if [ $? -ne 0 ]; then
       exit 1
@@ -211,7 +208,6 @@ if [ "${1}" = "-full" ]; then
    buildRPM "awips2-python-pycairo"
    buildRPM "awips2-python-shapely"
 
-   buildRPM "awips2-adapt-native"
    buildRPM "awips2-aviation-shared"
    buildRPM "awips2-cli"
    buildRPM "awips2-database"
@@ -341,8 +337,6 @@ if [ "${1}" = "-viz" ]; then
 fi
 
 if [ "${1}" = "-edex" ]; then
-   buildRPM "awips2-gfesuite-client"
-   buildRPM "awips2-gfesuite-server"
    buildRPM "awips2-edex-environment"
    buildEDEX
    if [ $? -ne 0 ]; then
@@ -390,12 +384,15 @@ if [ "${1}" = "-custom" ]; then
    #   exit 1
    #fi
    #buildRPM "awips2-httpd-pypies"
+
    #buildRPM "awips2-ant"
-   #buildRPM "awips2-adapt-native"
+   buildRPM "awips2-adapt-native"
    #buildRPM "awips2-common-base"
-   #buildRPM "awips2-hydroapps-shared"
+   buildRPM "awips2-gfesuite-client"
+   buildRPM "awips2-gfesuite-server"
+   buildRPM "awips2-hydroapps-shared"
    #buildRPM "awips2-java"
-   buildRPM "awips2-python-dynamicserialize"
+   #buildRPM "awips2-python-dynamicserialize"
    #buildRPM "awips2-rcm"
    #buildRPM "awips2-tools"
 
diff --git a/rpms/build/x86_64/build.sh b/rpms/build/x86_64/build.sh
index b61205f522..a06a560774 100644
--- a/rpms/build/x86_64/build.sh
+++ b/rpms/build/x86_64/build.sh
@@ -85,7 +85,6 @@ if [ "${2}" = "-nobinlightning" ]; then
 fi
 
 if [ "${1}" = "-64bit" ]; then
-   buildRPM "awips2-common-base"
    buildCAVE
    if [ $? -ne 0 ]; then
       exit 1
@@ -135,7 +134,6 @@ if [ "${1}" = "-postgres" ]; then
 fi
 
 if [ "${1}" = "-delta" ]; then
-   buildRPM "awips2-common-base"
    buildCAVE
    if [ $? -ne 0 ]; then
       exit 1
@@ -149,8 +147,6 @@ if [ "${1}" = "-delta" ]; then
    buildRPM "awips2-python-ufpy"
    buildRPM "awips2-cli"
    buildRPM "awips2-data.hdf5-gfe.climo"
-   buildRPM "awips2-gfesuite-client"
-   buildRPM "awips2-gfesuite-server"
    buildRPM "awips2-localapps-environment"
    buildRPM "awips2-data.hdf5-topo"
    buildRPM "awips2-data.gfe"
@@ -166,12 +162,12 @@ fi
 
 if [ "${1}" = "-full" ]; then
    buildRPM "awips2"
-   buildRPM "awips2-common-base"
    buildCAVE
    if [ $? -ne 0 ]; then
       exit 1
    fi
    buildRPM "awips2-alertviz"
+
    buildEDEX
    if [ $? -ne 0 ]; then
       exit 1
@@ -199,8 +195,6 @@ if [ "${1}" = "-full" ]; then
    buildRPM "awips2-python-pycairo"
    buildRPM "awips2-cli"
    buildRPM "awips2-data.hdf5-gfe.climo"
-   buildRPM "awips2-gfesuite-client"
-   buildRPM "awips2-gfesuite-server"
    buildRPM "awips2-localapps-environment"
    buildRPM "awips2-data.hdf5-topo"
    buildRPM "awips2-data.gfe"
@@ -236,7 +230,6 @@ if [ "${1}" = "-ade" ]; then
 fi
 
 if [ "${1}" = "-viz" ]; then
-   buildRPM "awips2-common-base"
    buildCAVE
    if [ $? -ne 0 ]; then
       exit 1
@@ -247,7 +240,6 @@ if [ "${1}" = "-viz" ]; then
 fi
 
 if [ "${1}" = "-edex" ]; then
-   buildRPM "awips2-common-base"
    buildRPM "awips2-edex-environment"
    buildEDEX
    if [ $? -ne 0 ]; then
@@ -286,9 +278,13 @@ if [ "${1}" = "-custom" ]; then
    #   exit 1
    #fi  
    #buildRPM "awips2-httpd-pypies"
-   buildRPM "awips2-adapt-native"
+
+   #buildRPM "awips2-adapt-native"
    #buildRPM "awips2-ant"
-   buildRPM "awips2-hydroapps-shared"
+   buildRPM "awips2-common-base"
+   #buildRPM "awips2-gfesuite-client"
+   #buildRPM "awips2-gfesuite-server"
+   #buildRPM "awips2-hydroapps-shared"
    #buildRPM "awips2-java"
    #buildRPM "awips2-python-dynamicserialize"
    #buildRPM "awips2-tools"
diff --git a/rpms/build/x86_64/build.sh-10312013 b/rpms/build/x86_64/build.sh-10312013
deleted file mode 100644
index fcd9f21030..0000000000
--- a/rpms/build/x86_64/build.sh-10312013
+++ /dev/null
@@ -1,338 +0,0 @@
-#!/bin/bash
-
-function buildRPM()
-{
-   # Arguments:
-   #   ${1} == the name of the rpm.
-   lookupRPM "${1}"
-   if [ $? -ne 0 ]; then
-      echo "ERROR: '${1}' is not a recognized AWIPS II RPM."
-      exit 1
-   fi
-
-   /usr/bin/rpmbuild -ba \
-      --define '_topdir %(echo ${AWIPSII_TOP_DIR})' \
-      --define '_baseline_workspace %(echo ${WORKSPACE})' \
-      --define '_uframe_eclipse %(echo ${UFRAME_ECLIPSE})' \
-      --define '_awipscm_share %(echo ${AWIPSCM_SHARE})' \
-      --define '_build_root %(echo ${AWIPSII_BUILD_ROOT})' \
-      --define '_component_version %(echo ${AWIPSII_VERSION})' \
-      --define '_component_release %(echo ${AWIPSII_RELEASE})' \
-      --define '_component_build_date %(echo ${COMPONENT_BUILD_DATE})' \
-      --define '_component_build_time %(echo ${COMPONENT_BUILD_TIME})' \
-      --define '_component_build_system %(echo ${COMPONENT_BUILD_SYSTEM})' \
-      --buildroot ${AWIPSII_BUILD_ROOT} \
-      ${RPM_SPECIFICATION}/component.spec
-   if [ $? -ne 0 ]; then
-      echo "ERROR: Failed to build RPM ${1}."
-      exit 1
-   fi
-
-   return 0
-}
-
-# This script will build all of the 64-bit rpms.
-# Ensure that we are on a machine with the correct architecture.
-
-architecture=`uname -i`
-if [ ! "${architecture}" = "x86_64" ]; then
-   echo "ERROR: This build can only be performed on a 64-bit Operating System."
-   exit 1
-fi
-
-# Determine which directory we are running from.
-path_to_script=`readlink -f $0`
-dir=$(dirname $path_to_script)
-
-common_dir=`cd ${dir}/../common; pwd;`
-if [ $? -ne 0 ]; then
-   echo "ERROR: Unable to find the common functions directory."
-   exit 1
-fi
-# source the common functions.
-source ${common_dir}/lookupRPM.sh
-if [ $? -ne 0 ]; then
-   echo "ERROR: Unable to source the common functions."
-   exit 1
-fi
-source ${common_dir}/usage.sh
-if [ $? -ne 0 ]; then
-   echo "ERROR: Unable to source the common functions."
-   exit 1
-fi
-source ${common_dir}/rpms.sh
-if [ $? -ne 0 ]; then
-   echo "ERROR: Unable to source the common functions."
-   exit 1
-fi
-source ${common_dir}/systemInfo.sh
-if [ $? -ne 0 ]; then
-   echo "ERROR: Unable to retrieve the system information."
-   exit 1
-fi
-
-# prepare the build environment.
-source ${dir}/buildEnvironment.sh
-if [ $? -ne 0 ]; then
-   echo "ERROR: Unable to prepare the build environment."
-   exit 1
-fi
-
-export LIGHTNING=true
-# Determine if the optional '-nobinlightning' argument has been specified.
-if [ "${2}" = "-nobinlightning" ]; then
-   LIGHTNING=false
-fi
-
-if [ "${1}" = "-64bit" ]; then
-   buildRPM "awips2-common-base"
-   buildCAVE
-   if [ $? -ne 0 ]; then
-      exit 1
-   fi
-   buildRPM "awips2-alertviz"
-   if [ $? -ne 0 ]; then
-      exit 1
-   fi
-   buildRPM "awips2-python"
-   buildRPM "awips2-python-cherrypy"
-   buildRPM "awips2-python-dynamicserialize"
-   buildRPM "awips2-python-h5py"
-   buildRPM "awips2-python-jimporter"
-   buildRPM "awips2-python-matplotlib"
-   buildRPM "awips2-python-nose"
-   buildRPM "awips2-python-numpy"
-   buildRPM "awips2-python-pil"
-   buildRPM "awips2-python-pmw"
-   buildRPM "awips2-python-pupynere"
-   buildRPM "awips2-python-qpid"
-   buildRPM "awips2-python-scientific"
-   buildRPM "awips2-python-scipy"
-   buildRPM "awips2-python-tables"
-   buildRPM "awips2-python-thrift"
-   buildRPM "awips2-python-tpg"
-   buildRPM "awips2-python-ufpy"
-   buildRPM "awips2-python-werkzeug"
-   buildRPM "awips2-python-pygtk"
-   buildRPM "awips2-python-pycairo"
-   buildJava
-   buildRPM "awips2-python-shapely"
-   buildRPM "awips2-notification"
-
-   exit 0
-fi
-
-if [ "${1}" = "-postgres" ]; then
-   buildRPM "awips2-postgres"
-   buildRPM "awips2-database-server-configuration"
-   buildRPM "awips2-database-standalone-configuration"
-   buildRPM "awips2-database"
-   buildRPM "awips2-maps-database"
-   buildRPM "awips2-ncep-database"
-   buildRPM "awips2-pgadmin3"
-
-   exit 0
-fi
-
-if [ "${1}" = "-delta" ]; then
-   buildRPM "awips2-common-base"
-   buildCAVE
-   if [ $? -ne 0 ]; then
-      exit 1
-   fi
-   buildRPM "awips2-alertviz"
-   buildEDEX
-   if [ $? -ne 0 ]; then
-      exit 1
-   fi
-   buildRPM "awips2-python-dynamicserialize"
-   buildRPM "awips2-python-ufpy"
-   buildRPM "awips2-cli"
-   buildRPM "awips2-data.hdf5-gfe.climo"
-   buildRPM "awips2-gfesuite-client"
-   buildRPM "awips2-gfesuite-server"
-   buildRPM "awips2-localapps-environment"
-   buildRPM "awips2-data.hdf5-topo"
-   buildRPM "awips2-data.gfe"
-   buildLocalizationRPMs
-   if [ $? -ne 0 ]; then
-      exit 1
-   fi
-   buildRPM "awips2-edex-environment"
-   buildRPM "awips2-notification"
-
-   exit 0
-fi
-
-if [ "${1}" = "-full" ]; then
-   buildRPM "awips2-common-base"
-   buildCAVE
-   if [ $? -ne 0 ]; then
-      exit 1
-   fi
-   buildRPM "awips2-alertviz"
-   buildEDEX
-   if [ $? -ne 0 ]; then
-      exit 1
-   fi
-   buildRPM "awips2-python"
-   buildRPM "awips2-python-cherrypy"
-   buildRPM "awips2-python-dynamicserialize"
-   buildRPM "awips2-python-h5py"
-   buildRPM "awips2-python-jimporter"
-   buildRPM "awips2-python-matplotlib"
-   buildRPM "awips2-python-nose"
-   buildRPM "awips2-python-numpy"
-   buildRPM "awips2-python-pil"
-   buildRPM "awips2-python-pmw"
-   buildRPM "awips2-python-pupynere"
-   buildRPM "awips2-python-qpid"
-   buildRPM "awips2-python-scientific"
-   buildRPM "awips2-python-scipy"
-   buildRPM "awips2-python-tables"
-   buildRPM "awips2-python-thrift"
-   buildRPM "awips2-python-tpg"
-   buildRPM "awips2-python-ufpy"
-   buildRPM "awips2-python-werkzeug"
-   buildRPM "awips2-python-pygtk"
-   buildRPM "awips2-python-pycairo"
-   buildRPM "awips2-cli"
-   buildRPM "awips2-data.hdf5-gfe.climo"
-   buildRPM "awips2-gfesuite-client"
-   buildRPM "awips2-gfesuite-server"
-   buildRPM "awips2-localapps-environment"
-   buildRPM "awips2-data.hdf5-topo"
-   buildRPM "awips2-data.gfe"
-   unpackHttpdPypies
-   if [ $? -ne 0 ]; then
-      exit 1
-   fi
-   buildRPM "awips2-httpd-pypies"
-   buildJava
-   buildRPM "awips2-groovy"
-   buildLocalizationRPMs
-   if [ $? -ne 0 ]; then
-      exit 1
-   fi
-   buildRPM "awips2-edex-environment"
-   buildRPM "awips2-notification"
-   buildRPM "awips2-python-shapely"
-   buildRPM "awips2-postgres"
-   buildRPM "awips2-database"
-   buildRPM "awips2-maps-database"
-   buildRPM "awips2-ncep-database"
-   buildRPM "awips2-pgadmin3"
-   buildRPM "awips2-ldm"
-   exit 0
-fi
-
-if [ "${1}" = "-ade" ]; then
-   echo "INFO: AWIPS II currently does not support a 64-bit version of the ADE."
-   exit 0
-   buildRPM "awips2-eclipse"
-
-   exit 0
-fi
-
-if [ "${1}" = "-viz" ]; then
-   buildRPM "awips2-common-base"
-   buildCAVE
-   if [ $? -ne 0 ]; then
-      exit 1
-   fi
-   buildRPM "awips2-alertviz"
-
-   exit 0
-fi
-
-if [ "${1}" = "-edex" ]; then
-   buildRPM "awips2-common-base"
-   buildRPM "awips2-edex-environment"
-   buildEDEX
-   if [ $? -ne 0 ]; then
-      exit 1
-   fi
-
-   exit 0
-fi
-
-if [ "${1}" = "-qpid" ]; then
-   buildQPID
-   if [ $? -ne 0 ]; then
-      exit 1
-   fi
-
-   exit 0
-fi
-
-if [ "${1}" = "-ldm" ]; then
-   buildRPM "awips2-ldm"
-
-   exit 0
-fi
-
-
-if [ "${1}" = "-awips2" ]; then
-   buildRPM "awips2"
-
-   exit 0
-fi
-
-# Use the custom flag for selecting specific rpms to build
-if [ "${1}" = "-custom" ]; then
-   #unpackHttpdPypies
-   #if [ $? -ne 0 ]; then
-   #   exit 1
-   #fi  
-   #buildRPM "awips2-httpd-pypies"
-   #buildRPM "awips2-adapt-native"
-   #buildRPM "awips2-hydroapps-shared"
-   #buildRPM "awips2-ant"
-   buildRPM "awips2-python-dynamicserialize"
-   #buildRPM "awips2-java"
-   #buildRPM "awips2-tools"
-
-   exit 0
-fi
-
-
-if [ "${1}" = "-package" ]; then
-   repository_directory="awips2-repository-${AWIPSII_VERSION}-${AWIPSII_RELEASE}"
-   if [ -d ${WORKSPACE}/${repository_directory} ]; then
-      rm -rf ${WORKSPACE}/${repository_directory}
-      if [ $? -ne 0 ]; then
-         exit 1
-      fi
-   fi
-   mkdir -p ${WORKSPACE}/${repository_directory}/${AWIPSII_VERSION}-${AWIPSII_RELEASE}
-   if [ $? -ne 0 ]; then
-      exit 1
-   fi
-
-   cp -r ${AWIPSII_TOP_DIR}/RPMS/* \
-      ${WORKSPACE}/${repository_directory}/${AWIPSII_VERSION}-${AWIPSII_RELEASE}
-   if [ $? -ne 0 ]; then
-      exit 1
-   fi
-
-   rpms_directory="${WORKSPACE}/rpms"
-   comps_xml="${rpms_directory}/common/yum/arch.x86_64/comps.xml"
-   cp -v ${comps_xml} ${WORKSPACE}/${repository_directory}
-   if [ $? -ne 0 ]; then
-      exit 1
-   fi
-
-   pushd . > /dev/null
-   cd ${WORKSPACE}
-   tar -cvf ${repository_directory}.tar ${repository_directory}
-   RC=$?
-   popd > /dev/null
-   if [ ${RC} -ne 0 ]; then
-      exit 1
-   fi
-
-   exit 0
-fi
-
-usage
-exit 0
diff --git a/rpms/build/x86_64/build.sh-10172013 b/rpms/build/x86_64/build.sh-keep-11012013
similarity index 96%
rename from rpms/build/x86_64/build.sh-10172013
rename to rpms/build/x86_64/build.sh-keep-11012013
index c1ac1b921a..a2d9d66f92 100644
--- a/rpms/build/x86_64/build.sh-10172013
+++ b/rpms/build/x86_64/build.sh-keep-11012013
@@ -85,7 +85,6 @@ if [ "${2}" = "-nobinlightning" ]; then
 fi
 
 if [ "${1}" = "-64bit" ]; then
-   buildRPM "awips2-common-base"
    buildCAVE
    if [ $? -ne 0 ]; then
       exit 1
@@ -135,7 +134,6 @@ if [ "${1}" = "-postgres" ]; then
 fi
 
 if [ "${1}" = "-delta" ]; then
-   buildRPM "awips2-common-base"
    buildCAVE
    if [ $? -ne 0 ]; then
       exit 1
@@ -149,8 +147,6 @@ if [ "${1}" = "-delta" ]; then
    buildRPM "awips2-python-ufpy"
    buildRPM "awips2-cli"
    buildRPM "awips2-data.hdf5-gfe.climo"
-   buildRPM "awips2-gfesuite-client"
-   buildRPM "awips2-gfesuite-server"
    buildRPM "awips2-localapps-environment"
    buildRPM "awips2-data.hdf5-topo"
    buildRPM "awips2-data.gfe"
@@ -165,12 +161,12 @@ if [ "${1}" = "-delta" ]; then
 fi
 
 if [ "${1}" = "-full" ]; then
-   buildRPM "awips2-common-base"
    buildCAVE
    if [ $? -ne 0 ]; then
       exit 1
    fi
    buildRPM "awips2-alertviz"
+
    buildEDEX
    if [ $? -ne 0 ]; then
       exit 1
@@ -198,8 +194,6 @@ if [ "${1}" = "-full" ]; then
    buildRPM "awips2-python-pycairo"
    buildRPM "awips2-cli"
    buildRPM "awips2-data.hdf5-gfe.climo"
-   buildRPM "awips2-gfesuite-client"
-   buildRPM "awips2-gfesuite-server"
    buildRPM "awips2-localapps-environment"
    buildRPM "awips2-data.hdf5-topo"
    buildRPM "awips2-data.gfe"
@@ -235,7 +229,6 @@ if [ "${1}" = "-ade" ]; then
 fi
 
 if [ "${1}" = "-viz" ]; then
-   buildRPM "awips2-common-base"
    buildCAVE
    if [ $? -ne 0 ]; then
       exit 1
@@ -246,7 +239,7 @@ if [ "${1}" = "-viz" ]; then
 fi
 
 if [ "${1}" = "-edex" ]; then
-   buildRPM "awips2-common-base"
+   buildRPM "awips2-edex-environment"
    buildEDEX
    if [ $? -ne 0 ]; then
       exit 1
@@ -279,13 +272,21 @@ fi
 
 # Use the custom flag for selecting specific rpms to build
 if [ "${1}" = "-custom" ]; then
-   unpackHttpdPypies
-   if [ $? -ne 0 ]; then
-      exit 1
-   fi  
-   buildRPM "awips2-httpd-pypies"
+   #unpackHttpdPypies
+   #if [ $? -ne 0 ]; then
+   #   exit 1
+   #fi  
+   #buildRPM "awips2-httpd-pypies"
+
    buildRPM "awips2-adapt-native"
+   #buildRPM "awips2-ant"
+   buildRPM "awips2-common-base"
+   buildRPM "awips2-gfesuite-client"
+   buildRPM "awips2-gfesuite-server"
    buildRPM "awips2-hydroapps-shared"
+   #buildRPM "awips2-java"
+   #buildRPM "awips2-python-dynamicserialize"
+   #buildRPM "awips2-tools"
 
    exit 0
 fi