Index: trunk/ippdor/src/executables/generate_cam_jobs.py
===================================================================
--- trunk/ippdor/src/executables/generate_cam_jobs.py	(revision 32901)
+++ trunk/ippdor/src/executables/generate_cam_jobs.py	(revision 32902)
@@ -4,8 +4,6 @@
 Generates the complete Camera stage DAG for one exposure
 """
+import sys
 from ipp.CamManager import CamManager as CamManager
-
-import sys
-import os
 
 #################################################################
@@ -23,9 +21,5 @@
     else:
         RECIPIENT = 'schastel@ifa.hawaii.edu'
-    if os.getenv('USER') == 'ippdor':
-        CAMQUERIER = CamManager(LABEL, EXPOSURE_NAME, recipient=RECIPIENT)
-    else:
-        CAMQUERIER = CamManager(LABEL, EXPOSURE_NAME, recipient=RECIPIENT,
-                                host='ipp0012.ifa.hawaii.edu')
+    CAMQUERIER = CamManager(LABEL, EXPOSURE_NAME, recipient=RECIPIENT)
     if STAGE == 'B010':
         CAMQUERIER.build_new_camera_jobs()
Index: trunk/ippdor/src/executables/generate_chip_jobs.py
===================================================================
--- trunk/ippdor/src/executables/generate_chip_jobs.py	(revision 32901)
+++ trunk/ippdor/src/executables/generate_chip_jobs.py	(revision 32902)
@@ -4,9 +4,7 @@
 Generates the full chip DAG for one exposure
 """
+import sys
 from ipp.ChipManager import ChipManager as ChipManager
 from ipp.exceptions.IppException import IppException
-
-import sys
-import os
 
 #################################################################
@@ -26,11 +24,6 @@
     else:
         RECIPIENT = 'schastel@ifa.hawaii.edu'
-    if os.getenv('USER') == 'ippdor':
-        CHIP_MANAGER = ChipManager(LABEL, EXPOSURE_NAME, 
-                                   RECIPIENT)
-    else:
-        CHIP_MANAGER = ChipManager(LABEL, EXPOSURE_NAME, 
-                                   RECIPIENT, 
-                                   host='ipp0012.ifa.hawaii.edu')
+    CHIP_MANAGER = ChipManager(LABEL, EXPOSURE_NAME, 
+                               RECIPIENT)
     try:
         if STAGE == 'A010':
Index: trunk/ippdor/src/executables/generate_exposure_dag.py
===================================================================
--- trunk/ippdor/src/executables/generate_exposure_dag.py	(revision 32901)
+++ trunk/ippdor/src/executables/generate_exposure_dag.py	(revision 32902)
@@ -4,4 +4,5 @@
 Generate the complete DAG for ONE exposure from chip to warp
 """
+import sys
 from ipp.helpers import mkdir
 from ipp.ChipManager import ChipManager as ChipManager
@@ -10,7 +11,4 @@
 from ipp.WarpManager import WarpManager as WarpManager
 from ipp.constants.Globals import Globals as GlobalConstants
-
-import sys
-import os
 
 class DagGenerator(ChipManager, CamManager, FakeManager, WarpManager):
@@ -212,9 +210,5 @@
     RECIPIENT = sys.argv[2]
     EXPOSURE_NAME = sys.argv[3]
-    if os.getenv('USER') == 'ippdor':
-        GENERATOR = DagGenerator(LABEL, EXPOSURE_NAME, RECIPIENT)
-    else:
-        GENERATOR = DagGenerator(LABEL, EXPOSURE_NAME, RECIPIENT, 
-                                 host='ipp0012.ifa.hawaii.edu')
+    GENERATOR = DagGenerator(LABEL, EXPOSURE_NAME, RECIPIENT)
     DAG_NAME = GENERATOR.build_dag()
     GENERATOR.build_new_chips_jobs()
Index: trunk/ippdor/src/executables/generate_fake_jobs.py
===================================================================
--- trunk/ippdor/src/executables/generate_fake_jobs.py	(revision 32901)
+++ trunk/ippdor/src/executables/generate_fake_jobs.py	(revision 32902)
@@ -4,8 +4,6 @@
 Generates the fake DAG and Condor jobs for one exposure
 """
+import sys
 from ipp.FakeManager import FakeManager as FakeManager
-
-import sys
-import os
 
 #################################################################
@@ -23,11 +21,5 @@
     else:
         RECIPIENT = 'schastel@ifa.hawaii.edu'
-    if os.getenv('USER') == 'ippdor':
-        FAKE_MANAGER = FakeManager(LABEL, EXPOSURE_NAME, 
-                                  recipient=RECIPIENT)
-    else:
-        FAKE_MANAGER = FakeManager(LABEL, EXPOSURE_NAME, 
-                                  recipient=RECIPIENT, 
-                                  host='ipp0012.ifa.hawaii.edu')
+    FAKE_MANAGER = FakeManager(LABEL, EXPOSURE_NAME, RECIPIENT)
     if STAGE == 'C010':
         FAKE_MANAGER.build_new_fake_jobs()
Index: trunk/ippdor/src/executables/generate_stack_jobs.py
===================================================================
--- trunk/ippdor/src/executables/generate_stack_jobs.py	(revision 32901)
+++ trunk/ippdor/src/executables/generate_stack_jobs.py	(revision 32902)
@@ -4,8 +4,6 @@
 Generates the complete stack stage DAG for one label
 """
+import sys
 from ipp.StackManager import StackManager as StackManager
-
-import sys
-import os
 
 #################################################################
@@ -19,10 +17,5 @@
     LABEL = sys.argv[2]
     RECIPIENT = sys.argv[3]
-    if os.getenv('USER') == 'ippdor':
-        STACK_QUERIER = StackManager(LABEL, RECIPIENT)
-    else:
-        STACK_QUERIER = StackManager(LABEL, 
-                                    RECIPIENT,
-                                    host='ipp0012.ifa.hawaii.edu')
+    STACK_QUERIER = StackManager(LABEL, RECIPIENT)
     if STAGE == 'E010':
         STACK_QUERIER.build_create_stack_entries_job()
Index: trunk/ippdor/src/executables/generate_warp_jobs.py
===================================================================
--- trunk/ippdor/src/executables/generate_warp_jobs.py	(revision 32901)
+++ trunk/ippdor/src/executables/generate_warp_jobs.py	(revision 32902)
@@ -4,8 +4,6 @@
 Generates the complete warp stage DAG for one exposure
 """
+import sys
 from ipp.WarpManager import WarpManager as WarpManager
-
-import sys
-import os
 
 #################################################################
@@ -23,11 +21,5 @@
     else:
         RECIPIENT = 'schastel@ifa.hawaii.edu'
-    if os.getenv('USER') == 'ippdor':
-        WARP_QUERIER = WarpManager(LABEL, EXPOSURE_NAME, 
-                                  recipient=RECIPIENT)
-    else:
-        WARP_QUERIER = WarpManager(LABEL, EXPOSURE_NAME, 
-                                  recipient=RECIPIENT, 
-                                  host='ipp0012.ifa.hawaii.edu')
+    WARP_QUERIER = WarpManager(LABEL, EXPOSURE_NAME, RECIPIENT)
     if STAGE == 'D010':
         WARP_QUERIER.build_new_exp_warp_jobs()
Index: trunk/ippdor/src/executables/ippdor_chip_to_warp.py
===================================================================
--- trunk/ippdor/src/executables/ippdor_chip_to_warp.py	(revision 32901)
+++ trunk/ippdor/src/executables/ippdor_chip_to_warp.py	(revision 32902)
@@ -228,5 +228,5 @@
         sys.exit(4)
     BUILDER = ChipWarpBuilder(LABEL, RECIPIENT)
-    # Check exposures        
+    # Check exposures
     EXPOSURES_IDS = dict()
     for _exposure_name in EXPOSURES_NAMES: