diff --git a/cave/com.raytheon.uf.viz.d2d.ui.upperair/localization/bundles/PirepPlot.xml b/cave/com.raytheon.uf.viz.d2d.ui.upperair/localization/bundles/PirepPlot.xml
deleted file mode 100644
index 4f4a98ec2d..0000000000
--- a/cave/com.raytheon.uf.viz.d2d.ui.upperair/localization/bundles/PirepPlot.xml
+++ /dev/null
@@ -1,123 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/cave/com.raytheon.uf.viz.d2d.ui.upperair/localization/menus/upperair/basePirep.xml b/cave/com.raytheon.uf.viz.d2d.ui.upperair/localization/menus/upperair/basePirep.xml
deleted file mode 100644
index 235b388877..0000000000
--- a/cave/com.raytheon.uf.viz.d2d.ui.upperair/localization/menus/upperair/basePirep.xml
+++ /dev/null
@@ -1,107 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/cave/com.raytheon.uf.viz.d2d.ui.upperair/localization/menus/upperair/index.xml b/cave/com.raytheon.uf.viz.d2d.ui.upperair/localization/menus/upperair/index.xml
index 170cf2bde1..3a9232b70f 100644
--- a/cave/com.raytheon.uf.viz.d2d.ui.upperair/localization/menus/upperair/index.xml
+++ b/cave/com.raytheon.uf.viz.d2d.ui.upperair/localization/menus/upperair/index.xml
@@ -21,7 +21,6 @@
-
+
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/edexOsgi/com.raytheon.uf.edex.archive/utility/common_static/base/archiver/purger/PROCESSED_DATA.xml b/edexOsgi/com.raytheon.uf.edex.archive/utility/common_static/base/archiver/purger/PROCESSED_DATA.xml
index 2d66fce9f9..99bda15263 100644
--- a/edexOsgi/com.raytheon.uf.edex.archive/utility/common_static/base/archiver/purger/PROCESSED_DATA.xml
+++ b/edexOsgi/com.raytheon.uf.edex.archive/utility/common_static/base/archiver/purger/PROCESSED_DATA.xml
@@ -121,7 +121,7 @@
Observation
168
- (acars|airep|airmet|taf)
+ (acars|airmet|taf)
(bufrsigwx|sfcobs)/.*
{1}
Date
@@ -129,7 +129,7 @@
.*-(\d{4})-(\d{2})-(\d{2})-(\d{2})\..*
- The first looks for files matching the in the directories acars, airep, airmet or taf.
+ The first looks for files matching the in the directories acars, airmet or taf.
The second expects to find the files in subdirectories of bufrsigwx or sfcobs such as bufrsigwx/SWH.
Here the display will only show, redbook. The directory looked at will be /redbook/. The all
@@ -147,7 +147,7 @@
Decision Assistance
168
- (cwat|fog|ffmp|fssobs|preciprate|qpf|scan|vil)/.*(\d{4})-(\d{2})-(\d{2})-(\d{2}).*
+ (cwat|fog|ffmp|preciprate|qpf|scan|vil)/.*(\d{4})-(\d{2})-(\d{2})-(\d{2}).*
{1}
2,3,4,5
@@ -195,7 +195,7 @@
Observation
168
- (acars|airep|binlightning|bufrascat|bufrhdw|bufrmthdw|bufrssmi|idft|lsr|obs|pirep|recco|svrwx)/.*-(\d{4})-(\d{2})-(\d{2})-(\d{2})
+ (acars|binlightning|bufrascat|bufrhdw|bufrmthdw|bufrssmi|idft|lsr|obs|recco|svrwx)/.*-(\d{4})-(\d{2})-(\d{2})-(\d{2})
(sfcobs)/.*/.*-(\d{4})-(\d{2})-(\d{2})-(\d{2})
{1}
2,3,4,5
diff --git a/installEDEX.sh b/installEDEX.sh
index 84e586db39..ae009a9e0e 100755
--- a/installEDEX.sh
+++ b/installEDEX.sh
@@ -60,7 +60,10 @@ service qpidd stop
if [ ! -d /awips2/data_store ]; then
mkdir -p /awips2/data_store
fi
-chown -R awips:fxalpha /awips2/data_store
+if [ ! -d /awips2/tmp ]; then
+ mkdir -p /awips2/tmp
+fi
+chown -R awips:fxalpha /awips2/data_store /awips2/tmp
if [[ $1 -eq "reinstall" ]]; then
echo ''
@@ -87,4 +90,6 @@ fi
echo ""
echo "Done..."
echo ""
+
+PATH=$PATH:/awips2/edex/bin/
exit
diff --git a/rpms/awips2.edex/Installer.edex/programs/edex b/rpms/awips2.edex/Installer.edex/programs/edex
index 7a749c503b..5bbfb534a8 100755
--- a/rpms/awips2.edex/Installer.edex/programs/edex
+++ b/rpms/awips2.edex/Installer.edex/programs/edex
@@ -285,6 +285,11 @@ edex_setup() { # setup IP subnet and domains for EDEX, prompt user for confirm
edex_start() { # start all edex services
edex_cleanup
+ if [ ! -d /awips2/tmp ]; then
+ mkdir -p /awips2/tmp
+ fi
+ chown -R awips:fxalpha /awips2/data_store /awips2/tmp
+
if [ -f "/etc/init.d/edex_postgres" ]; then
su -c "service edex_postgres start"
fi
diff --git a/rpms/awips2.upc/Installer.ldm/patch/etc/ldmd.conf b/rpms/awips2.upc/Installer.ldm/patch/etc/ldmd.conf
index fb19318c5f..71c95dd14a 100644
--- a/rpms/awips2.upc/Installer.ldm/patch/etc/ldmd.conf
+++ b/rpms/awips2.upc/Installer.ldm/patch/etc/ldmd.conf
@@ -106,12 +106,11 @@ REQUEST CONDUIT "nam" idd.unidata.ucar.edu
REQUEST CONDUIT "pgrb2" idd.unidata.ucar.edu
# NDFD
REQUEST CONDUIT "nwstg" idd.unidata.ucar.edu
-# GOES-East/16(R)
-REQUEST NOTHER "^TI[RS]... KNES.*" idd.unidata.ucar.edu
# GOES-East GLM
REQUEST DIFAX "GLM" idd.unidata.ucar.edu
# GOES-East
REQUEST EXP ".*" lead.unidata.ucar.edu
+#REQUEST NOTHER "^TI[RS]... KNES.*" idd.unidata.ucar.edu
# CMC
REQUEST CMC ".*" idd.unidata.ucar.edu
# CONDUIT RAP40