diff --git a/cave/com.raytheon.uf.viz.radarapps.fsi/src/com/raytheon/uf/viz/radarapps/fsi/getFsiEnviron.py b/cave/com.raytheon.uf.viz.radarapps.fsi/src/com/raytheon/uf/viz/radarapps/fsi/getFsiEnviron.py
index 5e32ddd2be..2fd4235a19 100644
--- a/cave/com.raytheon.uf.viz.radarapps.fsi/src/com/raytheon/uf/viz/radarapps/fsi/getFsiEnviron.py
+++ b/cave/com.raytheon.uf.viz.radarapps.fsi/src/com/raytheon/uf/viz/radarapps/fsi/getFsiEnviron.py
@@ -17,6 +17,14 @@
 # See the AWIPS II Master Rights File ("Master Rights File.pdf") for
 # further licensing information.
 ##
+
+#     SOFTWARE HISTORY
+#    
+#    Date            Ticket#       Engineer       Description
+#    ------------    ----------    -----------    --------------------------
+#    07/29/14        DR  2914      G. Armendariz Remove call to PropertiesFactory
+# 
+
 import os
 from com.raytheon.uf.common.message.response import ResponseMessageGeneric
 from java.util import HashMap
@@ -45,8 +53,8 @@ if not d.has_key('rssdHost'):
     d['rssdHost'] = socket.gethostname()
 
 if not d.has_key('lbOutputDir'):
-    from com.raytheon.uf.edex.core import PropertiesFactory
-    arch_dir = PropertiesFactory.getInstance().getEnvProperties().getEnvValue("ARCHIVEDIR")
+    from java.lang import System
+    arch_dir = System.getProperty("data.archive.root")
     d['lbOutputDir'] = os.path.join(arch_dir, "radar", "fsi")
     
 for k, v in d.items():
diff --git a/edexOsgi/com.raytheon.uf.edex.dissemination/utility/edex_static/base/dissemination/handleOUP.py b/edexOsgi/com.raytheon.uf.edex.dissemination/utility/edex_static/base/dissemination/handleOUP.py
index 1c07e92756..99e92b336e 100644
--- a/edexOsgi/com.raytheon.uf.edex.dissemination/utility/edex_static/base/dissemination/handleOUP.py
+++ b/edexOsgi/com.raytheon.uf.edex.dissemination/utility/edex_static/base/dissemination/handleOUP.py
@@ -36,6 +36,7 @@
 #    10/12/12        DR 15418      D. Friedman   Use unique attachment file names
 #    11/20/13        DR 16777      D. Friedman   Add a test mode.
 #    12/05/16        DR 16842      D. Friedman   Do not set product ID on MhsMessage
+#    07/29/14        DR  2914      G. Armendariz Remove call to PropertiesFactory
 # 
 #
 
@@ -63,9 +64,8 @@ for line in f:
     ACTION_CODES[codeSplit[0]] = codeSplit[1]
 f.close()
 
-from com.raytheon.uf.edex.core.props import PropertiesFactory
-env = PropertiesFactory.getInstance().getEnvProperties()
-dataDir = env.getEnvValue("DEFAULTDATADIR")
+from com.raytheon.uf.edex.core import EDEXUtil
+dataDir = EDEXUtil.getEdexData();
 OUT_DIR = dataDir + 'outgoing'
 if not os.path.isdir(OUT_DIR):
     os.mkdir(OUT_DIR)