diff --git a/PhysicsAnalysis/D3PDTools/EventLoop/EventLoop/Job.h b/PhysicsAnalysis/D3PDTools/EventLoop/EventLoop/Job.h
index 8f37ca3c0839f7ff2cdb41ee0a578dda26d17b5b..53a654bdaa2fe60e102fc07174f270f1d7515709 100644
--- a/PhysicsAnalysis/D3PDTools/EventLoop/EventLoop/Job.h
+++ b/PhysicsAnalysis/D3PDTools/EventLoop/EventLoop/Job.h
@@ -395,7 +395,6 @@ namespace EL
   public:
     static const std::string optGridDestSE;
     static const std::string optGridSite;
-    static const std::string optGridCloud;
     static const std::string optGridExcludedSite;
     static const std::string optGridNGBPerJob;
     static const std::string optGridMemory;
@@ -405,11 +404,9 @@ namespace EL
     static const std::string optGridNJobs;
     static const std::string optGridMaxFileSize;
     static const std::string optGridMaxNFilesPerJob;
-    static const std::string optGridUseChirpServer;
     static const std::string optGridExpress;
     static const std::string optGridNoSubmit;
     static const std::string optGridMergeOutput;
-    static const std::string optGridUseContElementBoundary;
     static const std::string optGridAddNthFieldOfInDSToLFN;
     static const std::string optGridWorkingGroup;
     static const std::string optGridShowCmd;
diff --git a/PhysicsAnalysis/D3PDTools/EventLoop/Root/Job.cxx b/PhysicsAnalysis/D3PDTools/EventLoop/Root/Job.cxx
index 62bb1063d0c0b1efb82fb8990698e222b1836265..92295c21fad25d5c5d2176702dbce9ebac5f2bd3 100644
--- a/PhysicsAnalysis/D3PDTools/EventLoop/Root/Job.cxx
+++ b/PhysicsAnalysis/D3PDTools/EventLoop/Root/Job.cxx
@@ -68,7 +68,6 @@ namespace EL
   const std::string Job::optOutputSampleName = "nc_outputSampleName";
   const std::string Job::optGridDestSE = "nc_destSE";
   const std::string Job::optGridSite = "nc_site";
-  const std::string Job::optGridCloud = "nc_cloud";
   const std::string Job::optGridExcludedSite = "nc_excludedSite";
   const std::string Job::optGridNGBPerJob = "nc_nGBPerJob";
   const std::string Job::optGridMemory = "nc_memory";
@@ -78,11 +77,9 @@ namespace EL
   const std::string Job::optGridNJobs = "nc_nJobs";
   const std::string Job::optGridMaxFileSize = "nc_maxFileSize";
   const std::string Job::optGridMaxNFilesPerJob = "nc_maxNFilesPerJob";
-  const std::string Job::optGridUseChirpServer = "nc_useChirpServer";
   const std::string Job::optGridExpress = "nc_express";
   const std::string Job::optGridNoSubmit = "nc_noSubmit";
   const std::string Job::optGridMergeOutput = "nc_mergeOutput";
-  const std::string Job::optGridUseContElementBoundary = "nc_useContElementBoundary";
   const std::string Job::optGridAddNthFieldOfInDSToLFN = "nc_addNthFieldOfInDSToLFN";
   const std::string Job::optGridWorkingGroup = "nc_workingGroup";
   const std::string Job::optGridShowCmd = "nc_showCmd";
diff --git a/PhysicsAnalysis/D3PDTools/EventLoopGrid/Root/PrunDriver.cxx b/PhysicsAnalysis/D3PDTools/EventLoopGrid/Root/PrunDriver.cxx
index 24ee3132d3a68a67533a3953adc3047571da581f..e9487cc7e4881860c149ffbbbdace1e105240d23 100644
--- a/PhysicsAnalysis/D3PDTools/EventLoopGrid/Root/PrunDriver.cxx
+++ b/PhysicsAnalysis/D3PDTools/EventLoopGrid/Root/PrunDriver.cxx
@@ -135,7 +135,6 @@ static SH::MetaObject defaultOpts()
   SH::MetaObject o;
   o.setString("nc_nGBPerJob", "MAX");
   o.setString("nc_mergeOutput", "true");
-  o.setString("nc_rootVer", gROOT->GetVersion());
   o.setString("nc_cmtConfig", gSystem->ExpandPathName("$AnalysisBase_PLATFORM"));
   o.setString("nc_useAthenaPackages", "true");
   const std::string mergestr = "elg_merge jobdef.root %OUT %IN";
diff --git a/PhysicsAnalysis/D3PDTools/EventLoopGrid/data/ELG_prun.py b/PhysicsAnalysis/D3PDTools/EventLoopGrid/data/ELG_prun.py
index c82a27b240b495e8125e9df6137f5b4acb1dce25..f2785c05681a8d04667272537f7842e87c7a5dc6 100644
--- a/PhysicsAnalysis/D3PDTools/EventLoopGrid/data/ELG_prun.py
+++ b/PhysicsAnalysis/D3PDTools/EventLoopGrid/data/ELG_prun.py
@@ -21,7 +21,6 @@ def ELG_prun(sample) :
     #These are options that can be set by the user
     opts = ['destSE',
             'site',
-            'cloud',
             'rootVer',
             'cmtConfig',
             'excludedSite',
@@ -41,8 +40,7 @@ def ELG_prun(sample) :
             'tmpDir']
 
     #These are options that can be set by the user
-    switches = ['useChirpServer',
-                'express',
+    switches = ['express',
                 'noSubmit',
                 'skipScout',
                 'disableAutoRetry',
@@ -50,8 +48,7 @@ def ELG_prun(sample) :
                 'official',
                 'mergeOutput',
                 'useRootCore',
-                'useAthenaPackages',
-                'useContElementBoundary']
+                'useAthenaPackages']
 
     for opt in opts :
         arg = sample.getMetaDouble('nc_' + opt, -1)