diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 57454c2f4aadb7ed71db4702e68783f9521e73ea..f93cadb643fca6a6fdb6c25183bd6d8bf35696f2 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -13,3 +13,12 @@ check-copyright:
   script:
     - curl -o check_copyright.py "https://gitlab.cern.ch/lhcb-core/LbDevTools/raw/master/LbDevTools/SourceTools.py?inline=false"
     - python check_copyright.py origin/2018-patches
+
+python-linting:
+  stage: .pre 
+  tags:
+    - cvmfs
+  script:
+    - . /cvmfs/lhcb.cern.ch/lib/LbEnv.sh
+    # Only run the pyflakes linter and a few select pycodestyle errors, ignore line too long warnings.
+    - flake8 --extend-ignore E203,E266,E501,F405,W191,W291 $(find . -name '*.py')
diff --git a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping24r2/CommonParticles/StdLooseDetachedKpi.py b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping24r2/CommonParticles/StdLooseDetachedKpi.py
index 0219b1e679d1c5b9ad49f044a84f8f8a43375669..d5d3419a036ad6416ed0862507d49d1e26aeddb1 100644
--- a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping24r2/CommonParticles/StdLooseDetachedKpi.py
+++ b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping24r2/CommonParticles/StdLooseDetachedKpi.py
@@ -21,7 +21,6 @@ from Gaudi.Configuration import *
 # , OfflineVertexFitter, OnOfflineTool
 from Configurables import CombineParticles
 from CommonParticles.Utils import *
-import GaudiKernel.SystemOfUnits as Units
 
 ###########################
 # StdDetachetKst2Kpi      #
diff --git a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping24r2/CommonParticles/StdLooseDetachedKstar.py b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping24r2/CommonParticles/StdLooseDetachedKstar.py
index 97db5f4b9cdd8e38903463cf2cddfcf9c898c78f..f5143379ce8feb4ba92c1d047771a703eede4083 100644
--- a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping24r2/CommonParticles/StdLooseDetachedKstar.py
+++ b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping24r2/CommonParticles/StdLooseDetachedKstar.py
@@ -19,7 +19,6 @@ __date__ = '29/06/2009'
 from Gaudi.Configuration import *
 from Configurables import FilterDesktop
 from CommonParticles.Utils import *
-import GaudiKernel.SystemOfUnits as Units
 
 ###########################
 # StdLooseDetachetKst2Kpi #
diff --git a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping24r2/CommonParticles/StdVeryLooseDetachedKstar.py b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping24r2/CommonParticles/StdVeryLooseDetachedKstar.py
index 109569b76caa72b0b9839f7ba19df48b20c09cc8..2a44a32a19d9e2bcfff700f69f96315e119396b6 100644
--- a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping24r2/CommonParticles/StdVeryLooseDetachedKstar.py
+++ b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping24r2/CommonParticles/StdVeryLooseDetachedKstar.py
@@ -20,7 +20,6 @@ from Gaudi.Configuration import *
 # , OfflineVertexFitter, OnOfflineTool
 from Configurables import CombineParticles
 from CommonParticles.Utils import *
-import GaudiKernel.SystemOfUnits as Units
 
 ###########################
 # StdVeryLooseDetachetKst2Kpi #
diff --git a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping24r2/CommonParticles/Utils.py b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping24r2/CommonParticles/Utils.py
old mode 100755
new mode 100644
index 67c402da2a69cc51fe8676479e32f484a2ab48d5..24e57e62eb5f85e9209402de11241319b86b73de
--- a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping24r2/CommonParticles/Utils.py
+++ b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping24r2/CommonParticles/Utils.py
@@ -22,7 +22,6 @@ Helper file for configuration of 'standard particles'
 from Configurables import LHCbConfigurableUser
 from Configurables import TrackSelector
 from Configurables import DataOnDemandSvc
-from Gaudi.Configuration import *
 author = "Vanya BELYAEV Ivan.Belyaev@nikhef.nl"
 version = "CVS tag $Name: not supported by cvs2svn $, version $Revision: 1.5 $"
 # =============================================================================
diff --git a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping25/CommonParticles/StdLooseDetachedKpi.py b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping25/CommonParticles/StdLooseDetachedKpi.py
index 0219b1e679d1c5b9ad49f044a84f8f8a43375669..d5d3419a036ad6416ed0862507d49d1e26aeddb1 100644
--- a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping25/CommonParticles/StdLooseDetachedKpi.py
+++ b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping25/CommonParticles/StdLooseDetachedKpi.py
@@ -21,7 +21,6 @@ from Gaudi.Configuration import *
 # , OfflineVertexFitter, OnOfflineTool
 from Configurables import CombineParticles
 from CommonParticles.Utils import *
-import GaudiKernel.SystemOfUnits as Units
 
 ###########################
 # StdDetachetKst2Kpi      #
diff --git a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping25/CommonParticles/StdLooseDetachedKstar.py b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping25/CommonParticles/StdLooseDetachedKstar.py
index 97db5f4b9cdd8e38903463cf2cddfcf9c898c78f..f5143379ce8feb4ba92c1d047771a703eede4083 100644
--- a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping25/CommonParticles/StdLooseDetachedKstar.py
+++ b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping25/CommonParticles/StdLooseDetachedKstar.py
@@ -19,7 +19,6 @@ __date__ = '29/06/2009'
 from Gaudi.Configuration import *
 from Configurables import FilterDesktop
 from CommonParticles.Utils import *
-import GaudiKernel.SystemOfUnits as Units
 
 ###########################
 # StdLooseDetachetKst2Kpi #
diff --git a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping25/CommonParticles/StdVeryLooseDetachedKstar.py b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping25/CommonParticles/StdVeryLooseDetachedKstar.py
index 109569b76caa72b0b9839f7ba19df48b20c09cc8..2a44a32a19d9e2bcfff700f69f96315e119396b6 100644
--- a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping25/CommonParticles/StdVeryLooseDetachedKstar.py
+++ b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping25/CommonParticles/StdVeryLooseDetachedKstar.py
@@ -20,7 +20,6 @@ from Gaudi.Configuration import *
 # , OfflineVertexFitter, OnOfflineTool
 from Configurables import CombineParticles
 from CommonParticles.Utils import *
-import GaudiKernel.SystemOfUnits as Units
 
 ###########################
 # StdVeryLooseDetachetKst2Kpi #
diff --git a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping25/CommonParticles/Utils.py b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping25/CommonParticles/Utils.py
old mode 100755
new mode 100644
index 67c402da2a69cc51fe8676479e32f484a2ab48d5..24e57e62eb5f85e9209402de11241319b86b73de
--- a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping25/CommonParticles/Utils.py
+++ b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping25/CommonParticles/Utils.py
@@ -22,7 +22,6 @@ Helper file for configuration of 'standard particles'
 from Configurables import LHCbConfigurableUser
 from Configurables import TrackSelector
 from Configurables import DataOnDemandSvc
-from Gaudi.Configuration import *
 author = "Vanya BELYAEV Ivan.Belyaev@nikhef.nl"
 version = "CVS tag $Name: not supported by cvs2svn $, version $Revision: 1.5 $"
 # =============================================================================
diff --git a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping27/CommonParticles/StdLooseDetachedKpi.py b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping27/CommonParticles/StdLooseDetachedKpi.py
index 0219b1e679d1c5b9ad49f044a84f8f8a43375669..d5d3419a036ad6416ed0862507d49d1e26aeddb1 100644
--- a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping27/CommonParticles/StdLooseDetachedKpi.py
+++ b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping27/CommonParticles/StdLooseDetachedKpi.py
@@ -21,7 +21,6 @@ from Gaudi.Configuration import *
 # , OfflineVertexFitter, OnOfflineTool
 from Configurables import CombineParticles
 from CommonParticles.Utils import *
-import GaudiKernel.SystemOfUnits as Units
 
 ###########################
 # StdDetachetKst2Kpi      #
diff --git a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping27/CommonParticles/StdLooseDetachedKstar.py b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping27/CommonParticles/StdLooseDetachedKstar.py
index 97db5f4b9cdd8e38903463cf2cddfcf9c898c78f..f5143379ce8feb4ba92c1d047771a703eede4083 100644
--- a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping27/CommonParticles/StdLooseDetachedKstar.py
+++ b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping27/CommonParticles/StdLooseDetachedKstar.py
@@ -19,7 +19,6 @@ __date__ = '29/06/2009'
 from Gaudi.Configuration import *
 from Configurables import FilterDesktop
 from CommonParticles.Utils import *
-import GaudiKernel.SystemOfUnits as Units
 
 ###########################
 # StdLooseDetachetKst2Kpi #
diff --git a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping27/CommonParticles/StdVeryLooseDetachedKstar.py b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping27/CommonParticles/StdVeryLooseDetachedKstar.py
index 109569b76caa72b0b9839f7ba19df48b20c09cc8..2a44a32a19d9e2bcfff700f69f96315e119396b6 100644
--- a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping27/CommonParticles/StdVeryLooseDetachedKstar.py
+++ b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping27/CommonParticles/StdVeryLooseDetachedKstar.py
@@ -20,7 +20,6 @@ from Gaudi.Configuration import *
 # , OfflineVertexFitter, OnOfflineTool
 from Configurables import CombineParticles
 from CommonParticles.Utils import *
-import GaudiKernel.SystemOfUnits as Units
 
 ###########################
 # StdVeryLooseDetachetKst2Kpi #
diff --git a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping27/CommonParticles/Utils.py b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping27/CommonParticles/Utils.py
old mode 100755
new mode 100644
index 67c402da2a69cc51fe8676479e32f484a2ab48d5..24e57e62eb5f85e9209402de11241319b86b73de
--- a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping27/CommonParticles/Utils.py
+++ b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping27/CommonParticles/Utils.py
@@ -22,7 +22,6 @@ Helper file for configuration of 'standard particles'
 from Configurables import LHCbConfigurableUser
 from Configurables import TrackSelector
 from Configurables import DataOnDemandSvc
-from Gaudi.Configuration import *
 author = "Vanya BELYAEV Ivan.Belyaev@nikhef.nl"
 version = "CVS tag $Name: not supported by cvs2svn $, version $Revision: 1.5 $"
 # =============================================================================
diff --git a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping28r2/CommonParticles/StdLooseDetachedKpi.py b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping28r2/CommonParticles/StdLooseDetachedKpi.py
index 0219b1e679d1c5b9ad49f044a84f8f8a43375669..d5d3419a036ad6416ed0862507d49d1e26aeddb1 100644
--- a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping28r2/CommonParticles/StdLooseDetachedKpi.py
+++ b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping28r2/CommonParticles/StdLooseDetachedKpi.py
@@ -21,7 +21,6 @@ from Gaudi.Configuration import *
 # , OfflineVertexFitter, OnOfflineTool
 from Configurables import CombineParticles
 from CommonParticles.Utils import *
-import GaudiKernel.SystemOfUnits as Units
 
 ###########################
 # StdDetachetKst2Kpi      #
diff --git a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping28r2/CommonParticles/StdLooseDetachedKstar.py b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping28r2/CommonParticles/StdLooseDetachedKstar.py
index 97db5f4b9cdd8e38903463cf2cddfcf9c898c78f..f5143379ce8feb4ba92c1d047771a703eede4083 100644
--- a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping28r2/CommonParticles/StdLooseDetachedKstar.py
+++ b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping28r2/CommonParticles/StdLooseDetachedKstar.py
@@ -19,7 +19,6 @@ __date__ = '29/06/2009'
 from Gaudi.Configuration import *
 from Configurables import FilterDesktop
 from CommonParticles.Utils import *
-import GaudiKernel.SystemOfUnits as Units
 
 ###########################
 # StdLooseDetachetKst2Kpi #
diff --git a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping28r2/CommonParticles/StdVeryLooseDetachedKstar.py b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping28r2/CommonParticles/StdVeryLooseDetachedKstar.py
index 109569b76caa72b0b9839f7ba19df48b20c09cc8..2a44a32a19d9e2bcfff700f69f96315e119396b6 100644
--- a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping28r2/CommonParticles/StdVeryLooseDetachedKstar.py
+++ b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping28r2/CommonParticles/StdVeryLooseDetachedKstar.py
@@ -20,7 +20,6 @@ from Gaudi.Configuration import *
 # , OfflineVertexFitter, OnOfflineTool
 from Configurables import CombineParticles
 from CommonParticles.Utils import *
-import GaudiKernel.SystemOfUnits as Units
 
 ###########################
 # StdVeryLooseDetachetKst2Kpi #
diff --git a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping28r2/CommonParticles/Utils.py b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping28r2/CommonParticles/Utils.py
old mode 100755
new mode 100644
index 67c402da2a69cc51fe8676479e32f484a2ab48d5..24e57e62eb5f85e9209402de11241319b86b73de
--- a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping28r2/CommonParticles/Utils.py
+++ b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping28r2/CommonParticles/Utils.py
@@ -22,7 +22,6 @@ Helper file for configuration of 'standard particles'
 from Configurables import LHCbConfigurableUser
 from Configurables import TrackSelector
 from Configurables import DataOnDemandSvc
-from Gaudi.Configuration import *
 author = "Vanya BELYAEV Ivan.Belyaev@nikhef.nl"
 version = "CVS tag $Name: not supported by cvs2svn $, version $Revision: 1.5 $"
 # =============================================================================
diff --git a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping28r2p1/CommonParticles/StdLooseDetachedKpi.py b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping28r2p1/CommonParticles/StdLooseDetachedKpi.py
index 0219b1e679d1c5b9ad49f044a84f8f8a43375669..d5d3419a036ad6416ed0862507d49d1e26aeddb1 100644
--- a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping28r2p1/CommonParticles/StdLooseDetachedKpi.py
+++ b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping28r2p1/CommonParticles/StdLooseDetachedKpi.py
@@ -21,7 +21,6 @@ from Gaudi.Configuration import *
 # , OfflineVertexFitter, OnOfflineTool
 from Configurables import CombineParticles
 from CommonParticles.Utils import *
-import GaudiKernel.SystemOfUnits as Units
 
 ###########################
 # StdDetachetKst2Kpi      #
diff --git a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping28r2p1/CommonParticles/StdLooseDetachedKstar.py b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping28r2p1/CommonParticles/StdLooseDetachedKstar.py
index 97db5f4b9cdd8e38903463cf2cddfcf9c898c78f..f5143379ce8feb4ba92c1d047771a703eede4083 100644
--- a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping28r2p1/CommonParticles/StdLooseDetachedKstar.py
+++ b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping28r2p1/CommonParticles/StdLooseDetachedKstar.py
@@ -19,7 +19,6 @@ __date__ = '29/06/2009'
 from Gaudi.Configuration import *
 from Configurables import FilterDesktop
 from CommonParticles.Utils import *
-import GaudiKernel.SystemOfUnits as Units
 
 ###########################
 # StdLooseDetachetKst2Kpi #
diff --git a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping28r2p1/CommonParticles/StdVeryLooseDetachedKstar.py b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping28r2p1/CommonParticles/StdVeryLooseDetachedKstar.py
index 109569b76caa72b0b9839f7ba19df48b20c09cc8..2a44a32a19d9e2bcfff700f69f96315e119396b6 100644
--- a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping28r2p1/CommonParticles/StdVeryLooseDetachedKstar.py
+++ b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping28r2p1/CommonParticles/StdVeryLooseDetachedKstar.py
@@ -20,7 +20,6 @@ from Gaudi.Configuration import *
 # , OfflineVertexFitter, OnOfflineTool
 from Configurables import CombineParticles
 from CommonParticles.Utils import *
-import GaudiKernel.SystemOfUnits as Units
 
 ###########################
 # StdVeryLooseDetachetKst2Kpi #
diff --git a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping28r2p1/CommonParticles/Utils.py b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping28r2p1/CommonParticles/Utils.py
old mode 100755
new mode 100644
index faac2879b9331aa34e60211d9c7cd5098b273485..d4c2763d576c34904afa98f833ef7456dc31b074
--- a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping28r2p1/CommonParticles/Utils.py
+++ b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping28r2p1/CommonParticles/Utils.py
@@ -22,7 +22,6 @@ Helper file for configuration of 'standard particles'
 from Configurables import LHCbConfigurableUser
 from Configurables import TrackSelector
 from Configurables import DataOnDemandSvc
-from Gaudi.Configuration import *
 author = "Vanya BELYAEV Ivan.Belyaev@nikhef.nl"
 # =============================================================================
 __all__ = (
diff --git a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping30r2/CommonParticles/StdLooseDetachedKpi.py b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping30r2/CommonParticles/StdLooseDetachedKpi.py
index 02660a5b61cbb4483daa09b24d26b6530a22f817..ff9899f392cbfcbf13c431727798070458b32c7b 100644
--- a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping30r2/CommonParticles/StdLooseDetachedKpi.py
+++ b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping30r2/CommonParticles/StdLooseDetachedKpi.py
@@ -21,7 +21,6 @@ from Gaudi.Configuration import *
 # , OfflineVertexFitter, OnOfflineTool
 from Configurables import CombineParticles
 from CommonParticles.Utils import *
-import GaudiKernel.SystemOfUnits as Units
 
 ###########################
 # StdDetachetKst2Kpi      #
diff --git a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping30r2/CommonParticles/StdLooseDetachedKstar.py b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping30r2/CommonParticles/StdLooseDetachedKstar.py
index acaaa4563e561044289b51a6a747dde089d61290..962c509c917ff04f904ee22b63ff2ef697e96cb6 100644
--- a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping30r2/CommonParticles/StdLooseDetachedKstar.py
+++ b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping30r2/CommonParticles/StdLooseDetachedKstar.py
@@ -19,7 +19,6 @@ __date__ = '29/06/2009'
 from Gaudi.Configuration import *
 from Configurables import FilterDesktop
 from CommonParticles.Utils import *
-import GaudiKernel.SystemOfUnits as Units
 
 ###########################
 # StdLooseDetachetKst2Kpi #
diff --git a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping30r2/CommonParticles/StdVeryLooseDetachedKstar.py b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping30r2/CommonParticles/StdVeryLooseDetachedKstar.py
index 6c5cdcbb1b68f253e32c197d99fd67f922485393..519f74f8b0594df60151fa07022fcf0dc04d5d2e 100644
--- a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping30r2/CommonParticles/StdVeryLooseDetachedKstar.py
+++ b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping30r2/CommonParticles/StdVeryLooseDetachedKstar.py
@@ -20,7 +20,6 @@ from Gaudi.Configuration import *
 # , OfflineVertexFitter, OnOfflineTool
 from Configurables import CombineParticles
 from CommonParticles.Utils import *
-import GaudiKernel.SystemOfUnits as Units
 
 ###########################
 # StdVeryLooseDetachetKst2Kpi #
diff --git a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping30r2/CommonParticles/Utils.py b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping30r2/CommonParticles/Utils.py
old mode 100755
new mode 100644
index 66847ea24a1afceb0b9e92dc9c0e20c41b7d0092..65f4569a4255fe6ed67515a92d41917bbf55623d
--- a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping30r2/CommonParticles/Utils.py
+++ b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping30r2/CommonParticles/Utils.py
@@ -23,7 +23,6 @@ Helper file for configuration of 'standard particles'
 from Configurables import LHCbConfigurableUser
 from Configurables import TrackSelector
 from Configurables import DataOnDemandSvc
-from Gaudi.Configuration import *
 author = "Vanya BELYAEV Ivan.Belyaev@nikhef.nl"
 version = "CVS tag $Name: not supported by cvs2svn $, version $Revision: 1.5 $"
 # =============================================================================
diff --git a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping30r3/CommonParticles/StdLooseDetachedKpi.py b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping30r3/CommonParticles/StdLooseDetachedKpi.py
index 02660a5b61cbb4483daa09b24d26b6530a22f817..ff9899f392cbfcbf13c431727798070458b32c7b 100644
--- a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping30r3/CommonParticles/StdLooseDetachedKpi.py
+++ b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping30r3/CommonParticles/StdLooseDetachedKpi.py
@@ -21,7 +21,6 @@ from Gaudi.Configuration import *
 # , OfflineVertexFitter, OnOfflineTool
 from Configurables import CombineParticles
 from CommonParticles.Utils import *
-import GaudiKernel.SystemOfUnits as Units
 
 ###########################
 # StdDetachetKst2Kpi      #
diff --git a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping30r3/CommonParticles/StdLooseDetachedKstar.py b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping30r3/CommonParticles/StdLooseDetachedKstar.py
index acaaa4563e561044289b51a6a747dde089d61290..962c509c917ff04f904ee22b63ff2ef697e96cb6 100644
--- a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping30r3/CommonParticles/StdLooseDetachedKstar.py
+++ b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping30r3/CommonParticles/StdLooseDetachedKstar.py
@@ -19,7 +19,6 @@ __date__ = '29/06/2009'
 from Gaudi.Configuration import *
 from Configurables import FilterDesktop
 from CommonParticles.Utils import *
-import GaudiKernel.SystemOfUnits as Units
 
 ###########################
 # StdLooseDetachetKst2Kpi #
diff --git a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping30r3/CommonParticles/StdVeryLooseDetachedKstar.py b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping30r3/CommonParticles/StdVeryLooseDetachedKstar.py
index 6c5cdcbb1b68f253e32c197d99fd67f922485393..519f74f8b0594df60151fa07022fcf0dc04d5d2e 100644
--- a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping30r3/CommonParticles/StdVeryLooseDetachedKstar.py
+++ b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping30r3/CommonParticles/StdVeryLooseDetachedKstar.py
@@ -20,7 +20,6 @@ from Gaudi.Configuration import *
 # , OfflineVertexFitter, OnOfflineTool
 from Configurables import CombineParticles
 from CommonParticles.Utils import *
-import GaudiKernel.SystemOfUnits as Units
 
 ###########################
 # StdVeryLooseDetachetKst2Kpi #
diff --git a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping30r3/CommonParticles/Utils.py b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping30r3/CommonParticles/Utils.py
old mode 100755
new mode 100644
index 66847ea24a1afceb0b9e92dc9c0e20c41b7d0092..65f4569a4255fe6ed67515a92d41917bbf55623d
--- a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping30r3/CommonParticles/Utils.py
+++ b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping30r3/CommonParticles/Utils.py
@@ -23,7 +23,6 @@ Helper file for configuration of 'standard particles'
 from Configurables import LHCbConfigurableUser
 from Configurables import TrackSelector
 from Configurables import DataOnDemandSvc
-from Gaudi.Configuration import *
 author = "Vanya BELYAEV Ivan.Belyaev@nikhef.nl"
 version = "CVS tag $Name: not supported by cvs2svn $, version $Revision: 1.5 $"
 # =============================================================================
diff --git a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping31r1/CommonParticles/StdLooseDetachedKpi.py b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping31r1/CommonParticles/StdLooseDetachedKpi.py
index 0219b1e679d1c5b9ad49f044a84f8f8a43375669..d5d3419a036ad6416ed0862507d49d1e26aeddb1 100644
--- a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping31r1/CommonParticles/StdLooseDetachedKpi.py
+++ b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping31r1/CommonParticles/StdLooseDetachedKpi.py
@@ -21,7 +21,6 @@ from Gaudi.Configuration import *
 # , OfflineVertexFitter, OnOfflineTool
 from Configurables import CombineParticles
 from CommonParticles.Utils import *
-import GaudiKernel.SystemOfUnits as Units
 
 ###########################
 # StdDetachetKst2Kpi      #
diff --git a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping31r1/CommonParticles/StdLooseDetachedKstar.py b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping31r1/CommonParticles/StdLooseDetachedKstar.py
index 97db5f4b9cdd8e38903463cf2cddfcf9c898c78f..f5143379ce8feb4ba92c1d047771a703eede4083 100644
--- a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping31r1/CommonParticles/StdLooseDetachedKstar.py
+++ b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping31r1/CommonParticles/StdLooseDetachedKstar.py
@@ -19,7 +19,6 @@ __date__ = '29/06/2009'
 from Gaudi.Configuration import *
 from Configurables import FilterDesktop
 from CommonParticles.Utils import *
-import GaudiKernel.SystemOfUnits as Units
 
 ###########################
 # StdLooseDetachetKst2Kpi #
diff --git a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping31r1/CommonParticles/StdVeryLooseDetachedKstar.py b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping31r1/CommonParticles/StdVeryLooseDetachedKstar.py
index 109569b76caa72b0b9839f7ba19df48b20c09cc8..2a44a32a19d9e2bcfff700f69f96315e119396b6 100644
--- a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping31r1/CommonParticles/StdVeryLooseDetachedKstar.py
+++ b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping31r1/CommonParticles/StdVeryLooseDetachedKstar.py
@@ -20,7 +20,6 @@ from Gaudi.Configuration import *
 # , OfflineVertexFitter, OnOfflineTool
 from Configurables import CombineParticles
 from CommonParticles.Utils import *
-import GaudiKernel.SystemOfUnits as Units
 
 ###########################
 # StdVeryLooseDetachetKst2Kpi #
diff --git a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping31r1/CommonParticles/Utils.py b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping31r1/CommonParticles/Utils.py
old mode 100755
new mode 100644
index ea06f33d30515919c010e6af201d23d49095b6cd..f8bc12004b42acc09008c1fc524d862f104025a8
--- a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping31r1/CommonParticles/Utils.py
+++ b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping31r1/CommonParticles/Utils.py
@@ -23,7 +23,6 @@ Helper file for configuration of 'standard particles'
 from Configurables import LHCbConfigurableUser
 from Configurables import TrackSelector
 from Configurables import DataOnDemandSvc
-from Gaudi.Configuration import *
 author = "Vanya BELYAEV Ivan.Belyaev@nikhef.nl"
 version = "CVS tag $Name: not supported by cvs2svn $, version $Revision: 1.5 $"
 # =============================================================================
diff --git a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping31r2/CommonParticles/StdLooseDetachedKpi.py b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping31r2/CommonParticles/StdLooseDetachedKpi.py
index 02660a5b61cbb4483daa09b24d26b6530a22f817..ff9899f392cbfcbf13c431727798070458b32c7b 100644
--- a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping31r2/CommonParticles/StdLooseDetachedKpi.py
+++ b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping31r2/CommonParticles/StdLooseDetachedKpi.py
@@ -21,7 +21,6 @@ from Gaudi.Configuration import *
 # , OfflineVertexFitter, OnOfflineTool
 from Configurables import CombineParticles
 from CommonParticles.Utils import *
-import GaudiKernel.SystemOfUnits as Units
 
 ###########################
 # StdDetachetKst2Kpi      #
diff --git a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping31r2/CommonParticles/StdLooseDetachedKstar.py b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping31r2/CommonParticles/StdLooseDetachedKstar.py
index acaaa4563e561044289b51a6a747dde089d61290..962c509c917ff04f904ee22b63ff2ef697e96cb6 100644
--- a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping31r2/CommonParticles/StdLooseDetachedKstar.py
+++ b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping31r2/CommonParticles/StdLooseDetachedKstar.py
@@ -19,7 +19,6 @@ __date__ = '29/06/2009'
 from Gaudi.Configuration import *
 from Configurables import FilterDesktop
 from CommonParticles.Utils import *
-import GaudiKernel.SystemOfUnits as Units
 
 ###########################
 # StdLooseDetachetKst2Kpi #
diff --git a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping31r2/CommonParticles/StdVeryLooseDetachedKstar.py b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping31r2/CommonParticles/StdVeryLooseDetachedKstar.py
index 6c5cdcbb1b68f253e32c197d99fd67f922485393..519f74f8b0594df60151fa07022fcf0dc04d5d2e 100644
--- a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping31r2/CommonParticles/StdVeryLooseDetachedKstar.py
+++ b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping31r2/CommonParticles/StdVeryLooseDetachedKstar.py
@@ -20,7 +20,6 @@ from Gaudi.Configuration import *
 # , OfflineVertexFitter, OnOfflineTool
 from Configurables import CombineParticles
 from CommonParticles.Utils import *
-import GaudiKernel.SystemOfUnits as Units
 
 ###########################
 # StdVeryLooseDetachetKst2Kpi #
diff --git a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping31r2/CommonParticles/Utils.py b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping31r2/CommonParticles/Utils.py
old mode 100755
new mode 100644
index 66847ea24a1afceb0b9e92dc9c0e20c41b7d0092..65f4569a4255fe6ed67515a92d41917bbf55623d
--- a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping31r2/CommonParticles/Utils.py
+++ b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping31r2/CommonParticles/Utils.py
@@ -23,7 +23,6 @@ Helper file for configuration of 'standard particles'
 from Configurables import LHCbConfigurableUser
 from Configurables import TrackSelector
 from Configurables import DataOnDemandSvc
-from Gaudi.Configuration import *
 author = "Vanya BELYAEV Ivan.Belyaev@nikhef.nl"
 version = "CVS tag $Name: not supported by cvs2svn $, version $Revision: 1.5 $"
 # =============================================================================
diff --git a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping33r2/CommonParticles/StdLooseDetachedKpi.py b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping33r2/CommonParticles/StdLooseDetachedKpi.py
index 0219b1e679d1c5b9ad49f044a84f8f8a43375669..d5d3419a036ad6416ed0862507d49d1e26aeddb1 100644
--- a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping33r2/CommonParticles/StdLooseDetachedKpi.py
+++ b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping33r2/CommonParticles/StdLooseDetachedKpi.py
@@ -21,7 +21,6 @@ from Gaudi.Configuration import *
 # , OfflineVertexFitter, OnOfflineTool
 from Configurables import CombineParticles
 from CommonParticles.Utils import *
-import GaudiKernel.SystemOfUnits as Units
 
 ###########################
 # StdDetachetKst2Kpi      #
diff --git a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping33r2/CommonParticles/StdLooseDetachedKstar.py b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping33r2/CommonParticles/StdLooseDetachedKstar.py
index 97db5f4b9cdd8e38903463cf2cddfcf9c898c78f..f5143379ce8feb4ba92c1d047771a703eede4083 100644
--- a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping33r2/CommonParticles/StdLooseDetachedKstar.py
+++ b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping33r2/CommonParticles/StdLooseDetachedKstar.py
@@ -19,7 +19,6 @@ __date__ = '29/06/2009'
 from Gaudi.Configuration import *
 from Configurables import FilterDesktop
 from CommonParticles.Utils import *
-import GaudiKernel.SystemOfUnits as Units
 
 ###########################
 # StdLooseDetachetKst2Kpi #
diff --git a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping33r2/CommonParticles/StdVeryLooseDetachedKstar.py b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping33r2/CommonParticles/StdVeryLooseDetachedKstar.py
index 109569b76caa72b0b9839f7ba19df48b20c09cc8..2a44a32a19d9e2bcfff700f69f96315e119396b6 100644
--- a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping33r2/CommonParticles/StdVeryLooseDetachedKstar.py
+++ b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping33r2/CommonParticles/StdVeryLooseDetachedKstar.py
@@ -20,7 +20,6 @@ from Gaudi.Configuration import *
 # , OfflineVertexFitter, OnOfflineTool
 from Configurables import CombineParticles
 from CommonParticles.Utils import *
-import GaudiKernel.SystemOfUnits as Units
 
 ###########################
 # StdVeryLooseDetachetKst2Kpi #
diff --git a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping33r2/CommonParticles/Utils.py b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping33r2/CommonParticles/Utils.py
old mode 100755
new mode 100644
index 67c402da2a69cc51fe8676479e32f484a2ab48d5..24e57e62eb5f85e9209402de11241319b86b73de
--- a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping33r2/CommonParticles/Utils.py
+++ b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping33r2/CommonParticles/Utils.py
@@ -22,7 +22,6 @@ Helper file for configuration of 'standard particles'
 from Configurables import LHCbConfigurableUser
 from Configurables import TrackSelector
 from Configurables import DataOnDemandSvc
-from Gaudi.Configuration import *
 author = "Vanya BELYAEV Ivan.Belyaev@nikhef.nl"
 version = "CVS tag $Name: not supported by cvs2svn $, version $Revision: 1.5 $"
 # =============================================================================
diff --git a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping34/CommonParticles/StdLooseDetachedKpi.py b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping34/CommonParticles/StdLooseDetachedKpi.py
index 0219b1e679d1c5b9ad49f044a84f8f8a43375669..d5d3419a036ad6416ed0862507d49d1e26aeddb1 100644
--- a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping34/CommonParticles/StdLooseDetachedKpi.py
+++ b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping34/CommonParticles/StdLooseDetachedKpi.py
@@ -21,7 +21,6 @@ from Gaudi.Configuration import *
 # , OfflineVertexFitter, OnOfflineTool
 from Configurables import CombineParticles
 from CommonParticles.Utils import *
-import GaudiKernel.SystemOfUnits as Units
 
 ###########################
 # StdDetachetKst2Kpi      #
diff --git a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping34/CommonParticles/StdLooseDetachedKstar.py b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping34/CommonParticles/StdLooseDetachedKstar.py
index 97db5f4b9cdd8e38903463cf2cddfcf9c898c78f..f5143379ce8feb4ba92c1d047771a703eede4083 100644
--- a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping34/CommonParticles/StdLooseDetachedKstar.py
+++ b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping34/CommonParticles/StdLooseDetachedKstar.py
@@ -19,7 +19,6 @@ __date__ = '29/06/2009'
 from Gaudi.Configuration import *
 from Configurables import FilterDesktop
 from CommonParticles.Utils import *
-import GaudiKernel.SystemOfUnits as Units
 
 ###########################
 # StdLooseDetachetKst2Kpi #
diff --git a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping34/CommonParticles/StdVeryLooseDetachedKstar.py b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping34/CommonParticles/StdVeryLooseDetachedKstar.py
index 109569b76caa72b0b9839f7ba19df48b20c09cc8..2a44a32a19d9e2bcfff700f69f96315e119396b6 100644
--- a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping34/CommonParticles/StdVeryLooseDetachedKstar.py
+++ b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping34/CommonParticles/StdVeryLooseDetachedKstar.py
@@ -20,7 +20,6 @@ from Gaudi.Configuration import *
 # , OfflineVertexFitter, OnOfflineTool
 from Configurables import CombineParticles
 from CommonParticles.Utils import *
-import GaudiKernel.SystemOfUnits as Units
 
 ###########################
 # StdVeryLooseDetachetKst2Kpi #
diff --git a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping34/CommonParticles/Utils.py b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping34/CommonParticles/Utils.py
old mode 100755
new mode 100644
index 03a0eda3a41ad5e3bd75d018613d6bfd68d596a9..83d543a005ebce9e5102e518c5e117dbcd392e6c
--- a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping34/CommonParticles/Utils.py
+++ b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping34/CommonParticles/Utils.py
@@ -23,7 +23,6 @@ Helper file for configuration of 'standard particles'
 from Configurables import LHCbConfigurableUser
 from Configurables import TrackSelector
 from Configurables import DataOnDemandSvc
-from Gaudi.Configuration import *
 author = "Vanya BELYAEV Ivan.Belyaev@nikhef.nl"
 version = "CVS tag $Name: not supported by cvs2svn $, version $Revision: 1.5 $"
 # =============================================================================
diff --git a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping34r0p1/CommonParticles/StdLooseDetachedKpi.py b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping34r0p1/CommonParticles/StdLooseDetachedKpi.py
index 0219b1e679d1c5b9ad49f044a84f8f8a43375669..d5d3419a036ad6416ed0862507d49d1e26aeddb1 100644
--- a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping34r0p1/CommonParticles/StdLooseDetachedKpi.py
+++ b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping34r0p1/CommonParticles/StdLooseDetachedKpi.py
@@ -21,7 +21,6 @@ from Gaudi.Configuration import *
 # , OfflineVertexFitter, OnOfflineTool
 from Configurables import CombineParticles
 from CommonParticles.Utils import *
-import GaudiKernel.SystemOfUnits as Units
 
 ###########################
 # StdDetachetKst2Kpi      #
diff --git a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping34r0p1/CommonParticles/StdLooseDetachedKstar.py b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping34r0p1/CommonParticles/StdLooseDetachedKstar.py
index 97db5f4b9cdd8e38903463cf2cddfcf9c898c78f..f5143379ce8feb4ba92c1d047771a703eede4083 100644
--- a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping34r0p1/CommonParticles/StdLooseDetachedKstar.py
+++ b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping34r0p1/CommonParticles/StdLooseDetachedKstar.py
@@ -19,7 +19,6 @@ __date__ = '29/06/2009'
 from Gaudi.Configuration import *
 from Configurables import FilterDesktop
 from CommonParticles.Utils import *
-import GaudiKernel.SystemOfUnits as Units
 
 ###########################
 # StdLooseDetachetKst2Kpi #
diff --git a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping34r0p1/CommonParticles/StdVeryLooseDetachedKstar.py b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping34r0p1/CommonParticles/StdVeryLooseDetachedKstar.py
index 109569b76caa72b0b9839f7ba19df48b20c09cc8..2a44a32a19d9e2bcfff700f69f96315e119396b6 100644
--- a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping34r0p1/CommonParticles/StdVeryLooseDetachedKstar.py
+++ b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping34r0p1/CommonParticles/StdVeryLooseDetachedKstar.py
@@ -20,7 +20,6 @@ from Gaudi.Configuration import *
 # , OfflineVertexFitter, OnOfflineTool
 from Configurables import CombineParticles
 from CommonParticles.Utils import *
-import GaudiKernel.SystemOfUnits as Units
 
 ###########################
 # StdVeryLooseDetachetKst2Kpi #
diff --git a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping34r0p1/CommonParticles/Utils.py b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping34r0p1/CommonParticles/Utils.py
old mode 100755
new mode 100644
index 67c402da2a69cc51fe8676479e32f484a2ab48d5..24e57e62eb5f85e9209402de11241319b86b73de
--- a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping34r0p1/CommonParticles/Utils.py
+++ b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping34r0p1/CommonParticles/Utils.py
@@ -22,7 +22,6 @@ Helper file for configuration of 'standard particles'
 from Configurables import LHCbConfigurableUser
 from Configurables import TrackSelector
 from Configurables import DataOnDemandSvc
-from Gaudi.Configuration import *
 author = "Vanya BELYAEV Ivan.Belyaev@nikhef.nl"
 version = "CVS tag $Name: not supported by cvs2svn $, version $Revision: 1.5 $"
 # =============================================================================
diff --git a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping34r0p2/CommonParticles/StdLooseDetachedKpi.py b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping34r0p2/CommonParticles/StdLooseDetachedKpi.py
index 0219b1e679d1c5b9ad49f044a84f8f8a43375669..d5d3419a036ad6416ed0862507d49d1e26aeddb1 100644
--- a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping34r0p2/CommonParticles/StdLooseDetachedKpi.py
+++ b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping34r0p2/CommonParticles/StdLooseDetachedKpi.py
@@ -21,7 +21,6 @@ from Gaudi.Configuration import *
 # , OfflineVertexFitter, OnOfflineTool
 from Configurables import CombineParticles
 from CommonParticles.Utils import *
-import GaudiKernel.SystemOfUnits as Units
 
 ###########################
 # StdDetachetKst2Kpi      #
diff --git a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping34r0p2/CommonParticles/StdLooseDetachedKstar.py b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping34r0p2/CommonParticles/StdLooseDetachedKstar.py
index 97db5f4b9cdd8e38903463cf2cddfcf9c898c78f..f5143379ce8feb4ba92c1d047771a703eede4083 100644
--- a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping34r0p2/CommonParticles/StdLooseDetachedKstar.py
+++ b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping34r0p2/CommonParticles/StdLooseDetachedKstar.py
@@ -19,7 +19,6 @@ __date__ = '29/06/2009'
 from Gaudi.Configuration import *
 from Configurables import FilterDesktop
 from CommonParticles.Utils import *
-import GaudiKernel.SystemOfUnits as Units
 
 ###########################
 # StdLooseDetachetKst2Kpi #
diff --git a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping34r0p2/CommonParticles/StdVeryLooseDetachedKstar.py b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping34r0p2/CommonParticles/StdVeryLooseDetachedKstar.py
index 109569b76caa72b0b9839f7ba19df48b20c09cc8..2a44a32a19d9e2bcfff700f69f96315e119396b6 100644
--- a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping34r0p2/CommonParticles/StdVeryLooseDetachedKstar.py
+++ b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping34r0p2/CommonParticles/StdVeryLooseDetachedKstar.py
@@ -20,7 +20,6 @@ from Gaudi.Configuration import *
 # , OfflineVertexFitter, OnOfflineTool
 from Configurables import CombineParticles
 from CommonParticles.Utils import *
-import GaudiKernel.SystemOfUnits as Units
 
 ###########################
 # StdVeryLooseDetachetKst2Kpi #
diff --git a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping34r0p2/CommonParticles/Utils.py b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping34r0p2/CommonParticles/Utils.py
old mode 100755
new mode 100644
index faac2879b9331aa34e60211d9c7cd5098b273485..d4c2763d576c34904afa98f833ef7456dc31b074
--- a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping34r0p2/CommonParticles/Utils.py
+++ b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping34r0p2/CommonParticles/Utils.py
@@ -22,7 +22,6 @@ Helper file for configuration of 'standard particles'
 from Configurables import LHCbConfigurableUser
 from Configurables import TrackSelector
 from Configurables import DataOnDemandSvc
-from Gaudi.Configuration import *
 author = "Vanya BELYAEV Ivan.Belyaev@nikhef.nl"
 # =============================================================================
 __all__ = (
diff --git a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r2/CommonParticles/StdLooseDetachedKpi.py b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r2/CommonParticles/StdLooseDetachedKpi.py
index 0219b1e679d1c5b9ad49f044a84f8f8a43375669..d5d3419a036ad6416ed0862507d49d1e26aeddb1 100644
--- a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r2/CommonParticles/StdLooseDetachedKpi.py
+++ b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r2/CommonParticles/StdLooseDetachedKpi.py
@@ -21,7 +21,6 @@ from Gaudi.Configuration import *
 # , OfflineVertexFitter, OnOfflineTool
 from Configurables import CombineParticles
 from CommonParticles.Utils import *
-import GaudiKernel.SystemOfUnits as Units
 
 ###########################
 # StdDetachetKst2Kpi      #
diff --git a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r2/CommonParticles/StdLooseDetachedKstar.py b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r2/CommonParticles/StdLooseDetachedKstar.py
index 97db5f4b9cdd8e38903463cf2cddfcf9c898c78f..f5143379ce8feb4ba92c1d047771a703eede4083 100644
--- a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r2/CommonParticles/StdLooseDetachedKstar.py
+++ b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r2/CommonParticles/StdLooseDetachedKstar.py
@@ -19,7 +19,6 @@ __date__ = '29/06/2009'
 from Gaudi.Configuration import *
 from Configurables import FilterDesktop
 from CommonParticles.Utils import *
-import GaudiKernel.SystemOfUnits as Units
 
 ###########################
 # StdLooseDetachetKst2Kpi #
diff --git a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r2/CommonParticles/StdVeryLooseDetachedKstar.py b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r2/CommonParticles/StdVeryLooseDetachedKstar.py
index 109569b76caa72b0b9839f7ba19df48b20c09cc8..2a44a32a19d9e2bcfff700f69f96315e119396b6 100644
--- a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r2/CommonParticles/StdVeryLooseDetachedKstar.py
+++ b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r2/CommonParticles/StdVeryLooseDetachedKstar.py
@@ -20,7 +20,6 @@ from Gaudi.Configuration import *
 # , OfflineVertexFitter, OnOfflineTool
 from Configurables import CombineParticles
 from CommonParticles.Utils import *
-import GaudiKernel.SystemOfUnits as Units
 
 ###########################
 # StdVeryLooseDetachetKst2Kpi #
diff --git a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r2/CommonParticles/Utils.py b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r2/CommonParticles/Utils.py
old mode 100755
new mode 100644
index 67c402da2a69cc51fe8676479e32f484a2ab48d5..24e57e62eb5f85e9209402de11241319b86b73de
--- a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r2/CommonParticles/Utils.py
+++ b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r2/CommonParticles/Utils.py
@@ -22,7 +22,6 @@ Helper file for configuration of 'standard particles'
 from Configurables import LHCbConfigurableUser
 from Configurables import TrackSelector
 from Configurables import DataOnDemandSvc
-from Gaudi.Configuration import *
 author = "Vanya BELYAEV Ivan.Belyaev@nikhef.nl"
 version = "CVS tag $Name: not supported by cvs2svn $, version $Revision: 1.5 $"
 # =============================================================================
diff --git a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r3/CommonParticles/StdLooseDetachedKpi.py b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r3/CommonParticles/StdLooseDetachedKpi.py
index 0219b1e679d1c5b9ad49f044a84f8f8a43375669..d5d3419a036ad6416ed0862507d49d1e26aeddb1 100644
--- a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r3/CommonParticles/StdLooseDetachedKpi.py
+++ b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r3/CommonParticles/StdLooseDetachedKpi.py
@@ -21,7 +21,6 @@ from Gaudi.Configuration import *
 # , OfflineVertexFitter, OnOfflineTool
 from Configurables import CombineParticles
 from CommonParticles.Utils import *
-import GaudiKernel.SystemOfUnits as Units
 
 ###########################
 # StdDetachetKst2Kpi      #
diff --git a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r3/CommonParticles/StdLooseDetachedKstar.py b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r3/CommonParticles/StdLooseDetachedKstar.py
index 97db5f4b9cdd8e38903463cf2cddfcf9c898c78f..f5143379ce8feb4ba92c1d047771a703eede4083 100644
--- a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r3/CommonParticles/StdLooseDetachedKstar.py
+++ b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r3/CommonParticles/StdLooseDetachedKstar.py
@@ -19,7 +19,6 @@ __date__ = '29/06/2009'
 from Gaudi.Configuration import *
 from Configurables import FilterDesktop
 from CommonParticles.Utils import *
-import GaudiKernel.SystemOfUnits as Units
 
 ###########################
 # StdLooseDetachetKst2Kpi #
diff --git a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r3/CommonParticles/StdVeryLooseDetachedKstar.py b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r3/CommonParticles/StdVeryLooseDetachedKstar.py
index 109569b76caa72b0b9839f7ba19df48b20c09cc8..2a44a32a19d9e2bcfff700f69f96315e119396b6 100644
--- a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r3/CommonParticles/StdVeryLooseDetachedKstar.py
+++ b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r3/CommonParticles/StdVeryLooseDetachedKstar.py
@@ -20,7 +20,6 @@ from Gaudi.Configuration import *
 # , OfflineVertexFitter, OnOfflineTool
 from Configurables import CombineParticles
 from CommonParticles.Utils import *
-import GaudiKernel.SystemOfUnits as Units
 
 ###########################
 # StdVeryLooseDetachetKst2Kpi #
diff --git a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r3/CommonParticles/Utils.py b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r3/CommonParticles/Utils.py
old mode 100755
new mode 100644
index 67c402da2a69cc51fe8676479e32f484a2ab48d5..24e57e62eb5f85e9209402de11241319b86b73de
--- a/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r3/CommonParticles/Utils.py
+++ b/Phys/CommonParticlesArchive/python/CommonParticlesArchive/Stripping35r3/CommonParticles/Utils.py
@@ -22,7 +22,6 @@ Helper file for configuration of 'standard particles'
 from Configurables import LHCbConfigurableUser
 from Configurables import TrackSelector
 from Configurables import DataOnDemandSvc
-from Gaudi.Configuration import *
 author = "Vanya BELYAEV Ivan.Belyaev@nikhef.nl"
 version = "CVS tag $Name: not supported by cvs2svn $, version $Revision: 1.5 $"
 # =============================================================================
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingB2CC/StrippingB2JpsiHH.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingB2CC/StrippingB2JpsiHH.py
index 426a15a03fdb410fd33fba1d83ccac165f4c345b..ea80a2693083b0dd305af119c0794a0a03dd0088 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingB2CC/StrippingB2JpsiHH.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingB2CC/StrippingB2JpsiHH.py
@@ -20,18 +20,10 @@ __date__ = '10/11/2016'
 
 __all__ = ('B2JpsiHHConf', 'default_config')
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from CommonParticles.Utils import updateDoD
-from StandardParticles import StdLoosePions
-from StandardParticles import StdLooseKaons
-from StandardParticles import StdLooseProtons
-from StandardParticles import StdAllLooseKaons
-from StandardParticles import StdAllLooseProtons
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
+from PhysSelPython.Wrappers import DataOnDemand, Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from GaudiKernel.SystemOfUnits import MeV
 
 default_config = {
     'NAME': 'B2JpsiHH',
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingB2CC/StrippingB2JpsiPi0.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingB2CC/StrippingB2JpsiPi0.py
index 90740f80b4fbe5d7cdd945fc3fb2a4331ac1e49d..170baf2fb63c5dbaab6735a4dbe697c61ed379a3 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingB2CC/StrippingB2JpsiPi0.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingB2CC/StrippingB2JpsiPi0.py
@@ -14,15 +14,10 @@ __version__ = '$Revision: 1.1$'
 
 __all__ = ('B2JpsiPi0Conf', 'default_config')
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from CommonParticles.Utils import updateDoD
-from StandardParticles import StdLooseResolvedPi0
-from StandardParticles import StdLooseMergedPi0
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
+from PhysSelPython.Wrappers import DataOnDemand, Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from GaudiKernel.SystemOfUnits import MeV
 
 default_config = {
     # The real name of the lines is BetaS, this is a reference this for the Settings.
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingB2CC/StrippingB2JpsiPi0_Run1.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingB2CC/StrippingB2JpsiPi0_Run1.py
index 3f5f0443aa9132ab2494cbb48813c4ad8991fc1b..1bf462e0083a2da3704b1f804d03b10239ecd920 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingB2CC/StrippingB2JpsiPi0_Run1.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingB2CC/StrippingB2JpsiPi0_Run1.py
@@ -14,15 +14,10 @@ __version__ = '$Revision: 1.2$'
 
 __all__ = ('B2JpsiPi0Conf_RI', 'default_config')
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from CommonParticles.Utils import updateDoD
-from StandardParticles import StdLooseResolvedPi0
-from StandardParticles import StdLooseMergedPi0
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
+from PhysSelPython.Wrappers import DataOnDemand, Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from GaudiKernel.SystemOfUnits import MeV
 
 default_config = {
     # The real name of the lines is BetaS, this is a reference this for the Settings.
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingB2CC/StrippingB2JpsiX0.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingB2CC/StrippingB2JpsiX0.py
index d93a42cce82d84a0ed23627a007cbaad6d469573..e15a04497fca1b721a890552c1359e732098a2be 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingB2CC/StrippingB2JpsiX0.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingB2CC/StrippingB2JpsiX0.py
@@ -20,18 +20,10 @@ __date__ = '22/01/2018'
 
 __all__ = ('B2JpsiX0Conf', 'default_config')
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from CommonParticles.Utils import updateDoD
-from StandardParticles import StdLoosePions
-from StandardParticles import StdLooseKaons
-from StandardParticles import StdLooseProtons
-from StandardParticles import StdAllLooseKaons
-from StandardParticles import StdAllLooseProtons
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
+from PhysSelPython.Wrappers import DataOnDemand, Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from GaudiKernel.SystemOfUnits import MeV
 
 default_config = {
     'NAME': 'B2JpsiX0',
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingB2CC/StrippingB2JpsiXforBeta_s.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingB2CC/StrippingB2JpsiXforBeta_s.py
index f249942b6e70534073a342298d7e41c294d2ac84..83cfcf7fbfeca7d7da85f9148f6fff86360c328b 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingB2CC/StrippingB2JpsiXforBeta_s.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingB2CC/StrippingB2JpsiXforBeta_s.py
@@ -26,16 +26,12 @@ __version__ = '$Revision: 4.0$'
 
 __all__ = ('B2JpsiXforBeta_sConf', 'default_config')
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from CommonParticles.Utils import updateDoD
 from StandardParticles import StdLoosePions
 from StandardParticles import StdLooseKaons
-from StandardParticles import StdAllLooseKaons
 from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from GaudiKernel.SystemOfUnits import MeV
 
 default_config = {
     'NAME': 'BetaS',
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingB2CC/StrippingBd2JpsieeKS.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingB2CC/StrippingBd2JpsieeKS.py
index 447acfd66a8a888ea16f056888b1b5a41ccee167..ccac3244d5f71227250f84d9c5d0c485845ab5b3 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingB2CC/StrippingBd2JpsieeKS.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingB2CC/StrippingBd2JpsieeKS.py
@@ -8,16 +8,10 @@
 # granted to it by virtue of its status as an Intergovernmental Organization  #
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
-from GaudiKernel.SystemOfUnits import MeV
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
-from StandardParticles import StdAllLooseKaons
-from StandardParticles import StdLooseKaons
-from StandardParticles import StdLoosePions
-from CommonParticles.Utils import updateDoD
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = 'Ramon Niet'
 __date__ = '2014/10/23'
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingB2CC/StrippingBd2JpsieeKstar.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingB2CC/StrippingBd2JpsieeKstar.py
index 692c26648abbb976dff28c0eca9daad7a9006f8c..d8622e85421314a8e33b7cf0702ca0a098f82955 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingB2CC/StrippingBd2JpsieeKstar.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingB2CC/StrippingBd2JpsieeKstar.py
@@ -12,7 +12,6 @@ from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from Configurables import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = 'Artur Ukleja, Jibo He, Konrad Klimaszewski, Varvara Batozskaya'
 __date__ = '2019/01/22'
 '''
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingB2CC/StrippingBs2EtacPhiBDT.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingB2CC/StrippingBs2EtacPhiBDT.py
index b6e256eaa1235a84cbf3b68362eea9bf7f387897..30d69a2c110a19ab5a45303854da636781997f4f 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingB2CC/StrippingBs2EtacPhiBDT.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingB2CC/StrippingBs2EtacPhiBDT.py
@@ -17,7 +17,6 @@ from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
-from Gaudi.Configuration import *
 __author__ = ['Morgan Martin, Jibo He']
 __date__ = '20/08/2014'
 __version__ = '$Revision: 1.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingB2CC/StrippingBs2JpsieePhi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingB2CC/StrippingBs2JpsieePhi.py
index 933c2f46f93196ffa448a855cea7a82e5fca3652..ee8bf0cf2aad66cd3771f048a336fffb0ed8165d 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingB2CC/StrippingBs2JpsieePhi.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingB2CC/StrippingBs2JpsieePhi.py
@@ -12,7 +12,6 @@ from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from Configurables import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = 'Artur Ukleja, Jibo He, Konrad Klimaszewski'
 __date__ = '2011/03/01'
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingB2OC/Beauty2Charm_B2DXBuilder.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingB2OC/Beauty2Charm_B2DXBuilder.py
index d01512cfa739b391ff97e67788844c3effae961e..8d36b45c37f55b97d51ff29b4d93997aa5326da5 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingB2OC/Beauty2Charm_B2DXBuilder.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingB2OC/Beauty2Charm_B2DXBuilder.py
@@ -12,11 +12,7 @@
 
 from copy import deepcopy
 from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-from PhysSelPython.Wrappers import Selection
-from Beauty2Charm_LoKiCuts import LoKiCuts
 from Beauty2Charm_Utils import *
-from Configurables import SubstitutePID
 
 # \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\#
 
@@ -1355,7 +1351,7 @@ class B2DXBuilder(object):
             'B2D0st2460D0Pi':
             ["B+ -> D*_2(2460)0 D0 pi+", "B- -> D*_2(2460)0 D0 pi-"]
         }
-        input = self.dst.dpi_2460_pid + self.d.kpi_pid + self.topoKaons_PID
+        self.dst.dpi_2460_pid + self.d.kpi_pid + self.topoKaons_PID
         inputs = {
             'B2D0st2460D0K':
             self.dst.dpi_2460_pid + self.d.kpi_pid + self.topoKaons_PID,
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingB2OC/Beauty2Charm_Bc2BXBuilder.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingB2OC/Beauty2Charm_Bc2BXBuilder.py
index 63ecc854364bae2f29d64ea2b95c3484988c7016..5bb9297a5c69f56bc7b9761489bf517623df7d3c 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingB2OC/Beauty2Charm_Bc2BXBuilder.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingB2OC/Beauty2Charm_Bc2BXBuilder.py
@@ -8,11 +8,9 @@
 # granted to it by virtue of its status as an Intergovernmental Organization  #
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
-from copy import deepcopy
 from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 from PhysSelPython.Wrappers import Selection, MergedSelection
-from Beauty2Charm_LoKiCuts import LoKiCuts
 from Beauty2Charm_Utils import *
 
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingB2OC/Beauty2Charm_Bc2DDBuilder.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingB2OC/Beauty2Charm_Bc2DDBuilder.py
index 17eda4547110606bb00b589ef9a9081a7ab985e7..44526bcd78bbc48eb6f8c6416c9eabdc38313ac4 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingB2OC/Beauty2Charm_Bc2DDBuilder.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingB2OC/Beauty2Charm_Bc2DDBuilder.py
@@ -11,10 +11,8 @@
 
 # \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\#
 
-from copy import deepcopy
 from Gaudi.Configuration import *
-from PhysSelPython.Wrappers import Selection, MergedSelection
-from Beauty2Charm_LoKiCuts import LoKiCuts
+from PhysSelPython.Wrappers import MergedSelection
 from Beauty2Charm_Utils import *
 # from Configurables import SubstitutePID
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingB2OC/Beauty2Charm_Bc2DXBuilder.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingB2OC/Beauty2Charm_Bc2DXBuilder.py
index af663b7592071fc14302f44aa5c2a5b5eb5608d2..7449f0734a1fbe2c6eafc03f67ed71d3bfd70c18 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingB2OC/Beauty2Charm_Bc2DXBuilder.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingB2OC/Beauty2Charm_Bc2DXBuilder.py
@@ -10,9 +10,6 @@
 ###############################################################################
 from copy import deepcopy
 from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-from PhysSelPython.Wrappers import Selection, MergedSelection
-from Beauty2Charm_LoKiCuts import LoKiCuts
 from Beauty2Charm_Utils import *
 
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingB2OC/Beauty2Charm_DBuilder.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingB2OC/Beauty2Charm_DBuilder.py
index 05f581bbff7f17fff94ce5901071ecb1d04665fa..802efc84d8efe6a8f5cdf53a5fbd653ce0be38e8 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingB2OC/Beauty2Charm_DBuilder.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingB2OC/Beauty2Charm_DBuilder.py
@@ -385,7 +385,6 @@ class DBuilder(object):
         # self.k3pi_ddx_pid = [filterSelection('D2k3pi_for_DDX',LoKiCuts(['VCHI2DOF','BPVVDCHI2'],config_for_ddx).code(),self.k3pi_pid)]
 
         # use this below
-        d_cf_noMassWin = d_cf
         d_cf = LoKiCuts.combine([d_cf, "in_range(%s,MM,%s)" % (d_min, d_max)])
         ds_cf = LoKiCuts.combine(
             [ds_cf, "in_range(%s,MM,%s)" % (ds_min, ds_max)])
@@ -2050,9 +2049,6 @@ class DBuilder(object):
 
     def _makeD2PhiMuNu(self, up=False):
         '''makes Ds->phi mu nu'''
-        decays = [['phi(1020)', 'mu+']]
-        min = '1125.13*MeV'
-        max = '2168.49*MeV'
         cpkk = CombineParticles(
             # ( hasTopoChild() )
             CombinationCut="ADAMASS('phi(1020)') < 150*MeV",
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingB2OC/Beauty2Charm_HHBuilder.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingB2OC/Beauty2Charm_HHBuilder.py
index 08f113046063b0225620e80b961f1c934caada99..83e86c72dbafe11cee4a83ba99c7328e94737144 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingB2OC/Beauty2Charm_HHBuilder.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingB2OC/Beauty2Charm_HHBuilder.py
@@ -10,7 +10,6 @@
 ###############################################################################
 # \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\#
 
-from copy import deepcopy
 from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 from PhysSelPython.Wrappers import Selection
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingB2OC/Beauty2Charm_HHHBuilder.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingB2OC/Beauty2Charm_HHHBuilder.py
index 4ca95e738689e28e73bea3eb642ac88f607712a1..28ca931f76590f11cdabcf62760db4c23769a749 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingB2OC/Beauty2Charm_HHHBuilder.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingB2OC/Beauty2Charm_HHHBuilder.py
@@ -10,9 +10,8 @@
 ###############################################################################
 # \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\#
 
-from copy import deepcopy
 from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N3BodyDecays
+from GaudiConfUtils.ConfigurableGenerators import DaVinci__N3BodyDecays
 from PhysSelPython.Wrappers import Selection
 from Beauty2Charm_LoKiCuts import LoKiCuts
 from Beauty2Charm_Utils import *
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingB2OC/Beauty2Charm_Lb2XBuilder.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingB2OC/Beauty2Charm_Lb2XBuilder.py
index dcd1e601c49b3297d24264a6d98a913f91f89a72..360fe99e73d9fbbe48f9065cb1246d7467de0572 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingB2OC/Beauty2Charm_Lb2XBuilder.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingB2OC/Beauty2Charm_Lb2XBuilder.py
@@ -1598,7 +1598,7 @@ class Lb2XBuilder(object):
 
     def _makeX2LcKPiPiPi(self):
         '''Makes RS + WS Xib -> Lc HH + c.c.'''
-        pions = self.pions
+        self.pions
         kaons = self.kaons
         pipipi = self.hhh.pipipi
         config = deepcopy(self.config)
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingB2OC/Beauty2Charm_LoKiCuts.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingB2OC/Beauty2Charm_LoKiCuts.py
index 54540ea2a223d554a751b02cf83000df4f3aa076..0fd327f8d32075591c9ca0e2d4dd434636c0ab35 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingB2OC/Beauty2Charm_LoKiCuts.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingB2OC/Beauty2Charm_LoKiCuts.py
@@ -10,11 +10,6 @@
 ###############################################################################
 # \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\#
 
-from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
-from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-from PhysSelPython.Wrappers import Selection, MergedSelection
-from StandardParticles import StdNoPIDsPions, StdNoPIDsKaons
 
 # \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\#
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingB2OC/Beauty2Charm_Utils.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingB2OC/Beauty2Charm_Utils.py
index 7949e5482cf0df4296d969b96966d2057310c75b..84d6df19648bdd16451bbfa4a21be153c20799e4 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingB2OC/Beauty2Charm_Utils.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingB2OC/Beauty2Charm_Utils.py
@@ -10,13 +10,11 @@
 ###############################################################################
 # \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\#
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-from PhysSelPython.Wrappers import DataOnDemand, Selection, MergedSelection, VoidEventSelection
+from PhysSelPython.Wrappers import DataOnDemand, Selection, VoidEventSelection
 from Beauty2Charm_LoKiCuts import LoKiCuts
 from Configurables import SubstitutePID
-from Configurables import ConeJetProxyFilter
 
 # \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\#
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingB2OC/StrippingB2DDphi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingB2OC/StrippingB2DDphi.py
index b0f8982f1efb389032da5f7becb2881e3c005379..92ca95c2ea3f7c46766aedbc04dbbc34c9c0b8ef 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingB2OC/StrippingB2DDphi.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingB2OC/StrippingB2DDphi.py
@@ -15,8 +15,7 @@ Author: M. Martinelli
 Notes: Excited states are included by placing the line in FULL.DST
 '''
 from PhysSelPython.Wrappers import Selection, DataOnDemand
-from Configurables import FilterDesktop, CombineParticles, DaVinci__N4BodyDecays
-from GaudiConfUtils.ConfigurableGenerators import CombineParticles
+from Configurables import DaVinci__N4BodyDecays, FilterDesktop
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 __author__ = ['Maurizio Martinelli']
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingB2OC/StrippingB2DXD2HMuNu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingB2OC/StrippingB2DXD2HMuNu.py
index 0c33c7610ceda08cc07fbbc35c72e2186d8d5d81..d01564ec9dde10135fe1fc2b84e567d131876e4c 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingB2OC/StrippingB2DXD2HMuNu.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingB2OC/StrippingB2DXD2HMuNu.py
@@ -12,13 +12,11 @@ __author__ = ['Wenbin Qian']
 __date__ = '09/11/2015'
 __version__ = '$Revision: 0.01 $'
 
-from Gaudi.Configuration import *
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, DaVinci__N4BodyDecays, DaVinci__N3BodyDecays
-from PhysSelPython.Wrappers import Selection, DataOnDemand
+from PhysSelPython.Wrappers import Selection
 from StandardParticles import StdLooseMuons, StdLoosePions, StdLooseKaons
-from GaudiKernel.SystemOfUnits import MeV, GeV, cm, mm
 
 __all__ = ('B2DXD2HMuNuBuilder',
            'default_config')
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingB2OC/StrippingB2nbody.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingB2OC/StrippingB2nbody.py
index 663bdbbf855c3d8d19dad3a29b6be667edaeedb9..04c84fc2dc39eb4b3d3d954f3c0083396e0c84fa 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingB2OC/StrippingB2nbody.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingB2OC/StrippingB2nbody.py
@@ -16,7 +16,6 @@ from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, MergedSelection, DataOnDemand, VoidEventSelection
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = ['Rudolf Oldeman']
 __date__ = '08/02/2011'
 __version__ = '$Revision: 1.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingB2OC/StrippingBeauty2Charm.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingB2OC/StrippingBeauty2Charm.py
index a421e32148d742d448b27f54fba26c87e40b5895..f5120a3fa4ee8a0825bc29d4073d1232811d83f7 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingB2OC/StrippingBeauty2Charm.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingB2OC/StrippingBeauty2Charm.py
@@ -28,11 +28,9 @@ from StandardParticles import (StdAllNoPIDsPions, StdAllNoPIDsKaons,
                                StdAllNoPIDsProtons, StdNoPIDsUpPions,
                                StdLooseMuons, StdNoPIDsUpKaons,
                                StdLooseResolvedPi0, StdLooseMergedPi0)
-from Configurables import LoKi__VoidFilter
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import EventSelection
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
+from PhysSelPython.Wrappers import MergedSelection, Selection
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
 from Gaudi.Configuration import *
 import re
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBandQ/StrippingB2Chic0KPi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBandQ/StrippingB2Chic0KPi.py
index 69e18721b3c6b45435046eaac0c9a79d5818b6da..030871800dfb7d9f6c18c93c207febaf3fad5cf8 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBandQ/StrippingB2Chic0KPi.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBandQ/StrippingB2Chic0KPi.py
@@ -17,7 +17,6 @@ from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
-from Gaudi.Configuration import *
 __author__ = ['Andrii Usachov']
 __date__ = '13/03/2018'
 __version__ = '$Revision: 1.2$'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBandQ/StrippingB2JpsiXforEM_s.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBandQ/StrippingB2JpsiXforEM_s.py
index d3aeeef75411f9cecca87053ee0faa991e8c7fd8..394fd7c3171d61beb9b93f762a890a248f2b190f 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBandQ/StrippingB2JpsiXforEM_s.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBandQ/StrippingB2JpsiXforEM_s.py
@@ -20,21 +20,11 @@ __version__ = '$Revision: 0.0 $'
 
 __all__ = ('B2JpsiXforEM_sConf', 'default_config')
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
 from Configurables import LoKi__PVReFitter, CombineParticles
-from CommonParticles.Utils import updateDoD
-from StandardParticles import StdLoosePions
-from StandardParticles import StdLooseKaons
-from StandardParticles import StdAllLooseKaons
-from StandardParticles import StdLooseResolvedPi0
-from StandardParticles import StdLooseMergedPi0
-from StandardParticles import StdNoPIDsPions
-from StandardParticles import StdLooseProtons
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
+from PhysSelPython.Wrappers import DataOnDemand, Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from GaudiKernel.SystemOfUnits import MeV
 
 default_config = {
     'NAME': 'B2JpsiXforEM',
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBandQ/StrippingBbbar2PhiPhi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBandQ/StrippingBbbar2PhiPhi.py
index 2c308991a8d9592619777fb7aad4c619a4a40437..fd4e526f5796889d5eb13efd1f1fca7adfbf4a97 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBandQ/StrippingBbbar2PhiPhi.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBandQ/StrippingBbbar2PhiPhi.py
@@ -21,12 +21,10 @@ confBbbar2PhiPhi = Bbbar2PhiPhiConf( name = 'Bbbar2PhiPhi', config = config_Bbba
 stream.appendLines( confBbbar2PhiPhi.lines() )
 '''
 
-from StandardParticles import StdNoPIDsProtons, StdNoPIDsPions, StdNoPIDsDownPions
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
+from PhysSelPython.Wrappers import DataOnDemand, Selection
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = ['Simone Stracka']
 __date__ = '10/03/2015'
 __all__ = (
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBandQ/StrippingBc2EtacMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBandQ/StrippingBc2EtacMu.py
index 8877c5bc3695f72c52af39f4f7af13d852e6e6d9..c522e1fc84c22650c7812568ffa4584c11d9a7f1 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBandQ/StrippingBc2EtacMu.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBandQ/StrippingBc2EtacMu.py
@@ -15,9 +15,8 @@ Module for B_c->eta_c mu
 
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand, AutomaticData
+from PhysSelPython.Wrappers import DataOnDemand, Selection
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = ['Valeriia Zhovkovska']
 __date__ = '15/03/2019'
 __version__ = '$Revision: 1.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBandQ/StrippingBc2JpsiHBDT.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBandQ/StrippingBc2JpsiHBDT.py
index d973f13d2bc8b32c5045776e5b5d3f96bc618e74..7b5a84a9de9b55f09a9ef0da7469b5cc113c4602 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBandQ/StrippingBc2JpsiHBDT.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBandQ/StrippingBc2JpsiHBDT.py
@@ -18,7 +18,6 @@ from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = ['Jibo He']
 __date__ = '02/11/2013'
 __version__ = '$Revision: 2.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBandQ/StrippingBc2JpsiMuXNew.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBandQ/StrippingBc2JpsiMuXNew.py
index 946bad8366ac6019498b9d14e89f0a8899cf70d4..bd156feb81f0deaaf2a07b14df76bcbbcdd03d5c 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBandQ/StrippingBc2JpsiMuXNew.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBandQ/StrippingBc2JpsiMuXNew.py
@@ -18,7 +18,6 @@ from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = ['Jibo He']
 __date__ = '02/09/2010'
 __version__ = '$Revision: 2.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBandQ/StrippingCC2DD.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBandQ/StrippingCC2DD.py
index 58f89513ddb6f5ae23ad89c616deb7d8f0c6f719..39a30438368c27a6a42f57688de187a8b1135e72 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBandQ/StrippingCC2DD.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBandQ/StrippingCC2DD.py
@@ -22,8 +22,7 @@ Module for construction of CC->D D, where CC is a particle decaying to D D
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 __author__ = ['Lucio Anderlini', 'Andrea Bizzeti']
 __date__ = '2015-12-01'
 __version__ = '$Revision: 0.4 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBandQ/StrippingCcbar2Baryons.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBandQ/StrippingCcbar2Baryons.py
index e5a87f652fa30a90026cc6172bb112eb157c1e0f..3e235742a82cc6b6eef181ba5871e7096a9e965d 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBandQ/StrippingCcbar2Baryons.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBandQ/StrippingCcbar2Baryons.py
@@ -20,7 +20,6 @@ stream.appendLines( [
 ])
 '''
 
-from StandardParticles import StdNoPIDsProtons, StdNoPIDsPions, StdNoPIDsDownPions
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBandQ/StrippingCcbar2KsKpi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBandQ/StrippingCcbar2KsKpi.py
index b6b5864ff95625b5e45b988663cfea44c0f42cdc..4fc4ffd7e775d5d46e7701adb4802707efae0b7c 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBandQ/StrippingCcbar2KsKpi.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBandQ/StrippingCcbar2KsKpi.py
@@ -18,9 +18,8 @@ Module for Charmonium->Ks K pi, including three lines
 
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand, AutomaticData
+from PhysSelPython.Wrappers import DataOnDemand, Selection
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = ['Valeriia Zhovkovska']
 __date__ = '07/03/2019'
 __version__ = '$Revision: 1.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBandQ/StrippingCcbar2LambdaLambda.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBandQ/StrippingCcbar2LambdaLambda.py
index 627203da22f81a94eda9c6247ea6c2a1fb128927..283be918e66c410e5d5d0c9fd13effb397d4b70b 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBandQ/StrippingCcbar2LambdaLambda.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBandQ/StrippingCcbar2LambdaLambda.py
@@ -12,14 +12,10 @@
 Module for selecting Ccbar->LambdaLambda detached line, with loose PT, PID cuts. 
 '''
 
-from StandardParticles import StdAllLoosePions
-from StandardParticles import StdLoosePions, StdNoPIDsDownPions
-from StandardParticles import StdNoPIDsProtons
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = ['Andrii Usachov']
 __date__ = '27/01/2019'
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBandQ/StrippingCcbar2LstLambda.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBandQ/StrippingCcbar2LstLambda.py
index 0c317712061ae5a153e89bd41b8390a4fc74e187..4937ef3626431e3998bb3086fe7c656fa4ec9e57 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBandQ/StrippingCcbar2LstLambda.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBandQ/StrippingCcbar2LstLambda.py
@@ -12,14 +12,10 @@
 Module for selecting Ccbar->LstLambda detached line, with loose PT, PID cuts. 
 '''
 
-from StandardParticles import StdAllLoosePions, StdAllLooseKaons
-from StandardParticles import StdLoosePions, StdNoPIDsDownPions, StdLooseKaons, StdLooseDownKaons
-from StandardParticles import StdNoPIDsProtons, StdNoPIDsKaons
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = ['Andrii Usachov']
 __date__ = '23/11/2017'
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBandQ/StrippingCcbar2LstLst.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBandQ/StrippingCcbar2LstLst.py
index cf2d3319f4c8d473c85741f08945e6d15bd1722b..fb7af606490052a513bd2a8433237fcbfca14aa4 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBandQ/StrippingCcbar2LstLst.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBandQ/StrippingCcbar2LstLst.py
@@ -12,12 +12,10 @@
 Module for selecting Ccbar->LstLst detached line, with loose PT, PID cuts. 
 '''
 
-from StandardParticles import StdNoPIDsProtons, StdNoPIDsKaons
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
+from PhysSelPython.Wrappers import DataOnDemand, Selection
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = ['Andrii Usachov']
 __date__ = '12/01/2017'
 
@@ -58,19 +56,19 @@ class Ccbar2LstLstConf(LineBuilder):
         self.name = name
         self.config = config
 
-        TRCHI2DOF = config['TRCHI2DOF']
-        KaonProbNNk = config['KaonProbNNk']
-        KaonPTSec = config['KaonPTSec']
-        ProtonProbNNp = config['ProtonProbNNp']
-        ProtonP = config['ProtonP']
-        ProtonPTSec = config['ProtonPTSec']
-        LstVtxChi2 = config['LstVtxChi2']
-        LstMinMass = config['LstMinMass']
-        LstMaxMass = config['LstMaxMass']
-        CombMaxMass = config['CombMaxMass']
-        CombMinMass = config['CombMinMass']
-        MaxMass = config['MaxMass']
-        MinMass = config['MinMass']
+        config['TRCHI2DOF']
+        config['KaonProbNNk']
+        config['KaonPTSec']
+        config['ProtonProbNNp']
+        config['ProtonP']
+        config['ProtonPTSec']
+        config['LstVtxChi2']
+        config['LstMinMass']
+        config['LstMaxMass']
+        config['CombMaxMass']
+        config['CombMinMass']
+        config['MaxMass']
+        config['MinMass']
 
         self.DetachedProtonForLst = self.createSubSel(OutputList="DetachedProtonForLst" + self.name,
                                                       InputList=DataOnDemand(
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBandQ/StrippingCcbar2PPPiPi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBandQ/StrippingCcbar2PPPiPi.py
index 28b6a56f5499cd8ecbce8b1d1e366f216f123073..91e5c78c655288eb933c6478d1eafcaee3904f84 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBandQ/StrippingCcbar2PPPiPi.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBandQ/StrippingCcbar2PPPiPi.py
@@ -12,12 +12,11 @@
 Module for selecting charmonium -> p pbar pi pi 
 '''
 
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
+from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
 from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
-from Gaudi.Configuration import *
 __author__ = ['Jibo He']
 __date__ = '12/11/2015'
 __version__ = '$Revision: 1.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBandQ/StrippingCcbar2PhiPhi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBandQ/StrippingCcbar2PhiPhi.py
index c21b9fa874a5dccb0d9c373c28e255bbe309ea95..101a8e21ba087c6c991fe35e18471728a0abe2e3 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBandQ/StrippingCcbar2PhiPhi.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBandQ/StrippingCcbar2PhiPhi.py
@@ -21,12 +21,10 @@ confCcbar2PhiPhi = Ccbar2PhiPhiConf( name = 'Ccbar2PhiPhi', config = config_Ccba
 stream.appendLines( confCcbar2PhiPhi.lines() )
 '''
 
-from StandardParticles import StdNoPIDsProtons, StdNoPIDsPions, StdNoPIDsDownPions
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
+from PhysSelPython.Wrappers import DataOnDemand, Selection
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = ['Jibo He']
 __date__ = '20/01/2012'
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBandQ/StrippingCcbar2PhiPhiDetached.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBandQ/StrippingCcbar2PhiPhiDetached.py
index 9cece8aa8a316b6c48d7062407ae3c5e4a4703e3..8d48d19f4b11b35402f710baec49d8b99bec7f11 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBandQ/StrippingCcbar2PhiPhiDetached.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBandQ/StrippingCcbar2PhiPhiDetached.py
@@ -15,12 +15,10 @@ Inherited from StrippingCcbar2PhiPhi.py; moved To FullDST
 
 '''
 
-from StandardParticles import StdNoPIDsProtons, StdNoPIDsPions, StdNoPIDsDownPions
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
+from PhysSelPython.Wrappers import DataOnDemand, Selection
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = ['Jibo He, Liupan An']
 __date__ = '11/01/2017'
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBandQ/StrippingCcbar2PhiPhiPiPi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBandQ/StrippingCcbar2PhiPhiPiPi.py
index 3255f0fb24ce2bf3d5dedf3d48901b1a3b7fdf4c..8ded03963ceb90126c111e3d53772e2529b17348 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBandQ/StrippingCcbar2PhiPhiPiPi.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBandQ/StrippingCcbar2PhiPhiPiPi.py
@@ -12,12 +12,11 @@
 Module for selecting charmonium -> phi phi pi pi 
 '''
 
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
+from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
 from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
-from Gaudi.Configuration import *
 __author__ = ['Andrii Usachov']
 __date__ = '10/04/2017'
 __version__ = '$Revision: 1.1 $'
@@ -60,12 +59,12 @@ class Ccbar2PhiPhiPiPiConf(LineBuilder):
         self.name = name
         self.config = config
 
-        PhiVtxChi2 = config['PhiVtxChi2']
-        PhiMassW = config['PhiMassW']
-        KaonPT = config['KaonPT']
-        TRCHI2DOF = config['TRCHI2DOF']
-        KaonProbNNk = config['KaonProbNNk']
-        KaonIPCHI2 = config['KaonIPCHI2']
+        config['PhiVtxChi2']
+        config['PhiMassW']
+        config['KaonPT']
+        config['TRCHI2DOF']
+        config['KaonProbNNk']
+        config['KaonIPCHI2']
 
         self.SelPions = self.createSubSel(OutputList=self.name + "SelPions",
                                           InputList=DataOnDemand(
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBandQ/StrippingCcbar2PpbarNew.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBandQ/StrippingCcbar2PpbarNew.py
index 7b897199b13de2dc141c8f7cbc7d68b45c57f609..247fee87e88715cbf6df1707199f9b596c0115a8 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBandQ/StrippingCcbar2PpbarNew.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBandQ/StrippingCcbar2PpbarNew.py
@@ -18,9 +18,8 @@ Module for Charmonium->p pbar, including three lines
 
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
+from PhysSelPython.Wrappers import Selection
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 __author__ = ['Jibo He']
 __date__ = '03/10/2010'
 __version__ = '$Revision: 1.2 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBandQ/StrippingChiCJPsiGammaConv.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBandQ/StrippingChiCJPsiGammaConv.py
index 0974ad33bc785e6c21ccfbd8abd76c1de3c8330d..13c82277579b4165c559b3e45a8dc8a26f329028 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBandQ/StrippingChiCJPsiGammaConv.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBandQ/StrippingChiCJPsiGammaConv.py
@@ -11,8 +11,7 @@
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
-from Configurables import FilterDesktop, CombineParticles, OfflineVertexFitter
-from Gaudi.Configuration import *
+from Configurables import CombineParticles, FilterDesktop
 __author__ = 'Edwige Tournefier'
 __date__ = '08/06/2012'
 __version__ = '$ 1.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBandQ/StrippingDiMuonForXsection.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBandQ/StrippingDiMuonForXsection.py
index 99d45c194f644de10f8a90371ed1079dcd2e147e..7ceb214bd70cc59ffa52391a7a3321cce9dba642 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBandQ/StrippingDiMuonForXsection.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBandQ/StrippingDiMuonForXsection.py
@@ -16,7 +16,6 @@ from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
-from Gaudi.Configuration import *
 __author__ = ['Jibo He']
 __date__ = '28/03/2012'
 __version__ = '$Revision: 1.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBandQ/StrippingDiMuonNew.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBandQ/StrippingDiMuonNew.py
index 7c60c2e0a15b0e700724dae73d54a428fd669c7a..dd539e9d69fb0fa229c32fd245d281db456c4fed 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBandQ/StrippingDiMuonNew.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBandQ/StrippingDiMuonNew.py
@@ -60,7 +60,6 @@ from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand, EventSelection
 from Configurables import LoKi__VoidFilter
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
-from Gaudi.Configuration import *
 __author__ = ['Jibo He']
 __date__ = '30/09/2010'
 __version__ = '$Revision: 1.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBandQ/StrippingEtap2pipimumu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBandQ/StrippingEtap2pipimumu.py
index d3d1d1ace791be2cf505fc6059dff04cd92af55b..af48f7c83025956348c7d9b1611c8e902321aa5f 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBandQ/StrippingEtap2pipimumu.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBandQ/StrippingEtap2pipimumu.py
@@ -13,9 +13,7 @@ from StandardParticles import StdAllLooseMuons, StdAllLoosePions, StdAllLooseKao
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, OfflineVertexFitter
-from Gaudi.Configuration import *
-from copy import copy
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop
 __author__ = ['Xabier Cid Vidal']
 # inspired by StrippingD2XMuMuSSConf, from Malcolm John, B. Viaud and O. Kochebina
 __date__ = '25/1/2019'
@@ -149,10 +147,10 @@ class StrippingEtap2pipimumuConf(LineBuilder):
 
         LineBuilder.__init__(self, name, config)
 
-        Ds2EtapLine_name = name+"_Ds2Etap"
-        Bu2EtapLine_name = name+"_Bu2Etap"
-        Ds2Phi3PiLine_name = name+"_Ds2Phi3Pi"
-        Bu2JPsiKLine_name = name+"_Bu2JPsiK"
+        name+"_Ds2Etap"
+        name+"_Bu2Etap"
+        name+"_Ds2Phi3Pi"
+        name+"_Bu2JPsiK"
 
         # 1 : Make pions and kaons
         selPionsEta = makeDaughters(
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBandQ/StrippingHeavyBaryons.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBandQ/StrippingHeavyBaryons.py
index fdc48e45e9d8cddbdbd0c89c4f67663a329603f3..500f8829198f1352b6129c8bf22fff77d3f04e68 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBandQ/StrippingHeavyBaryons.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBandQ/StrippingHeavyBaryons.py
@@ -12,14 +12,10 @@
 Stripping line for HeavyBaryons studies : Xi_b-, Xi_b0 and Omega_b-
 Author: Yasmine Amhis
 '''
-from GaudiKernel.SystemOfUnits import MeV
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
-from StandardParticles import StdAllLoosePions, StdAllLooseKaons
-from StandardParticles import StdLoosePions, StdNoPIDsDownPions, StdLooseKaons, StdLooseDownKaons
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = ['Yasmine Amhis']
 __date__ = '19/05/2011'
 __version__ = '$Revision: 1.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBandQ/StrippingInclusiveCharmBaryons.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBandQ/StrippingInclusiveCharmBaryons.py
index a64e6452e0858c91aeb86cc42eebceee0762821f..56181c2008f1c579eb3fe7d29d46c1f0ef3a29fb 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBandQ/StrippingInclusiveCharmBaryons.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBandQ/StrippingInclusiveCharmBaryons.py
@@ -17,13 +17,10 @@ Author: M. Stahl
 Notes: Be creative!
 '''
 from PhysSelPython.Wrappers import Selection, AutomaticData
-import math
 from LoKiProtoParticles.decorators import *
 from LoKiArrayFunctors.decorators import *
 from LoKiPhys.decorators import *
-from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-from Configurables import FilterDesktop
-from PhysConf.Selections import FilterSelection, CombineSelection, Combine4BodySelection, Combine3BodySelection, LimitSelection, MergedSelection
+from PhysConf.Selections import Combine3BodySelection, Combine4BodySelection, FilterSelection, MergedSelection
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 __author__ = ['Marian Stahl']
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBandQ/StrippingInclusiveDoubleD.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBandQ/StrippingInclusiveDoubleD.py
index 3bb5f912fc5f4b7d935b2372622aaf76e01b2ed4..f78227698244a8dcef2b4170c65ff0781e60729a 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBandQ/StrippingInclusiveDoubleD.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBandQ/StrippingInclusiveDoubleD.py
@@ -18,12 +18,9 @@ Author: M. Stahl
 Notes: Be creative!
 '''
 from PhysSelPython.Wrappers import Selection, AutomaticData
-import math
 from LoKiProtoParticles.decorators import *
 from LoKiArrayFunctors.decorators import *
 from LoKiPhys.decorators import *
-from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-from Configurables import FilterDesktop
 from PhysConf.Selections import FilterSelection, CombineSelection, Combine3BodySelection, MergedSelection
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBandQ/StrippingLb2EtacKp.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBandQ/StrippingLb2EtacKp.py
index 595b70726ad9e4327f73d63a9aed16d30c954c9e..f21e96937e0a0f4934eb8717cbd5c1562a53ba43 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBandQ/StrippingLb2EtacKp.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBandQ/StrippingLb2EtacKp.py
@@ -18,7 +18,6 @@ from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = ['Liming Zhang', 'Xuesong Liu']
 __date__ = '23/11/2016'
 __version__ = '$Revision: 2.0$'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBandQ/StrippingOmegabDecays.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBandQ/StrippingOmegabDecays.py
index 6cb9b0c8ab26d14b40905a6b266eb3f859e415cb..445c8816a29eef4ec56c715fd44e85bbab2a5a0f 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBandQ/StrippingOmegabDecays.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBandQ/StrippingOmegabDecays.py
@@ -26,8 +26,7 @@ __all__ = ('OmegabDecaysConf', 'makeXic', 'makeOmegac', 'makeXic0',
            'makeOmegab2Omegacpi', 'makeOmegab2Omegacpi0pi',
            'makeOmegab2Omegacgammapi', 'default_config')
 
-from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBandQ/StrippingPPMuMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBandQ/StrippingPPMuMu.py
index cfa93241546b8cb1958f0c080bce3ed3974eb196..1e28adc9f8419151808afa067316d7a0f98387fb 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBandQ/StrippingPPMuMu.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBandQ/StrippingPPMuMu.py
@@ -12,12 +12,11 @@
 Module for selecting Hc -> p pbar mu mu
 '''
 
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
+from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
 from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
-from Gaudi.Configuration import *
 __author__ = ['Liupan An']
 __date__ = '18/05/2017'
 __version__ = '$Revision: 1.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBandQ/StrippingXib2LcKpiDecays.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBandQ/StrippingXib2LcKpiDecays.py
index 7d0962de93c0a70d6a707584ddbd31872e92b9e0..b1f2adb65e934b4fa528ea5d459b36bd5fe0ffce 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBandQ/StrippingXib2LcKpiDecays.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBandQ/StrippingXib2LcKpiDecays.py
@@ -24,8 +24,7 @@ __version__ = '$Revision: 1.0 $'
 __all__ = ('XibDecaysConf', 'makeLc', 'makeXic0', 'makeXib2LcKpi',
            'makeXib2Xicpi', 'default_config')
 
-from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBandQ/StrippingXibc.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBandQ/StrippingXibc.py
index ed73d91a4d03fe2ff6427b7cd54ccc7ed18aeaa7..d0446cddfd42feba526eaf11c9d8cf13a4160779 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBandQ/StrippingXibc.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBandQ/StrippingXibc.py
@@ -47,17 +47,11 @@ __all__ = ('XibcBuilder'  # LineBuilder class specialization
            )
 
 
-from Gaudi.Configuration import *
-
 from Configurables import FilterDesktop, CombineParticles
 from PhysSelPython.Wrappers import Selection, AutomaticData, MergedSelection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 
-from CommonParticles.StdLooseLambda import StdLooseLambdaLL, StdLooseLambdaDD
-from GaudiKernel.SystemOfUnits import MeV, GeV, mm
-from Configurables import TisTosParticleTagger
-
 
 default_name = "Xibc"
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBandQ/StrippingXibcBDT.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBandQ/StrippingXibcBDT.py
index 5520ac91aac71eded5064eb9daf551c6b35891fe..28b1ca4c2d5b6567ed207d4b3cd2e8dcd52a9324 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBandQ/StrippingXibcBDT.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBandQ/StrippingXibcBDT.py
@@ -33,8 +33,6 @@ from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticle
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, MergedSelection, DataOnDemand
-from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays
-from Gaudi.Configuration import *
 __author__ = ['Jibo He']
 __date__ = '20/11/2016'
 __version__ = '$Revision: 1.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBandQ/StrippingXiccBDT.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBandQ/StrippingXiccBDT.py
index 0fda677dfb8d63acd803c2278c95da8b32d22700..7dde23cf7ee6e3329158f6ed2ef36ed1b1c5655c 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBandQ/StrippingXiccBDT.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBandQ/StrippingXiccBDT.py
@@ -30,9 +30,7 @@ Xicc+  -> D+ p+ K-
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, MergedSelection, DataOnDemand
-from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays
-from Gaudi.Configuration import *
+from PhysSelPython.Wrappers import DataOnDemand, Selection
 __author__ = ['Jibo He']
 __date__ = '20/11/2016'
 __version__ = '$Revision: 1.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBnoC/StrippingB24pLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBnoC/StrippingB24pLines.py
index fed91323554dd309e9a4137174eba46ba8676d87..2c744f40e0299eacf7acf157af33557db0eec23d 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBnoC/StrippingB24pLines.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBnoC/StrippingB24pLines.py
@@ -54,12 +54,10 @@ Exported symbols (use python help!):
    - 
 """
 
-from GaudiKernel.PhysicalConstants import c_light
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
-from Configurables import FilterDesktop, CombineParticles, DaVinci__N4BodyDecays
-from Gaudi.Configuration import *
+from Configurables import DaVinci__N4BodyDecays
 __author__ = ["Pietro Marino", "Oliver Gruenberg"]
 __date__ = "13.10.2017"
 __version__ = "$Revision: 3.0 $"
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBnoC/StrippingB2CharmlessInclusive.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBnoC/StrippingB2CharmlessInclusive.py
index 056df1189d8c6e124a4dcb4201ec68d8ac1fc40d..8ae9f04166a6ba66089d684f07c4dfc79cbbc333 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBnoC/StrippingB2CharmlessInclusive.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBnoC/StrippingB2CharmlessInclusive.py
@@ -16,9 +16,8 @@ from StandardParticles import StdLooseKsDD, StdLooseKsLL
 from StandardParticles import StdNoPIDsPions, StdLooseAllPhotons, StdLooseMergedPi0, StdLooseResolvedPi0
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand, SimpleSelection, MergedSelection
+from PhysSelPython.Wrappers import MergedSelection, Selection, SimpleSelection
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = ['Fred Blanc', 'Luca Pescatore']
 __date__ = '23/01/2019'
 __version__ = '$Revision: 3.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBnoC/StrippingB2HHBDT.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBnoC/StrippingB2HHBDT.py
index 58ec12b040a0d920e656286d4bfc1dda9cf9a73f..e6d9ba6ae39bf426ebdfb99b036c32ac4554915e 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBnoC/StrippingB2HHBDT.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBnoC/StrippingB2HHBDT.py
@@ -24,16 +24,13 @@ __all__ = ('B2HHBDTLines',
            'applyBDT',
            'default_config')
 
-from Gaudi.Configuration import *
 
-from GaudiKernel.SystemOfUnits import *
-
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 from StandardParticles import StdNoPIDsPions
 
 from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
-from StrippingUtils.Utils import LineBuilder, checkConfig
+from StrippingUtils.Utils import LineBuilder
 
 
 default_config = {
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBnoC/StrippingB2HHPi0.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBnoC/StrippingB2HHPi0.py
index bb255a96ff5e37e3059e4fd6df5cfadc8cfb0b7a..f8813f46fcbbc60b4f1ff068547e0ee3c7d07454 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBnoC/StrippingB2HHPi0.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBnoC/StrippingB2HHPi0.py
@@ -27,9 +27,8 @@ __all__ = ('StrippingB2HHPi0Conf',
            'makeB2HHPi0M',
            'default_config')
 
-from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from PhysSelPython.Wrappers import Selection, DataOnDemand
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
+from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from StandardParticles import StdNoPIDsPions, StdLooseMergedPi0, StdLooseResolvedPi0
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBnoC/StrippingB2KShh.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBnoC/StrippingB2KShh.py
index f404e2a87328dc23eb64929a9a9f3cd002ddadcf..2dcd40aee03deb0e241de124f68de39f1abe783b 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBnoC/StrippingB2KShh.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBnoC/StrippingB2KShh.py
@@ -25,7 +25,6 @@ __version__ = 'Stripping24r1/Stripping26r1'
 __all__ = {'B2KShhConf',
            'default_config'}
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, DaVinci__N3BodyDecays
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBnoC/StrippingB2KShhh.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBnoC/StrippingB2KShhh.py
index f95cf109667b3401f5eb904c78285279c34d00b5..07d236ac77af02d637424d32f3f4e637192ba3e1 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBnoC/StrippingB2KShhh.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBnoC/StrippingB2KShhh.py
@@ -27,13 +27,13 @@ __all__ = ('B2KShhhConf',
 
 from Gaudi.Configuration import *
 
-from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N4BodyDecays
+from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays
 from StandardParticles import StdNoPIDsPions, StdNoPIDsKaons  # ipchi2 cut
 from StandardParticles import StdLooseKsDD, StdLooseKsLL
 
-from PhysSelPython.Wrappers import Selection, MergedSelection
+from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
-from StrippingUtils.Utils import LineBuilder, checkConfig
+from StrippingUtils.Utils import LineBuilder
 
 from Configurables import FilterDesktop
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBnoC/StrippingB2Ksthh.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBnoC/StrippingB2Ksthh.py
index 94a25a2714e9626cb22e6966b9ad7a1955d78eb9..a39998cb04eef71b62a1bf9337b6fb914d58a917 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBnoC/StrippingB2Ksthh.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBnoC/StrippingB2Ksthh.py
@@ -22,7 +22,6 @@ __version__ = 'Stripping26'
 __all__ = {'B2KsthhConf',
            'default_config'}
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
@@ -176,7 +175,7 @@ class B2KsthhConf(LineBuilder):
         _massCutHigh = "(AM<(5279+%s)*MeV)" % config['B_Mhigh']
         _aptCut = "(APT>%s*MeV)" % config['B_APTmin']
         _daugMedPtCut = "(ANUM(PT>%s*MeV)>=2)" % config['BDaug_MedPT_PT']
-        _daugMaxPtIPCut = "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['BDaug_MaxPT_IP']
+        "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['BDaug_MaxPT_IP']
         _daugPtSumCut = "((APT1+APT2+APT3)>%s*MeV)" % config['BDaug_PTsum']
 
         _combCuts = _aptCut
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBnoC/StrippingB2TwoBaryons.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBnoC/StrippingB2TwoBaryons.py
index 8911a3d3bdc4a0add9f550c63095470ab59d4fef..93fef262a5bd7d8cd0abd1063e287bef85404e66 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBnoC/StrippingB2TwoBaryons.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBnoC/StrippingB2TwoBaryons.py
@@ -31,11 +31,10 @@ from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
 from StandardParticles import StdLooseProtons
 from StandardParticles import StdNoPIDsPions as Pions
-from CommonParticles.StdLooseLambda import StdLooseLambdaLL, StdLooseLambdaDD
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
-from StrippingUtils.Utils import LineBuilder, checkConfig
-from GaudiKernel.SystemOfUnits import MeV, GeV, mm, ns
+from StrippingUtils.Utils import LineBuilder
+from GaudiKernel.SystemOfUnits import GeV, MeV, mm
 
 default_config = {'NAME': 'B2TwoBaryons',
                   'WGs': ['BnoC'],
@@ -157,7 +156,7 @@ class B2TwoBaryonLines(LineBuilder):
 
         B2PPbarName = name + "B2PPbar"
 
-        B2PPSameSignName = name + "B2PPSameSign"
+        name + "B2PPSameSign"
 
         B2Lp_dd_name = name+'B2PLambdabarDD'
         B2Lp_ll_name = name+'B2PLambdabarLL'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBnoC/StrippingB2XEta.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBnoC/StrippingB2XEta.py
index e1adec50004bf9392e263cc5cb3ba465d4e08bf7..95fbd42162ff7cf67819bcb2ccbe2b4f88c30155 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBnoC/StrippingB2XEta.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBnoC/StrippingB2XEta.py
@@ -25,9 +25,7 @@ from StandardParticles import StdLoosePions as Pions
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, DaVinci__N3BodyDecays
-from PhysSelPython.Wrappers import DataOnDemand, Selection, SelectionSequence, MergedSelection
-from GaudiKernel import SystemOfUnits as Units
-from Gaudi.Configuration import *
+from PhysSelPython.Wrappers import DataOnDemand, MergedSelection, Selection
 __author__ = ['Timothy Williams']
 __date__ = '1/12/2016'
 __version__ = 'Stripping26r1'
@@ -564,7 +562,7 @@ class B2XEtaConf(LineBuilder):
         _trackCuts = _track_PT+'&'+_track_Chi2+'&'+_track_GPCut+'&'+_track_PIDCut
         _combCuts = _massCut+'&'+_docaCut
         _combCut12Doca = "ACHI2DOCA(1,2)<%s" % config['eta_DOCA']
-        _combCut12Vtx = "(VFASPF(VCHI2/VDOF)<%s)" % config['eta_vtxChi2']
+        "(VFASPF(VCHI2/VDOF)<%s)" % config['eta_vtxChi2']
         _combCut12 = _combCut12Doca
 
         # _eta3Pi=CombineParticles("eta3Pi",
@@ -592,7 +590,7 @@ class B2XEtaConf(LineBuilder):
         _trackCuts = _track_PT+'&'+_track_Chi2+'&'+_track_GPCut+'&'+_track_PIDCut
         _combCuts = _massCut+'&'+_docaCut
         _combCut12Doca = "ACHI2DOCA(1,2)<%s" % config['eta_prime_DOCA']
-        _combCut12Vtx = "(VFASPF(VCHI2/VDOF)<%s)" % config['eta_prime_vtxChi2']
+        "(VFASPF(VCHI2/VDOF)<%s)" % config['eta_prime_vtxChi2']
         _combCut12 = _combCut12Doca
 
         # _etap=CombineParticles("etap",
@@ -883,7 +881,7 @@ class B2XEtaConf(LineBuilder):
         _combCuts = _massCut+'&'+_docaCut
         _allCuts = _PTCut+'&'+_vtxCut+'&'+_diraCut+'&'+_IPChi2Cut
         _combCut12Doca = "ACHI2DOCA(1,2)<%s" % config['LbDaug_LL_maxDocaChi2']
-        _combCut12Vtx = "(VFASPF(VCHI2/VDOF)<%s)" % config['Lb_VtxChi2']
+        "(VFASPF(VCHI2/VDOF)<%s)" % config['Lb_VtxChi2']
         _combCut12 = _combCut12Doca
 
         _Lb2pKetap = DaVinci__N3BodyDecays(DecayDescriptor="[Lambda_b0 -> p+ K- eta_prime]cc",
@@ -921,7 +919,7 @@ class B2XEtaConf(LineBuilder):
         _combCuts = _massCut
         _allCuts = _PTCut+'&'+_IPChi2Cut+'&'+_vtxCut+'&'+_diraCut
         _combCut12Doca = "ACHI2DOCA(1,2)<%s" % config['LbDaug_LL_maxDocaChi2']
-        _combCut12Vtx = "(VFASPF(VCHI2/VDOF)<%s)" % config['Lb_VtxChi2']
+        "(VFASPF(VCHI2/VDOF)<%s)" % config['Lb_VtxChi2']
         _combCut12 = _combCut12Doca
 
         _Lb2pKeta3Pi = DaVinci__N3BodyDecays(DecayDescriptor="[Lambda_b0 -> p+ K- eta]cc",
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBnoC/StrippingB2a1Pi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBnoC/StrippingB2a1Pi.py
index 29c0766744b242c4ed1be4817cca727495bcb265..9f701cc986294843a275fb204128fb9f3c88fb1d 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBnoC/StrippingB2a1Pi.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBnoC/StrippingB2a1Pi.py
@@ -17,7 +17,6 @@ from Configurables import DaVinci__N4BodyDecays
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
-from Gaudi.Configuration import *
 __author__ = ['Daniel Vieira, Jibo He']
 __date__ = '01/12/2016'
 __version__ = '$Revision: 1.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBnoC/StrippingB2hhpipiPhsSpcCut.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBnoC/StrippingB2hhpipiPhsSpcCut.py
index 08e1d2943eafcfa9ad7d1764a6d5aab6ce3c9526..9fe5c82af0b14937c33c30fd9627961fa0731c0a 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBnoC/StrippingB2hhpipiPhsSpcCut.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBnoC/StrippingB2hhpipiPhsSpcCut.py
@@ -17,7 +17,6 @@ from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = ['Daniel Vieira']
 __date__ = '29/11/2018'
 __version__ = '$Revision: 1.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBnoC/StrippingB2pphh.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBnoC/StrippingB2pphh.py
old mode 100755
new mode 100644
index 782d89e7466f93f490e15dd1095ac153359b502b..99d5b7265b684f2c69cc962f37bc4fe0b20ac220
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBnoC/StrippingB2pphh.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBnoC/StrippingB2pphh.py
@@ -25,16 +25,13 @@ __all__ = ('B2pphhConf',
            )
 
 
-from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop
+from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
 # from Configurables import DaVinci__N4BodyDecays
 from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays
 
-from StandardParticles import StdAllNoPIDsKaons, StdAllNoPIDsPions, StdAllNoPIDsProtons
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from Configurables import LoKi__VoidFilter as VoidFilter
 
 default_config = {
     'NAME': 'B2pphh',
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBnoC/StrippingBc2hhh_BnoC.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBnoC/StrippingBc2hhh_BnoC.py
index cc0952e7ed4c72dc5b618028ac8bc563928c126d..21b92fa5aab68df4d68f10c50e59c126b546bd31 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBnoC/StrippingBc2hhh_BnoC.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBnoC/StrippingBc2hhh_BnoC.py
@@ -23,13 +23,11 @@ Exported symbols (use python help!):
    - makeppK_excl  
 '''
 
-from Configurables import LoKi__VoidFilter as VoidFilter
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection
 import StandardParticles
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 __author__ = ['Alvaro Gomes', 'Adlene Hicheur']
 __date__ = '31/08/2014'
 __version__ = '$Revision: 1.5 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBnoC/StrippingBs2KKhh.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBnoC/StrippingBs2KKhh.py
index 8e1d82eebe3207f2b0821206169ad4c382873b63..9bc10b6c09e8b7c4b3ef80530670c7b690b78229 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBnoC/StrippingBs2KKhh.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBnoC/StrippingBs2KKhh.py
@@ -36,7 +36,6 @@ from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop
-from Gaudi.Configuration import *
 __author__ = ['Sean Benson', 'Adam Morris', 'Laurence Carson',
               'Emmy Pauline Maria Gabriel', 'Markus Roehrken']
 __date__ = '29/05/2019'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBnoC/StrippingBs2KSKS_Run2.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBnoC/StrippingBs2KSKS_Run2.py
index 629ca8140bd72d6380100393e840bf791f2f2cd9..6afaa37fab4f411e76010a848c09d7d72e5a05d9 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBnoC/StrippingBs2KSKS_Run2.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBnoC/StrippingBs2KSKS_Run2.py
@@ -22,15 +22,11 @@ __date__ = '13/09/2016'
 __version__ = 'Run2'
 __all__ = {'Bs2KSKSConf', 'default_config'}
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
+from PhysSelPython.Wrappers import DataOnDemand, Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 
-from StandardParticles import StdNoPIDsPions as Pions
-from StandardParticles import StdNoPIDsDownPions as DownPions
-
 
 default_config = {
     'NAME': 'Bs2KSKS',
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBnoC/StrippingBs2Kst_0Kst_0.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBnoC/StrippingBs2Kst_0Kst_0.py
index 6179c70e7f0f16586cd5a958eb2131e9f13bf1ad..7345868ade6e0cebd873ec58d7ea07808efe59f9 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBnoC/StrippingBs2Kst_0Kst_0.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBnoC/StrippingBs2Kst_0Kst_0.py
@@ -22,11 +22,8 @@ Rate estimated on 100K events using a 2017 data sample is: 0.027%
 
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, SelectionSequence, DataOnDemand
+from PhysSelPython.Wrappers import DataOnDemand, Selection
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-from CommonParticles.Utils import *
-from LHCbKernel.Configuration import *
-from Gaudi.Configuration import *
 __author__ = ['Brais Sanmartin Sedes']
 __date__ = '12/11/2015'
 __version__ = '5.1'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBnoC/StrippingBs2PhiKst0.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBnoC/StrippingBs2PhiKst0.py
index ceb8daa24373fc0cd210ec42fdbc56fd456f51e4..0c1ff7d620f2ef3058536bb8bbba7bedc35b168a 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBnoC/StrippingBs2PhiKst0.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBnoC/StrippingBs2PhiKst0.py
@@ -20,11 +20,8 @@ Exported symbols (use python help!):
 
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, SelectionSequence, DataOnDemand
+from PhysSelPython.Wrappers import DataOnDemand, Selection
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-from CommonParticles.Utils import *
-from LHCbKernel.Configuration import *
-from Gaudi.Configuration import *
 __author__ = ['Brais Sanmartin Sedes']
 __date__ = '01/12/2015'
 __version__ = '5.0'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBnoC/StrippingBs2PhiPhi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBnoC/StrippingBs2PhiPhi.py
index 0f280a3a06ba478759dc6e19bf80e278c15e5d40..1124dcdfd432c594fe79f1bc1e0b70fc24f9d21f 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBnoC/StrippingBs2PhiPhi.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBnoC/StrippingBs2PhiPhi.py
@@ -23,13 +23,10 @@ Exports the following stripping lines as instance data members:
 '''
 
 from StandardParticles import StdAllLooseANNKaons as MyLooseKaons
-from StandardParticles import StdLooseANNUpKaons as MyLooseUpKaons
-import StandardParticles
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
+from PhysSelPython.Wrappers import Selection
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 __author__ = ['Sean Benson']
 __date__ = '2013/08/15'
 __version__ = '3.0'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBnoC/StrippingBu2Ksthh.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBnoC/StrippingBu2Ksthh.py
index 5a06d1502605fd2037a6b16043d5efb150ce86d5..032717bced65040c1e6edaf12520110a1398cd1d 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBnoC/StrippingBu2Ksthh.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBnoC/StrippingBu2Ksthh.py
@@ -23,7 +23,6 @@ __version__ = 'Stripping26'
 __all__ = {'Bu2KsthhConf',
            'default_config'}
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
@@ -302,7 +301,7 @@ class Bu2KsthhConf(LineBuilder):
         _massCutHigh = "(AM<(5279+%s)*MeV)" % config['B_Mhigh']
         _aptCut = "(APT>%s*MeV)" % config['B_APTmin']
         _daugMedPtCut = "(ANUM(PT>%s*MeV)>=2)" % config['BDaug_MedPT_PT']
-        _daugMaxPtIPCut = "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['BDaug_MaxPT_IP']
+        "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['BDaug_MaxPT_IP']
         _maxDocaChi2Cut = "(ACUTDOCACHI2(%s,''))" % config['BDaug_DD_maxDocaChi2']
         _daugPtSumCut = "((APT1+APT2+APT3)>%s*MeV)" % config['BDaug_DD_PTsum']
 
@@ -359,7 +358,7 @@ class Bu2KsthhConf(LineBuilder):
         _massCutHigh = "(AM<(5279+%s)*MeV)" % config['B_Mhigh']
         _aptCut = "(APT>%s*MeV)" % config['B_APTmin']
         _daugMedPtCut = "(ANUM(PT>%s*MeV)>=2)" % config['BDaug_MedPT_PT']
-        _daugMaxPtIPCut = "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['BDaug_MaxPT_IP']
+        "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['BDaug_MaxPT_IP']
         _maxDocaChi2Cut = "(ACUTDOCACHI2(%s,''))" % config['BDaug_LL_maxDocaChi2']
         _daugPtSumCut = "((APT1+APT2+APT3)>%s*MeV)" % config['BDaug_LL_PTsum']
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBnoC/StrippingBu2hhh.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBnoC/StrippingBu2hhh.py
index 890eba4692dbe06517c0d7aee8f51d320cca8a64..62ede4129b7f2bd6ff173b27d26ebf7e47e4e6ea 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBnoC/StrippingBu2hhh.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBnoC/StrippingBu2hhh.py
@@ -22,13 +22,11 @@ Exported symbols (use python help!):
    - makepph_incl
 '''
 
-from Configurables import LoKi__VoidFilter as VoidFilter
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection
 import StandardParticles
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 __author__ = ['Irina Nasteva', 'Jussara Miranda', 'Alvaro Gomes']
 __date__ = '19/05/2017'
 __version__ = 'Stripping29'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBnoC/StrippingBu2rho0rhoPlus.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBnoC/StrippingBu2rho0rhoPlus.py
index 6ff36ce6304e5d819eb96fe6ca06587bb1baa6cc..51df1d5067b9100ee67537610b0005b048a5d51f 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBnoC/StrippingBu2rho0rhoPlus.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBnoC/StrippingBu2rho0rhoPlus.py
@@ -21,7 +21,6 @@ from StrippingUtils.Utils import LineBuilder, checkConfig
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = "Jason E Andrews"
 __date__ = "26/11/2016"
 __version__ = "4.0"
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBnoC/StrippingButo5h.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBnoC/StrippingButo5h.py
index be4eeb8a2dc0617afde7aab5929540d3bc8d05c7..65e1b29f0dde00492a6a5432e53292b9bc4c81a7 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBnoC/StrippingButo5h.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBnoC/StrippingButo5h.py
@@ -23,13 +23,11 @@ Exported symbols (use python help!):
    - makeppKpipi_excl
 '''
 
-from Configurables import LoKi__VoidFilter as VoidFilter
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection
 import StandardParticles
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 __author__ = ['Luiz Gustavo de Oliveira',
               'Alvaro Gomes', 'Bruno Souza de Paula']
 __date__ = '22/Aug/2014'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBnoC/StrippingD2HHBDT.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBnoC/StrippingD2HHBDT.py
index 6bee345112d54e258044f31f0e7d809849b112f7..98ef43000bc5732a81fe2e10bace645263334787 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBnoC/StrippingD2HHBDT.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBnoC/StrippingD2HHBDT.py
@@ -23,14 +23,13 @@ __all__ = ('D2HHBDTLines',
            'makeD2HHBDT',
            'default_config')
 
-from Gaudi.Configuration import *
 
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
 from StandardParticles import StdNoPIDsKaons, StdAllNoPIDsPions
 
 from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
-from StrippingUtils.Utils import LineBuilder, checkConfig
+from StrippingUtils.Utils import LineBuilder
 
 
 default_config = {
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBnoC/StrippingHb2Charged2Body.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBnoC/StrippingHb2Charged2Body.py
index 11da99218434ae71c894fa73b708dca4ee60de5d..3b3424d2fb6688333e151f52793701a7a2c00dbe 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBnoC/StrippingHb2Charged2Body.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBnoC/StrippingHb2Charged2Body.py
@@ -23,14 +23,13 @@ __all__ = ('Hb2Charged2BodyLines',
            'makeB2Charged2Body',
            'default_config')
 
-from Gaudi.Configuration import *
 
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-from StandardParticles import StdNoPIDsPions, StdLooseProtons, StdLooseKaons
+from StandardParticles import StdNoPIDsPions
 
 from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
-from StrippingUtils.Utils import LineBuilder, checkConfig
+from StrippingUtils.Utils import LineBuilder
 
 
 default_config = {
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBnoC/StrippingHb2V0V0h.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBnoC/StrippingHb2V0V0h.py
index 6b1c9eb94b261dbc185e979f0314ffe2bd69f930..f3104c9b58e73817c70f7fa7e3d68a0b9ecf0860 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBnoC/StrippingHb2V0V0h.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBnoC/StrippingHb2V0V0h.py
@@ -22,7 +22,6 @@ __date__ = '10/02/2017'
 __version__ = 'Stripping28'
 __all__ = 'Hb2V0V0hConf'
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBnoC/StrippingLb2V04h.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBnoC/StrippingLb2V04h.py
index 9581b3a3c8ca532b0fcd72075b16cc16ae289eea..a344f55b8065990dea1a13cd3f596086b2c4c743 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBnoC/StrippingLb2V04h.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBnoC/StrippingLb2V04h.py
@@ -24,7 +24,6 @@ __date__ = '28/05/2019'
 __version__ = 'Stripping28r2'
 __all__ = 'Lb2V04hConf'
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
@@ -381,7 +380,7 @@ class Lb2V04hConf(LineBuilder):
         _vtxChi2Cut = "(VFASPF(VCHI2)<%s)" % config['Lb_VtxChi2']
         _diraCut = "(BPVDIRA>%s)" % config['Lb_DD_Dira']
         _ipChi2Cut = "(MIPCHI2DV(PRIMARY)<%s)" % config['Lb_DD_IPCHI2wrtPV']
-        _fdCut = "(VFASPF(VMINVDDV(PRIMARY))>%s)" % config['Lb_FDwrtPV']
+        "(VFASPF(VMINVDDV(PRIMARY))>%s)" % config['Lb_FDwrtPV']
         _fdChi2Cut = "(BPVVDCHI2>%s)" % config['Lb_DD_FDChi2']
 
         _motherCuts = _ptCut
@@ -556,7 +555,7 @@ class Lb2V04hConf(LineBuilder):
         _vtxChi2Cut = "(VFASPF(VCHI2)<%s)" % config['Lb_VtxChi2']
         _diraCut = "(BPVDIRA>%s)" % config['Lb_LD_Dira']
         _ipChi2Cut = "(MIPCHI2DV(PRIMARY)<%s)" % config['Lb_LD_IPCHI2wrtPV']
-        _fdCut = "(VFASPF(VMINVDDV(PRIMARY))>%s)" % config['Lb_FDwrtPV']
+        "(VFASPF(VMINVDDV(PRIMARY))>%s)" % config['Lb_FDwrtPV']
         _fdChi2Cut = "(BPVVDCHI2>%s)" % config['Lb_LD_FDChi2']
 
         _motherCuts = _ptCut
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBnoC/StrippingLb2V0hh.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBnoC/StrippingLb2V0hh.py
index f63034e02f45426009146384bed4036d16056a26..e896944db6cf521ad12d86186f9bda930b5bfd87 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBnoC/StrippingLb2V0hh.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBnoC/StrippingLb2V0hh.py
@@ -25,7 +25,6 @@ __date__ = '11/01/2017'
 __version__ = 'Stripping28'
 __all__ = 'Lb2V0hhConf'
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
@@ -211,8 +210,8 @@ class Lb2V0hhConf(LineBuilder):
         _vtxCut = "(VFASPF(VCHI2)<%s)   " % config['Lambda_DD_VtxChi2']
         _fdChi2Cut = "(BPVVDCHI2>%s)" % config['Lambda_DD_FDChi2']
         _momCut = "(P>%s*MeV)" % config['Lambda_DD_Pmin']
-        _trkGhostProbCut1 = "(CHILDCUT((TRGHOSTPROB<%s),1))" % config['Trk_GhostProb']
-        _trkGhostProbCut2 = "(CHILDCUT((TRGHOSTPROB<%s),2))" % config['Trk_GhostProb']
+        "(CHILDCUT((TRGHOSTPROB<%s),1))" % config['Trk_GhostProb']
+        "(CHILDCUT((TRGHOSTPROB<%s),2))" % config['Trk_GhostProb']
 
         _allCuts = _momCut
         _allCuts += '&'+_massCut
@@ -268,8 +267,8 @@ class Lb2V0hhConf(LineBuilder):
         _vtxCut = "(VFASPF(VCHI2)<%s)   " % config['Lambda_DD_VtxChi2']
         _fdChi2Cut = "(BPVVDCHI2>%s)" % config['Lambda_DD_FDChi2']
         _momCut = "(P>%s*MeV)" % config['Lambda_DD_Pmin']
-        _trkGhostProbCut1 = "(CHILDCUT((TRGHOSTPROB<%s),1))" % config['Trk_GhostProb']
-        _trkGhostProbCut2 = "(CHILDCUT((TRGHOSTPROB<%s),2))" % config['Trk_GhostProb']
+        "(CHILDCUT((TRGHOSTPROB<%s),1))" % config['Trk_GhostProb']
+        "(CHILDCUT((TRGHOSTPROB<%s),2))" % config['Trk_GhostProb']
 
         _allCuts = _momCut
         _allCuts += '&'+_massCut
@@ -302,7 +301,7 @@ class Lb2V0hhConf(LineBuilder):
         _massCutHigh = "(AM<(5619+%s)*MeV)" % config['Lb_2bodyMhigh']
         _aptCut = "(APT>%s*MeV)" % config['Lb_APTmin']
         _daugMedPtCut = "(ANUM(PT>%s*MeV)>=2)" % config['LbDaug_MedPT_PT']
-        _daugMaxPtIPCut = "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP']
+        "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP']
         _maxDocaChi2Cut = "(ACUTDOCACHI2(%s,''))" % config['LbDaug_DD_maxDocaChi2']
         _daugPtSumCut = "(APT1>%s*MeV)" % config['Lbh_DD_PTMin']
 
@@ -353,7 +352,7 @@ class Lb2V0hhConf(LineBuilder):
         _massCutHigh = "(AM<(5619+%s)*MeV)" % config['Lb_Mhigh']
         _aptCut = "(APT>%s*MeV)" % config['Lb_APTmin']
         _daugMedPtCut = "(ANUM(PT>%s*MeV)>=2)" % config['LbDaug_MedPT_PT']
-        _daugMaxPtIPCut = "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP']
+        "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP']
         _maxDocaChi2Cut = "(ACUTDOCACHI2(%s,''))" % config['LbDaug_DD_maxDocaChi2']
         _daugPtSumCut = "((APT1+APT2+APT3)>%s*MeV)" % config['LbDaug_DD_PTsum']
 
@@ -369,7 +368,7 @@ class Lb2V0hhConf(LineBuilder):
         _vtxChi2Cut = "(VFASPF(VCHI2)<%s)" % config['Lb_VtxChi2']
         _diraCut = "(BPVDIRA>%s)" % config['Lb_DD_Dira']
         _ipChi2Cut = "(MIPCHI2DV(PRIMARY)<%s)" % config['Lb_DD_IPCHI2wrtPV']
-        _fdCut = "(VFASPF(VMINVDDV(PRIMARY))>%s)" % config['Lb_FDwrtPV']
+        "(VFASPF(VMINVDDV(PRIMARY))>%s)" % config['Lb_FDwrtPV']
         _fdChi2Cut = "(BPVVDCHI2>%s)" % config['Lb_DD_FDChi2']
 
         _motherCuts = _ptCut
@@ -541,7 +540,7 @@ class Lb2V0hhConf(LineBuilder):
         _massCutHigh = "(AM<(5619+%s)*MeV)" % config['Lb_2bodyMhigh']
         _aptCut = "(APT>%s*MeV)" % config['Lb_APTmin']
         _daugMedPtCut = "(ANUM(PT>%s*MeV)>=2)" % config['LbDaug_MedPT_PT']
-        _daugMaxPtIPCut = "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP']
+        "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP']
         _maxDocaChi2Cut = "(ACUTDOCACHI2(%s,''))" % config['LbDaug_LD_maxDocaChi2']
         _daugPtSumCut = "(APT1>%s*MeV)" % config['Lbh_LD_PTMin']
 
@@ -592,7 +591,7 @@ class Lb2V0hhConf(LineBuilder):
         _massCutHigh = "(AM<(5619+%s)*MeV)" % config['Lb_Mhigh']
         _aptCut = "(APT>%s*MeV)" % config['Lb_APTmin']
         _daugMedPtCut = "(ANUM(PT>%s*MeV)>=2)" % config['LbDaug_MedPT_PT']
-        _daugMaxPtIPCut = "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP']
+        "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP']
         _maxDocaChi2Cut = "(ACUTDOCACHI2(%s,''))" % config['LbDaug_LD_maxDocaChi2']
         _daugPtSumCut = "((APT1+APT2+APT3)>%s*MeV)" % config['LbDaug_LD_PTsum']
 
@@ -608,7 +607,7 @@ class Lb2V0hhConf(LineBuilder):
         _vtxChi2Cut = "(VFASPF(VCHI2)<%s)" % config['Lb_VtxChi2']
         _diraCut = "(BPVDIRA>%s)" % config['Lb_LD_Dira']
         _ipChi2Cut = "(MIPCHI2DV(PRIMARY)<%s)" % config['Lb_LD_IPCHI2wrtPV']
-        _fdCut = "(VFASPF(VMINVDDV(PRIMARY))>%s)" % config['Lb_FDwrtPV']
+        "(VFASPF(VMINVDDV(PRIMARY))>%s)" % config['Lb_FDwrtPV']
         _fdChi2Cut = "(BPVVDCHI2>%s)" % config['Lb_LD_FDChi2']
 
         _motherCuts = _ptCut
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBnoC/StrippingLb2V0pp.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBnoC/StrippingLb2V0pp.py
index 23c63deba0a566efad08463be4f9e9577abecd08..77385a7d77c2a03b1678f32801ca31cd7356be5c 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBnoC/StrippingLb2V0pp.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBnoC/StrippingLb2V0pp.py
@@ -24,7 +24,6 @@ __date__ = '06/01/2019'
 __version__ = 'Stripping34'
 __all__ = 'Lb2V0ppConf'
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
@@ -210,8 +209,8 @@ class Lb2V0ppConf(LineBuilder):
         _vtxCut = "(VFASPF(VCHI2)<%s)   " % config['Lambda_DD_VtxChi2']
         _fdChi2Cut = "(BPVVDCHI2>%s)" % config['Lambda_DD_FDChi2']
         _momCut = "(P>%s*MeV)" % config['Lambda_DD_Pmin']
-        _trkGhostProbCut1 = "(CHILDCUT((TRGHOSTPROB<%s),1))" % config['Trk_GhostProb']
-        _trkGhostProbCut2 = "(CHILDCUT((TRGHOSTPROB<%s),2))" % config['Trk_GhostProb']
+        "(CHILDCUT((TRGHOSTPROB<%s),1))" % config['Trk_GhostProb']
+        "(CHILDCUT((TRGHOSTPROB<%s),2))" % config['Trk_GhostProb']
 
         _allCuts = _momCut
         _allCuts += '&'+_massCut
@@ -266,8 +265,8 @@ class Lb2V0ppConf(LineBuilder):
         _vtxCut = "(VFASPF(VCHI2)<%s)   " % config['Lambda_DD_VtxChi2']
         _fdChi2Cut = "(BPVVDCHI2>%s)" % config['Lambda_DD_FDChi2']
         _momCut = "(P>%s*MeV)" % config['Lambda_DD_Pmin']
-        _trkGhostProbCut1 = "(CHILDCUT((TRGHOSTPROB<%s),1))" % config['Trk_GhostProb']
-        _trkGhostProbCut2 = "(CHILDCUT((TRGHOSTPROB<%s),2))" % config['Trk_GhostProb']
+        "(CHILDCUT((TRGHOSTPROB<%s),1))" % config['Trk_GhostProb']
+        "(CHILDCUT((TRGHOSTPROB<%s),2))" % config['Trk_GhostProb']
 
         _allCuts = _momCut
         _allCuts += '&'+_massCut
@@ -300,7 +299,7 @@ class Lb2V0ppConf(LineBuilder):
         _massCutHigh = "(AM<(5619+%s)*MeV)" % config['Lb_2bodyMhigh']
         _aptCut = "(APT>%s*MeV)" % config['Lb_APTmin']
         _daugMedPtCut = "(ANUM(PT>%s*MeV)>=2)" % config['LbDaug_MedPT_PT']
-        _daugMaxPtIPCut = "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP']
+        "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP']
         _maxDocaChi2Cut = "(ACUTDOCACHI2(%s,''))" % config['LbDaug_DD_maxDocaChi2']
         _daugPtSumCut = "(APT1>%s*MeV)" % config['Lbh_DD_PTMin']
 
@@ -351,7 +350,7 @@ class Lb2V0ppConf(LineBuilder):
         _massCutHigh = "(AM<(5619+%s)*MeV)" % config['Lb_Mhigh']
         _aptCut = "(APT>%s*MeV)" % config['Lb_APTmin']
         _daugMedPtCut = "(ANUM(PT>%s*MeV)>=2)" % config['LbDaug_MedPT_PT']
-        _daugMaxPtIPCut = "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP']
+        "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP']
         _maxDocaChi2Cut = "(ACUTDOCACHI2(%s,''))" % config['LbDaug_DD_maxDocaChi2']
         _daugPtSumCut = "((APT1+APT2+APT3)>%s*MeV)" % config['LbDaug_DD_PTsum']
 
@@ -540,7 +539,7 @@ class Lb2V0ppConf(LineBuilder):
         _massCutHigh = "(AM<(5619+%s)*MeV)" % config['Lb_2bodyMhigh']
         _aptCut = "(APT>%s*MeV)" % config['Lb_APTmin']
         _daugMedPtCut = "(ANUM(PT>%s*MeV)>=2)" % config['LbDaug_MedPT_PT']
-        _daugMaxPtIPCut = "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP']
+        "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP']
         _maxDocaChi2Cut = "(ACUTDOCACHI2(%s,''))" % config['LbDaug_LD_maxDocaChi2']
         _daugPtSumCut = "(APT1>%s*MeV)" % config['Lbh_LD_PTMin']
 
@@ -591,7 +590,7 @@ class Lb2V0ppConf(LineBuilder):
         _massCutHigh = "(AM<(5619+%s)*MeV)" % config['Lb_Mhigh']
         _aptCut = "(APT>%s*MeV)" % config['Lb_APTmin']
         _daugMedPtCut = "(ANUM(PT>%s*MeV)>=2)" % config['LbDaug_MedPT_PT']
-        _daugMaxPtIPCut = "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP']
+        "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP']
         _maxDocaChi2Cut = "(ACUTDOCACHI2(%s,''))" % config['LbDaug_LD_maxDocaChi2']
         _daugPtSumCut = "((APT1+APT2+APT3)>%s*MeV)" % config['LbDaug_LD_PTsum']
 
@@ -607,7 +606,7 @@ class Lb2V0ppConf(LineBuilder):
         _vtxChi2Cut = "(VFASPF(VCHI2)<%s)" % config['Lb_VtxChi2']
         _diraCut = "(BPVDIRA>%s)" % config['Lb_LD_Dira']
         _ipChi2Cut = "(MIPCHI2DV(PRIMARY)<%s)" % config['Lb_LD_IPCHI2wrtPV']
-        _fdCut = "(VFASPF(VMINVDDV(PRIMARY))>%s)" % config['Lb_FDwrtPV']
+        "(VFASPF(VMINVDDV(PRIMARY))>%s)" % config['Lb_FDwrtPV']
         _fdChi2Cut = "(BPVVDCHI2>%s)" % config['Lb_LD_FDChi2']
 
         _motherCuts = _ptCut
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBnoC/StrippingXb23ph.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBnoC/StrippingXb23ph.py
index 44ba838d436b418c4eaef7372eccd95c28426134..ef24837631cfc50b46aabe0cc7dba0c8cdeb66fd 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBnoC/StrippingXb23ph.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBnoC/StrippingXb23ph.py
@@ -22,7 +22,6 @@ from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, DaVinci__N4Body
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection
-from Gaudi.Configuration import *
 __author__ = ['Jinlin Fu', 'Maurizio Martinelli', 'Andrea Merli']
 __date__ = '12/11/2015'
 __version__ = 'v1r0'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBnoC/StrippingXb2p3h.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBnoC/StrippingXb2p3h.py
index d07d7e52c17b8a01201968b3a1b929751c31bc9d..2c10d1f20bf15892c5e8ef6a5861130250a0a8ae 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBnoC/StrippingXb2p3h.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBnoC/StrippingXb2p3h.py
@@ -22,7 +22,6 @@ from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, DaVinci__N4Body
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection
-from Gaudi.Configuration import *
 __author__ = ['Jan Mickelle V. Maratas', 'Stephane Monteil', 'Andrea Merli']
 __date__ = '01/04/2016'
 __version__ = 'v1r0'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBnoC/StrippingXb2phh.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBnoC/StrippingXb2phh.py
index ae62ac803dcda11696229820fa7bcb3737c75114..35432dcb4a93cdbf47f1ec738735037534d82c07 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBnoC/StrippingXb2phh.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingBnoC/StrippingXb2phh.py
@@ -22,7 +22,6 @@ from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, DaVinci__N3Body
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection
-from Gaudi.Configuration import *
 __author__ = ['Jan Mickelle V. Maratas', 'Stephane Monteil', 'Thomas Latham']
 __date__ = '24/11/2016'
 __version__ = 'v1r0'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCalib/StrippingCaloPID.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCalib/StrippingCaloPID.py
index 2f768ece0ec79881d379db3382b656e758d13866..cd04a1f6b3dcabb7d6e33f2e489a79ce889ce10b 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCalib/StrippingCaloPID.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCalib/StrippingCaloPID.py
@@ -23,16 +23,10 @@ __version__ = '$Revision: 1.1 $'
 
 __all__ = ('CaloPIDConf', 'default_config')
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from PhysSelPython.Wrappers import Combine3BodySelection
-from CommonParticles.Utils import updateDoD
-from StandardParticles import StdLoosePions
-from StandardParticles import StdLooseKaons
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
+from PhysSelPython.Wrappers import DataOnDemand, Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from GaudiKernel.SystemOfUnits import MeV, GeV, mm
 
 default_config = {
     'NAME': 'CaloPID',
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCalib/StrippingCharmFromBSemiForHadronAsy.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCalib/StrippingCharmFromBSemiForHadronAsy.py
index 08e7ce501b97c255a5b8e5a3de8395e4cbcf3cb6..6156fdca33abf5ffff5cbf8a3a9368f977dbcd6f 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCalib/StrippingCharmFromBSemiForHadronAsy.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCalib/StrippingCharmFromBSemiForHadronAsy.py
@@ -19,14 +19,12 @@ __author__ = ['Mika Vesterinen']
 __date__ = '10/03/2013'
 __version__ = '$Revision: 0.0 $'
 
-from Gaudi.Configuration import *
 
 from Configurables import FilterDesktop, CombineParticles
 from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from StandardParticles import StdAllLoosePions, StdLoosePions, StdLooseMuons, StdLooseKaons, StdLooseProtons
-from Configurables import TisTosParticleTagger
+from StandardParticles import StdLooseKaons, StdLooseMuons, StdLoosePions
 
 __all__ = ('CharmFromBSemiForHadronAsyAllLinesConf',
            'TOSFilter',
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCalib/StrippingCharmFromBSemiForProtonPID.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCalib/StrippingCharmFromBSemiForProtonPID.py
index 331ebd34b3e7842bbf2e94a73977d8b0cc10b450..a1e805b96edf80f3f08a3ba0f447e47d13b203c2 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCalib/StrippingCharmFromBSemiForProtonPID.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCalib/StrippingCharmFromBSemiForProtonPID.py
@@ -18,12 +18,11 @@ __author__ = ['Mika Vesterinen']
 __date__ = '19/03/2013'
 __version__ = '$Revision: 0.0 $'
 
-from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from StandardParticles import StdLoosePions, StdLooseMuons, StdLooseKaons, StdLooseProtons, StdNoPIDsProtons
+from StandardParticles import StdLooseKaons, StdLooseMuons, StdLoosePions, StdNoPIDsProtons
 
 __all__ = ('CharmFromBSemiForProtonPIDAllLinesConf',
            'default_config')
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCalib/StrippingD02KPiGamma.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCalib/StrippingD02KPiGamma.py
index 60507d78d4ed57865af9bc4a7d952b1be8f8cdab..9b3e955dfdbdad8eb3225f0bf7d204cc9ef6176b 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCalib/StrippingD02KPiGamma.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCalib/StrippingD02KPiGamma.py
@@ -25,9 +25,8 @@ __all__ = ('StrippingD02KPiGammaConf', 'makeD02KPiGamma', 'default_config')
 # Selections taken from Regis Lefevre D02Kpipi0 lines
 ####################################################################
 
-from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from PhysSelPython.Wrappers import Selection, DataOnDemand
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
+from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from StandardParticles import StdTightPions, StdTightKaons, StdLooseAllPhotons
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCalib/StrippingD02KPiPi0.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCalib/StrippingD02KPiPi0.py
index b0efbccbb69d5ac6209e0a251edf9943a222afe9..a431e7b970041f35d68bc9a765db0757832a6fdd 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCalib/StrippingD02KPiPi0.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCalib/StrippingD02KPiPi0.py
@@ -25,9 +25,8 @@ __all__ = ('StrippingD02KPiPi0Conf',
            'makeD02KPiPi0M',
            'default_config')
 
-from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from PhysSelPython.Wrappers import Selection, DataOnDemand
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
+from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from StandardParticles import StdTightPions, StdTightKaons, StdLooseMergedPi0, StdLooseResolvedPi0
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCalib/StrippingD02KPiPi0DalitzPartReco.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCalib/StrippingD02KPiPi0DalitzPartReco.py
index caaa8b1b857ec7efb302c62895c9b7a334961cbf..7a1c97e88520fb73f140818146de685e254df9f7 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCalib/StrippingD02KPiPi0DalitzPartReco.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCalib/StrippingD02KPiPi0DalitzPartReco.py
@@ -8,9 +8,7 @@
 # granted to it by virtue of its status as an Intergovernmental Organization  #
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
-import logging
 from StrippingUtils.Utils import LineBuilder
-from Gaudi.Configuration import *
 __author__ = ['Greg Ciezarek', 'Liang Sun', 'Adam Davis']
 __date__ = '18/05/2017'
 __version__ = '$Revision: 0.01 $'
@@ -75,7 +73,6 @@ class D2KPiPi0_PartRecoBuilder(LineBuilder):
     def __init__(self, name, config):
         LineBuilder.__init__(self, name, config)
         self._config = config
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
 
         # self.GECs = { "Code":"( recSummaryTrack(LHCb.RecSummary.nLongTracks, TrLONG) < %(GEC_nLongTrk)s )" % config,
         #              "Preambulo": ["from LoKiTracks.decorators import *"]}
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCalib/StrippingD0ForBXX.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCalib/StrippingD0ForBXX.py
index 836cb251bf6bed5dcdba32758964e9950e666b07..d9859abdb5e61ecd488fc22f98c91f6df28e248f 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCalib/StrippingD0ForBXX.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCalib/StrippingD0ForBXX.py
@@ -20,7 +20,7 @@ from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from StandardParticles import StdLoosePions, StdLooseKaons, StdLooseProtons, StdAllLoosePions
+from StandardParticles import StdAllLoosePions, StdLooseKaons, StdLoosePions
 
 
 name = 'confD0forBXX'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCalib/StrippingDst2D0Pi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCalib/StrippingDst2D0Pi.py
index e4131dad48242646fd6ae26b601f4cbb45780d56..3306ddfaa9cc14e117596053f278462c4fa8cee9 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCalib/StrippingDst2D0Pi.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCalib/StrippingDst2D0Pi.py
@@ -25,9 +25,8 @@ Stripping selection for D*0 -> [D0 -> K pi gamma] pi+
 __all__ = ('StrippingDst2D0PiConf', 'makeD02KPiGamma', 'makeDst2D0Pi',
            'default_config')
 
-from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from PhysSelPython.Wrappers import Selection, DataOnDemand
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
+from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from StandardParticles import StdTightPions, StdTightKaons, StdLooseAllPhotons, StdNoPIDsPions
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCalib/StrippingDstarD02hhPi0PartRecoForPhotonCalib.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCalib/StrippingDstarD02hhPi0PartRecoForPhotonCalib.py
index 644f0bd8f2b5adfdea5faa81ad39141eeea329f8..7e79ca79aec743366778e237cc1baefe1dfc7ad9 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCalib/StrippingDstarD02hhPi0PartRecoForPhotonCalib.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCalib/StrippingDstarD02hhPi0PartRecoForPhotonCalib.py
@@ -31,15 +31,15 @@ from Gaudi.Configuration import *
 
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 from StandardParticles import StdAllNoPIDsPions, StdNoPIDsPions, StdNoPIDsKaons
-from StandardParticles import StdLooseAllPhotons, StdLooseResolvedPi0, StdLooseMergedPi0
+from StandardParticles import StdLooseAllPhotons
 
 from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
-from StrippingUtils.Utils import LineBuilder, checkConfig
+from StrippingUtils.Utils import LineBuilder
 
 from Configurables import FilterDesktop
 
-from GaudiKernel.SystemOfUnits import GeV, MeV, picosecond, mm
+from GaudiKernel.SystemOfUnits import GeV, MeV, picosecond
 
 default_config = {
     'NAME': 'DstarD2hhGammaCalib',
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCalib/StrippingElectronID.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCalib/StrippingElectronID.py
index f8385e403a664f2d870608e8c28ac1032d182cc0..1b5dd98b23444069027c372e85ae7f6f3318a423 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCalib/StrippingElectronID.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCalib/StrippingElectronID.py
@@ -23,9 +23,8 @@ stream.appendLines( [
 
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand
+from PhysSelPython.Wrappers import Selection
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = ['Jibo He']
 __date__ = '03/10/2010'
 __version__ = '$Revision: 1.2 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCalib/StrippingElectronRecoEff.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCalib/StrippingElectronRecoEff.py
index c19ff961c1db5ef3bfbfb03a4d9133a4c8888bdf..bdb2892004f5f8e6c93bb551bb939895eca5eb63 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCalib/StrippingElectronRecoEff.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCalib/StrippingElectronRecoEff.py
@@ -17,17 +17,15 @@ from StandardParticles import StdAllLoosePions as Hlt2Pions
 from StandardParticles import StdAllLooseKaons as Hlt2Kaons
 from StandardParticles import StdNoPIDsElectrons as Hlt2Electrons
 from StandardParticles import StdNoPIDsMuons as Hlt2Muons
-from TrackFitter.ConfiguredFitters import (ConfiguredEventFitter,
-                                           ConfiguredForwardStraightLineEventFitter)
+from TrackFitter.ConfiguredFitters import ConfiguredEventFitter
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import DataOnDemand, MergedSelection
 from PhysConf.Selections import L0TOSSelection
 from PhysConf.Selections import Hlt1TOSSelection
 from PhysConf.Selections import Hlt2TOSSelection
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 from StrippingUtils.Utils import LineBuilder
-from GaudiKernel.SystemOfUnits import GeV, MeV, mm
+from GaudiKernel.SystemOfUnits import MeV, mm
 from Gaudi.Configuration import *
 __author__ = ['Adam Davis', 'Laurent Dufour', 'V. V. Gligorov']
 __date__ = '14/1/2018'
@@ -45,10 +43,9 @@ from PhysSelPython.Wrappers import Selection, Hlt1Selection, Hlt2Selection, L0Se
 from SelPy.utils import (UniquelyNamedObject,
                          ClonableObject,
                          SelectionBase)
-from Configurables import (DecodeVeloRawBuffer, FastVeloTracking, TrackPrepareVelo,
-                           NoPIDsParticleMaker, DataOnDemandSvc, ChargedProtoParticleMaker,
-                           PrTrackAssociator, DelegatingTrackSelector, TrackContainerCopy, TrackAssociator,
-                           TrackStateInitAlg, TrackStateInitTool)
+from Configurables import (FastVeloTracking, NoPIDsParticleMaker, DataOnDemandSvc,
+                           ChargedProtoParticleMaker, DelegatingTrackSelector, TrackContainerCopy,
+                           TrackStateInitAlg)
 
 default_config = {'NAME': 'ElectronRecoEff',
                   'WGs': ['Calib'],
@@ -287,7 +284,6 @@ class StrippingElectronRecoEffLines(LineBuilder):
     def __init__(self, name, config):
         LineBuilder.__init__(self, name, config)
 
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
         self._config = config
         self.name = name
 
@@ -571,7 +567,7 @@ class StrippingElectronRecoEffLines(LineBuilder):
         )
 
     def DetachedEEKPair(self, _name):
-        configuration = self._config["DetachedEEK"]
+        self._config["DetachedEEK"]
 
         _DetachedEEKPair = self.getCPForEEK("DetachedEEK")
         _DetachedEEKPair_Sel = Selection("SelEEK_for_"+_name,
@@ -591,7 +587,7 @@ class StrippingElectronRecoEffLines(LineBuilder):
         return line
 
     def DetachedEEKstarPair(self, _name):
-        configuration = self._config["DetachedEEKstar"]
+        self._config["DetachedEEKstar"]
 
         _DetachedEEKstarPair = self.getCPForEEK("DetachedEEKstar")
         _DetachedEEKstarPair_Sel = Selection("SelEEKstar_for_"+_name,
@@ -611,7 +607,7 @@ class StrippingElectronRecoEffLines(LineBuilder):
         return line
 
     def DetachedEEPhiPair(self, _name):
-        configuration = self._config["DetachedEEPhi"]
+        self._config["DetachedEEPhi"]
 
         _DetachedEEPhiPair = self.getCPForEEK("DetachedEEPhi")
         _DetachedEEPhiPair_Sel = Selection("SelEEPhi_for_"+_name,
@@ -882,7 +878,6 @@ class StrippingElectronRecoEffLines(LineBuilder):
     def MakeVeloTracks(self, prefilter):
         if self._config["DoVeloDecoding"]:
             from DAQSys.Decoders import DecoderDB
-            from DAQSys.DecoderClass import decodersForBank
             decs = []
             vdec = DecoderDB["DecodeVeloRawBuffer/createBothVeloClusters"]
             vdec.Active = True
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCalib/StrippingJPsiForSL.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCalib/StrippingJPsiForSL.py
index 66d3cf569e7e3d642fb1e90689c09009970a9f91..f83a469f0d79f559f3b8f1ce7fa0a29617c07287 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCalib/StrippingJPsiForSL.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCalib/StrippingJPsiForSL.py
@@ -20,11 +20,10 @@ __version__ = '$Revision: 0.1 $'
 
 from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from PhysSelPython.Wrappers import Selection, DataOnDemand
+from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from StandardParticles import StdLoosePions, StdLooseMuons, StdLooseKaons, StdLooseProtons, StdNoPIDsPions, StdNoPIDsMuons, StdLooseMergedPi0, StdLooseResolvedPi0, StdLooseElectrons, StdNoPIDsKaons
-from Configurables import TisTosParticleTagger
+from StandardParticles import StdNoPIDsKaons, StdNoPIDsMuons
 
 __all__ = ('JPsiForSLAllLinesConf',
            'confdict')
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCalib/StrippingK23PiForDownstreamTrackEff.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCalib/StrippingK23PiForDownstreamTrackEff.py
index 5e95ecb40bf4a7b0d570152c6cb5a85c2e157431..9ea071dc760c1a4d2e8adb1bd47ddd464f85a7d1 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCalib/StrippingK23PiForDownstreamTrackEff.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCalib/StrippingK23PiForDownstreamTrackEff.py
@@ -14,10 +14,6 @@ one missing pion, using the corrected mass
 '''
 
 from StrippingUtils.Utils import LineBuilder
-from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = ['Michel De Cian']
 __date__ = '19/12/2018'
 __version__ = '$Revision: 1.0 $'
@@ -269,8 +265,8 @@ class K23PiForDownstreamTrackEffConf(LineBuilder):
         if self._dipionSelSSNarrowDownstream is not None:
             return self._dipionSelSSNarrowDownstream
 
-        from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
+        from GaudiConfUtils.ConfigurableGenerators import CombineParticles
+        from PhysSelPython.Wrappers import Selection
 
         _k2pipi = CombineParticles(
             DecayDescriptors=["[phi(1020) -> pi+ pi+]cc"],
@@ -293,8 +289,8 @@ class K23PiForDownstreamTrackEffConf(LineBuilder):
         if self._dipionSelSSNarrowLong is not None:
             return self._dipionSelSSNarrowLong
 
-        from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
+        from GaudiConfUtils.ConfigurableGenerators import CombineParticles
+        from PhysSelPython.Wrappers import Selection
 
         _k2pipi = CombineParticles(
             DecayDescriptors=["[phi(1020) -> pi+ pi+]cc"],
@@ -317,8 +313,8 @@ class K23PiForDownstreamTrackEffConf(LineBuilder):
         if self._dipionSelSSWide is not None:
             return self._dipionSelSSWide
 
-        from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
+        from GaudiConfUtils.ConfigurableGenerators import CombineParticles
+        from PhysSelPython.Wrappers import Selection
 
         _k2pipi = CombineParticles(
             DecayDescriptors=["[phi(1020) -> pi+ pi+]cc"],
@@ -342,8 +338,8 @@ class K23PiForDownstreamTrackEffConf(LineBuilder):
         if self._dipionSelOSNarrowDownstream is not None:
             return self._dipionSelOSNarrowDownstream
 
-        from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
+        from GaudiConfUtils.ConfigurableGenerators import CombineParticles
+        from PhysSelPython.Wrappers import Selection
 
         # Cut out the Kshort
         mCut = self._dipionSelectionNarrow() + " & (ADMASS('KS0') > 40)"
@@ -370,8 +366,8 @@ class K23PiForDownstreamTrackEffConf(LineBuilder):
         if self._dipionSelOSNarrowLong is not None:
             return self._dipionSelOSNarrowLong
 
-        from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
+        from GaudiConfUtils.ConfigurableGenerators import CombineParticles
+        from PhysSelPython.Wrappers import Selection
 
         # Cut out the Kshort
         mCut = self._dipionSelectionNarrow() + " & (ADMASS('KS0') > 40)"
@@ -398,8 +394,8 @@ class K23PiForDownstreamTrackEffConf(LineBuilder):
         if self._dipionSelOSWide is not None:
             return self._dipionSelOSWide
 
-        from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
+        from GaudiConfUtils.ConfigurableGenerators import CombineParticles
+        from PhysSelPython.Wrappers import Selection
 
         # Cut out the Kshort
         mCut = self._dipionSelectionWide() + " & (ADMASS('KS0') > 40)"
@@ -427,8 +423,8 @@ class K23PiForDownstreamTrackEffConf(LineBuilder):
         # if self._tripionSelDipionSS is not None:
         #   return self._tripionSelDipionSS
 
-        from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
+        from GaudiConfUtils.ConfigurableGenerators import CombineParticles
+        from PhysSelPython.Wrappers import Selection
 
         _k2pipipi = CombineParticles(
             DecayDescriptors=["[K+ -> phi(1020) pi-]cc"],
@@ -449,8 +445,8 @@ class K23PiForDownstreamTrackEffConf(LineBuilder):
         # if self._tripionSelDipionOS is not None:
         #   return self._tripionSelDipionOS
 
-        from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
+        from GaudiConfUtils.ConfigurableGenerators import CombineParticles
+        from PhysSelPython.Wrappers import Selection
 
         _k2pipipi = CombineParticles(
             DecayDescriptors=["[K+ -> phi(1020) pi+]cc"],
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCalib/StrippingLowPtMuID.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCalib/StrippingLowPtMuID.py
index c938bbfa4f325120436121227b8c9ba66d1420d7..96d9c592351659e6d677d1fb083266fb9f80f738 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCalib/StrippingLowPtMuID.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCalib/StrippingLowPtMuID.py
@@ -19,12 +19,9 @@ largely cloned from line written by 'S.Furcas', 'G.Lanfranchi', 'M.Palutan', 'A.
 
 from StandardParticles import StdAllNoPIDsMuons
 from StrippingUtils.Utils import LineBuilder
-from Configurables import LoKi__Hybrid__CoreFactory as CoreFactory
-from Configurables import LoKi__VoidFilter as VoidFilter
-from PhysSelPython.Wrappers import DataOnDemand, Selection, SelectionSequence, MergedSelection
+from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 __author__ = ['G.Ciezarek', ]
 __date__ = '03/12/2015'
 __version__ = '$Revision: 1.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCalib/StrippingMuIDCalib.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCalib/StrippingMuIDCalib.py
index 48473756334933bd76098e1f169f2fcac058f2d2..9647c11e74493f1b68f480afc92080ecc6f1c325 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCalib/StrippingMuIDCalib.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCalib/StrippingMuIDCalib.py
@@ -22,15 +22,12 @@ lb = builder( 'MuIDCalib', config_params )
 
 '''
 
-from StandardParticles import StdAllNoPIDsKaons, StdAllNoPIDsMuons, StdAllNoPIDsPions, StdAllNoPIDsProtons
+from StandardParticles import StdAllNoPIDsMuons
 from StandardParticles import StdNoPIDsKaons, StdNoPIDsMuons, StdNoPIDsPions, StdNoPIDsProtons
 from StrippingUtils.Utils import LineBuilder
-from Configurables import LoKi__Hybrid__CoreFactory as CoreFactory
-from Configurables import LoKi__VoidFilter as VoidFilter
-from PhysSelPython.Wrappers import DataOnDemand, Selection, SelectionSequence, MergedSelection
+from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 __author__ = ['S.Furcas', 'G.Lanfranchi',
               'M.Palutan', 'A.Sarti', 'D.Milanes', 'MuID Team']
 __date__ = '23/08/2011'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCalib/StrippingNoPIDDstarWithD02RSKPi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCalib/StrippingNoPIDDstarWithD02RSKPi.py
index 914c4a47cd048e3cd64e662985a9b4f35d9be508..5969dfaafb882830e2b62086af2a6274bffd846b 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCalib/StrippingNoPIDDstarWithD02RSKPi.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCalib/StrippingNoPIDDstarWithD02RSKPi.py
@@ -13,10 +13,8 @@
 from StandardParticles import StdAllNoPIDsKaons, StdAllNoPIDsPions
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from LHCbKernel.Configuration import *
-from Gaudi.Configuration import *
+from PhysSelPython.Wrappers import Selection
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 __author__ = ['Philip Xing', 'Andrew Powell']
 __date__ = '23rd August 2012'
 __version__ = '$Revision: 7.0 $'
@@ -42,7 +40,7 @@ StrippingReport                                                INFO Event 100000
 __all__ = ('NoPIDDstarWithD02RSKPiConf', 'default_config')
 
 
-from GaudiKernel.SystemOfUnits import mm, cm, MeV, GeV
+from GaudiKernel.SystemOfUnits import GeV, MeV
 # from Configurables import FilterDesktop, CombineParticles
 
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCalib/StrippingPIDCalib.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCalib/StrippingPIDCalib.py
index 8623a70bd54a0795643cfb82ff6fd7187bb2e331..14cb906598d89fb606bb271edd416b3ac28fcaef 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCalib/StrippingPIDCalib.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCalib/StrippingPIDCalib.py
@@ -34,9 +34,7 @@ from Configurables import DaVinci__N3BodyDecays
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
 from Configurables import CombineParticles
-from Gaudi.Configuration import *
 __author__ = ['Lucio Anderlini']
 __date__ = '25/02/2015'
 __version__ = '$Revision: 1.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCalib/StrippingTrackEffD0ToKPi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCalib/StrippingTrackEffD0ToKPi.py
index b93a420e3f50b2e4f8f1d92b1881f55e362e1bcf..1a0ca1d608bbe19c5586681674ba9a975871571b 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCalib/StrippingTrackEffD0ToKPi.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCalib/StrippingTrackEffD0ToKPi.py
@@ -17,7 +17,7 @@ from Configurables import FilterDesktop, CombineParticles
 from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from StandardParticles import StdLooseKaons, StdLoosePions, StdAllLoosePions, StdAllNoPIDsPions
+from StandardParticles import StdAllLoosePions, StdLooseKaons, StdLoosePions
 from SelPy.utils import (UniquelyNamedObject,
                          ClonableObject,
                          SelectionBase)
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCalib/StrippingTrackEffDownMuon.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCalib/StrippingTrackEffDownMuon.py
old mode 100755
new mode 100644
index 3e974208bdc310dc0dfe706a362628d140667861..b891dd1de3f622d45cfe8e52e9f01bbc709c238b
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCalib/StrippingTrackEffDownMuon.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCalib/StrippingTrackEffDownMuon.py
@@ -39,35 +39,27 @@ __all__ = ('StrippingTrackEffDownMuonConf', 'default_config', 'selMuonPParts',
 # FIXME Write includes in a cleaner way
 from Gaudi.Configuration import *
 from LHCbKernel.Configuration import *
-from DAQSys.DecoderClass import Decoder
 from Configurables import GaudiSequencer
 from Configurables import UnpackTrack, ChargedProtoParticleMaker, DelegatingTrackSelector, TrackSelector, BestPIDParticleMaker
-from TrackFitter.ConfiguredFitters import ConfiguredFit
 from Configurables import TrackStateInitAlg
 from StrippingConf.StrippingLine import StrippingLine
-from Configurables import ChargedProtoParticleAddMuonInfo, MuonIDAlgLite
+from Configurables import ChargedProtoParticleAddMuonInfo
 from MuonID import ConfiguredMuonIDs
 from Configurables import ChargedProtoCombineDLLsAlg, ProtoParticleMUONFilter
-from PhysSelPython.Wrappers import Selection, DataOnDemand
+from PhysSelPython.Wrappers import Selection
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
 from StandardParticles import StdLooseMuons
 
 from StrippingUtils.Utils import LineBuilder
-from Configurables import LoKi__VoidFilter
-from os import environ
 from Gaudi.Configuration import *
-import GaudiKernel.ProcessJobOptions
-from GaudiKernel.SystemOfUnits import mm
 
 from GaudiConfUtils.ConfigurableGenerators import TisTosParticleTagger
 from StandardParticles import StdAllLooseMuons
 from Configurables import GaudiSequencer
 from Configurables import TrackToDST
-from Configurables import TrackSys
 from Configurables import PatSeeding, PatSeedingTool, PatLongLivedTracking
-from PhysSelPython.Wrappers import AutomaticData
 # Get the fitters
-from TrackFitter.ConfiguredFitters import ConfiguredFit, ConfiguredFitSeed, ConfiguredFitDownstream
+from TrackFitter.ConfiguredFitters import ConfiguredFitDownstream
 from PatAlgorithms import PatAlgConf
 
 from SelPy.utils import (UniquelyNamedObject, ClonableObject, SelectionBase)
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCalib/StrippingTrackEffMuonTT.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCalib/StrippingTrackEffMuonTT.py
index ab3be8ab235c22a1beb144c04853bf520903700f..968289b5618b1b794af456ce34d7719b86a9dff9 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCalib/StrippingTrackEffMuonTT.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCalib/StrippingTrackEffMuonTT.py
@@ -52,11 +52,10 @@ __all__ = ('StrippingTrackEffMuonTTConf', 'default_config',
            'makeResonanceMuMuTrackEff', 'makeBJpsiKTrackEff',
            'filterHLT2ForBJpsiK')
 
-from Gaudi.Configuration import *
-from PhysSelPython.Wrappers import Selection, DataOnDemand, ChargedProtoParticleSelection
+from PhysSelPython.Wrappers import ChargedProtoParticleSelection, Selection
 from StrippingConf.StrippingLine import StrippingLine
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from StrippingUtils.Utils import LineBuilder, checkConfig
+from StrippingUtils.Utils import LineBuilder
 from StandardParticles import StdLooseKaons, StdLooseMuons, StdAllLooseMuons
 
 from Configurables import (MuonCombRec, MuonTTTrack, MuonHitDecode,
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCalib/StrippingTrackEffVeloMuon.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCalib/StrippingTrackEffVeloMuon.py
index c7da7abeddda6483ce8d3b57a6b3083ee07bdafe..3f821c02445e084449fcec8a684ab687eb7dca9a 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCalib/StrippingTrackEffVeloMuon.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCalib/StrippingTrackEffVeloMuon.py
@@ -29,25 +29,17 @@
 from SelPy.utils import (UniquelyNamedObject,
                          ClonableObject,
                          SelectionBase)
-from Configurables import TrackEventCloneKiller, VeloMuonBuilder
-from Configurables import TrackStateInitAlg, TrackEventFitter, TrackPrepareVelo, TrackContainerCopy, Tf__PatVeloSpaceTool, StandaloneMuonRec
+from Configurables import VeloMuonBuilder
+from Configurables import StandaloneMuonRec, TrackPrepareVelo
 from Configurables import CombineParticles
-from Configurables import TrackKalmanFilter, TrackMasterExtrapolator
-from Configurables import TrackEventFitter, TrackMasterFitter
-from TrackFitter.ConfiguredFitters import ConfiguredFit
-from PhysSelPython.Wrappers import AutomaticData
-from Configurables import TrackSys
 from Configurables import GaudiSequencer
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, TisTosParticleTagger
 from StandardParticles import StdLooseMuons
 from StrippingUtils.Utils import LineBuilder
-from Configurables import TrackCloneFinder
 from StrippingConf.StrippingLine import StrippingLine
 from Configurables import FastVeloTracking
-from Configurables import ChargedProtoParticleMaker, NoPIDsParticleMaker, DataOnDemandSvc, DelegatingTrackSelector, TrackSelector, CombinedParticleMaker, BestPIDParticleMaker
-from PhysSelPython.Wrappers import Selection, SelectionSequence, DataOnDemand
-from LHCbKernel.Configuration import *
-from Gaudi.Configuration import *
+from Configurables import ChargedProtoParticleMaker, DataOnDemandSvc, DelegatingTrackSelector, NoPIDsParticleMaker, TrackSelector
+from PhysSelPython.Wrappers import Selection
 __author__ = ['Flavio Archilli']
 __date__ = '30/10/2019'
 __version__ = '$Revision: 0.1 $'
@@ -159,8 +151,6 @@ class StrippingTrackEffVeloMuonConf(LineBuilder):
 
         _config = self.config[confLine]
 
-        _pchargeCut = None
-        _tchargeCut = None
         _tagCharge = None
         _probeCharge = None
         _chargename = None
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCharm/StrippingB2ppipiSigmacmm_Lcpi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCharm/StrippingB2ppipiSigmacmm_Lcpi.py
index 1932ea73632bfc335a5d650d07d5b01c5d455fa9..397b76425631bddc729ad4ce8bbb2a99c6f92bf2 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCharm/StrippingB2ppipiSigmacmm_Lcpi.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCharm/StrippingB2ppipiSigmacmm_Lcpi.py
@@ -31,12 +31,11 @@ __all__ = ('StrippingB2ppipiSigmacmm_Lcpi_Conf', 'makeLc2pKpi', 'makepifromSigma
            )
 
 from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, ConjugateNeutralPID, DaVinci__N3BodyDecays
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N3BodyDecays, FilterDesktop
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
-from StrippingUtils.Utils import checkConfig, LineBuilder
+from StrippingUtils.Utils import LineBuilder
 from GaudiKernel.SystemOfUnits import MeV, GeV, mm
-from copy import copy
 
 name = 'StrippingB2ppipiSigmacmm_Lcpi'
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCharm/StrippingChargedHyperons.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCharm/StrippingChargedHyperons.py
index 920c9faefc12697a4686bb708606c7aefce7c812..1e9ecbdf32eac322732659ae13423893f4c17ced 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCharm/StrippingChargedHyperons.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCharm/StrippingChargedHyperons.py
@@ -21,13 +21,9 @@ __version__ = '$Revision: 1.0 $'
 __all__ = ('StrippingChargedHyperonsConf', 'default_config')
 
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from StandardParticles import StdLoosePions, StdNoPIDsDownPions, StdLooseKaons, StdLooseDownKaons
-from StandardParticles import StdAllLoosePions, StdAllLooseKaons
 
 from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
-from PhysSelPython.Wrappers import MultiSelectionSequence
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from GaudiKernel.SystemOfUnits import MeV, mm, picosecond
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCharm/StrippingCharm2PPX.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCharm/StrippingCharm2PPX.py
index 8f420ab23681879eda33d3f11a9c1854083e6f5d..1776621bc50d11dd212c17cc7c967c25e7570f68 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCharm/StrippingCharm2PPX.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCharm/StrippingCharm2PPX.py
@@ -26,7 +26,7 @@ __all__ = (
     'StrippingCharm2PPXConf'  # ???
 )
 
-from GaudiKernel.SystemOfUnits import MeV, GeV, mm, mrad
+from GaudiKernel.SystemOfUnits import GeV, MeV, mm
 from Configurables import CombineParticles, FilterDesktop
 # from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop, DaVinci__N3BodyDecays
 from StandardParticles import (
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCharm/StrippingCharmForVub.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCharm/StrippingCharmForVub.py
index addb5112d833323e807d80a2fcd5d1c6ef104d89..196b7aca8b732e4ce87cfa408c9240c9d4ca9fe8 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCharm/StrippingCharmForVub.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCharm/StrippingCharmForVub.py
@@ -31,9 +31,8 @@ __all__ = ('CharmForVubConf',
            'makeDstarD02HMuNu')
 
 from Gaudi.Configuration import *
-from Configurables import SubstitutePID
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
+from PhysSelPython.Wrappers import MergedSelection, Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from StandardParticles import StdLooseMuons, StdLooseKaons, StdAllLoosePions, StdLoosePions
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCharm/StrippingCharmWeakDecays.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCharm/StrippingCharmWeakDecays.py
index 62cf538da90f04787baab5c812393440f86c3b23..72c36178501074aeada4d5d7f91bd305c974ec78 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCharm/StrippingCharmWeakDecays.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCharm/StrippingCharmWeakDecays.py
@@ -28,7 +28,7 @@ __all__ = ('CharmWeakDecaysConf',
            'default_config')
 
 from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCharm/StrippingD02KSKS.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCharm/StrippingD02KSKS.py
index 048a0f735673d789716920a6b813f3734a817158..2e831b063d5dd66449d672d2c0c14659bb9d9210 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCharm/StrippingD02KSKS.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCharm/StrippingD02KSKS.py
@@ -25,9 +25,8 @@ __date__ = '15/05/2014'
 __version__ = 'Stripping23'
 __all__ = 'D02KSKSConf'
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
+from PhysSelPython.Wrappers import DataOnDemand, Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 
@@ -556,7 +555,7 @@ class D02KSKSConf(LineBuilder):
         _daughterCuts = "(TRGHOSTPROB <=%s )" % config['slowPi_LLL_TRGHOSTPROB']
 
         # 40
-        _vertexChi2_cut = "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_LL']
+        "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_LL']
 
         # 200
         _combCuts = "(ADAMASS('D*(2010)+') < %s*MeV)" % config['Dst_mass_LL']
@@ -593,7 +592,7 @@ class D02KSKSConf(LineBuilder):
         _daughterCuts = "(TRGHOSTPROB <=%s )" % config['slowPi_LLU_TRGHOSTPROB']
 
         # 40
-        _vertexChi2_cut = "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_LL']
+        "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_LL']
 
         # 200
         _combCuts = "(ADAMASS('D*(2010)+') < %s*MeV)" % config['Dst_mass_LL']
@@ -630,7 +629,7 @@ class D02KSKSConf(LineBuilder):
         _daughterCuts = "(TRGHOSTPROB <=%s )" % config['slowPi_LDL_TRGHOSTPROB']
 
         # 40
-        _vertexChi2_cut = "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_LD']
+        "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_LD']
 
         # 200
         _combCuts = "(ADAMASS('D*(2010)+') < %s*MeV)" % config['Dst_mass_LD']
@@ -667,7 +666,7 @@ class D02KSKSConf(LineBuilder):
         _daughterCuts = "(TRGHOSTPROB <=%s )" % config['slowPi_LDU_TRGHOSTPROB']
 
         # 40
-        _vertexChi2_cut = "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_LD']
+        "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_LD']
 
         # 200
         _combCuts = "(ADAMASS('D*(2010)+') < %s*MeV)" % config['Dst_mass_LD']
@@ -704,7 +703,7 @@ class D02KSKSConf(LineBuilder):
         _daughterCuts = "(TRGHOSTPROB <=%s )" % config['slowPi_DDL_TRGHOSTPROB']
 
         # 40
-        _vertexChi2_cut = "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_DD']
+        "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_DD']
 
         # 200
         _combCuts = "(ADAMASS('D*(2010)+') < %s*MeV)" % config['Dst_mass_DD']
@@ -741,7 +740,7 @@ class D02KSKSConf(LineBuilder):
         _daughterCuts = "(TRGHOSTPROB <=%s )" % config['slowPi_DDU_TRGHOSTPROB']
 
         # 40
-        _vertexChi2_cut = "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_DD']
+        "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_DD']
 
         # 200
         _combCuts = "(ADAMASS('D*(2010)+') < %s*MeV)" % config['Dst_mass_DD']
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCharm/StrippingD2HHHGamma.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCharm/StrippingD2HHHGamma.py
index f493f6bd9021f7c482ad4f11110b31209e277d1e..e0da6bf833dec41ba4733267992c2593b1e66642 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCharm/StrippingD2HHHGamma.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCharm/StrippingD2HHHGamma.py
@@ -22,19 +22,18 @@ __version__ = '$Revision: 0.1 $'
 __all__ = ('D2HHHGammaLines',
            'default_config')
 
-from Gaudi.Configuration import *
 
-from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N4BodyDecays
+from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays
 from StandardParticles import StdNoPIDsPions, StdNoPIDsKaons
 from StandardParticles import StdLooseAllPhotons, StdAllLooseGammaLL, StdAllLooseGammaDD
 
 from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
-from StrippingUtils.Utils import LineBuilder, checkConfig
+from StrippingUtils.Utils import LineBuilder
 
 from Configurables import FilterDesktop
 
-from GaudiKernel.SystemOfUnits import GeV, MeV, picosecond, mm
+from GaudiKernel.SystemOfUnits import GeV, MeV, picosecond
 
 
 default_config = {
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCharm/StrippingD2HHHKs.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCharm/StrippingD2HHHKs.py
index e5639b90812290f4e2226c3b0c140285aa788b00..8b56f2ae08f0d364c45bed96aa90657daee77a7d 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCharm/StrippingD2HHHKs.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCharm/StrippingD2HHHKs.py
@@ -22,19 +22,18 @@ __version__ = '$Revision: 0.1 $'
 __all__ = ('D2HHHKsLines',
            'default_config')
 
-from Gaudi.Configuration import *
 
-from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N4BodyDecays
+from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays
 from StandardParticles import StdNoPIDsPions, StdNoPIDsKaons
 from StandardParticles import StdLooseKsDD, StdLooseKsLL
 
 from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
-from StrippingUtils.Utils import LineBuilder, checkConfig
+from StrippingUtils.Utils import LineBuilder
 
 from Configurables import FilterDesktop
 
-from GaudiKernel.SystemOfUnits import GeV, MeV, picosecond, mm
+from GaudiKernel.SystemOfUnits import MeV, mm, picosecond
 
 
 default_config = {
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCharm/StrippingD2HHHPi0.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCharm/StrippingD2HHHPi0.py
index 6083359069ac88d66ad4d2d0c3f6c4a785962da6..8557b0ed7b6ea3312ecd34ede82d7cbd720f6775 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCharm/StrippingD2HHHPi0.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCharm/StrippingD2HHHPi0.py
@@ -22,19 +22,18 @@ __version__ = '$Revision: 0.1 $'
 __all__ = ('D2HHHPi0Lines',
            'default_config')
 
-from Gaudi.Configuration import *
 
-from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N4BodyDecays
+from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays
 from StandardParticles import StdNoPIDsPions, StdNoPIDsKaons
 from StandardParticles import StdLooseResolvedPi0, StdLooseMergedPi0
 
 from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
-from StrippingUtils.Utils import LineBuilder, checkConfig
+from StrippingUtils.Utils import LineBuilder
 
 from Configurables import FilterDesktop
 
-from GaudiKernel.SystemOfUnits import GeV, MeV, picosecond, mm
+from GaudiKernel.SystemOfUnits import GeV, MeV, picosecond
 
 
 default_config = {
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCharm/StrippingD2HMuNu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCharm/StrippingD2HMuNu.py
index 2ceba3956453266f579b29b43ab66b82c4dc906a..0b1aa8422f7bb32ab3d194b98dead0e474772019 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCharm/StrippingD2HMuNu.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCharm/StrippingD2HMuNu.py
@@ -9,9 +9,7 @@
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
 
-import logging
 from StrippingUtils.Utils import LineBuilder
-from Gaudi.Configuration import *
 __author__ = ['Liang Sun', 'Adam Davis']
 __date__ = '09/11/2015'
 __version__ = '$Revision: 0.01 $'
@@ -98,7 +96,6 @@ class D2HLepNuBuilder(LineBuilder):
     def __init__(self, name, config):
         LineBuilder.__init__(self, name, config)
         self._config = config
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
 
         self.GECs = {"Code": "( recSummaryTrack(LHCb.RecSummary.nLongTracks, TrLONG) < %(GEC_nLongTrk)s )" % config,
                      "Preambulo": ["from LoKiTracks.decorators import *"]}
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCharm/StrippingD2KPiPiMuNu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCharm/StrippingD2KPiPiMuNu.py
index 98c15ef26f01b9fd72dfc1f76d2f9a4cdc798fcf..83a654c81ec0d3cdcc0b1452f1a33bbc93523d29 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCharm/StrippingD2KPiPiMuNu.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCharm/StrippingD2KPiPiMuNu.py
@@ -9,9 +9,7 @@
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
 
-import logging
 from StrippingUtils.Utils import LineBuilder
-from Gaudi.Configuration import *
 __author__ = ['Liang Sun']
 __date__ = '07/05/2019'
 __version__ = '$Revision: 0.01 $'
@@ -103,7 +101,6 @@ class D2KPiPiMuNuBuilder(LineBuilder):
     def __init__(self, name, config):
         LineBuilder.__init__(self, name, config)
         self._config = config
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
 
         self.GECs = {"Code": "( recSummaryTrack(LHCb.RecSummary.nLongTracks, TrLONG) < %(GEC_nLongTrk)s )" % config,
                      "Preambulo": ["from LoKiTracks.decorators import *"]}
@@ -200,7 +197,7 @@ class D2KPiPiMuNuBuilder(LineBuilder):
 
         from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
         from PhysSelPython.Wrappers import Selection
-        from StandardParticles import StdLooseMuons, StdAllLooseMuons, StdAllNoPIDsMuons
+        from StandardParticles import StdAllLooseMuons, StdAllNoPIDsMuons
         _mu = FilterDesktop(Code=self._NominalMuSelection() % self._config)
         _mupid = StdAllLooseMuons
         if self._config["NoPIDmu"]:
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCharm/StrippingD2KS0H_conf.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCharm/StrippingD2KS0H_conf.py
index d58964475590bc2e6571bcd929685425e3694bc1..e5b9f6c8683eaaab3109aca8686f163c2f08aef0 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCharm/StrippingD2KS0H_conf.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCharm/StrippingD2KS0H_conf.py
@@ -44,9 +44,9 @@ from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticle
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StandardParticles import StdLoosePions, StdLooseKaons
 from StrippingConf.StrippingLine import StrippingLine
-from StrippingUtils.Utils import LineBuilder, checkConfig
+from StrippingUtils.Utils import LineBuilder
 from Configurables import TisTosParticleTagger
-from GaudiKernel.SystemOfUnits import GeV, MeV, picosecond, mm
+from GaudiKernel.SystemOfUnits import MeV, mm, picosecond
 
 default_name = 'D2KS0H'
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCharm/StrippingD2PiPi0.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCharm/StrippingD2PiPi0.py
index 2cf2e1f2dfcc01187fa87b6b497e55c580034ef2..3593748cd50e6ab84496cfb7045a1b29f0016504 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCharm/StrippingD2PiPi0.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCharm/StrippingD2PiPi0.py
@@ -33,7 +33,7 @@ __all__ = (
 
 )
 
-from GaudiKernel.SystemOfUnits import MeV, GeV, mrad, picosecond
+from GaudiKernel.SystemOfUnits import MeV, picosecond
 
 from StandardParticles import (
     StdAllNoPIDsKaons,
@@ -51,7 +51,7 @@ from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 
 # from Configurables import CombineParticles, FilterDesktop
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, ConjugateNeutralPID, DaVinci__N3BodyDecays
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N3BodyDecays
 
 default_config = {
     'D2Pi0H': {
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCharm/StrippingD2XMuMuSS.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCharm/StrippingD2XMuMuSS.py
index 6cb43802872df951b5676b3b0a91f42091655f73..f2ecc06f375c01960838df612bae449a097161ea 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCharm/StrippingD2XMuMuSS.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCharm/StrippingD2XMuMuSS.py
@@ -9,14 +9,13 @@
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
 
-from StandardParticles import StdAllLooseElectrons, StdAllNoPIDsElectrons
+from StandardParticles import StdAllLooseElectrons
 from StandardParticles import StdAllLooseKaons, StdAllLoosePions, StdAllLooseMuons, StdAllNoPIDsPions, StdAllNoPIDsKaons
-from StandardParticles import StdLooseKaons, StdLoosePions, StdLooseMuons, StdNoPIDsPions, StdNoPIDsKaons, StdLooseProtons, StdAllNoPIDsProtons
+from StandardParticles import StdAllNoPIDsProtons, StdLooseKaons, StdLooseMuons, StdLoosePions, StdLooseProtons
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, OfflineVertexFitter
-from Gaudi.Configuration import *
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop
 import copy
 __author__ = ['Malcolm John', 'B. Viaud', 'O. Kochebina']
 __date__ = '25/6/2012'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCharm/StrippingD2hh.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCharm/StrippingD2hh.py
index 51c213ed2d3c259435dcd6aef0631877156b6bb0..a370c49abb16101fe062f7fa9fd7c27efecb37e3 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCharm/StrippingD2hh.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCharm/StrippingD2hh.py
@@ -24,7 +24,6 @@ __all__ = ('D2hhBuilder',
 '''
 This file contains stripping lines for time-dependent two-body charm analyses of mixing, yCP, and A_Gamma
 '''
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
@@ -129,7 +128,7 @@ class D2hhBuilder(LineBuilder):
         stdNoPIDsPions = StdAllNoPIDsPions
 
         d2kpi_name = name+'PromptD2KPi'
-        d0RS_name = name+'PromptD0RS'
+        name+'PromptD0RS'
         d0WS_name = name+'PromptD0WS'
         d2kk_name = name+'PromptD2KK'
         d2pipi_name = name+'PromptD2PiPi'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCharm/StrippingD2hhh_FTcalib.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCharm/StrippingD2hhh_FTcalib.py
index 4135055031043e8695ee88d1bb9ef372f937ca33..968b6ee94298cd1648477c4fc8322ffb29b1466c 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCharm/StrippingD2hhh_FTcalib.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCharm/StrippingD2hhh_FTcalib.py
@@ -28,12 +28,10 @@ __version__ = '$Revision: 0.0 $'
 
 __all__ = ('D2hhhFTCalibConf', 'makeStdD2hhhFT')
 
-from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
+from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from StandardParticles import (StdNoPIDsPions, StdTightKaons)
 
 name = "D2hhhFTCalib"
 # Cuts to be implemented vy the Stripping team in Stripping Settings
@@ -251,7 +249,6 @@ def globalEventCutFilter(name, MaxTrSIZE=None):
     if MaxTrSIZE == None:
         return None
 
-    from Configurables import LoKi__VoidFilter as VoidFilter
     from Configurables import LoKi__Hybrid__CoreFactory as CoreFactory
     modules = CoreFactory('CoreFactory').Modules
     for i in ['LoKiTracks.decorators']:
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCharm/StrippingD2hhh_conf.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCharm/StrippingD2hhh_conf.py
index 436d8a20ebfa69a07273b9fc952667e306a823fd..49374bf7789c8403fcf3e4660b179452634cef16 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCharm/StrippingD2hhh_conf.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCharm/StrippingD2hhh_conf.py
@@ -38,8 +38,7 @@ from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticle
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from StandardParticles import (StdNoPIDsPions,
-                               StdTightKaons)
+from StandardParticles import StdNoPIDsPions
 
 name = "D2hhh"
 # Cuts to be implemented vy the Stripping team in Stripping Settings
@@ -717,7 +716,6 @@ def globalEventCutFilter(name,
     if MaxTrSIZE == None:
         return None
 
-    from Configurables import LoKi__VoidFilter as VoidFilter
     from Configurables import LoKi__Hybrid__CoreFactory as CoreFactory
     modules = CoreFactory('CoreFactory').Modules
     for i in ['LoKiTracks.decorators']:
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCharm/StrippingDstarD02xx.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCharm/StrippingDstarD02xx.py
index ce2ac8d8facde4ad7816e78bcb9fd402160bb81a..e052e20eec4a83a6f489851d64e937c3ee00b05f 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCharm/StrippingDstarD02xx.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCharm/StrippingDstarD02xx.py
@@ -22,8 +22,7 @@ __all__ = ('StrippingDstarD02xxConf', 'combinetwobody', 'combineDstar', 'default
             where xx = {mu mu, pi pi, pi mu, k mu, ... }
             
 '''
-from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCharm/StrippingDstarD0ToHHPi0.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCharm/StrippingDstarD0ToHHPi0.py
index fd5188441bc83f651edf601e0fc081e5761b90a2..9f366f1a65e17dac9704f2cda14ac7c90073bb1d 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCharm/StrippingDstarD0ToHHPi0.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCharm/StrippingDstarD0ToHHPi0.py
@@ -17,13 +17,11 @@ Module for D* tagged D0 -> hhpi0.
 Supersedes StrippingDstarD2hhpi0
 """
 
-from Gaudi.Configuration import *
 from Configurables import FilterDesktop, CombineParticles, OfflineVertexFitter
 from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from StandardParticles import StdAllLoosePions, StdLoosePions, StdLooseKaons, StdLooseResolvedPi0, StdLooseMergedPi0
-from Configurables import TisTosParticleTagger
 
 __all__ = ('DstarD0ToHHPi0AllLinesBuilder',
            'DstarMaker',
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCharm/StrippingDstarD2HHHH.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCharm/StrippingDstarD2HHHH.py
index 79b905d65e08f76846da8aeebd29e1bd52022454..15c8bc47e0445328a0083162a53a4335865cca1b 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCharm/StrippingDstarD2HHHH.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCharm/StrippingDstarD2HHHH.py
@@ -22,16 +22,15 @@ __version__ = '$Revision: 1.0 $'
 __all__ = ('DstarD2HHHHLines',
            'default_config')
 
-from Gaudi.Configuration import *
 
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N4BodyDecays
 from StandardParticles import StdAllNoPIDsPions, StdNoPIDsPions, StdNoPIDsKaons
 
 from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
-from StrippingUtils.Utils import LineBuilder, checkConfig
+from StrippingUtils.Utils import LineBuilder
 
-from GaudiKernel.SystemOfUnits import GeV, MeV, picosecond, mm
+from GaudiKernel.SystemOfUnits import MeV, picosecond
 
 
 default_config = {
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCharm/StrippingDstarD2KSHHPi0.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCharm/StrippingDstarD2KSHHPi0.py
index 1a1c91b788986c0a547216e92ee30ee234979f5e..2cf7967d07c7867df16b8b2cfa45c3c0ddd24ac4 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCharm/StrippingDstarD2KSHHPi0.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCharm/StrippingDstarD2KSHHPi0.py
@@ -22,18 +22,17 @@ __version__ = '$Revision: 1.0 $'
 __all__ = ('DstarD2KSHHPi0Lines',
            'default_config')
 
-from Gaudi.Configuration import *
 
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N4BodyDecays
 from StandardParticles import StdAllNoPIDsPions, StdNoPIDsPions, StdNoPIDsKaons, StdLooseResolvedPi0, StdLooseMergedPi0, StdLooseKsDD, StdLooseKsLL
 
 from PhysSelPython.Wrappers import Selection, MergedSelection
 from StrippingConf.StrippingLine import StrippingLine
-from StrippingUtils.Utils import LineBuilder, checkConfig
+from StrippingUtils.Utils import LineBuilder
 
 from Configurables import FilterDesktop
 
-from GaudiKernel.SystemOfUnits import GeV, MeV, picosecond, mm
+from GaudiKernel.SystemOfUnits import MeV, mm, picosecond
 
 
 default_config = {
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCharm/StrippingDstarD2KShh.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCharm/StrippingDstarD2KShh.py
index 0446a490bf8b78aaa6a090c0170ee5d84241b931..8bb88c690db0782705ee07f1579b03266ff72d96 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCharm/StrippingDstarD2KShh.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCharm/StrippingDstarD2KShh.py
@@ -34,7 +34,6 @@ __all__ = ('DstarD2KShhBuilder',
            'makeD2KShh',
            'makeDstar')
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCharm/StrippingDstarD2XGamma.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCharm/StrippingDstarD2XGamma.py
index bf59f6f837edb8f442786e16807458e40dc309b3..188f8b4147978915021b16bdb12f423af3d17739 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCharm/StrippingDstarD2XGamma.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCharm/StrippingDstarD2XGamma.py
@@ -28,7 +28,6 @@ __version__ = '$Revision: 0.3 $'
 
 __all__ = ('DstarD2XGammaLines', 'default_config')
 
-from Gaudi.Configuration import *
 
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 from StandardParticles import StdAllNoPIDsPions, StdNoPIDsPions, StdNoPIDsKaons
@@ -36,11 +35,11 @@ from StandardParticles import StdLooseAllPhotons, StdAllLooseGammaLL, StdAllLoos
 
 from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
-from StrippingUtils.Utils import LineBuilder, checkConfig
+from StrippingUtils.Utils import LineBuilder
 
 from Configurables import FilterDesktop
 
-from GaudiKernel.SystemOfUnits import GeV, MeV, picosecond, mm
+from GaudiKernel.SystemOfUnits import GeV, MeV, picosecond
 
 default_config = {
     'NAME': 'DstarD2XGamma',
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCharm/StrippingDstarPromptWithD02HHHH.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCharm/StrippingDstarPromptWithD02HHHH.py
index 13343e4031d3c9fe7ad9b92cfb6f3c3fff754d98..22e9ffd46fd5a0b8ab4623cae0293fe3c10c129d 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCharm/StrippingDstarPromptWithD02HHHH.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCharm/StrippingDstarPromptWithD02HHHH.py
@@ -36,11 +36,10 @@ __version__ = '$Revision: 1.2 $'
 __all__ = ('DstarPromptWithD02HHHHConf', 'makeD02hhhh',
            'makePromptDstar', 'default_config')
 
-from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, ConjugateNeutralPID
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles, ConjugateNeutralPID
 from PhysSelPython.Wrappers import Selection, MergedSelection
 from StrippingConf.StrippingLine import StrippingLine
-from StrippingUtils.Utils import checkConfig, LineBuilder
+from StrippingUtils.Utils import LineBuilder
 from GaudiKernel.SystemOfUnits import MeV, GeV, mm
 from copy import copy
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCharm/StrippingDstarPromptWithD02HHMuMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCharm/StrippingDstarPromptWithD02HHMuMu.py
index e83ad60bb1ff3c30f6cfd21e7ea0e2fb6ead7646..a1c41727aab9df91366ea29963944e783d29f676 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCharm/StrippingDstarPromptWithD02HHMuMu.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCharm/StrippingDstarPromptWithD02HHMuMu.py
@@ -29,11 +29,10 @@ __version__ = '$Revision: 2.0 $'
 __all__ = ('DstarPromptWithD02HHLLConf', 'makeD02hhll',
            'makePromptDstar', 'default_config')
 
-from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, ConjugateNeutralPID
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles, ConjugateNeutralPID
 from PhysSelPython.Wrappers import Selection, MergedSelection
 from StrippingConf.StrippingLine import StrippingLine
-from StrippingUtils.Utils import checkConfig, LineBuilder
+from StrippingUtils.Utils import LineBuilder
 from GaudiKernel.SystemOfUnits import MeV, GeV, mm
 from copy import copy
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCharm/StrippingExcitedDsSpectroscopy.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCharm/StrippingExcitedDsSpectroscopy.py
index 6b08898929e9ee290d51640d43d073b4a548a98b..dadd6c5c25c094fb4e5dfdef695cd98af0384ee1 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCharm/StrippingExcitedDsSpectroscopy.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCharm/StrippingExcitedDsSpectroscopy.py
@@ -321,7 +321,6 @@ def globalEventCutFilter(name,
     if MaxTrSIZE == None:
         return None
 
-    from Configurables import LoKi__VoidFilter as VoidFilter
     from Configurables import LoKi__Hybrid__CoreFactory as CoreFactory
     modules = CoreFactory('CoreFactory').Modules
     for i in ['LoKiTracks.decorators']:
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCharm/StrippingHc2V02H.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCharm/StrippingHc2V02H.py
index 6bdf6a7bffd07e3e7c001fd4de61f7a4bd934d6f..b32a173f2c8c885c8f785ae8a69631f5f80b99fd 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCharm/StrippingHc2V02H.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCharm/StrippingHc2V02H.py
@@ -26,7 +26,7 @@ __date__ = '18/07/2019'
 __all__ = ('default_config', 'StrippingHc2V02HConf')
 
 from GaudiKernel.SystemOfUnits import MeV, GeV, mm, mrad
-from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop, DaVinci__N3BodyDecays
+from GaudiConfUtils.ConfigurableGenerators import DaVinci__N3BodyDecays, FilterDesktop
 # from StandardParticles import StdNoPIDsPions as InputPionsPiPi
 # from StandardParticles import StdNoPIDsKaons as InputKaons
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCharm/StrippingHc2V03H.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCharm/StrippingHc2V03H.py
index d3888168faa1cbed51e85b5dd40fa51f82370dcd..2c9fd008996a8b8f7f34cbf4a6617f8d731b378b 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCharm/StrippingHc2V03H.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCharm/StrippingHc2V03H.py
@@ -24,11 +24,9 @@ __date__ = '13/10/2017'
 __all__ = ('default_config', 'StrippingHc2V03HConf')
 
 from GaudiKernel.SystemOfUnits import MeV, GeV, mm, mrad
-from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop, DaVinci__N4BodyDecays
+from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays, FilterDesktop
 from StandardParticles import StdAllLoosePions as InputPions
 from StandardParticles import StdAllLooseKaons as InputKaons
-from StandardParticles import StdVeryLooseLambdaLL as InputLambdasLL
-from StandardParticles import StdLooseLambdaDD as InputLambdasDD
 
 from PhysSelPython.Wrappers import Selection, MergedSelection, DataOnDemand
 from StrippingUtils.Utils import LineBuilder
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCharm/StrippingHc2V2H.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCharm/StrippingHc2V2H.py
index 1cc1e18bb59332589773894f931054575d3bd57d..62f83f01a95c995d84514559ea3eb725d34e7335 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCharm/StrippingHc2V2H.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCharm/StrippingHc2V2H.py
@@ -29,8 +29,6 @@ from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDeskto
 from StandardParticles import StdNoPIDsDownPions as InputDownPions
 from StandardParticles import StdNoPIDsPions as InputPions
 from StandardParticles import StdNoPIDsKaons as InputKaons
-from StandardParticles import StdLooseLambdaLL as InputLambdasLL
-from StandardParticles import StdLooseLambdaDD as InputLambdasDD
 
 from PhysSelPython.Wrappers import Selection, MergedSelection, DataOnDemand
 from StrippingUtils.Utils import LineBuilder
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCharm/StrippingHc2V3H.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCharm/StrippingHc2V3H.py
index 8860909e6ec1c8f2862b43d64f75e5158a1c67e3..05d0ef19028d88f3cf40161b0e7b207226c117e3 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCharm/StrippingHc2V3H.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCharm/StrippingHc2V3H.py
@@ -31,8 +31,6 @@ from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDeskto
 from StandardParticles import StdNoPIDsDownPions as InputDownPions
 from StandardParticles import StdNoPIDsPions as InputPions
 from StandardParticles import StdNoPIDsKaons as InputKaons
-from StandardParticles import StdLooseLambdaLL as InputLambdasLL
-from StandardParticles import StdLooseLambdaDD as InputLambdasDD
 
 from PhysSelPython.Wrappers import Selection, MergedSelection, DataOnDemand
 from StrippingUtils.Utils import LineBuilder
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCharm/StrippingKKPiPi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCharm/StrippingKKPiPi.py
index cedaab2089da1034f1207a1c958ba82c6e694ba7..767a1fdbf50445fb204987a0cc70c2f97dfb5421 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCharm/StrippingKKPiPi.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCharm/StrippingKKPiPi.py
@@ -12,12 +12,11 @@
 Module for selecting [cs][ubar dbar] -> K+ K+ pi- pi-
 '''
 
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
+from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
 from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
-from Gaudi.Configuration import *
 __author__ = ['Mengzhen Wang']
 __date__ = '10/10/2017'
 __version__ = '$Revision: 1.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCharm/StrippingLambdac2V03H.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCharm/StrippingLambdac2V03H.py
index 8c19d9d3aeebd29855bd2d76b366fe9611b08aaf..9689bee39c9e7d84a61e56605ba3bb5f443ec5d1 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCharm/StrippingLambdac2V03H.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCharm/StrippingLambdac2V03H.py
@@ -27,7 +27,7 @@ __all__ = (
 )
 
 from GaudiKernel.SystemOfUnits import MeV, GeV, mm, mrad
-from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop, DaVinci__N4BodyDecays
+from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays, FilterDesktop
 from StandardParticles import StdNoPIDsPions as InputPions
 from StandardParticles import StdNoPIDsKaons as InputKaons
 from StandardParticles import StdLooseLambdaLL as InputLambdasLL
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCharm/StrippingLc2L0LLpi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCharm/StrippingLc2L0LLpi.py
index 0165e116e9da33c044fd297b7fa4c1090c6cbf39..0a027afeb1d2d303ea6a37758bc2b3bf4bb5f79d 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCharm/StrippingLc2L0LLpi.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCharm/StrippingLc2L0LLpi.py
@@ -12,17 +12,10 @@
 Module for selecting Lambda_c+->Lambda pi+
 '''
 
-from StandardParticles import (StdAllLoosePions, StdLooseProtons,
-                               StdLoosePions, StdNoPIDsUpPions)
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from StandardParticles import StdLooseAllPhotons, StdVeryLooseAllPhotons
-from Configurables import LoKi__VoidFilter
-from PhysSelPython.Wrappers import MergedSelection
-from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
-from Gaudi.Configuration import *
 __author__ = ['Guiyun Ding', 'Jiesheng Yu', 'Yuehong Xie']
 __date__ = '28/11/2016'
 __version__ = '$Revision: 2.0$'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCharm/StrippingNeutralCBaryons.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCharm/StrippingNeutralCBaryons.py
index bf6d1603296752d86c0e7c13ec03b037aa4b7dd0..165e0fbf71ca71084e7f0b7ac538d4257975d87f 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCharm/StrippingNeutralCBaryons.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCharm/StrippingNeutralCBaryons.py
@@ -23,13 +23,9 @@ __version__ = '$Revision: 1.0 $'
 __all__ = ('StrippingNeutralCBaryonsConf', 'default_config')
 
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from StandardParticles import StdLoosePions, StdNoPIDsDownPions, StdLooseKaons, StdLooseDownKaons
-from StandardParticles import StdAllLoosePions, StdAllLooseKaons
 
 from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
-from PhysSelPython.Wrappers import MultiSelectionSequence
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from GaudiKernel.SystemOfUnits import MeV, mm, picosecond
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCharm/StrippingXic2HHH.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCharm/StrippingXic2HHH.py
index e34807cd11d54a2a33e0a1189dffe5a4b8d17475..32300611aa84de3bdf0390670c07b3849c390e20 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCharm/StrippingXic2HHH.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCharm/StrippingXic2HHH.py
@@ -8,18 +8,15 @@
 # granted to it by virtue of its status as an Intergovernmental Organization  #
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
-from StandardParticles import StdNoPIDsPions, StdNoPIDsKaons, StdNoPIDsProtons, StdAllNoPIDsProtons
-from Configurables import TisTosParticleTagger
+from StandardParticles import StdNoPIDsKaons, StdNoPIDsPions, StdNoPIDsProtons
 from StrippingUtils.Utils import LineBuilder
-from PhysSelPython.Wrappers import MultiSelectionSequence
-from PhysSelPython.Wrappers import Selection, DataOnDemand, AutomaticData, MergedSelection
+from PhysSelPython.Wrappers import DataOnDemand, MergedSelection, Selection
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
 from Configurables import FilterDesktop, CombineParticles
 from LHCbKernel.Configuration import *
-from GaudiKernel.SystemOfUnits import MeV, mm, ns
+from GaudiKernel.SystemOfUnits import MeV, mm
 from StrippingConf.StrippingLine import StrippingLine
 from Gaudi.Configuration import *
-import re
 all
 ''' Xic+ and Theta+ lines Designed by Yury Shcheglov, Alexey Dzyuba, Nelya Sagidova to study Xic+ and Theta+ particles '''
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCharm/StrippingXic2LambdaKPi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCharm/StrippingXic2LambdaKPi.py
index 968b10448f5ff96bf5069b19d8e2a65d00f3f3bd..5f91de838fcaa1d4ecdf89cb5a647f42841f946b 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCharm/StrippingXic2LambdaKPi.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCharm/StrippingXic2LambdaKPi.py
@@ -14,8 +14,6 @@ Exclusive lines for Xic+ -> Lambda0 KS0 pi+ and Xic0 -> Lambda0 K- pi+
 
 Author: M. Stahl
 '''
-from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-from Configurables import FilterDesktop
 from PhysConf.Selections import FilterSelection, Combine3BodySelection, MergedSelection
 from PhysSelPython.Wrappers import AutomaticData
 from StrippingUtils.Utils import LineBuilder
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCharm/StrippingXicc.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCharm/StrippingXicc.py
index 2468c2d79739511bfdefe170463aa125124d506e..45478d9be226dbd5e3fdd09b0ff769294d99d064 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCharm/StrippingXicc.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingCharm/StrippingXicc.py
@@ -52,9 +52,6 @@ from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticle
 from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from StandardParticles import StdAllLoosePions, StdAllLooseKaons, StdAllLooseProtons
-from StandardParticles import StdLoosePions
-from CommonParticles.StdLooseLambda import StdLooseLambdaLL, StdLooseLambdaDD
 from GaudiKernel.SystemOfUnits import MeV, GeV, mm
 from Configurables import TisTosParticleTagger
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingIFT/StrippingHeavyIonConvertedPhoton.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingIFT/StrippingHeavyIonConvertedPhoton.py
index b38a84b86b368e54eb7956ef92addf71154d1923..c8361ce1732d1f9749491ad6fa0d7449522abd70 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingIFT/StrippingHeavyIonConvertedPhoton.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingIFT/StrippingHeavyIonConvertedPhoton.py
@@ -23,7 +23,7 @@ __all__ = (
 
 from Gaudi.Configuration import *
 from CommonParticles.Utils import *
-from GaudiKernel.SystemOfUnits import MeV, GeV, mm
+from GaudiKernel.SystemOfUnits import MeV, mm
 from Configurables import (DiElectronMaker,
                            ProtoParticleCALOFilter,
                            ParticleTransporter,
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingIFT/StrippingHeavyIonD02KPiPi0.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingIFT/StrippingHeavyIonD02KPiPi0.py
index 3e380b9342ba9bebae1a3195dcadf08a1b598fc9..8ffdf55b27ce401ff26b2fe355cc99597f755347 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingIFT/StrippingHeavyIonD02KPiPi0.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingIFT/StrippingHeavyIonD02KPiPi0.py
@@ -25,9 +25,8 @@ __all__ = ('StrippingHeavyIonD02KPiPi0Conf',
            'makeD02KPiPi0M',
            'default_config')
 
-from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from PhysSelPython.Wrappers import Selection, DataOnDemand
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
+from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from StandardParticles import StdTightPions, StdTightKaons, StdLooseMergedPi0, StdLooseResolvedPi0
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingIFT/StrippingHeavyIonDiMuon.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingIFT/StrippingHeavyIonDiMuon.py
index 0c2b044b5fe850934f513781b14f5faf5b8fc181..e97c2ed82a33c94fba2489f2b078001b5dc839e6 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingIFT/StrippingHeavyIonDiMuon.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingIFT/StrippingHeavyIonDiMuon.py
@@ -17,8 +17,7 @@ from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 from StandardParticles import StdAllLooseMuons
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand
-from Gaudi.Configuration import *
+from PhysSelPython.Wrappers import Selection
 __author__ = ['Emilie MAURICE']
 __date__ = ''
 __version__ = '$Revision: 2.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingIFT/StrippingHeavyIonDst2D0KPiForPID.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingIFT/StrippingHeavyIonDst2D0KPiForPID.py
index 4282eb3c7b386840ce3bb3a47569a6a981e3194c..c3ba0aa8f46df637625d1f88481903dd9414f15e 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingIFT/StrippingHeavyIonDst2D0KPiForPID.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingIFT/StrippingHeavyIonDst2D0KPiForPID.py
@@ -13,10 +13,8 @@
 from StandardParticles import StdAllNoPIDsKaons, StdAllNoPIDsPions
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from LHCbKernel.Configuration import *
-from Gaudi.Configuration import *
+from PhysSelPython.Wrappers import Selection
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 __author__ = ['Philip Xing', 'Andrew Powell']
 __date__ = '23rd August 2012'
 __version__ = '$Revision: 7.0 $'
@@ -36,7 +34,7 @@ Usage:
 __all__ = ('HeavyIonDst2D0KPiForPIDConf', 'default_config', "D0", "Dstar")
 
 
-from GaudiKernel.SystemOfUnits import mm, cm, MeV, GeV
+from GaudiKernel.SystemOfUnits import GeV, MeV
 # from Configurables import FilterDesktop, CombineParticles
 
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingIFT/StrippingHeavyIonGammaHadron.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingIFT/StrippingHeavyIonGammaHadron.py
index df8ad92d7e7813151437ff0a0a8d2dfe8e9bab68..42c4e64093225339c3ada6e6ee97e25c483ed75e 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingIFT/StrippingHeavyIonGammaHadron.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingIFT/StrippingHeavyIonGammaHadron.py
@@ -13,13 +13,10 @@ Stripping selections or Gamma+Hadron physics.
 Based on those by Patrick K.
 '''
 
-from Configurables import RelInfoConeVariables
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from Configurables import FilterDesktop, CombineParticles
-from StandardParticles import StdLoosePhotons, StdAllLooseGammaLL, StdAllLooseGammaDD, StandardBasic
-from Gaudi.Configuration import *
+from Configurables import FilterDesktop
 __author__ = 'Cesar da Silva'
 __date__ = '30/04/2017'
 __version__ = '$Revision: 0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingIFT/StrippingHeavyIonMiniBias.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingIFT/StrippingHeavyIonMiniBias.py
index c63f00873a80c36c86290265b6ec4e0371de1408..685921c79f00fd6435fb915aaa8333675a7dfcff 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingIFT/StrippingHeavyIonMiniBias.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingIFT/StrippingHeavyIonMiniBias.py
@@ -13,7 +13,6 @@ Stripping selections or Minimum Bias physics.
 Based on those by Patrick K.
 '''
 
-from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 __author__ = 'Yanxi ZHANG, Emilie MAURICE'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingIFT/StrippingHeavyIonOpenCharm.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingIFT/StrippingHeavyIonOpenCharm.py
index 89ba90160c11f4ec225daca0022e27ee258efe57..75ee902a2bf417dec38a7240d3cd97c6aad266c4 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingIFT/StrippingHeavyIonOpenCharm.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingIFT/StrippingHeavyIonOpenCharm.py
@@ -31,8 +31,8 @@ __all__ = (
 )
 
 
-from GaudiKernel.SystemOfUnits import MeV, GeV, mrad, mm
-from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop
+from GaudiKernel.SystemOfUnits import GeV, MeV, mrad
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 # from Configurables import CombineParticles, FilterDesktop
 from StandardParticles import (
     StdAllNoPIDsKaons,
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingIFT/StrippingHeavyIonOthercc.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingIFT/StrippingHeavyIonOthercc.py
index 68874ffb4319386ba39c68da21a84cb3498f7c28..efc32ecd43b218de32e707b4d5f132d518d9658d 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingIFT/StrippingHeavyIonOthercc.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingIFT/StrippingHeavyIonOthercc.py
@@ -17,8 +17,7 @@ from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 from StandardParticles import StdNoPIDsElectrons, StdAllLooseProtons, StdLooseMuons
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand
-from Gaudi.Configuration import *
+from PhysSelPython.Wrappers import Selection
 __author__ = ['Emilie MAURICE']
 __date__ = ''
 __version__ = '$Revision: 1.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingIFT/StrippingHeavyIonPIDCalib.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingIFT/StrippingHeavyIonPIDCalib.py
index 4d96b70412efeeaa567401f7247511c02704fc0f..635480e78d2cba544bf3537d6a6d0e92293ac75f 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingIFT/StrippingHeavyIonPIDCalib.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingIFT/StrippingHeavyIonPIDCalib.py
@@ -37,7 +37,6 @@ from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
 from Gaudi.Configuration import *
 __author__ = ['Yanxi ZHANG']
 __date__ = '25/02/2015'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingIFT/StrippingHeavyIonSingleElectron.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingIFT/StrippingHeavyIonSingleElectron.py
index 4751a2767bc4a63d9d78087de7b67a9493851237..ce4c263cd6870c12d9bbbfccb585bedc00c300f9 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingIFT/StrippingHeavyIonSingleElectron.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingIFT/StrippingHeavyIonSingleElectron.py
@@ -14,7 +14,7 @@ Stripping selections for single scattered electrons
 
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
 from StandardParticles import StdAllNoPIDsElectrons
-from PhysSelPython.Wrappers import Selection, DataOnDemand
+from PhysSelPython.Wrappers import Selection
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 __author__ = 'Giacomo Graziani'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingIFT/StrippingHeavyIonTopology.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingIFT/StrippingHeavyIonTopology.py
index 19f3d03c95644de38c49321c5c0b7fb0636739e4..8308d72b5faed1731235c6cd48d682ca5b65d690 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingIFT/StrippingHeavyIonTopology.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingIFT/StrippingHeavyIonTopology.py
@@ -12,13 +12,9 @@
 Module for selecting specific topology
 '''
 
-from Configurables import FilterDesktop, CombineParticles
-from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-from StandardParticles import StdAllLooseMuons, StdAllLoosePions, StdAllNoPIDsPions, StdLoosePhotons
+from Configurables import FilterDesktop
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand
-from Gaudi.Configuration import *
 __author__ = ['Emilie MAURICE']
 __date__ = ''
 __version__ = '$Revision: 1.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingIFT/StrippingHeavyIonTrackEffDownMuon.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingIFT/StrippingHeavyIonTrackEffDownMuon.py
index 6e7eb7567d6f9a66f2e89cffa4cea4c71115f9cf..0880e97b075e2bc495173b6acf653ff01884be82 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingIFT/StrippingHeavyIonTrackEffDownMuon.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingIFT/StrippingHeavyIonTrackEffDownMuon.py
@@ -43,34 +43,26 @@ __all__ = ('StrippingHeavyIonTrackEffDownMuonConf',
 # FIXME Write includes in a cleaner way
 from Gaudi.Configuration import *
 from LHCbKernel.Configuration import *
-from DAQSys.DecoderClass import Decoder
 from Configurables import GaudiSequencer
 from Configurables import UnpackTrack, ChargedProtoParticleMaker, DelegatingTrackSelector, TrackSelector, BestPIDParticleMaker
-from TrackFitter.ConfiguredFitters import ConfiguredFit
 from Configurables import TrackStateInitAlg
 from StrippingConf.StrippingLine import StrippingLine
-from Configurables import ChargedProtoParticleAddMuonInfo, MuonIDAlgLite
+from Configurables import ChargedProtoParticleAddMuonInfo
 from MuonID import ConfiguredMuonIDs
 from Configurables import ChargedProtoCombineDLLsAlg, ProtoParticleMUONFilter
-from PhysSelPython.Wrappers import Selection, DataOnDemand
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
+from PhysSelPython.Wrappers import Selection
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 
 from StrippingUtils.Utils import LineBuilder
-from Configurables import LoKi__VoidFilter
-from os import environ
 from Gaudi.Configuration import *
-import GaudiKernel.ProcessJobOptions
-from GaudiKernel.SystemOfUnits import mm
 
 from GaudiConfUtils.ConfigurableGenerators import TisTosParticleTagger
 from StandardParticles import StdAllLooseMuons
 from Configurables import GaudiSequencer
 from Configurables import TrackToDST
-from Configurables import TrackSys
 from Configurables import PatSeeding, PatSeedingTool, PatLongLivedTracking
-from PhysSelPython.Wrappers import AutomaticData
 # Get the fitters
-from TrackFitter.ConfiguredFitters import ConfiguredFit, ConfiguredFitSeed, ConfiguredFitDownstream
+from TrackFitter.ConfiguredFitters import ConfiguredFitDownstream
 from PatAlgorithms import PatAlgConf
 
 from SelPy.utils import (UniquelyNamedObject,
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingIFT/StrippingHeavyIonTrackEffMuonTT.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingIFT/StrippingHeavyIonTrackEffMuonTT.py
index 56d4a18efe2b562eed3412a268bb47e35915eb37..3af84c0e2ed472dd795c0b18c8d095381ac3715c 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingIFT/StrippingHeavyIonTrackEffMuonTT.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingIFT/StrippingHeavyIonTrackEffMuonTT.py
@@ -63,10 +63,10 @@ __all__ = ('StrippingHeavyionTrackEffMuonTTConf',
            'filterHLT2ForBJpsiK')
 
 from Gaudi.Configuration import *
-from PhysSelPython.Wrappers import Selection, DataOnDemand, ChargedProtoParticleSelection
+from PhysSelPython.Wrappers import ChargedProtoParticleSelection, Selection
 from StrippingConf.StrippingLine import StrippingLine
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from StrippingUtils.Utils import LineBuilder, checkConfig
+from StrippingUtils.Utils import LineBuilder
 from StandardParticles import StdLooseKaons, StdLooseMuons, StdAllLooseMuons
 
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingIFT/StrippingHeavyIonTrackEffVeloMuon.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingIFT/StrippingHeavyIonTrackEffVeloMuon.py
index 0e07045325c58f87f6345eafe88988d9f7a3f147..7cd8b2c0d6f462f14fd64f8f6c50386fc74e091e 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingIFT/StrippingHeavyIonTrackEffVeloMuon.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingIFT/StrippingHeavyIonTrackEffVeloMuon.py
@@ -40,17 +40,14 @@ __all__ = ('HeavyIonTrackEffVeloMuonConf',
            )
 
 
-from Gaudi.Configuration import *
-from LHCbKernel.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 # from Configurables import CombineParticles
-from PhysSelPython.Wrappers import Selection, SelectionSequence, DataOnDemand
-from Configurables import ChargedProtoParticleMaker, NoPIDsParticleMaker, DataOnDemandSvc, DelegatingTrackSelector, TrackSelector, CombinedParticleMaker, BestPIDParticleMaker
+from PhysSelPython.Wrappers import Selection
+from Configurables import ChargedProtoParticleMaker, DataOnDemandSvc, DelegatingTrackSelector, NoPIDsParticleMaker, TrackSelector
 from Configurables import FastVeloTracking
 
 from StrippingConf.StrippingLine import StrippingLine
-from Configurables import TrackStateInitAlg, TrackEventFitter, TrackPrepareVelo, TrackContainerCopy, Tf__PatVeloSpaceTool, StandaloneMuonRec
-from Configurables import TrackCloneFinder
+from Configurables import StandaloneMuonRec, TrackPrepareVelo
 from StrippingUtils.Utils import LineBuilder
 # changed from StdLooseMuons, yanxi
 from StandardParticles import StdAllLooseMuons
@@ -59,14 +56,9 @@ from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, TisTosParticleT
 # from Configurables import TisTosParticleTagger
 
 from Configurables import GaudiSequencer
-from Configurables import TrackSys
-from PhysSelPython.Wrappers import AutomaticData
 # Get the fitters
-from TrackFitter.ConfiguredFitters import ConfiguredFit
 
-from Configurables import TrackEventCloneKiller, VeloMuonBuilder
-from Configurables import TrackEventFitter, TrackMasterFitter
-from Configurables import TrackKalmanFilter, TrackMasterExtrapolator
+from Configurables import VeloMuonBuilder
 # from TrackFitter.ConfiguredFitters import ConfiguredFastFitter
 # from Configurables import TrackCloneFinder
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingMiniBias/StrippingBadEvents.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingMiniBias/StrippingBadEvents.py
index 4d837a2f722d72d1c7683e8f61d6316db037f332..460036843530f41526b7139b73c204dba3cf9160 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingMiniBias/StrippingBadEvents.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingMiniBias/StrippingBadEvents.py
@@ -8,7 +8,6 @@
 # granted to it by virtue of its status as an Intergovernmental Organization  #
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
-from PhysSelPython.Wrappers import Selection
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 __author__ = 'Andrea Contu'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingMiniBias/StrippingMiniBias.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingMiniBias/StrippingMiniBias.py
index 7ba890fe41b117c0dcaaac7777296c741c397754..f791c6cd1cfac775c9b2357307a4044a5100eb87 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingMiniBias/StrippingMiniBias.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingMiniBias/StrippingMiniBias.py
@@ -8,7 +8,6 @@
 # granted to it by virtue of its status as an Intergovernmental Organization  #
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
-from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 __author__ = 'Patrick Koppenburg'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingQEE/DisplVertices_Utils.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingQEE/DisplVertices_Utils.py
index 96c2f57f73e7b9b1e76dbe63397e2210046dbfbd..38ecb854268d3d33d2086b442d573ac6517fd931 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingQEE/DisplVertices_Utils.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingQEE/DisplVertices_Utils.py
@@ -14,13 +14,12 @@ Utilities for displaced vertex stripping: wrapper class around PatPV3D
 
 __all__ = ("SelectionFromAlgorithmWithTools", "SelectionPatPV3DWrapper")
 
-from GaudiConfUtils import isConfigurable
 
 from SelPy.utils import (UniquelyNamedObject, ClonableObject, SelectionBase,
                          compatibleSequences, IncompatibleInputLocations,
-                         CloneCallable, makeOutputLocation, setOutputLocation)
+                         makeOutputLocation, setOutputLocation)
 
-from PhysSelPython.Wrappers import checkConfigurable, checkName
+from PhysSelPython.Wrappers import checkName
 
 
 def connectToRequiredSelections(selection, inputSetter):
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingQEE/StrippingA1MuMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingQEE/StrippingA1MuMu.py
old mode 100755
new mode 100644
index abe503359313f7d3122ef96d84150915e13aba4c..3eacb151a1458052c87f07b1310f376035f94132
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingQEE/StrippingA1MuMu.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingQEE/StrippingA1MuMu.py
@@ -22,11 +22,9 @@ A_1 -> mu+ mu-, based on functionality from StrippingDiMuonNew by Jibo He.
 
 """
 
-from Gaudi.Configuration import *
-from LHCbKernel.Configuration import *
 
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
-from PhysSelPython.Wrappers import Selection, DataOnDemand, SimpleSelection
+from PhysSelPython.Wrappers import SimpleSelection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from GaudiKernel.SystemOfUnits import MeV
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingQEE/StrippingA2MuMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingQEE/StrippingA2MuMu.py
index fb0c0e5bde7e9d42f576efe9574e89f0b25b1352..dbb90795e4701667afcb062a45650c23e39a212e 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingQEE/StrippingA2MuMu.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingQEE/StrippingA2MuMu.py
@@ -21,7 +21,7 @@ from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from StandardParticles import StdAllLooseMuons, StdAllNoPIDsMuons
+from StandardParticles import StdAllLooseMuons
 from GaudiKernel.SystemOfUnits import GeV
 
 default_config = {
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingQEE/StrippingA2MuMuSameSign.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingQEE/StrippingA2MuMuSameSign.py
index 0b9ad4036a8a1efcddc43f3605366c7e8d390b48..8593dce8251de65e8125a56be3f510899461f649 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingQEE/StrippingA2MuMuSameSign.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingQEE/StrippingA2MuMuSameSign.py
@@ -21,7 +21,7 @@ from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from StandardParticles import StdAllLooseMuons, StdAllNoPIDsMuons
+from StandardParticles import StdAllLooseMuons
 from GaudiKernel.SystemOfUnits import GeV
 
 default_config = {
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingQEE/StrippingB2LLP2HH.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingQEE/StrippingB2LLP2HH.py
index 3a1106bd62aadf5fe227262f7427cf483b7a92f9..458ae43447788d81e1f54bedab9ce400857754fb 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingQEE/StrippingB2LLP2HH.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingQEE/StrippingB2LLP2HH.py
@@ -20,13 +20,11 @@ __date__ = '25/01/2019'
 
 __all__ = ('B2LLPV0_sConf', 'default_config')
 
-from Gaudi.Configuration import *
 from StandardParticles import StdAllNoPIDsPions
 from PhysSelPython.Wrappers import CombineSelection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from GaudiKernel.SystemOfUnits import GeV
-from LoKiPhys.functions import SOURCE, SIZE
 
 default_config = {
     'NAME': 'B2LLPV0',
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingQEE/StrippingConvertedPhoton.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingQEE/StrippingConvertedPhoton.py
index ff470d2d68d8acbac080718b50f8ec5992aa1277..23dcde2c3661a33c459cf0c28b0b4c6b2d50908b 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingQEE/StrippingConvertedPhoton.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingQEE/StrippingConvertedPhoton.py
@@ -20,7 +20,7 @@ __all__ = ('ConvertedPhotonConf', 'default_config')
 
 from Gaudi.Configuration import *
 from CommonParticles.Utils import *
-from GaudiKernel.SystemOfUnits import MeV, GeV, mm
+from GaudiKernel.SystemOfUnits import MeV, mm
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
 from Configurables import (
     DiElectronMaker,
@@ -28,8 +28,7 @@ from Configurables import (
     ParticleTransporter,
     LoKi__VertexFitter,
 )
-from PhysSelPython.Wrappers import (Selection, SimpleSelection,
-                                    MergedSelection, AutomaticData)
+from PhysSelPython.Wrappers import (Selection, MergedSelection)
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingQEE/StrippingDY2MuMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingQEE/StrippingDY2MuMu.py
index 87815b149ed487be0e29a168b8cd1e83a2d7062f..98a521ed9af49eae4df29c7e66ad90a8e731565d 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingQEE/StrippingDY2MuMu.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingQEE/StrippingDY2MuMu.py
@@ -26,9 +26,8 @@ __author__ = ['J. Anderson']
 
 __all__ = 'DY2MuMuConf', 'default_config'
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-from PhysSelPython.Wrappers import Selection, SimpleSelection
+from PhysSelPython.Wrappers import SimpleSelection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from StandardParticles import StdAllLooseMuons
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingQEE/StrippingDY2ee.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingQEE/StrippingDY2ee.py
index 04dec7ea97eef81e8c032fef4a80fbf549a7016a..36bd711e12685876d348c8ba3b561241ecf2e1bc 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingQEE/StrippingDY2ee.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingQEE/StrippingDY2ee.py
@@ -20,9 +20,8 @@ __author__ = ['S.Bifani', 'D.Ward']
 
 __all__ = ('DY2eeConf', 'default_config')
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-from PhysSelPython.Wrappers import Selection, DataOnDemand
+from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from StandardParticles import StdAllNoPIDsElectrons
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingQEE/StrippingDisplJets.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingQEE/StrippingDisplJets.py
index 153e6a08fc0522eb4a46021b0a6b379d1c119505..594bbe8670b04bf181d93f97cb6e4c49bce6754d 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingQEE/StrippingDisplJets.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingQEE/StrippingDisplJets.py
@@ -9,8 +9,6 @@
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
 
-from Gaudi.Configuration import *
-from CommonParticles.Utils import *
 # from Configurables import FilterDesktop
 # from PhysSelPython.Wrappers import Selection, DataOnDemand, FilterSelection
 from StrippingConf.StrippingLine import StrippingLine
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingQEE/StrippingDisplVertices.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingQEE/StrippingDisplVertices.py
index adc6e51963c535e381c38c219f49b6cc33f3be9d..2fed6d3264f281fa2094960fa79385b29e34bdec 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingQEE/StrippingDisplVertices.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingQEE/StrippingDisplVertices.py
@@ -40,7 +40,6 @@ __all__ = ('DisplVerticesConf', 'default_config')
 
 from Gaudi.Configuration import *
 from GaudiKernel import SystemOfUnits as units
-from LHCbKernel.Configuration import DEBUG, VERBOSE
 
 import logging
 logger = logging.getLogger(__name__)
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingQEE/StrippingDitau.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingQEE/StrippingDitau.py
old mode 100755
new mode 100644
index 774669335119a9a7c61534f34240c273f191b236..344691f63922986ebf8c047347d2ff7246fb3369
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingQEE/StrippingDitau.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingQEE/StrippingDitau.py
@@ -154,8 +154,7 @@ Derived from works of S.Farry & P. Ilten
 
 """
 
-import os
-from GaudiKernel.SystemOfUnits import MeV, GeV, micrometer
+from GaudiKernel.SystemOfUnits import GeV, MeV
 from PhysSelPython.Wrappers import Selection, SimpleSelection, PassThroughSelection, MergedSelection, AutomaticData
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
@@ -936,7 +935,7 @@ def Tuples():
 
   """
     import re
-    from DecayTreeTuple.Configuration import DecayTreeTuple, EventTuple
+    from DecayTreeTuple.Configuration import DecayTreeTuple
 
     seq = GaudiSequencer('TupleSeq')
     seq.ModeOR = True
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingQEE/StrippingExotica.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingQEE/StrippingExotica.py
old mode 100755
new mode 100644
index 544d195e6128309244c2f0542c06359cabc9f2f6..0212fcbde49bb732638a9f83eafa0910648cd63b
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingQEE/StrippingExotica.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingQEE/StrippingExotica.py
@@ -33,7 +33,7 @@ Hlt2ExoticaEtaToDiEGamma
 from GaudiKernel.SystemOfUnits import MeV, GeV, mm, picosecond
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-from PhysSelPython.Wrappers import Selection, SimpleSelection, MergedSelection, AutomaticData
+from PhysSelPython.Wrappers import AutomaticData, SimpleSelection
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingQEE/StrippingFullDiJets.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingQEE/StrippingFullDiJets.py
index 1e54dc4e2fad7924399b2b4775d0d6fb951bfc0d..bebda7a47815b284905127138fece6475cc118ef 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingQEE/StrippingFullDiJets.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingQEE/StrippingFullDiJets.py
@@ -9,14 +9,10 @@
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
 
-from Gaudi.Configuration import *
-from Configurables import FilterDesktop, CombineParticles, LoKi__VertexFitter
+from Configurables import CombineParticles, LoKi__VertexFitter
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from StandardParticles import StdJets
-from CommonParticles.Utils import *
-from Configurables import FilterJet
 from GaudiKernel.SystemOfUnits import GeV
 
 __author__ = "Xabier Cid Vidal", "Cedric Potterat", "William Barter"
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingQEE/StrippingGluinos.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingQEE/StrippingGluinos.py
index cce1aef99f43134e31fba47d2da7f03efdc613f0..6ecf1b2aeb4830730c6e516e948fbb385438e36f 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingQEE/StrippingGluinos.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingQEE/StrippingGluinos.py
@@ -15,11 +15,10 @@ __all__ = ('GluinosJetsConf', 'default_config')
 
 from Gaudi.Configuration import *
 from StandardParticles import StdJets
-from PhysSelPython.Wrappers import FilterSelection, PassThroughSelection, DataOnDemand
+from PhysSelPython.Wrappers import FilterSelection, PassThroughSelection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from GaudiKernel.SystemOfUnits import GeV
-from LoKiPhys.functions import SOURCE, SIZE
 from CommonParticles.Utils import *
 from Configurables import FilterDesktop, JetVertexAlg
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingQEE/StrippingLFVExotica.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingQEE/StrippingLFVExotica.py
old mode 100755
new mode 100644
index 0b04ec6ed0781154cc6991a1b147a28a81e9385a..1e18590e79ff5c8ebf1464abd69557f5104e0401
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingQEE/StrippingLFVExotica.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingQEE/StrippingLFVExotica.py
@@ -171,7 +171,7 @@ def create_stdjets(strob, line_location, stdjets_name_ban):
         strob.StdJetsNoJetIDBan = [myconf1]
 
     # configure Data-On-Demand service
-    locations = updateDoD(myconf1)
+    updateDoD(myconf1)
 
 
 relInfoJetsVars = [
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingQEE/StrippingLLP2HH.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingQEE/StrippingLLP2HH.py
index cbb3d601d46ef4105435903a6c9f13438b8a2520..0a07d3ff43e1c8fbcbabe32fd722c27f2216e3fe 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingQEE/StrippingLLP2HH.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingQEE/StrippingLLP2HH.py
@@ -18,13 +18,11 @@ __date__ = '24/01/2019'
 
 __all__ = ('LLPV0_sConf', 'default_config')
 
-from Gaudi.Configuration import *
 from StandardParticles import StdAllNoPIDsPions
 from PhysSelPython.Wrappers import CombineSelection, PassThroughSelection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from GaudiKernel.SystemOfUnits import GeV
-from LoKiPhys.functions import SOURCE, SIZE
 
 default_config = {
     'NAME': 'LLPV0',
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingQEE/StrippingLLP2Jets.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingQEE/StrippingLLP2Jets.py
index ad5869ed214adcbde275b0c3ad4c7000508947ad..05b9288c09ef152fafa5462ae40861122b2a48ab 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingQEE/StrippingLLP2Jets.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingQEE/StrippingLLP2Jets.py
@@ -18,7 +18,6 @@ __date__ = '25/01/2019'
 
 __all__ = ('LLP2Jets_sConf', 'default_config')
 
-from Gaudi.Configuration import *
 from Configurables import JetVertexAlg
 from StandardParticles import StdJets
 from CommonParticles.Utils import updateDoD
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingQEE/StrippingLLP2MuX.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingQEE/StrippingLLP2MuX.py
index 1fe569976baccf5738ded8f9e14ba38e2062bce1..d224b684cf3b12e8b7e63ec633e51105e156d9cd 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingQEE/StrippingLLP2MuX.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingQEE/StrippingLLP2MuX.py
@@ -15,7 +15,6 @@ __author__ = "Pieter David"
 __date__ = "2014-08-28"
 __all__ = ("LLP2MuXConf", "default_config")
 
-from LHCbKernel.Configuration import *
 from GaudiKernel import SystemOfUnits as units
 
 from PhysSelPython.Wrappers import AutomaticData, Selection
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingQEE/StrippingLb2dp.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingQEE/StrippingLb2dp.py
old mode 100755
new mode 100644
index e9720d9e0d4ced6c0005bb768400a9b5a837b6cb..71e00421e9099135e65173a6ccef16e12d6db41b
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingQEE/StrippingLb2dp.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingQEE/StrippingLb2dp.py
@@ -20,15 +20,11 @@ __version__ = 'v2r1'
 
 __all__ = ('Lb2dpConf', 'default_config')
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop
-from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays
 
-from StandardParticles import StdAllNoPIDsPions, StdAllNoPIDsProtons, StdAllNoPIDsKaons
 from PhysSelPython.Wrappers import Selection, DataOnDemand, SimpleSelection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from Configurables import LoKi__VoidFilter as VoidFilter
 
 default_config = {
     'NAME': 'Lb2dp',
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingQEE/StrippingMicroDiJets.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingQEE/StrippingMicroDiJets.py
index 53504471c8e931317af19ca7d746e2d2abe8d5f7..48a3e7beab4c76bee2a321cba6add6aef3c3ca13 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingQEE/StrippingMicroDiJets.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingQEE/StrippingMicroDiJets.py
@@ -10,13 +10,12 @@
 ###############################################################################
 
 from Gaudi.Configuration import *
-from Configurables import FilterDesktop, CombineParticles, LoKi__VertexFitter
+from Configurables import CombineParticles
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from StandardParticles import StdJets
 from CommonParticles.Utils import *
-from Configurables import FilterJet, ClearDaughters
+from Configurables import ClearDaughters
 from GaudiKernel.SystemOfUnits import GeV
 
 __author__ = "Xabier Cid Vidal", "Cedric Potterat", "William Barter"
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingQEE/StrippingMuMuSS.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingQEE/StrippingMuMuSS.py
index 431547890dd20f39862974d095aa8d3b16fa4e71..40f9804480afd1b456501ad2ecf96958b9b00306 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingQEE/StrippingMuMuSS.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingQEE/StrippingMuMuSS.py
@@ -26,7 +26,7 @@ __author__ = (
 )
 
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-from PhysSelPython.Wrappers import Selection, SimpleSelection
+from PhysSelPython.Wrappers import SimpleSelection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from StandardParticles import StdAllLooseMuons
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingQEE/StrippingSbarSCorrelations.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingQEE/StrippingSbarSCorrelations.py
index 29103497b00fb1fd631b389a1828c38468beab4b..2ebd6f4795d6389519bf74a08d6ae9e8f730d6ff 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingQEE/StrippingSbarSCorrelations.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingQEE/StrippingSbarSCorrelations.py
@@ -23,10 +23,8 @@ __date__ = '24/08/2013'
 __version__ = '$Revision: 1.0 $'
 __all__ = ('SbarSCorrelationsConf', 'default_config')
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from StandardParticles import StdAllNoPIDsPions, StdTightKaons, StdAllNoPIDsProtons
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
+from PhysSelPython.Wrappers import DataOnDemand, Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from GaudiKernel.SystemOfUnits import MeV, GeV
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingQEE/StrippingStrangeBaryons.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingQEE/StrippingStrangeBaryons.py
index 840a332bb95130322ebeeacf51c7ce137afe692e..b11f2d20b979fdfb88cfaa78037a6ede6fe85ddb 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingQEE/StrippingStrangeBaryons.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingQEE/StrippingStrangeBaryons.py
@@ -23,14 +23,10 @@ __date__ = '26/06/2012'
 __version__ = '$Revision: 0.3 $'
 __all__ = ('StrippingStrangeBaryonsConf', 'default_config')
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from StandardParticles import StdLoosePions, StdNoPIDsDownPions, StdLooseKaons, StdLooseDownKaons, StdLooseProtons, StdNoPIDsDownProtons
-from CommonParticles import StdLooseLambda
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
+from PhysSelPython.Wrappers import DataOnDemand, Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from GaudiKernel.SystemOfUnits import MeV
 
 default_config = {
     'NAME': 'StrangeBaryons',
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingQEE/StrippingStrangeBaryonsNoPID.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingQEE/StrippingStrangeBaryonsNoPID.py
index 13d95b4418ce78b3e4267b8fe1d395645df53fdd..28c41c8196b437671af596b33c5ff1039546de59 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingQEE/StrippingStrangeBaryonsNoPID.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingQEE/StrippingStrangeBaryonsNoPID.py
@@ -23,12 +23,10 @@ __date__ = '13/01/2014'
 __version__ = '$Revision: 0.0 $'
 __all__ = ('StrippingStrangeBaryonsNoPIDConf', 'default_config')
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
+from PhysSelPython.Wrappers import DataOnDemand, Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from GaudiKernel.SystemOfUnits import MeV
 
 default_config = {
     'NAME': 'StrangeBaryonsNoPID',
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingQEE/StrippingTaggedJets.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingQEE/StrippingTaggedJets.py
old mode 100755
new mode 100644
index 795832ef101973402b32eed0cf236b0c8fe9113d..fb75194bafe04c781ae4135e8952e89fe988678f
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingQEE/StrippingTaggedJets.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingQEE/StrippingTaggedJets.py
@@ -10,11 +10,10 @@
 ###############################################################################
 
 from Gaudi.Configuration import *
-from Configurables import FilterDesktop, CombineParticles, LoKi__VertexFitter
+from Configurables import CombineParticles, LoKi__VertexFitter
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from StandardParticles import StdJets
 from CommonParticles.Utils import *
 from Configurables import FilterJet
 from GaudiKernel.SystemOfUnits import GeV
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingQEE/StrippingW2nH.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingQEE/StrippingW2nH.py
index 7de8fc5d98991b45cf653570e60060825876567a..8a3b772f636664161ba9a5347e87c69830cd676c 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingQEE/StrippingW2nH.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingQEE/StrippingW2nH.py
@@ -25,7 +25,6 @@ from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from StandardParticles import StdAllNoPIDsPions
 from GaudiKernel.SystemOfUnits import GeV
-from GaudiKernel.SystemOfUnits import MeV
 
 default_config = {
     'NAME': 'W2nH',
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingQEE/StrippingWJets.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingQEE/StrippingWJets.py
old mode 100755
new mode 100644
index 043f1547c9b13a4b480f39eba3a2db3e1163a118..94742800d76e6a7cdbff25a473322b23cdf8819a
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingQEE/StrippingWJets.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingQEE/StrippingWJets.py
@@ -22,14 +22,12 @@ They are then cover a phasespace complementarily on each other.
 
 """
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
 from Configurables import CombineParticles, LoKi__VertexFitter
 from PhysSelPython.Wrappers import Selection, SimpleSelection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from StandardParticles import StdAllLooseMuons, StdAllNoPIDsElectrons, StdJets
-from CommonParticles.Utils import *
 from GaudiKernel.SystemOfUnits import GeV, MeV
 
 __author__ = "Xabier Cid Vidal"
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingQEE/StrippingWRareDecay.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingQEE/StrippingWRareDecay.py
index 54df080283962944cdd4c56e31d205c882182fc7..e2ae1d62d7a73b722d0c46e08077a587bf00ae73 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingQEE/StrippingWRareDecay.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingQEE/StrippingWRareDecay.py
@@ -22,8 +22,7 @@ __version__ = '$Revision: 2.0 $'
 
 __all__ = 'default_config', 'WRareDecayConf'
 
-from Gaudi.Configuration import *
-from GaudiKernel.SystemOfUnits import MeV, GeV, mm, picosecond
+from GaudiKernel.SystemOfUnits import MeV, picosecond
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
 from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
 from StrippingConf.StrippingLine import StrippingLine
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingQEE/StrippingWe.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingQEE/StrippingWe.py
index 59f63e96c4976855f2369e7bb422bc9d1a8ed49f..c42ba0b0d3f7fcbeebf74859905d20c1704f2d49 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingQEE/StrippingWe.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingQEE/StrippingWe.py
@@ -21,7 +21,6 @@ We control: StdAllNoPIDsElectrons, PRS>50Mev & E_ECal/P>0.1 & E_HCal/P<0.05 & pT
 __all__ = 'WeConf', 'default_config'
 __author__ = 'S. Bifani', 'D. Ward'
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
 from PhysSelPython.Wrappers import SimpleSelection
 from StrippingConf.StrippingLine import StrippingLine
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingQEE/StrippingZ02ee.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingQEE/StrippingZ02ee.py
index 0f6bc7a98fee17e01830d4327504b1524e06ec84..1abd32cad5da9bd00b29ad3dcd3763ddd9f9b42b 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingQEE/StrippingZ02ee.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingQEE/StrippingZ02ee.py
@@ -23,7 +23,6 @@ __all__ = (
     'default_config',
 )
 
-from Gaudi.Configuration import *
 from GaudiKernel.SystemOfUnits import GeV, MeV
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 from PhysSelPython.Wrappers import SimpleSelection
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingQEE/StrippingZ02nH.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingQEE/StrippingZ02nH.py
index 447780b6cac5c0f6861741d621d1aa0d0fa1258a..b1f0290f055986c6990926ef39c95ef00c08f479 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingQEE/StrippingZ02nH.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingQEE/StrippingZ02nH.py
@@ -25,7 +25,6 @@ from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from StandardParticles import StdAllNoPIDsPions
 from GaudiKernel.SystemOfUnits import GeV
-from GaudiKernel.SystemOfUnits import MeV
 
 default_config = {
     'NAME': 'Z02nH',
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingQEE/StrippingZ0RareDecay.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingQEE/StrippingZ0RareDecay.py
index ab636e06a8665d27e9527e63a2283bdf07caa5dc..4b366b8cb379754fb214b3ec2942433b8d3f9c2c 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingQEE/StrippingZ0RareDecay.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingQEE/StrippingZ0RareDecay.py
@@ -22,8 +22,7 @@ __version__ = '$Revision: 2.0 $'
 
 __all__ = 'default_config', 'Z0RareDecayConf'
 
-from Gaudi.Configuration import *
-from GaudiKernel.SystemOfUnits import MeV, GeV, mm
+from GaudiKernel.SystemOfUnits import MeV
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
 from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
 from StrippingConf.StrippingLine import StrippingLine
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingQEE/depreciated/StrippingDijets.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingQEE/depreciated/StrippingDijets.py
index f55d8734a938685c0ec76ac2af3183cf9799d2d3..0f8c3d7c3d59e597ace36ffca0b9acc5da6d67b3 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingQEE/depreciated/StrippingDijets.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingQEE/depreciated/StrippingDijets.py
@@ -14,8 +14,7 @@
 
 __all__ = ('DijetsConf', 'default_config')
 
-from Gaudi.Configuration import *
-from GaudiKernel.SystemOfUnits import MeV, GeV, mm
+from GaudiKernel.SystemOfUnits import GeV, MeV
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingQEE/depreciated/StrippingHighPtTopoJets.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingQEE/depreciated/StrippingHighPtTopoJets.py
index cc4053e60549f8b04bc10755d8efa01db3f8ad84..ebb09a00758373cf01d149b4d83255b7a9b62799 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingQEE/depreciated/StrippingHighPtTopoJets.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingQEE/depreciated/StrippingHighPtTopoJets.py
@@ -20,8 +20,6 @@ __all__ = ('default_config', 'HighPtTopoJetsConf')
 
 # \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\#
 
-from Gaudi.Configuration import *
-from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from PhysSelPython.Wrappers import EventSelection
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingQEE/depreciated/StrippingJets.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingQEE/depreciated/StrippingJets.py
index f4449288c9497cfabcbcf6600cced56c6a67c113..fe0b8c3cb36b8e0698ff2cb3f95cdfedd2ea4c9f 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingQEE/depreciated/StrippingJets.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingQEE/depreciated/StrippingJets.py
@@ -14,13 +14,11 @@
 
 __all__ = ('JetsConf', 'default_config')
 
-from Gaudi.Configuration import *
-from GaudiKernel.SystemOfUnits import MeV, GeV, mm
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
+from GaudiKernel.SystemOfUnits import GeV, MeV
+from PhysSelPython.Wrappers import MergedSelection, Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
-from JetAccessories.JetMaker_Config import JetMakerConf
 from StandardParticles import StdJets, StdAllNoPIDsPions
 from Configurables import CombineParticles
 from Configurables import TopologicalTagging
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingQEE/depreciated/StrippingZ02nH.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingQEE/depreciated/StrippingZ02nH.py
index 447780b6cac5c0f6861741d621d1aa0d0fa1258a..b1f0290f055986c6990926ef39c95ef00c08f479 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingQEE/depreciated/StrippingZ02nH.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingQEE/depreciated/StrippingZ02nH.py
@@ -25,7 +25,6 @@ from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from StandardParticles import StdAllNoPIDsPions
 from GaudiKernel.SystemOfUnits import GeV
-from GaudiKernel.SystemOfUnits import MeV
 
 default_config = {
     'NAME': 'Z02nH',
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/Beauty2Charm_LoKiCuts.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/Beauty2Charm_LoKiCuts.py
index ce5265655cf518aa12121d3a5728d84c36da26cd..666cef80aacee423a071365fe7281c63e506e27d 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/Beauty2Charm_LoKiCuts.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/Beauty2Charm_LoKiCuts.py
@@ -10,11 +10,6 @@
 ###############################################################################
 # \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\#
 
-from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
-from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-from PhysSelPython.Wrappers import Selection, MergedSelection
-from StandardParticles import StdNoPIDsPions, StdNoPIDsKaons
 
 # \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\#
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingB02Lcmu_pKpi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingB02Lcmu_pKpi.py
index 3d6992fd337683bf5bcf97e994e4fd64705add4f..93bd54fbf8871329e8e7bcb95f7722d9913e1cff 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingB02Lcmu_pKpi.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingB02Lcmu_pKpi.py
@@ -14,7 +14,6 @@ from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = ['Nikita Beliy', 'Jibo He']
 __date__ = '28/11/2016'
 __version__ = '$Revision: 1.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingB23MuLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingB23MuLines.py
index a6e53abda621d1f1b0efe6185553c1b46aae67e6..15ea2076dcaea1a75c4fec8295e895be19887b4a 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingB23MuLines.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingB23MuLines.py
@@ -55,13 +55,11 @@ __all__ = ("B23MuLinesConf",
 
 #############################################################################
 
-from Gaudi.Configuration import *
-from Configurables import FilterDesktop, CombineParticles, DaVinci__N3BodyDecays
+from Configurables import DaVinci__N3BodyDecays
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 # from StrippingSelections.Utils import checkConfig
-from GaudiKernel.PhysicalConstants import c_light
 
 #############################################################################
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingB2EtaMuMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingB2EtaMuMu.py
index f381d03d4c48f11bd00893be7f33743af8c8f237..ba15a0b21f0277cd2962cbc8596db2f5b1d9392a 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingB2EtaMuMu.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingB2EtaMuMu.py
@@ -12,13 +12,12 @@
 B->etamumuselection
 '''
 
-from StandardParticles import StdAllNoPIDsMuons, StdAllLooseMuons
+from StandardParticles import StdAllNoPIDsMuons
 from StandardParticles import StdNoPIDsPions, StdLooseAllPhotons, StdLooseMergedPi0, StdLooseResolvedPi0
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand, SimpleSelection, MergedSelection
+from PhysSelPython.Wrappers import MergedSelection, Selection, SimpleSelection
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = ['Fred Blanc']
 __date__ = '12/03/2019'
 __version__ = '$Revision: 1.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingB2KLLXInclusive.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingB2KLLXInclusive.py
index a9d2ffd4e4d8d6444da6c3df3731248c13fce6e7..61a740d6b5d3d92a7f2015b59a5021738a7a2958 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingB2KLLXInclusive.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingB2KLLXInclusive.py
@@ -19,15 +19,12 @@ __all__ = ('B2KLLXInclusiveConf', 'default_config')
 Stripping selection for inclusively selected B->KmumuX decays.
 """
 
-from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop
+from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
 
 from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from LHCbKernel.Configuration import *  # check if needed
-from Configurables import SubstitutePID
-from Configurables import SubPIDMMFilter
 
 
 #################
@@ -333,7 +330,6 @@ class B2KLLXInclusiveConf(LineBuilder):
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         CombineDiMuon = CombineParticles()
         CombineDiMuon.DecayDescriptors = ["[B+ -> J/psi(1S) K+]cc"]
-        sel_name = "InclKLL"
         CombineDiMuon.MotherCut = self.InclKLLCut
         # choose
         leptons = self.InclLeptons
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingB2KstTauTau.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingB2KstTauTau.py
index 0e62fb1a13ae5f9586b34995cc3f4f00d8de7dee..a236059c8ca69aa4aaf625cf6925165cda17c83a 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingB2KstTauTau.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingB2KstTauTau.py
@@ -15,8 +15,7 @@ from StandardParticles import StdTightMuons
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, OfflineVertexFitter, DaVinci__N3BodyDecays
-from Gaudi.Configuration import *
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N3BodyDecays, FilterDesktop
 __author__ = [' G. Mancinelli, J. Serrano']
 __date__ = '15/08/2014'
 __version__ = '$Revision: 0.1 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingB2LLXBDT.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingB2LLXBDT.py
index a54a8d62db8142ab3d222eadcd0fbb7cf94ce5ef..8222b357dbb8dec476454f264b2be33bb01560f5 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingB2LLXBDT.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingB2LLXBDT.py
@@ -19,9 +19,7 @@ Note:
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, MergedSelection
-from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = ['Jibo He']
 __date__ = '20/11/2015'
 __version__ = '$Revision: 1.0 $'
@@ -303,7 +301,7 @@ class B2LLXBDTConf(LineBuilder):
         """
         Kshort, both LL and DD
         """
-        from StandardParticles import StdLooseKsDD, StdLooseKsLL
+        from StandardParticles import StdLooseKsDD
 
         self.SelKsDD = self.createSubSel(
             OutputList=self.name + "SelKsDD",
@@ -337,7 +335,7 @@ class B2LLXBDTConf(LineBuilder):
         """
         Lambda, both LL and DD
         """
-        from StandardParticles import StdLooseLambdaDD, StdLooseLambdaLL
+        from StandardParticles import StdLooseLambdaDD
 
         self.SelLambdaDD = self.createSubSel(
             OutputList=self.name + "SelLambdaDD",
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingB2Lambda0ELines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingB2Lambda0ELines.py
index dcb376b6317e21a82d05511d6642d51a9139b1e0..beaae1e2b2d8fdb3ab6922b0b597f4f3735074b1 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingB2Lambda0ELines.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingB2Lambda0ELines.py
@@ -21,7 +21,6 @@ __all__ = ('B2Lambda0ELines',
            'default_config')
 
 from StandardParticles import StdLoosePions, StdLooseElectrons, StdNoPIDsDownElectrons, StdNoPIDsDownPions
-from Configurables import TisTosParticleTagger
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingB2Lambda0MuLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingB2Lambda0MuLines.py
index e758feafbbaf38bbf2c16b62697aeccc5044b5c0..8c8ebee90e957bb0642c7fb649a57f03d93eef97 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingB2Lambda0MuLines.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingB2Lambda0MuLines.py
@@ -21,7 +21,6 @@ __all__ = ('B2Lambda0MuLines',
            'default_config')
 
 from StandardParticles import StdLoosePions, StdLooseMuons, StdLooseDownMuons, StdNoPIDsDownPions
-from Configurables import TisTosParticleTagger
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingB2Lambda0MuOSLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingB2Lambda0MuOSLines.py
index 389b9bf695c2932c173a4ee768404acc14c2b153..4186a8554984cb039f3d149cda4700f95f9a9753 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingB2Lambda0MuOSLines.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingB2Lambda0MuOSLines.py
@@ -21,7 +21,6 @@ __all__ = ('B2Lambda0MuOSLines',
            'default_config')
 
 from StandardParticles import StdLoosePions, StdLooseMuons, StdLooseDownMuons, StdNoPIDsDownPions
-from Configurables import TisTosParticleTagger
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingB2Lambda0SSMuMu3PiLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingB2Lambda0SSMuMu3PiLines.py
index b829fcd48cd4d244f39b998208c83dfea4c65343..f47c81735abc7cb47558594658aaf83f1ca7bc36 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingB2Lambda0SSMuMu3PiLines.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingB2Lambda0SSMuMu3PiLines.py
@@ -21,7 +21,6 @@ __all__ = ('B2Lambda0SSMuMu3PiLines',
            'default_config')
 
 from StandardParticles import StdLoosePions, StdLooseMuons, StdLooseDownMuons, StdNoPIDsDownPions
-from Configurables import TisTosParticleTagger
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingB2MuMuMuMuLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingB2MuMuMuMuLines.py
index e8be535494b2f042b5e0ac87439ef9f4f7c4bd9d..e6a830521e3233715c6896a50d0ffe4616617755 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingB2MuMuMuMuLines.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingB2MuMuMuMuLines.py
@@ -19,7 +19,7 @@ from Beauty2Charm_LoKiCuts import LoKiCuts
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
-from Configurables import FilterDesktop, CombineParticles
+from Configurables import CombineParticles
 from Gaudi.Configuration import *
 __author__ = ['Diego Martinez Santos', 'Johannes Albrecht',
               'Konstantinos A. Petridis', 'Alexander Baranov']
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingB2XLL.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingB2XLL.py
old mode 100755
new mode 100644
index 893c8f7d24822aaf5128c145a0ea679b0efd25cc..54c9d8dbdf1774215b4f2574855ce20420b67924
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingB2XLL.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingB2XLL.py
@@ -10,9 +10,8 @@
 ###############################################################################
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection, AutomaticData
+from PhysSelPython.Wrappers import MergedSelection, Selection
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = 'Raja Nandakumar, Fergus Wilson, Stefania Ricciardi'
 __date__ = '04/11/2015'
 __version__ = '$Revision: 0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingB2XMuMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingB2XMuMu.py
index d4fe321dc6b6467f22d50384ab0c3055ac1359bc..976ac58d3d5f0c7d376f6245456b23b6eb4144a3 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingB2XMuMu.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingB2XMuMu.py
@@ -18,7 +18,6 @@ __version__ = '$Revision: 1.2 $'
 
 __all__ = ('B2XMuMuConf', 'default_config')
 
-from Gaudi.Configuration import *
 from LHCbKernel.Configuration import *  # check if needed
 
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop, DaVinci__N3BodyDecays, DaVinci__N4BodyDecays
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingB2XTau.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingB2XTau.py
index 89967ffc1bd10cb56544c7233004d1b229731f9c..9050443393da5af1c9abb3eee3ba2e1eda76009d 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingB2XTau.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingB2XTau.py
@@ -8,16 +8,13 @@
 # granted to it by virtue of its status as an Intergovernmental Organization  #
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
-from StandardParticles import StdAllLoosePions, StdAllNoPIDsPions
-from copy import deepcopy
 from StandardParticles import StdLooseKaons
-from StandardParticles import StdLoosePions, StdTightPions
-from StandardParticles import StdNoPIDsKaons, StdNoPIDsPions, StdTightMuons
+from StandardParticles import StdLoosePions
+from StandardParticles import StdNoPIDsPions, StdTightMuons
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, OfflineVertexFitter, DaVinci__N3BodyDecays
-from Gaudi.Configuration import *
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N3BodyDecays, FilterDesktop
 __author__ = ['G. Dujany, G. Mancinelli, J. Serrano']
 __date__ = '24/05/2010,15/01/2014, 19/10/2017'
 __version__ = '$Revision: 1.3 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingB2XTauMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingB2XTauMu.py
index 1539daf38aad3280d179e42101b30c7b9367dc90..3bf392ac2eb839b14fbb1f75d9e94e760e94edd9 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingB2XTauMu.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingB2XTauMu.py
@@ -25,8 +25,6 @@ __all__ = ('B2XTauMuConf',
            'default_config')
 
 
-from Gaudi.Configuration import *
-
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
 from PhysSelPython.Wrappers import Selection, MergedSelection
 from StrippingConf.StrippingLine import StrippingLine
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingB2XTauTau.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingB2XTauTau.py
index 44cd40b223f3cc0f18f50a09a1e6f2fad19f1ae6..f25de253e9360d45277265567601c6f09dd87a01 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingB2XTauTau.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingB2XTauTau.py
@@ -14,8 +14,7 @@ from StandardParticles import StdNoPIDsPions, StdLoosePions
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand, SimpleSelection
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, OfflineVertexFitter, DaVinci__N3BodyDecays
-from Gaudi.Configuration import *
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N3BodyDecays, FilterDesktop
 __author__ = [' L. Pescatore', 'F. Blanc']
 __date__ = '12/03/2019'
 __version__ = '$Revision: 0.1$'
@@ -23,7 +22,6 @@ __version__ = '$Revision: 0.1$'
 # Stripping line for B->Htautau
 
 from GaudiKernel.SystemOfUnits import MeV
-from GaudiKernel.SystemOfUnits import mm
 """
   B->KstarTauTau, B->KTauTau, B->PhiTauTau, B->Eta'TauTau
 """
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingBLVLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingBLVLines.py
index 8bf68933cf866f19e4931849021862745276afe7..a5196ce34b14f3f32b717e3c7fcb254e2f21f2fa 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingBLVLines.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingBLVLines.py
@@ -95,8 +95,7 @@ __all__ = ("BLVLinesConf",
 
 ###################################################################################################
 
-from Gaudi.Configuration import *
-from Configurables import FilterDesktop, CombineParticles, DaVinci__N3BodyDecays
+from Configurables import CombineParticles, DaVinci__N3BodyDecays
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingBd2KSLLX.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingBd2KSLLX.py
index 419b0f7505b9bb8f7a0008bd6bd040167c12c60a..54c987ef8b72fd7e148a11fb44cebadb12188639 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingBd2KSLLX.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingBd2KSLLX.py
@@ -10,9 +10,8 @@
 ###############################################################################
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection, AutomaticData
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, DaVinci__N3BodyDecays
-from Gaudi.Configuration import *
+from PhysSelPython.Wrappers import MergedSelection, Selection
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop
 __author__ = 'SB'
 __date__ = '08/10/2017'
 __version__ = '$Revision: 1 $'
@@ -47,15 +46,8 @@ class Bd2KSLLXConf(LineBuilder):
         mmXLine_name = name + "_mm"
         eeXLine_name = name + "_ee"
 
-        from StandardParticles import StdLoosePions as Pions
-        from StandardParticles import StdLooseKaons as Kaons
-        from StandardParticles import StdLooseKstar2Kpi as Kstars
-        from StandardParticles import StdLoosePhi2KK as Phis
         from StandardParticles import StdLooseKsLL as KshortsLL
         from StandardParticles import StdLooseKsDD as KshortsDD
-        from StandardParticles import StdLooseLambdaLL as LambdasLL
-        from StandardParticles import StdLooseLambdaDD as LambdasDD
-        from StandardParticles import StdLooseLambdastar2pK as Lambdastars
 
         SelKshortsLL = self._filterHadron(name="KshortsLLFor" + self._name,
                                           sel=KshortsLL,
@@ -64,12 +56,10 @@ class Bd2KSLLXConf(LineBuilder):
                                           sel=KshortsDD,
                                           params=config)
 
-        from StandardParticles import StdDiElectronFromTracks as DiElectronsFromTracks
         from StandardParticles import StdLooseDiElectron as DiElectrons
         from StandardParticles import StdLooseDiMuon as DiMuons
 
-        ElecID = "(PIDe > %(PIDe)s)" % config
-        MuonID = "(HASMUON)&(ISMUON)"
+        "(PIDe > %(PIDe)s)" % config
 
         DiElectronID = "(2 == NINTREE((ABSID==11)&(PIDe > %(PIDe)s)))" % config
         DiMuonID = "(2 == NINTREE((ABSID==13)&(HASMUON)&(ISMUON)))"
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingBd2eeKstarBDT.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingBd2eeKstarBDT.py
index 1a6b3547113e58f48bff1e36952cfc3fb4d30295..6776dcdf27807a56103010584c7a22734b4a8a3f 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingBd2eeKstarBDT.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingBd2eeKstarBDT.py
@@ -18,7 +18,6 @@ from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = ['Marie-Helene Schune', 'Jibo He']
 __date__ = '20/01/2012'
 __version__ = '$Revision: 1.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingBeauty2XGamma.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingBeauty2XGamma.py
index d21b9a25bc2714ed14237d6218c1dad601dc1240..05e9c9cf0af28c167f2cc98f655c56f432f3ea6b 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingBeauty2XGamma.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingBeauty2XGamma.py
@@ -12,7 +12,7 @@
 B-> X Gamma selections
 '''
 
-from StandardParticles import StdAllNoPIDsKaons, StdAllNoPIDsPions, StdLooseAllPhotons, StdLooseMergedPi0, StdLooseResolvedPi0, StdAllLooseGammaDD, StdAllLooseGammaLL, StdAllNoPIDsProtons
+from StandardParticles import StdAllLooseGammaDD, StdAllLooseGammaLL, StdAllNoPIDsPions, StdLooseAllPhotons, StdLooseMergedPi0, StdLooseResolvedPi0
 from Configurables import TisTosParticleTagger
 from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays as Combine4Particles
 from GaudiConfUtils.ConfigurableGenerators import DaVinci__N3BodyDecays as Combine3Particles
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingBs2MuMuGamma.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingBs2MuMuGamma.py
index 0cfb5425d7a51fe618e72a66a2e6e2062510e41d..f1f37c46035071eccb7cf880d283aafb532e0b8f 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingBs2MuMuGamma.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingBs2MuMuGamma.py
@@ -15,7 +15,7 @@ Authors: Meril Reboud, Jean-Francois Marchand
 """
 
 ########################################################################
-from StrippingUtils.Utils import LineBuilder, checkConfig
+from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Combine3BodySelection
 from StandardParticles import StdLooseMuons, StdLooseAllPhotons
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingBs2MuMuLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingBs2MuMuLines.py
index 28fab868cccc6d58e46553f2585cd743326a977c..8bf0a80a0ffc3aa0267bf6dfb6cc948d4a90331a 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingBs2MuMuLines.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingBs2MuMuLines.py
@@ -26,7 +26,7 @@ from Gaudi.Configuration import *
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
-from Configurables import FilterDesktop, CombineParticles
+from Configurables import CombineParticles
 from JetAccessories.JetMaker_Config import JetMakerConf
 from CommonParticles.Utils import *
 from Gaudi.Configuration import *
@@ -159,7 +159,7 @@ def create_stdjets(strob, line_location, stdjets_name_ban, stdjets_name_addb):
         strob.StdJetsNoJetIDBan = [myconf1]
 
     # configure Data-On-Demand service
-    locations = updateDoD(myconf1)
+    updateDoD(myconf1)
 
     myconf2 = JetMakerConf(stdjets_name_addb,
                            Inputs=['Phys/PFParticles/Particles', line_location],
@@ -173,7 +173,7 @@ def create_stdjets(strob, line_location, stdjets_name_ban, stdjets_name_addb):
         strob.StdJetsNoJetIDAddB = [myconf2]
 
     # configure Data-On-Demand service
-    locations = updateDoD(myconf2)
+    updateDoD(myconf2)
 
 ##########################################
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingBs2gammagamma.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingBs2gammagamma.py
index a19590514ce1912b186311ffed8d51783a633f9c..5dd7a2cdce789ca4b9dbc99b6ec9ffef3e98e01e 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingBs2gammagamma.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingBs2gammagamma.py
@@ -21,16 +21,11 @@ Exports the following stripping lines as instance data members:
 - Bs2gammagamma_NoConvWideLine  : wide line with 0 conversions
 '''
 
-from Configurables import (DiElectronMaker, ProtoParticleCALOFilter,
-                           ParticleTransporter, BremAdder)
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop  # , CombineParticles
-from CommonParticles import StdLooseAllPhotons
-from CommonParticles import StdAllLooseGammaConversion
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
 from Configurables import CombineParticles
-from Gaudi.Configuration import *
 __author__ = ['Sean Benson']
 __date__ = '2016/04/08'
 __version__ = '1.2'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingBs2st2KKMuX.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingBs2st2KKMuX.py
index 86d2fbe036d44821a158f2fba4fe7e558c1d3d55..22e9c5c994936c1db65ca0b5c70f9d8f5601bd3b 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingBs2st2KKMuX.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingBs2st2KKMuX.py
@@ -22,9 +22,8 @@ Stripping lines:
 from StandardParticles import StdLooseMuons, StdLooseKaons, StdAllLooseKaons, StdMassConstrainedJpsi2MuMu
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand
+from PhysSelPython.Wrappers import Selection
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = ['Jianchun Wang']
 __date__ = '03/22/2015'
 __version__ = '$Revision: 0.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingBu2LLK.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingBu2LLK.py
index 92fae7bab7e025e403c7b9b7fcd2fdc42d0bd59e..f267c86a869b3ba202ca57507bdff38dda60e6fc 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingBu2LLK.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingBu2LLK.py
@@ -10,7 +10,7 @@
 ###############################################################################
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection, AutomaticData
+from PhysSelPython.Wrappers import DataOnDemand, MergedSelection, Selection
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, DaVinci__N3BodyDecays
 from Gaudi.Configuration import *
 __author__ = 'Patrick Koppenburg, Alex Shires, Thomas Blake, Luca Pescatore, Simone Bifani, Yasmine Amhis, Paula Alvarez Cartelle, Harry Cliff, Rafael Silva Coutinho, Guido Andreassi, Mick Mulder, Maarten van Veghel, John Smeaton, Vitalii Lisovskyi'
@@ -451,7 +451,6 @@ class Bu2LLKConf(LineBuilder):
         from StandardParticles import StdLoosePions as Pions
         from StandardParticles import StdLooseKaons as Kaons
         from StandardParticles import StdLooseProtons as Protons
-        from StandardParticles import StdAllLoosePions as AllPions
         from StandardParticles import StdAllLooseKaons as AllKaons
         from StandardParticles import StdAllLooseProtons as AllProtons
         from StandardParticles import StdLooseKstar2Kpi as Kstars
@@ -1773,7 +1772,6 @@ class Bu2LLKConf(LineBuilder):
         from StandardParticles import StdLooseMuons as Muons
         # from CommonParticles import StdLooseDetachedTau
         # Taus = DataOnDemand(Location = "Phys/StdLooseDetachedTau3pi/Particles")
-        from CommonParticles import StdTightDetachedTau
         Taus = DataOnDemand(Location="Phys/StdTightDetachedTau3pi/Particles")
 
         _DecayDescriptor = "[J/psi(1S) -> mu+ tau-]cc"
@@ -1948,7 +1946,6 @@ class Bu2LLKConf(LineBuilder):
             linename,
             outputlocprefix="Leptonic/Phys/",
             photonloc="Phys/StdVeryLooseAllPhotons/Particles"):
-        from PhysSelPython.Wrappers import FilterSelection, DataOnDemand, SelectionSequence
         from Configurables import (CopyParticles, ParticleCloner,
                                    ProtoParticleCloner, CaloHypoCloner,
                                    CaloClusterCloner)
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingBu2MajoLep.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingBu2MajoLep.py
index 5a96cdedd562ea723f6b2b20d6b2cf30f98f517f..850c2f87ccfaddc8f68a9b6e087f3f6d41cebbb1 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingBu2MajoLep.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingBu2MajoLep.py
@@ -19,12 +19,10 @@ __version__ = 'V0.9'
 __all__ = ('Bu2MajoLepConf',
            'default_config')
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
+from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from GaudiKernel.SystemOfUnits import *
 
 from StandardParticles import StdLooseMuons as Muons
 from StandardParticles import StdLoosePions as Pions
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingBu2MuNu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingBu2MuNu.py
index 19ce21e90e54ca7bc0f65d55187d37c95520c6d9..4163901dd65f50c70f659de9c335932f2c9649fa 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingBu2MuNu.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingBu2MuNu.py
@@ -25,12 +25,11 @@ __all__ = ('Bu2MuNuConf',
            'default_config')
 
 from Gaudi.Configuration import *
-from PhysSelPython.Wrappers import Selection, DataOnDemand
+from PhysSelPython.Wrappers import DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from StandardParticles import StdTightMuons, StdTightANNMuons
 from CommonParticles.Utils import *
-from Configurables import FilterDesktop, CombineParticles
+from Configurables import FilterDesktop
 from JetAccessories.JetMaker_Config import JetMakerConf
 
 default_name = 'Bu2MuNu'
@@ -72,7 +71,7 @@ def create_stdjets(strobj, line_location, stdjets_name_ban):
         strobj.StdJetsNoJetIDBan = [myconf1]
 
     # configure Data-On-Demand service
-    locations = updateDoD(myconf1)
+    updateDoD(myconf1)
 
 
 relInfoJetsVars = ["JETNOMU1PX", "JETNOMU1PY", "JETNOMU1PZ", "JETNOMU1PT", "JETNOMU1JETWIDTH", "JETNOMU1NNTAG", "JETNOMU1MNF", "JETNOMU2PX", "JETNOMU2PY", "JETNOMU2PZ", "JETNOMU2PT", "JETNOMU2JETWIDTH", "JETNOMU2NNTAG",
@@ -255,7 +254,7 @@ class Bu2MuNuConf(LineBuilder):
                                            JetIDCut=False).algorithms[0]
 
         # configure Data-On-Demand service
-        locations = updateDoD(StdJetsNoJetIDNoBan)
+        updateDoD(StdJetsNoJetIDNoBan)
 
         # add the jets with the specific banning
         create_stdjets(self, self.ControlLine.outputLocation(),
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingD23MuLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingD23MuLines.py
index 9d9153bde02604dd6518511524323b953c58b810..a119c6aadabeb6405ae23f48d28004723f035a3b 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingD23MuLines.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingD23MuLines.py
@@ -51,12 +51,11 @@ __all__ = ("D23MuLinesConf",
 #############################################################################
 
 from Gaudi.Configuration import *
-from Configurables import FilterDesktop, CombineParticles, DaVinci__N3BodyDecays
+from Configurables import DaVinci__N3BodyDecays
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 # from StrippingSelections.Utils import checkConfig
-from GaudiKernel.PhysicalConstants import c_light
 
 #############################################################################
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingDarkBoson.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingDarkBoson.py
index 0601486c8f5015f4eb64f73e79d9f06b0495a45a..655431951c82a16dc7805ee36b01262b6f7f88eb 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingDarkBoson.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingDarkBoson.py
@@ -17,23 +17,18 @@ Author: M. Williams, D. Craik
 from GaudiConfUtils.ConfigurableGenerators import DaVinci__N3BodyDecays
 from Configurables import DiElectronMaker, ProtoParticleCALOFilter
 from CommonParticles.Utils import *
-from copy import deepcopy
 from Configurables import SubstitutePID
 from StandardParticles import StdAllLooseGammaLL, StdAllLooseGammaDD, \
     StdAllLooseElectrons, StdLooseAllPhotons  # , StdDiElectronFromTracks
 from Beauty2Charm_LoKiCuts import LoKiCuts
 from StandardParticles import StdAllNoPIDsPions, StdAllNoPIDsKaons, \
-    StdAllNoPIDsProtons, StdNoPIDsUpPions, StdAllLooseMuons, \
-    StdLooseDownMuons
-from Configurables import LoKi__VoidFilter
+    StdAllLooseMuons, StdLooseDownMuons
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import EventSelection
 from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
 from Gaudi.Configuration import *
-import re
 __author__ = ['Mike Williams', 'Dan Craik']
 
 moduleName = 'DarkBoson'
@@ -364,7 +359,7 @@ class DarkBosonConf(LineBuilder):
         mmDDX = makeX('MuMuDD', default_config['XDD'], 'KS0 -> mu+ mu-',
                       [muDX])
         kkX = makeX('KK', default_config['XLL'], 'KS0 -> K+ K-', [kX])
-        kkDDX = makeX('KKDD', default_config['XDD'], 'KS0 -> K+ K-', [kDX])
+        makeX('KKDD', default_config['XDD'], 'KS0 -> K+ K-', [kDX])
         pipiX = makeX('PiPi', default_config['XLLhard'], 'KS0 -> pi+ pi-',
                       [piX])
         pipiDDX = makeX('PiPiDD', default_config['XDD'], 'KS0 -> pi+ pi-',
@@ -418,7 +413,7 @@ class DarkBosonConf(LineBuilder):
                           '[KS0 -> pi+ pi+]cc', [piDX])
         preSS = default_config['Prescales']['SS']
 
-        preDD = default_config['Prescales']['DD']
+        default_config['Prescales']['DD']
         preKK = default_config['Prescales']['KK']
 
         j = makeJ(default_config['J'], [muJ])
@@ -629,7 +624,7 @@ class DarkBosonConf(LineBuilder):
         kst = filterKst()
         self._makeBLine('B2JKst', ['[B0 -> J/psi(1S) K*(892)0]cc'], [j, kst],
                         default_config['B2KX'])
-        rho = makeRho([piB])
+        makeRho([piB])
         # self._makeBLine('B2RhoX2MuMu',['B0 -> rho(770)0 KS0'],[rho,mmX],
         #                default_config['B2HHX'])
         # self._makeBLine('B2RhoX2MuMuDD',['B0 -> rho(770)0 KS0'],[rho,mmDDX],
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingDoubleSLForRX.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingDoubleSLForRX.py
index f7e5ccc228e7525247584f38f94bf53502f3cdea..3116bd40e9e8d6da906924d79ac8c85fabf37565 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingDoubleSLForRX.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingDoubleSLForRX.py
@@ -19,7 +19,6 @@ from GaudiConfUtils.ConfigurableGenerators import (CombineParticles,
                                                    DaVinci__N3BodyDecays)
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from Gaudi.Configuration import *
 __author__ = 'M. Kreps, T. Blake, D. Loh'
 __date__ = '10/11/2016'
 __version__ = '$Revision: 1.0$'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingHypb2L0HGamma.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingHypb2L0HGamma.py
index 83e2745fd58ace3d154d5c84e17588243850ee63..e33667deb325d3bc47009996d2c37915a3a42fd3 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingHypb2L0HGamma.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingHypb2L0HGamma.py
@@ -16,8 +16,8 @@ __all__ = ('Hypb2L0HGammaConf',
            'default_config', )
 
 from Gaudi.Configuration import *
-from Configurables import FilterDesktop, CombineParticles, TisTosParticleTagger
-from PhysSelPython.Wrappers import Selection, MergedSelection, DataOnDemand
+from Configurables import CombineParticles, FilterDesktop
+from PhysSelPython.Wrappers import DataOnDemand, Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from StandardParticles import StdLooseAllPhotons
@@ -495,7 +495,7 @@ def tisTosSelection(sel, TISTOSdict):
 
 
 def makevelotracks(name):
-    from Configurables import FastVeloTracking, TrackPrepareVelo, DecodeVeloRawBuffer, TrackEventFitter, TrackStateInitAlg,  TrackContainerCopy
+    from Configurables import FastVeloTracking, TrackContainerCopy, TrackStateInitAlg
     from TrackFitter.ConfiguredFitters import ConfiguredEventFitter
 
     MyFastVeloTracking = FastVeloTracking(
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingK0s2XXMuMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingK0s2XXMuMu.py
index 454c44356bf363573cfae8fad85f13e9b83e92ea..dc8a94331712da6fda2d902eeaadf4a4c7f30f0f 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingK0s2XXMuMu.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingK0s2XXMuMu.py
@@ -19,9 +19,7 @@ from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection
 from StandardParticles import StdAllLoosePions, StdAllLooseMuons
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-from GaudiKernel.PhysicalConstants import c_light
-from GaudiKernel.SystemOfUnits import MeV, m, mm, picosecond
-from Gaudi.Configuration import *
+from GaudiKernel.SystemOfUnits import MeV, mm, picosecond
 __author__ = ['Miguel Ramos Pernas']
 __date__ = '10/10/2017'
 __version__ = '$Revision: 0.00 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingKshort2Leptons.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingKshort2Leptons.py
index 9fac7dec5fafb0649cd301f2324589dc0d20acb8..e7856b8d27f550715c579c88eb7e34377ffd2867 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingKshort2Leptons.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingKshort2Leptons.py
@@ -18,7 +18,6 @@ from StandardParticles import StdAllNoPIDsElectrons
 from StandardParticles import StdNoPIDsUpPions
 from StandardParticles import StdAllNoPIDsPions
 from StandardParticles import StdAllLooseMuons
-from StandardParticles import StdAllNoPIDsMuons
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingKshort2MuMuMuMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingKshort2MuMuMuMu.py
index 86a943e5a6fb41852c6a9f29c92389947b9c890f..81ef82f2043ed504638103a44bd0a0e915d41771 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingKshort2MuMuMuMu.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingKshort2MuMuMuMu.py
@@ -15,15 +15,12 @@ derived, in large measure, from StrippingKshort2PiPiMuMu.py
 '''
 
 from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays
-from GaudiKernel.SystemOfUnits import MeV
-from StandardParticles import StdNoPIDsDownPions, StdLooseDownMuons
-from StandardParticles import StdAllLoosePions, StdAllLooseMuons, StdAllNoPIDsPions
-from StandardParticles import StdLoosePions, StdLooseMuons, StdNoPIDsPions
+from StandardParticles import StdLooseDownMuons
+from StandardParticles import StdAllLooseMuons
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
+from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
 __author__ = ['Mike Sokoloff']
 __date__ = '07 January 2014'
 __version__ = '$Revision: 0.1 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingKshort2PiPiMuMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingKshort2PiPiMuMu.py
index 0955f65fa0e2efdcb575b1c11a7ad439f53a1944..07b134c737342e2921702f4d74fa30eda7121cf9 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingKshort2PiPiMuMu.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingKshort2PiPiMuMu.py
@@ -10,15 +10,12 @@
 ###############################################################################
 
 from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays
-from GaudiKernel.SystemOfUnits import MeV
 from StandardParticles import StdNoPIDsDownPions, StdLooseDownMuons
-from StandardParticles import StdAllLoosePions, StdAllLooseMuons, StdAllNoPIDsPions
-from StandardParticles import StdLoosePions, StdLooseMuons, StdNoPIDsPions
+from StandardParticles import StdAllLooseMuons, StdAllLoosePions
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
+from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
 __author__ = ['Mike Sokoloff']
 __date__ = '25/10/2012'
 __version__ = '$Revision: 0.1 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingKshort2eePiPi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingKshort2eePiPi.py
index 5ac8f83630db4b9cf4e5a235dd3ceeb48b0a2a95..d8b95bcb790eaafc5b7c90a8f83fe5663eee0c11 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingKshort2eePiPi.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingKshort2eePiPi.py
@@ -23,7 +23,6 @@ from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection
 from GaudiConfUtils.ConfigurableGenerators import DaVinci__N3BodyDecays as Combine3Particles
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
-from Gaudi.Configuration import *
 __author__ = ['Carla Marin', 'Xabier Cid Vidal',  'Adrian Casais Vidal']
 __date__ = '23/02/2018'
 __version__ = '$2.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingLFVLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingLFVLines.py
index 4a7726e9b33f8cb67d0e0e1c4052c9f7f01e78b5..279eff2f3e813fb4043b2104ebb0bf7955e48339 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingLFVLines.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingLFVLines.py
@@ -23,14 +23,12 @@ __all__ = ('LFVLinesConf',
            'default_config',
            )
 
-from Gaudi.Configuration import *
 # from Configurables import FilterDesktop, CombineParticles
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, DaVinci__N3BodyDecays
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N3BodyDecays
 from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from GaudiKernel.PhysicalConstants import c_light
-from GaudiKernel.SystemOfUnits import GeV, MeV, mm
+from GaudiKernel.SystemOfUnits import MeV, mm
 from copy import deepcopy
 #
 # Configure related info tools
@@ -1284,7 +1282,7 @@ class LFVLinesConf(LineBuilder):
         hemu_name = name+'B2heMu'
         pmu_name = name+'B2hMu'
         bu_name = name+'Bu2KJPsiee'
-        taumu_name = name+'B2TauMu'
+        name+'B2TauMu'
         htaumu_name = name+'B2hTauMu'
         muetap_gamma_name = name+'Tau2MuEtaP2pipig'
         muetap_pi_name = name+'Tau2MuEtaP2pipipi'
@@ -1778,7 +1776,6 @@ def makeB2TauMu(name):
         "& (BPVVDCHI2> 225)"\
         "& (BPVIPCHI2()< 25) "
 
-    from CommonParticles import StdLooseDetachedTau, StdLooseDipion
     _stdLooseMuons = DataOnDemand(Location="Phys/StdLooseMuons/Particles")
     _stdLooseDetachedTaus = DataOnDemand(
         Location="Phys/StdLooseDetachedTau3pi/Particles")
@@ -2418,7 +2415,6 @@ def makeB2hTauMu(name):
                           "& (BPVVDCHI2> 225)"\
                           "& (BPVIPCHI2()< 16) "  # maybe 16
 
-    from CommonParticles import StdLooseDetachedTau, StdLooseDipion
     _stdLooseMuons = DataOnDemand(Location="Phys/StdLooseMuons/Particles")
     _stdLooseDetachedTaus = DataOnDemand(
         Location="Phys/StdLooseDetachedTau3pi/Particles")
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingLb2L0Gamma.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingLb2L0Gamma.py
index 802119884510c53e5cf00d3e4788223b09ab5a71..bfcf8336af14cb0e5ff39ae2da6502181e9066d9 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingLb2L0Gamma.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingLb2L0Gamma.py
@@ -25,9 +25,6 @@ __date__ = "14.11.2016"
 __version__ = "2.0"
 __all__ = ("default_config", "StrippingLb2L0GammaConf")
 
-import os
-
-from Gaudi.Configuration import *
 
 from Configurables import CombineParticles
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
@@ -36,9 +33,7 @@ from PhysSelPython.Wrappers import Selection, MergedSelection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 
-from StandardParticles import StdAllNoPIDsPions, StdAllNoPIDsProtons
 from StandardParticles import StdLooseAllPhotons, StdAllLooseGammaDD, StdAllLooseGammaLL
-from StandardParticles import StdVeryLooseDetachedKst2Kpi
 from StandardParticles import StdLooseJpsi2MuMu
 
 default_config = {'NAME': 'Lb2L0Gamma',
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingLc23MuLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingLc23MuLines.py
index b2244bd7aa9f116d9783ce03a8fc1944cde17b39..3d97e939f7633e3e700dd756976cae1b815955f7 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingLc23MuLines.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingLc23MuLines.py
@@ -68,12 +68,11 @@ __all__ = ("Lc23MuLinesConf",
 ###################################################################################################
 
 from Gaudi.Configuration import *
-from Configurables import FilterDesktop, CombineParticles, DaVinci__N3BodyDecays, DaVinci__N4BodyDecays
+from Configurables import CombineParticles, DaVinci__N3BodyDecays, DaVinci__N4BodyDecays
 # from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from GaudiKernel.PhysicalConstants import c_light
 
 ###################################################################################################
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingPhiToKSKS.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingPhiToKSKS.py
index ff157859dd3877ab38f9cad234fb49a80418e50d..1a62ef5db16a204dc0a3d66d1fd1d1f75d4a04d4 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingPhiToKSKS.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingPhiToKSKS.py
@@ -23,8 +23,7 @@ from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from StandardParticles import StdAllLooseKaons, StdAllLooseMuons
-from Configurables import FitDecayTrees
-from PhysSelPython.Wrappers import AutomaticData, MergedSelection
+from PhysSelPython.Wrappers import MergedSelection
 
 __all__ = ('PhiToKSKSAllLinesConf',
            'TOSFilter',
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingRareNStrange.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingRareNStrange.py
index 95f70d0b641829f0a44259b730566f4c68fa1093..98b3814df4bee7388e334a0c9969c741474a9f63 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingRareNStrange.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingRareNStrange.py
@@ -10,9 +10,8 @@
 ###############################################################################
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection, AutomaticData
+from PhysSelPython.Wrappers import Selection
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = 'Diego Martinez Santos, Carlos Vazquez, Xabier Cid, Jessica Prisciandaro, Miguel Ramos Pernas'
 __date__ = '08/05/2015'
 __version__ = '$Revision: Not sure $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingRareStrange.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingRareStrange.py
index 6f7264e1db8f4045b2b139a11daa3e90056e3c44..bba73d994ee42cf94a9237f00597a4d7be7cc54d 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingRareStrange.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingRareStrange.py
@@ -59,15 +59,11 @@ __all__ = ('RareStrangeLinesConf',
 from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 from GaudiConfUtils.ConfigurableGenerators import DaVinci__N3BodyDecays as Combine3Particles
-from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays as Combine4Particles
-from CommonParticles import StdNoPIDsDownElectrons
 from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from GaudiKernel.PhysicalConstants import c_light
-from StandardParticles import (StdAllNoPIDsPions, StdNoPIDsDownPions,
-                               StdLoosePions, StdLooseDownMuons,
-                               StdLooseMergedPi0, StdLooseResolvedPi0, StdLooseDalitzPi0)
+from StandardParticles import (StdLooseMergedPi0, StdLooseResolvedPi0,
+                               StdLooseDalitzPi0)
 
 # from CommonParticles.StdLooseDalitzPi0 import (StdLoosePi02gee, StdLoosePi024e)
 
@@ -2786,7 +2782,7 @@ def makeLambdaPPiEE(name, config, inputs):
 
 
 def makevelotracks(name):
-    from Configurables import FastVeloTracking, TrackPrepareVelo, DecodeVeloRawBuffer, TrackEventFitter, TrackStateInitAlg,  TrackContainerCopy
+    from Configurables import FastVeloTracking, TrackContainerCopy, TrackStateInitAlg
     from TrackFitter.ConfiguredFitters import ConfiguredEventFitter
 
     MyFastVeloTracking = FastVeloTracking(
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingStrangeHadrons.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingStrangeHadrons.py
index 5c16fb7fd63ec1f15df76e17b03a96af7c5a4c61..e2488a937f3c160c5d1dc0bbb81310ee8ff58466 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingStrangeHadrons.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingStrangeHadrons.py
@@ -35,23 +35,12 @@ __all__ = ('default_config',
            'StrangeHadronsConf',
            )
 
-import os
 
-from Gaudi.Configuration import *
-
-from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-
-from GaudiConfUtils.ConfigurableGenerators import DaVinci__N3BodyDecays as Combine3Particles
-from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays as Combine4Particles
-from CommonParticles import StdNoPIDsDownElectrons
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
+from PhysSelPython.Wrappers import DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from GaudiKernel.PhysicalConstants import c_light
 from GaudiKernel.SystemOfUnits import MeV
 
-from StandardParticles import StdAllNoPIDsPions, StdLoosePions, StdLooseProtons, StdAllLoosePions, StdAllLooseMuons
-from StandardParticles import StdLooseAllPhotons
 ##
 from PhysConf.Selections import CombineSelection
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingStrangeSL.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingStrangeSL.py
index 5134ef5434ea3f244733fc6ac26485b868c228fb..26590be4ba73ad6710f007e7e831cea2a4a4b23a 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingStrangeSL.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingStrangeSL.py
@@ -36,23 +36,12 @@ __all__ = ('default_config',
            'StrangeSLConf',
            )
 
-import os
 
-from Gaudi.Configuration import *
-
-from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-
-from GaudiConfUtils.ConfigurableGenerators import DaVinci__N3BodyDecays as Combine3Particles
-from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays as Combine4Particles
-from CommonParticles import StdNoPIDsDownElectrons
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
+from PhysSelPython.Wrappers import DataOnDemand, Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from GaudiKernel.PhysicalConstants import c_light
 from GaudiKernel.SystemOfUnits import MeV
 
-from StandardParticles import StdAllNoPIDsPions, StdLoosePions, StdLooseProtons, StdAllLoosePions, StdAllLooseMuons, StdAllLooseElectrons
-from StandardParticles import StdLooseMergedPi0, StdLooseResolvedPi0, StdLooseDalitzPi0
 from PhysConf.Selections import CombineSelection
 
 default_config = {
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingTau23MuLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingTau23MuLines.py
index 6adb37dd06aeeb58dcd798447fe8b5ee90fa6e99..b2fa9b13c2441549d3939f19589727c3e261e09d 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingTau23MuLines.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingTau23MuLines.py
@@ -35,7 +35,6 @@ from GaudiConfUtils.ConfigurableGenerators import DaVinci__N5BodyDecays as Combi
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from GaudiKernel.PhysicalConstants import c_light
 
 default_config = {
     'NAME': 'Tau23Mu',
@@ -70,7 +69,7 @@ class Tau23MuLinesConf(LineBuilder):
         # checkConfig(Bs2MuMuLinesConf.__configuration_keys__,config)
 
         tau_name = name+'Tau23Mu'
-        ds23PiTIS_name = name+'Ds23PiTIS'
+        name+'Ds23PiTIS'
         ds23Pi_name = name+'Ds23Pi'
         ds2PhiPi_name = name+'Ds2PhiPi'
         tau25_name = name+'Tau25Mu'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingTau2LambdaMuLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingTau2LambdaMuLines.py
index 6f7caa01d008433cca4a3184d6bdfeb2a9bcd909..2e5401740f914b698345c335bfe29788f1e7ed2e 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingTau2LambdaMuLines.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingTau2LambdaMuLines.py
@@ -16,12 +16,10 @@ Exported symbols (use python help!):
    - 
 '''
 
-from GaudiKernel.PhysicalConstants import c_light
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
-from Configurables import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
+from Configurables import CombineParticles
 __author__ = ['Marcin Chrzaszcz']
 __date__ = '14/12/2012'
 __version__ = '$Revision: 1.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingZVTOP.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingZVTOP.py
index f4ee63f69c4320486335e4fa797004ccb36ecca4..6b5cbfa74e249908ea9e854e9c0f238ebdd2d9cf 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingZVTOP.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingRD/StrippingZVTOP.py
@@ -9,14 +9,12 @@
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
 from Configurables import TopoTauAlg, TopoVertexTool
-from StandardParticles import StdLooseKaons
-from StandardParticles import StdLoosePions, StdTightPions
-from StandardParticles import StdNoPIDsKaons, StdNoPIDsPions
+from StandardParticles import StdLoosePions
+from StandardParticles import StdNoPIDsPions
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, OfflineVertexFitter
-from Gaudi.Configuration import *
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop
 __author__ = ['Giampi Mancinelli', 'Julien Cogan', 'Justine Serrano']
 
 __date__ = '14/01/2014'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingSL/StrippingB23MuNu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingSL/StrippingB23MuNu.py
index 11d81c34fb0178677727235bc3bd636b83427207..97c4220c4e62f1a00d3c320d5f76806aba8c4c4a 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingSL/StrippingB23MuNu.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingSL/StrippingB23MuNu.py
@@ -19,15 +19,12 @@ __all__ = ('B23MuNuConf')
 Stripping selection for B to three muons and a neutrino.
 """
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop
 
-from PhysSelPython.Wrappers import Selection, AutomaticData, MergedSelection
+from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from LHCbKernel.Configuration import *  # check if needed
-from Configurables import SubstitutePID
-from Configurables import SubPIDMMFilter
 
 
 #################
@@ -161,15 +158,13 @@ class B23MuNuConf(LineBuilder):
         """
         Creates Jpsi as proxy for dimuon
         """
-        from PhysSelPython.Wrappers import AutomaticData, Selection, SelectionSequence, DataOnDemand, MergedSelection
+        from PhysSelPython.Wrappers import Selection
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         # from Configurables import CombineParticles
 
         CombineJpsi = CombineParticles(DecayDescriptors=["J/psi(1S) -> mu+ mu-", "[J/psi(1S) -> mu+ mu+]cc"],
                                        MotherCut="ALL")
 
-        sel_name = "Jpsi"
-
         from PhysSelPython.Wrappers import Selection
         SelJpsi = Selection("Sel_" + self.name + "_Jpsi", Algorithm=CombineJpsi,
                             RequiredSelections=[self.Muons])
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingSL/StrippingB2DMuForTauMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingSL/StrippingB2DMuForTauMu.py
index bbb6591f636c547192b1c9759ebfeedf27b88e2b..8bd9a436ea3d941e0b4ec5b3610d262206579753 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingSL/StrippingB2DMuForTauMu.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingSL/StrippingB2DMuForTauMu.py
@@ -18,12 +18,10 @@ __version__ = '$Revision: 2.0 $'
 
 from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from PhysSelPython.Wrappers import Selection, DataOnDemand
+from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from StandardParticles import StdLoosePions, StdAllLooseMuons, StdLooseKaons, StdLooseProtons, StdAllLoosePions, StdLooseMergedPi0, StdLooseResolvedPi0, StdAllNoPIDsMuons, StdLooseANNUpPions
-from Configurables import ConjugateNeutralPID
-from PhysSelPython.Wrappers import MergedSelection
+from StandardParticles import StdAllLooseMuons, StdAllNoPIDsMuons, StdLooseKaons, StdLoosePions, StdLooseProtons
 
 __all__ = ('B2DMuForTauMuconf',
            # 'makeb2DMuX',
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingSL/StrippingB2DMuNuX.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingSL/StrippingB2DMuNuX.py
index 7fbc22fc579e9906ec73dc1565f73ff8a7135da2..34974681b85312d8b611810697feb4e07ec1b5fe 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingSL/StrippingB2DMuNuX.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingSL/StrippingB2DMuNuX.py
@@ -13,14 +13,13 @@ __date__ = '23/07/2010'
 __version__ = '$Revision: 5.0 $'
 
 from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
+from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
 from PhysSelPython.Wrappers import Selection
-from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from StandardParticles import StdLoosePions, StdLooseMuons, StdLooseKaons, StdLooseProtons, StdLooseElectrons
 from StandardParticles import StdNoPIDsPions, StdNoPIDsKaons, StdNoPIDsProtons, StdNoPIDsMuons
 from StrippingB2DMuNuXUtils import *
-from GaudiKernel.SystemOfUnits import MeV, GeV, cm, mm
+from GaudiKernel.SystemOfUnits import GeV, MeV, mm
 
 __all__ = ('B2DMuNuXAllLinesConf', 'default_config')
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingSL/StrippingB2DMuNuXUtils.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingSL/StrippingB2DMuNuXUtils.py
index 98dff760c0e0b881f30158091e8c6e53a0ee2fd1..c0162b92c48147384955d02657959c69645f8a0c 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingSL/StrippingB2DMuNuXUtils.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingSL/StrippingB2DMuNuXUtils.py
@@ -13,11 +13,9 @@ __date__ = '06/03/2015'
 __version__ = '$Revision: 0.0 $'
 
 from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
-from StrippingUtils.Utils import LineBuilder
-from StandardParticles import StdLoosePions, StdLooseMuons, StdLooseKaons, StdLooseProtons, StdNoPIDsPions, StdLooseElectrons, StdNoPIDsMuons
 
 
 def BtoDlnuLine(module_name,
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingSL/StrippingB2Dlnu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingSL/StrippingB2Dlnu.py
index 0c8d00bd94717af821926626f5446a85cb20a902..b05a05c95319c31661cfe61524eca70e234905c3 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingSL/StrippingB2Dlnu.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingSL/StrippingB2Dlnu.py
@@ -17,12 +17,10 @@ __version__ = '$Revision: 1.0 $'
 
 from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from PhysSelPython.Wrappers import Selection, DataOnDemand
+from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from StandardParticles import StdLoosePions, StdLooseMuons, StdLooseKaons, StdLooseProtons, StdAllLoosePions, StdLooseMergedPi0, StdLooseResolvedPi0, StdAllNoPIDsMuons, StdLooseANNUpPions, StdLooseElectrons
-from Configurables import ConjugateNeutralPID
-from PhysSelPython.Wrappers import MergedSelection
+from StandardParticles import StdAllNoPIDsMuons, StdLooseElectrons, StdLooseKaons, StdLooseMuons, StdLoosePions
 
 __all__ = ('B2DMuForLNuconf',
            # 'makeb2DMuX',
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingSL/StrippingB2Dst0MuNu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingSL/StrippingB2Dst0MuNu.py
index 3f6fd96ade4433b51152a37ee46ccbd072892fbe..e98d2b4850975113ec77abeed5a53c59a6ba950c 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingSL/StrippingB2Dst0MuNu.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingSL/StrippingB2Dst0MuNu.py
@@ -12,12 +12,11 @@ __author__ = ['Michel De Cian']
 __date__ = '12/12/2018'
 __version__ = '$Revision: 0.0 $'
 
-from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from PhysSelPython.Wrappers import Selection, DataOnDemand
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
+from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from StandardParticles import StdLoosePions, StdLooseMuons, StdLooseKaons, StdAllLoosePions, StdAllLooseElectrons, StdLooseResolvedPi0, StdLooseMergedPi0, StdLooseDalitzPi0
+from StandardParticles import StdAllLooseElectrons, StdLooseDalitzPi0, StdLooseKaons, StdLooseMergedPi0, StdLooseMuons, StdLoosePions, StdLooseResolvedPi0
 
 __all__ = ('B2Dst0MuNuAllLinesConf',
            'TOSFilter',
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingSL/StrippingB2DstMuNuIncl.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingSL/StrippingB2DstMuNuIncl.py
index 6abd041bf344194b0ad86747d5d5622ae5fdddf9..3a91f70e613b554c2c0d5b7095d89a8eb3c67f3d 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingSL/StrippingB2DstMuNuIncl.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingSL/StrippingB2DstMuNuIncl.py
@@ -12,9 +12,8 @@ __author__ = ['Mika Vesterinen']
 __date__ = '04/04/2015'
 __version__ = '$Revision: 0.0 $'
 
-from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from PhysSelPython.Wrappers import Selection, DataOnDemand
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
+from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from StandardParticles import StdLoosePions, StdLooseMuons, StdLooseKaons, StdAllLoosePions
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingSL/StrippingB2PPbarMuForTauMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingSL/StrippingB2PPbarMuForTauMu.py
index 1d97e42a98b40f8bef4d02281e5fd0b77ab45300..5eaa8cff0ccedf2007a0fc0b82bdb43f18bff30a 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingSL/StrippingB2PPbarMuForTauMu.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingSL/StrippingB2PPbarMuForTauMu.py
@@ -9,9 +9,7 @@
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
 
-import logging
 from StrippingUtils.Utils import LineBuilder
-from Gaudi.Configuration import *
 __author__ = ['Mark Smith']
 __date__ = '17/10/2016'
 __version__ = '$Revision: 1.0 $'
@@ -107,8 +105,6 @@ class B2PPbarMuForTauMuBuilder(LineBuilder):
     def __init__(self, name, config):
         LineBuilder.__init__(self, name, config)
 
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
-
         self.GECs = {"Code": "( recSummary(LHCb.RecSummary.nSPDhits,'Raw/Spd/Digits') < %(GEC_nSPDHits)s )" % config,
                      "Preambulo": ["from LoKiTracks.decorators import *"]}
 
@@ -437,7 +433,7 @@ class B2PPbarMuForTauMuBuilder(LineBuilder):
     ###### B->ppMuNu Signal ######
     def _bhad2PMuX_B(self):
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-        from PhysSelPython.Wrappers import Selection, MergedSelection
+        from PhysSelPython.Wrappers import Selection
 
         _pMu = CombineParticles(
             DecayDescriptors=self._config["DECAYS"], ReFitPVs=True)
@@ -454,7 +450,7 @@ class B2PPbarMuForTauMuBuilder(LineBuilder):
     ###### B->ppMuNu Signal for Topo Line ######
     def _bhad2PMuX_BTopo(self):
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-        from PhysSelPython.Wrappers import Selection, MergedSelection
+        from PhysSelPython.Wrappers import Selection
 
         _pMu = CombineParticles(
             DecayDescriptors=self._config["DECAYS"], ReFitPVs=True)
@@ -471,7 +467,7 @@ class B2PPbarMuForTauMuBuilder(LineBuilder):
     ###### B->ppMuNu Same-Sign protons ######
     def _bhad2PMuX_B_SS(self):
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-        from PhysSelPython.Wrappers import Selection, MergedSelection
+        from PhysSelPython.Wrappers import Selection
 
         _pMu = CombineParticles(
             DecayDescriptors=self._config["DECAYS"], ReFitPVs=True)
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingSL/StrippingB2XTauNu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingSL/StrippingB2XTauNu.py
index 7e086d88664dbe28a77ab80ac882b7a7014366c9..6ace30c6ea487c9ee422ba92f199da4e11ac0085 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingSL/StrippingB2XTauNu.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingSL/StrippingB2XTauNu.py
@@ -610,7 +610,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         self.__MakeB0d2DdoubleStar2PiDstar02GammaD0TauNuNonPhysTau__()
 
         from StrippingConf.StrippingLine import StrippingLine
-        from PhysSelPython.Wrappers import SelectionSequence
 
         # TisTos filter
         def filterTisTos(name, Input, myTisTosSpecs):
@@ -1365,7 +1364,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
 
         from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseJpsi2MuMu
 
         JpsiForBc = FilterDesktop(
             Code=self.totalJpsiCut
@@ -1384,7 +1382,7 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
 
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
+        from PhysSelPython.Wrappers import Selection
         from StandardParticles import StdLoosePions
 
         CombDdoubleStar02DstarPi = CombineParticles(
@@ -1405,7 +1403,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3pi/Particles')
@@ -1428,7 +1425,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3pi/Particles')
@@ -1453,7 +1449,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3pi/Particles')
@@ -1477,7 +1472,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTauNonPhys
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3piNonPhys/Particles')
@@ -1501,7 +1495,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3pi/Particles')
@@ -1526,7 +1519,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3pi/Particles')
@@ -1551,7 +1543,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTauNonPhys
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3piNonPhys/Particles')
@@ -1575,7 +1566,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3pi/Particles')
@@ -1600,7 +1590,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3pi/Particles')
@@ -1625,7 +1614,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTauNonPhys
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3piNonPhys/Particles')
@@ -1650,7 +1638,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3pi/Particles')
@@ -1674,7 +1661,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTauNonPhys
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3piNonPhys/Particles')
@@ -1698,7 +1684,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3pi/Particles')
@@ -1723,7 +1708,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3pi/Particles')
@@ -1748,7 +1732,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTauNonPhys
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3piNonPhys/Particles')
@@ -1773,7 +1756,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3pi/Particles')
@@ -1799,7 +1781,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3pi/Particles')
@@ -1823,7 +1804,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3pi/Particles')
@@ -1849,7 +1829,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3pi/Particles')
@@ -1874,7 +1853,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTauNonPhys
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3piNonPhys/Particles')
@@ -1900,7 +1878,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3pi/Particles')
@@ -1924,7 +1901,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3pi/Particles')
@@ -1947,7 +1923,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3pi/Particles')
@@ -1971,7 +1946,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3pi/Particles')
@@ -1995,7 +1969,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTauNonPhys
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3piNonPhys/Particles')
@@ -2019,7 +1992,7 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
 
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
+        from PhysSelPython.Wrappers import Selection
         from StandardParticles import StdLooseResolvedPi0
 
         CombDStar02Pi0D0 = CombineParticles(
@@ -2039,7 +2012,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3pi/Particles')
@@ -2062,7 +2034,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3pi/Particles')
@@ -2085,7 +2056,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3piNonPhys/Particles')
@@ -2108,7 +2078,7 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
 
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
+        from PhysSelPython.Wrappers import Selection
         from StandardParticles import StdLooseAllPhotons
 
         CombDStar02GammaD0 = CombineParticles(
@@ -2128,7 +2098,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3pi/Particles')
@@ -2151,7 +2120,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3pi/Particles')
@@ -2174,7 +2142,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3piNonPhys/Particles')
@@ -2196,7 +2163,7 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
 
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
+        from PhysSelPython.Wrappers import Selection
         from StandardParticles import StdLoosePions
 
         CombDdoubleStar2PiDstar02Pi0D0 = CombineParticles(
@@ -2216,7 +2183,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3pi/Particles')
@@ -2239,7 +2205,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3pi/Particles')
@@ -2262,7 +2227,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3piNonPhys/Particles')
@@ -2284,7 +2248,7 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
 
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
+        from PhysSelPython.Wrappers import Selection
         from StandardParticles import StdLoosePions
 
         CombDdoubleStar2PiDstar02GammaD0 = CombineParticles(
@@ -2304,7 +2268,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3pi/Particles')
@@ -2327,7 +2290,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3pi/Particles')
@@ -2350,7 +2312,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3piNonPhys/Particles')
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingSL/StrippingB2XuENu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingSL/StrippingB2XuENu.py
index 73ab1a2a4e2c0a0a1016fb4040cc2e6b7b36c884..b59084d7969d22b0c34cc4c7c11b62ae657ce530 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingSL/StrippingB2XuENu.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingSL/StrippingB2XuENu.py
@@ -9,9 +9,7 @@
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
 
-import logging
 from StrippingUtils.Utils import LineBuilder
-from Gaudi.Configuration import *
 __author__ = ['Phillip Urquijo, Alessandra Borgia', 'Michel De Cian']
 __date__ = '11/01/2019'
 __version__ = '$Revision: 1.6 $'
@@ -243,7 +241,7 @@ class B2XuENuBuilder(LineBuilder):
     def __init__(self, name, config):
         LineBuilder.__init__(self, name, config)
         self.config = config
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
+        from PhysSelPython.Wrappers import DataOnDemand
         self._stdVeryLooseKsLL = DataOnDemand(
             "Phys/StdVeryLooseKsLL/Particles")
         self._stdLooseKsLD = DataOnDemand("Phys/StdLooseKsLD/Particles")
@@ -734,7 +732,7 @@ class B2XuENuBuilder(LineBuilder):
 
     # Bs -> K*/Kspi e nu lines
     def _Kstar_line(self):
-        NoPS = self.config['NoPrescales']
+        self.config['NoPrescales']
         from StrippingConf.StrippingLine import StrippingLine
         return StrippingLine(self._name+'Bs2Kstar_Line', prescale=1.0,
                              FILTER=self.GECs,
@@ -1055,8 +1053,8 @@ class B2XuENuBuilder(LineBuilder):
         if self._KSSel is not None:
             return self._KSSel
 
-        from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
+        from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
+        from PhysSelPython.Wrappers import Selection
 
         _code = FilterDesktop(Code=self._NominalKsSelection() % self._config)
 
@@ -1141,7 +1139,6 @@ class B2XuENuBuilder(LineBuilder):
 
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection
-        from StandardParticles import StdLoosePions
 
         _rho770 = CombineParticles(
             DecayDescriptors=["rho(770)0 -> pi- pi+"],
@@ -1171,7 +1168,6 @@ class B2XuENuBuilder(LineBuilder):
 
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection
-        from StandardParticles import StdLoosePions
 
         _rho770NoPID = CombineParticles(
             DecayDescriptors=["rho(770)0 -> pi- pi+"],
@@ -1201,7 +1197,6 @@ class B2XuENuBuilder(LineBuilder):
 
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection
-        from StandardParticles import StdLoosePions
 
         _rho770WS = CombineParticles(
             DecayDescriptors=["[rho(770)0 -> pi+ pi+]cc"],
@@ -1229,7 +1224,6 @@ class B2XuENuBuilder(LineBuilder):
 
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection
-        from StandardParticles import StdLoosePions
 
         _rho770SB = CombineParticles(
             DecayDescriptors=["rho(770)0 -> pi+ pi-"],
@@ -1341,7 +1335,7 @@ class B2XuENuBuilder(LineBuilder):
 
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection
-        from StandardParticles import StdLoosePions, StdLooseElectrons
+        from StandardParticles import StdLoosePions
 
         _Ksh = CombineParticles(
             DecayDescriptor="KS0 -> e- pi+",
@@ -1369,7 +1363,7 @@ class B2XuENuBuilder(LineBuilder):
 
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection
-        from StandardParticles import StdLoosePions, StdLooseElectrons
+        from StandardParticles import StdLoosePions
 
         _Ksh = CombineParticles(
             DecayDescriptor="KS0 -> e+ pi-",
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingSL/StrippingB2XuMuNu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingSL/StrippingB2XuMuNu.py
index e990a0f5fca381288d278a31edfe8c4be451c2d9..7dbf8f670c004436033f2172b635cf83469f0692 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingSL/StrippingB2XuMuNu.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingSL/StrippingB2XuMuNu.py
@@ -9,9 +9,7 @@
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
 
-import logging
 from StrippingUtils.Utils import LineBuilder
-from Gaudi.Configuration import *
 __author__ = ['Phillip Urquijo, Alessandra Borgia', 'Michel De Cian']
 __date__ = '11/01/2019'
 __version__ = '$Revision: 1.6 $'
@@ -238,7 +236,7 @@ class B2XuMuNuBuilder(LineBuilder):
     def __init__(self, name, config):
         LineBuilder.__init__(self, name, config)
         self.config = config
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
+        from PhysSelPython.Wrappers import DataOnDemand
         self._stdVeryLooseKsLL = DataOnDemand(
             "Phys/StdVeryLooseKsLL/Particles")
         self._stdLooseKsLD = DataOnDemand("Phys/StdLooseKsLD/Particles")
@@ -733,7 +731,7 @@ class B2XuMuNuBuilder(LineBuilder):
 
     # Bs -> K*/Kspi mu nu lines
     def _Kstar_line(self):
-        NoPS = self.config['NoPrescales']
+        self.config['NoPrescales']
         from StrippingConf.StrippingLine import StrippingLine
         return StrippingLine(self._name+'Bs2Kstar_Line', prescale=1.0,
                              FILTER=self.GECs,
@@ -1052,8 +1050,8 @@ class B2XuMuNuBuilder(LineBuilder):
         if self._KSSel is not None:
             return self._KSSel
 
-        from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
+        from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
+        from PhysSelPython.Wrappers import Selection
 
         _code = FilterDesktop(Code=self._NominalKsSelection() % self._config)
 
@@ -1138,7 +1136,6 @@ class B2XuMuNuBuilder(LineBuilder):
 
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection
-        from StandardParticles import StdLoosePions
 
         _rho770 = CombineParticles(
             DecayDescriptors=["rho(770)0 -> pi- pi+"],
@@ -1168,7 +1165,6 @@ class B2XuMuNuBuilder(LineBuilder):
 
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection
-        from StandardParticles import StdLoosePions
 
         _rho770NoPID = CombineParticles(
             DecayDescriptors=["rho(770)0 -> pi- pi+"],
@@ -1198,7 +1194,6 @@ class B2XuMuNuBuilder(LineBuilder):
 
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection
-        from StandardParticles import StdLoosePions
 
         _rho770WS = CombineParticles(
             DecayDescriptors=["[rho(770)0 -> pi+ pi+]cc"],
@@ -1226,7 +1221,6 @@ class B2XuMuNuBuilder(LineBuilder):
 
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection
-        from StandardParticles import StdLoosePions
 
         _rho770SB = CombineParticles(
             DecayDescriptors=["rho(770)0 -> pi+ pi-"],
@@ -1338,7 +1332,7 @@ class B2XuMuNuBuilder(LineBuilder):
 
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection
-        from StandardParticles import StdLoosePions, StdLooseMuons
+        from StandardParticles import StdLoosePions
 
         _Ksh = CombineParticles(
             DecayDescriptor="KS0 -> mu- pi+",
@@ -1366,7 +1360,7 @@ class B2XuMuNuBuilder(LineBuilder):
 
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection
-        from StandardParticles import StdLoosePions, StdLooseMuons
+        from StandardParticles import StdLoosePions
 
         _Ksh = CombineParticles(
             DecayDescriptor="KS0 -> mu+ pi-",
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingSL/StrippingCharmFromBSemiForHadronAsy.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingSL/StrippingCharmFromBSemiForHadronAsy.py
index a80fcb301fa6917bd97160506a3b0a679ff40777..ddaec2925512363daba54947938f97bdafffeb41 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingSL/StrippingCharmFromBSemiForHadronAsy.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingSL/StrippingCharmFromBSemiForHadronAsy.py
@@ -25,8 +25,7 @@ from Configurables import FilterDesktop, CombineParticles
 from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from StandardParticles import StdAllLoosePions, StdLoosePions, StdLooseMuons, StdLooseKaons, StdLooseProtons
-from Configurables import TisTosParticleTagger
+from StandardParticles import StdLooseKaons, StdLooseMuons, StdLoosePions
 
 __all__ = ('CharmFromBSemiForHadronAsyAllLinesConf',
            'TOSFilter',
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingSL/StrippingLb2LcMuNuX_Lc2L0Pi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingSL/StrippingLb2LcMuNuX_Lc2L0Pi.py
index 074ba01a451ce4cf74c483e687d7a71c404d4adb..729f75ac3c69725569c584dc08bdd9610f2b693a 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingSL/StrippingLb2LcMuNuX_Lc2L0Pi.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingSL/StrippingLb2LcMuNuX_Lc2L0Pi.py
@@ -16,14 +16,13 @@ __author__ = ['Scott Ely']
 __date__ = '23/01/2019'
 __version__ = '$Revision: 1.0 $'
 
-from Gaudi.Configuration import *
 from Configurables import FilterDesktop, CombineParticles
-from PhysSelPython.Wrappers import Selection, DataOnDemand
+from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from StandardParticles import StdLoosePions, StdLooseMuons, StdLooseKaons, StdLooseProtons, StdLooseElectrons, StdVeryLooseLambdaLL
-from StandardParticles import StdNoPIDsPions, StdNoPIDsKaons, StdNoPIDsProtons, StdNoPIDsMuons
-from GaudiKernel.SystemOfUnits import MeV, GeV, cm, mm
+from StandardParticles import StdLooseMuons, StdLoosePions, StdVeryLooseLambdaLL
+from StandardParticles import StdNoPIDsMuons
+from GaudiKernel.SystemOfUnits import GeV, MeV, mm
 
 __all__ = ('Lb2LcMuNuX_Lc2L0PiConf', 'default_config')
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingSL/StrippingLb2pMuNuVub.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingSL/StrippingLb2pMuNuVub.py
index cd969d689449a9dc069bd745b4acbc62f683dfda..e74c7de20e90982142bcf10f66be4a6cb90689e6 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingSL/StrippingLb2pMuNuVub.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingSL/StrippingLb2pMuNuVub.py
@@ -9,9 +9,7 @@
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
 
-import logging
 from StrippingUtils.Utils import LineBuilder
-from Gaudi.Configuration import *
 __author__ = ['William Sutcliffe']
 __date__ = '19/01/2014'
 __version__ = '$Revision: 1.0 $'
@@ -137,8 +135,6 @@ class Lb2pMuNuVubBuilder(LineBuilder):
     def __init__(self, name, config):
         LineBuilder.__init__(self, name, config)
 
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
-
         self.GECs = {"Code": "( recSummaryTrack(LHCb.RecSummary.nLongTracks, TrLONG) < %(GEC_nLongTrk)s )" % config,
                      "Preambulo": ["from LoKiTracks.decorators import *"]}
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingSL/Strippingbhad2PMuX.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingSL/Strippingbhad2PMuX.py
index e89305332152e8ebc4ee1e72a7f10cd8d9d2dfae..f46738721f8dbfce869e840a1aa8cbb13c6fdd2f 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingSL/Strippingbhad2PMuX.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping24r2/StrippingSL/Strippingbhad2PMuX.py
@@ -9,9 +9,7 @@
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
 
-import logging
 from StrippingUtils.Utils import LineBuilder
-from Gaudi.Configuration import *
 __author__ = ['William Sutcliffe', 'Patrick Owen']
 __date__ = '02/12/2015'
 __version__ = '$Revision: 2.0 $'
@@ -132,8 +130,6 @@ class bhad2PMuXBuilder(LineBuilder):
     def __init__(self, name, config):
         LineBuilder.__init__(self, name, config)
 
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
-
         self.GECs = {"Code": "( recSummaryTrack(LHCb.RecSummary.nLongTracks, TrLONG) < %(GEC_nLongTrk)s )" % config,
                      "Preambulo": ["from LoKiTracks.decorators import *"]}
 
@@ -455,7 +451,7 @@ class bhad2PMuXBuilder(LineBuilder):
     ###### Lb->pMuNu High M_corr Opposite Sign ######
     def _bhad2PMuX_Lb(self):
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-        from PhysSelPython.Wrappers import Selection, MergedSelection
+        from PhysSelPython.Wrappers import Selection
 
         _pMu = CombineParticles(
             DecayDescriptors=self._config["DECAYS"], ReFitPVs=True)
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping25/StrippingIFT/StrippingHeavyIonDiMuon.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping25/StrippingIFT/StrippingHeavyIonDiMuon.py
index 8a6589b1c0f5e032bdf53a6cd359f842a904a424..2bc95cdbcb62c071aaa8c306b9f04dc1d4e846f9 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping25/StrippingIFT/StrippingHeavyIonDiMuon.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping25/StrippingIFT/StrippingHeavyIonDiMuon.py
@@ -17,8 +17,7 @@ from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 from StandardParticles import StdAllLooseMuons
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand
-from Gaudi.Configuration import *
+from PhysSelPython.Wrappers import Selection
 __author__ = ['Yanxi ZHANG']
 __date__ = ''
 __version__ = '$Revision: 1.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping25/StrippingIFT/StrippingHeavyIonDst2D0KPiForPID.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping25/StrippingIFT/StrippingHeavyIonDst2D0KPiForPID.py
index a4eadcafc99ecc69608756d772f40be61aba1eff..185bf2bcee475c0742983d20949c506ca62f9672 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping25/StrippingIFT/StrippingHeavyIonDst2D0KPiForPID.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping25/StrippingIFT/StrippingHeavyIonDst2D0KPiForPID.py
@@ -13,10 +13,8 @@
 from StandardParticles import StdAllNoPIDsKaons, StdAllNoPIDsPions
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from LHCbKernel.Configuration import *
-from Gaudi.Configuration import *
+from PhysSelPython.Wrappers import Selection
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 __author__ = ['Philip Xing', 'Andrew Powell']
 __date__ = '23rd August 2012'
 __version__ = '$Revision: 7.0 $'
@@ -36,7 +34,7 @@ Usage:
 __all__ = ('HeavyIonDst2D0KPiForPIDConf', 'default_config', "D0", "Dstar")
 
 
-from GaudiKernel.SystemOfUnits import mm, cm, MeV, GeV
+from GaudiKernel.SystemOfUnits import GeV, MeV
 # from Configurables import FilterDesktop, CombineParticles
 
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping25/StrippingIFT/StrippingHeavyIonOpenCharm.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping25/StrippingIFT/StrippingHeavyIonOpenCharm.py
index fe413a53cc364ecb82542810d822bc5577fe31dd..4553b4495538c28fe3a86311f343da13beddde22 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping25/StrippingIFT/StrippingHeavyIonOpenCharm.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping25/StrippingIFT/StrippingHeavyIonOpenCharm.py
@@ -30,7 +30,7 @@ __all__ = (
 
 
 from GaudiKernel.SystemOfUnits import MeV, GeV, mrad, mm
-from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 # from Configurables import CombineParticles, FilterDesktop
 from StandardParticles import (
     StdAllNoPIDsKaons,
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping25/StrippingIFT/StrippingHeavyIonPIDCalib.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping25/StrippingIFT/StrippingHeavyIonPIDCalib.py
index 71fc25135a1eb40835cd3659d308c1fc4f4f9bc8..a28622e663420e695a47bd3f52cead7d9312e997 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping25/StrippingIFT/StrippingHeavyIonPIDCalib.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping25/StrippingIFT/StrippingHeavyIonPIDCalib.py
@@ -37,7 +37,6 @@ from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
 from Gaudi.Configuration import *
 __author__ = ['Yanxi ZHANG']
 __date__ = '25/02/2015'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping25/StrippingIFT/StrippingHeavyIonTrackEffMuonTT.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping25/StrippingIFT/StrippingHeavyIonTrackEffMuonTT.py
index d9a2032b62ee173bf309fb6a60ffd14d843a7418..d77dca0c6b7fb73b9b35cd2c02037f5a84b9bfd5 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping25/StrippingIFT/StrippingHeavyIonTrackEffMuonTT.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping25/StrippingIFT/StrippingHeavyIonTrackEffMuonTT.py
@@ -62,12 +62,11 @@ __all__ = ('HeavyIonTrackEffMuonTTConf',
            'makeBJpsiKTrackEff',
            'filterHLT2ForBJpsiK')
 
-from Gaudi.Configuration import *
-from PhysSelPython.Wrappers import Selection, DataOnDemand, ChargedProtoParticleSelection
+from PhysSelPython.Wrappers import ChargedProtoParticleSelection, Selection
 from StrippingConf.StrippingLine import StrippingLine
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from StrippingUtils.Utils import LineBuilder, checkConfig
-from StandardParticles import StdLooseKaons, StdLooseMuons, StdAllLooseMuons
+from StrippingUtils.Utils import LineBuilder
+from StandardParticles import StdAllLooseMuons, StdLooseKaons
 
 
 from Configurables import (MuonCombRec,
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping25/StrippingIFT/StrippingHeavyIonTrackEffVeloMuon.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping25/StrippingIFT/StrippingHeavyIonTrackEffVeloMuon.py
index 48751a571ff664e69d1fd4a5b8af79a36b4c8be5..80a17511dfec9773a6e9873ff521af9248a075ce 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping25/StrippingIFT/StrippingHeavyIonTrackEffVeloMuon.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping25/StrippingIFT/StrippingHeavyIonTrackEffVeloMuon.py
@@ -40,17 +40,14 @@ __all__ = ('HeavyIonTrackEffVeloMuonConf',
            )
 
 
-from Gaudi.Configuration import *
-from LHCbKernel.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 # from Configurables import CombineParticles
-from PhysSelPython.Wrappers import Selection, SelectionSequence, DataOnDemand
-from Configurables import ChargedProtoParticleMaker, NoPIDsParticleMaker, DataOnDemandSvc, DelegatingTrackSelector, TrackSelector, CombinedParticleMaker, BestPIDParticleMaker
+from PhysSelPython.Wrappers import Selection
+from Configurables import ChargedProtoParticleMaker, DataOnDemandSvc, DelegatingTrackSelector, NoPIDsParticleMaker, TrackSelector
 from Configurables import FastVeloTracking
 
 from StrippingConf.StrippingLine import StrippingLine
-from Configurables import TrackStateInitAlg, TrackEventFitter, TrackPrepareVelo, TrackContainerCopy, Tf__PatVeloSpaceTool, StandaloneMuonRec
-from Configurables import TrackCloneFinder
+from Configurables import StandaloneMuonRec, TrackPrepareVelo
 from StrippingUtils.Utils import LineBuilder
 # changed from StdLooseMuons, yanxi
 from StandardParticles import StdAllLooseMuons
@@ -59,14 +56,9 @@ from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, TisTosParticleT
 # from Configurables import TisTosParticleTagger
 
 from Configurables import GaudiSequencer
-from Configurables import TrackSys
-from PhysSelPython.Wrappers import AutomaticData
 # Get the fitters
-from TrackFitter.ConfiguredFitters import ConfiguredFit
 
-from Configurables import TrackEventCloneKiller, VeloMuonBuilder
-from Configurables import TrackEventFitter, TrackMasterFitter
-from Configurables import TrackKalmanFilter, TrackMasterExtrapolator
+from Configurables import VeloMuonBuilder
 # from TrackFitter.ConfiguredFitters import ConfiguredFastFitter
 # from Configurables import TrackCloneFinder
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping27/StrippingIFT/StrippingHeavyIonDiMuon.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping27/StrippingIFT/StrippingHeavyIonDiMuon.py
index 96c0813f05ded0d818ab52f9c278b44b00ba87c2..52296e67d2bb757faa7a7270fe9e3d38272c58f2 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping27/StrippingIFT/StrippingHeavyIonDiMuon.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping27/StrippingIFT/StrippingHeavyIonDiMuon.py
@@ -17,8 +17,7 @@ from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 from StandardParticles import StdAllLooseMuons
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand
-from Gaudi.Configuration import *
+from PhysSelPython.Wrappers import Selection
 __author__ = ['Yanxi ZHANG']
 __date__ = ''
 __version__ = '$Revision: 1.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping27/StrippingIFT/StrippingHeavyIonDst2D0KPiForPID.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping27/StrippingIFT/StrippingHeavyIonDst2D0KPiForPID.py
index 4282eb3c7b386840ce3bb3a47569a6a981e3194c..c3ba0aa8f46df637625d1f88481903dd9414f15e 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping27/StrippingIFT/StrippingHeavyIonDst2D0KPiForPID.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping27/StrippingIFT/StrippingHeavyIonDst2D0KPiForPID.py
@@ -13,10 +13,8 @@
 from StandardParticles import StdAllNoPIDsKaons, StdAllNoPIDsPions
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from LHCbKernel.Configuration import *
-from Gaudi.Configuration import *
+from PhysSelPython.Wrappers import Selection
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 __author__ = ['Philip Xing', 'Andrew Powell']
 __date__ = '23rd August 2012'
 __version__ = '$Revision: 7.0 $'
@@ -36,7 +34,7 @@ Usage:
 __all__ = ('HeavyIonDst2D0KPiForPIDConf', 'default_config', "D0", "Dstar")
 
 
-from GaudiKernel.SystemOfUnits import mm, cm, MeV, GeV
+from GaudiKernel.SystemOfUnits import GeV, MeV
 # from Configurables import FilterDesktop, CombineParticles
 
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping27/StrippingIFT/StrippingHeavyIonOpenCharm.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping27/StrippingIFT/StrippingHeavyIonOpenCharm.py
index ab9c1f95f256cb9b66c01167b9b256523bb14e9a..5d5f045d9c44b323203753069fffb848d389f85c 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping27/StrippingIFT/StrippingHeavyIonOpenCharm.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping27/StrippingIFT/StrippingHeavyIonOpenCharm.py
@@ -30,7 +30,7 @@ __all__ = (
 
 
 from GaudiKernel.SystemOfUnits import MeV, GeV, mrad, mm
-from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 # from Configurables import CombineParticles, FilterDesktop
 from StandardParticles import (
     StdAllNoPIDsKaons,
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping27/StrippingIFT/StrippingHeavyIonPIDCalib.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping27/StrippingIFT/StrippingHeavyIonPIDCalib.py
index 4d96b70412efeeaa567401f7247511c02704fc0f..635480e78d2cba544bf3537d6a6d0e92293ac75f 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping27/StrippingIFT/StrippingHeavyIonPIDCalib.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping27/StrippingIFT/StrippingHeavyIonPIDCalib.py
@@ -37,7 +37,6 @@ from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
 from Gaudi.Configuration import *
 __author__ = ['Yanxi ZHANG']
 __date__ = '25/02/2015'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping27/StrippingIFT/StrippingHeavyIonTrackEffMuonTT.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping27/StrippingIFT/StrippingHeavyIonTrackEffMuonTT.py
index 04451dca97551205e646eb1e70cd7bf64cf08168..a78c74425a4bbf3a691168a4e72c399948ff4012 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping27/StrippingIFT/StrippingHeavyIonTrackEffMuonTT.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping27/StrippingIFT/StrippingHeavyIonTrackEffMuonTT.py
@@ -62,12 +62,11 @@ __all__ = ('HeavyIonTrackEffMuonTTConf',
            'makeBJpsiKTrackEff',
            'filterHLT2ForBJpsiK')
 
-from Gaudi.Configuration import *
-from PhysSelPython.Wrappers import Selection, DataOnDemand, ChargedProtoParticleSelection
+from PhysSelPython.Wrappers import ChargedProtoParticleSelection, Selection
 from StrippingConf.StrippingLine import StrippingLine
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from StrippingUtils.Utils import LineBuilder, checkConfig
-from StandardParticles import StdLooseKaons, StdLooseMuons, StdAllLooseMuons
+from StrippingUtils.Utils import LineBuilder
+from StandardParticles import StdAllLooseMuons, StdLooseKaons
 
 
 from Configurables import (MuonCombRec,
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping27/StrippingIFT/StrippingHeavyIonTrackEffVeloMuon.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping27/StrippingIFT/StrippingHeavyIonTrackEffVeloMuon.py
index c91e15ecaaebcc3d1474c5d85d300398604504da..9b65c27646a93f1c79d2addef700eb3463f95e85 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping27/StrippingIFT/StrippingHeavyIonTrackEffVeloMuon.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping27/StrippingIFT/StrippingHeavyIonTrackEffVeloMuon.py
@@ -40,17 +40,14 @@ __all__ = ('HeavyIonTrackEffVeloMuonConf',
            )
 
 
-from Gaudi.Configuration import *
-from LHCbKernel.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 # from Configurables import CombineParticles
-from PhysSelPython.Wrappers import Selection, SelectionSequence, DataOnDemand
-from Configurables import ChargedProtoParticleMaker, NoPIDsParticleMaker, DataOnDemandSvc, DelegatingTrackSelector, TrackSelector, CombinedParticleMaker, BestPIDParticleMaker
+from PhysSelPython.Wrappers import Selection
+from Configurables import ChargedProtoParticleMaker, DataOnDemandSvc, DelegatingTrackSelector, NoPIDsParticleMaker, TrackSelector
 from Configurables import FastVeloTracking
 
 from StrippingConf.StrippingLine import StrippingLine
-from Configurables import TrackStateInitAlg, TrackEventFitter, TrackPrepareVelo, TrackContainerCopy, Tf__PatVeloSpaceTool, StandaloneMuonRec
-from Configurables import TrackCloneFinder
+from Configurables import StandaloneMuonRec, TrackPrepareVelo
 from StrippingUtils.Utils import LineBuilder
 # changed from StdLooseMuons, yanxi
 from StandardParticles import StdAllLooseMuons
@@ -59,14 +56,9 @@ from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, TisTosParticleT
 # from Configurables import TisTosParticleTagger
 
 from Configurables import GaudiSequencer
-from Configurables import TrackSys
-from PhysSelPython.Wrappers import AutomaticData
 # Get the fitters
-from TrackFitter.ConfiguredFitters import ConfiguredFit
 
-from Configurables import TrackEventCloneKiller, VeloMuonBuilder
-from Configurables import TrackEventFitter, TrackMasterFitter
-from Configurables import TrackKalmanFilter, TrackMasterExtrapolator
+from Configurables import VeloMuonBuilder
 # from TrackFitter.ConfiguredFitters import ConfiguredFastFitter
 # from Configurables import TrackCloneFinder
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingB2CC/StrippingB2JpsiHH.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingB2CC/StrippingB2JpsiHH.py
index 426a15a03fdb410fd33fba1d83ccac165f4c345b..ea80a2693083b0dd305af119c0794a0a03dd0088 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingB2CC/StrippingB2JpsiHH.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingB2CC/StrippingB2JpsiHH.py
@@ -20,18 +20,10 @@ __date__ = '10/11/2016'
 
 __all__ = ('B2JpsiHHConf', 'default_config')
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from CommonParticles.Utils import updateDoD
-from StandardParticles import StdLoosePions
-from StandardParticles import StdLooseKaons
-from StandardParticles import StdLooseProtons
-from StandardParticles import StdAllLooseKaons
-from StandardParticles import StdAllLooseProtons
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
+from PhysSelPython.Wrappers import DataOnDemand, Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from GaudiKernel.SystemOfUnits import MeV
 
 default_config = {
     'NAME': 'B2JpsiHH',
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingB2CC/StrippingB2JpsiPi0.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingB2CC/StrippingB2JpsiPi0.py
index 90740f80b4fbe5d7cdd945fc3fb2a4331ac1e49d..170baf2fb63c5dbaab6735a4dbe697c61ed379a3 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingB2CC/StrippingB2JpsiPi0.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingB2CC/StrippingB2JpsiPi0.py
@@ -14,15 +14,10 @@ __version__ = '$Revision: 1.1$'
 
 __all__ = ('B2JpsiPi0Conf', 'default_config')
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from CommonParticles.Utils import updateDoD
-from StandardParticles import StdLooseResolvedPi0
-from StandardParticles import StdLooseMergedPi0
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
+from PhysSelPython.Wrappers import DataOnDemand, Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from GaudiKernel.SystemOfUnits import MeV
 
 default_config = {
     # The real name of the lines is BetaS, this is a reference this for the Settings.
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingB2CC/StrippingB2JpsiPi0_Run1.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingB2CC/StrippingB2JpsiPi0_Run1.py
index 3f5f0443aa9132ab2494cbb48813c4ad8991fc1b..1bf462e0083a2da3704b1f804d03b10239ecd920 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingB2CC/StrippingB2JpsiPi0_Run1.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingB2CC/StrippingB2JpsiPi0_Run1.py
@@ -14,15 +14,10 @@ __version__ = '$Revision: 1.2$'
 
 __all__ = ('B2JpsiPi0Conf_RI', 'default_config')
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from CommonParticles.Utils import updateDoD
-from StandardParticles import StdLooseResolvedPi0
-from StandardParticles import StdLooseMergedPi0
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
+from PhysSelPython.Wrappers import DataOnDemand, Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from GaudiKernel.SystemOfUnits import MeV
 
 default_config = {
     # The real name of the lines is BetaS, this is a reference this for the Settings.
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingB2CC/StrippingB2JpsiX0.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingB2CC/StrippingB2JpsiX0.py
index d93a42cce82d84a0ed23627a007cbaad6d469573..e15a04497fca1b721a890552c1359e732098a2be 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingB2CC/StrippingB2JpsiX0.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingB2CC/StrippingB2JpsiX0.py
@@ -20,18 +20,10 @@ __date__ = '22/01/2018'
 
 __all__ = ('B2JpsiX0Conf', 'default_config')
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from CommonParticles.Utils import updateDoD
-from StandardParticles import StdLoosePions
-from StandardParticles import StdLooseKaons
-from StandardParticles import StdLooseProtons
-from StandardParticles import StdAllLooseKaons
-from StandardParticles import StdAllLooseProtons
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
+from PhysSelPython.Wrappers import DataOnDemand, Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from GaudiKernel.SystemOfUnits import MeV
 
 default_config = {
     'NAME': 'B2JpsiX0',
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingB2CC/StrippingB2JpsiXforBeta_s.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingB2CC/StrippingB2JpsiXforBeta_s.py
index f249942b6e70534073a342298d7e41c294d2ac84..83cfcf7fbfeca7d7da85f9148f6fff86360c328b 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingB2CC/StrippingB2JpsiXforBeta_s.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingB2CC/StrippingB2JpsiXforBeta_s.py
@@ -26,16 +26,12 @@ __version__ = '$Revision: 4.0$'
 
 __all__ = ('B2JpsiXforBeta_sConf', 'default_config')
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from CommonParticles.Utils import updateDoD
 from StandardParticles import StdLoosePions
 from StandardParticles import StdLooseKaons
-from StandardParticles import StdAllLooseKaons
 from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from GaudiKernel.SystemOfUnits import MeV
 
 default_config = {
     'NAME': 'BetaS',
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingB2CC/StrippingBd2JpsieeKS.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingB2CC/StrippingBd2JpsieeKS.py
index 447acfd66a8a888ea16f056888b1b5a41ccee167..ccac3244d5f71227250f84d9c5d0c485845ab5b3 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingB2CC/StrippingBd2JpsieeKS.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingB2CC/StrippingBd2JpsieeKS.py
@@ -8,16 +8,10 @@
 # granted to it by virtue of its status as an Intergovernmental Organization  #
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
-from GaudiKernel.SystemOfUnits import MeV
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
-from StandardParticles import StdAllLooseKaons
-from StandardParticles import StdLooseKaons
-from StandardParticles import StdLoosePions
-from CommonParticles.Utils import updateDoD
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = 'Ramon Niet'
 __date__ = '2014/10/23'
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingB2CC/StrippingBd2JpsieeKstar.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingB2CC/StrippingBd2JpsieeKstar.py
index 692c26648abbb976dff28c0eca9daad7a9006f8c..d8622e85421314a8e33b7cf0702ca0a098f82955 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingB2CC/StrippingBd2JpsieeKstar.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingB2CC/StrippingBd2JpsieeKstar.py
@@ -12,7 +12,6 @@ from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from Configurables import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = 'Artur Ukleja, Jibo He, Konrad Klimaszewski, Varvara Batozskaya'
 __date__ = '2019/01/22'
 '''
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingB2CC/StrippingBs2EtacPhiBDT.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingB2CC/StrippingBs2EtacPhiBDT.py
index b6e256eaa1235a84cbf3b68362eea9bf7f387897..30d69a2c110a19ab5a45303854da636781997f4f 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingB2CC/StrippingBs2EtacPhiBDT.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingB2CC/StrippingBs2EtacPhiBDT.py
@@ -17,7 +17,6 @@ from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
-from Gaudi.Configuration import *
 __author__ = ['Morgan Martin, Jibo He']
 __date__ = '20/08/2014'
 __version__ = '$Revision: 1.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingB2CC/StrippingBs2JpsieePhi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingB2CC/StrippingBs2JpsieePhi.py
index 933c2f46f93196ffa448a855cea7a82e5fca3652..ee8bf0cf2aad66cd3771f048a336fffb0ed8165d 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingB2CC/StrippingBs2JpsieePhi.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingB2CC/StrippingBs2JpsieePhi.py
@@ -12,7 +12,6 @@ from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from Configurables import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = 'Artur Ukleja, Jibo He, Konrad Klimaszewski'
 __date__ = '2011/03/01'
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingB2OC/Beauty2Charm_B2DXBuilder.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingB2OC/Beauty2Charm_B2DXBuilder.py
index d01512cfa739b391ff97e67788844c3effae961e..8d36b45c37f55b97d51ff29b4d93997aa5326da5 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingB2OC/Beauty2Charm_B2DXBuilder.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingB2OC/Beauty2Charm_B2DXBuilder.py
@@ -12,11 +12,7 @@
 
 from copy import deepcopy
 from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-from PhysSelPython.Wrappers import Selection
-from Beauty2Charm_LoKiCuts import LoKiCuts
 from Beauty2Charm_Utils import *
-from Configurables import SubstitutePID
 
 # \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\#
 
@@ -1355,7 +1351,7 @@ class B2DXBuilder(object):
             'B2D0st2460D0Pi':
             ["B+ -> D*_2(2460)0 D0 pi+", "B- -> D*_2(2460)0 D0 pi-"]
         }
-        input = self.dst.dpi_2460_pid + self.d.kpi_pid + self.topoKaons_PID
+        self.dst.dpi_2460_pid + self.d.kpi_pid + self.topoKaons_PID
         inputs = {
             'B2D0st2460D0K':
             self.dst.dpi_2460_pid + self.d.kpi_pid + self.topoKaons_PID,
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingB2OC/Beauty2Charm_Bc2BXBuilder.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingB2OC/Beauty2Charm_Bc2BXBuilder.py
index 63ecc854364bae2f29d64ea2b95c3484988c7016..5bb9297a5c69f56bc7b9761489bf517623df7d3c 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingB2OC/Beauty2Charm_Bc2BXBuilder.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingB2OC/Beauty2Charm_Bc2BXBuilder.py
@@ -8,11 +8,9 @@
 # granted to it by virtue of its status as an Intergovernmental Organization  #
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
-from copy import deepcopy
 from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 from PhysSelPython.Wrappers import Selection, MergedSelection
-from Beauty2Charm_LoKiCuts import LoKiCuts
 from Beauty2Charm_Utils import *
 
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingB2OC/Beauty2Charm_Bc2DDBuilder.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingB2OC/Beauty2Charm_Bc2DDBuilder.py
index 17eda4547110606bb00b589ef9a9081a7ab985e7..44526bcd78bbc48eb6f8c6416c9eabdc38313ac4 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingB2OC/Beauty2Charm_Bc2DDBuilder.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingB2OC/Beauty2Charm_Bc2DDBuilder.py
@@ -11,10 +11,8 @@
 
 # \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\#
 
-from copy import deepcopy
 from Gaudi.Configuration import *
-from PhysSelPython.Wrappers import Selection, MergedSelection
-from Beauty2Charm_LoKiCuts import LoKiCuts
+from PhysSelPython.Wrappers import MergedSelection
 from Beauty2Charm_Utils import *
 # from Configurables import SubstitutePID
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingB2OC/Beauty2Charm_Bc2DXBuilder.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingB2OC/Beauty2Charm_Bc2DXBuilder.py
index af663b7592071fc14302f44aa5c2a5b5eb5608d2..7449f0734a1fbe2c6eafc03f67ed71d3bfd70c18 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingB2OC/Beauty2Charm_Bc2DXBuilder.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingB2OC/Beauty2Charm_Bc2DXBuilder.py
@@ -10,9 +10,6 @@
 ###############################################################################
 from copy import deepcopy
 from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-from PhysSelPython.Wrappers import Selection, MergedSelection
-from Beauty2Charm_LoKiCuts import LoKiCuts
 from Beauty2Charm_Utils import *
 
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingB2OC/Beauty2Charm_DBuilder.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingB2OC/Beauty2Charm_DBuilder.py
index 05f581bbff7f17fff94ce5901071ecb1d04665fa..802efc84d8efe6a8f5cdf53a5fbd653ce0be38e8 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingB2OC/Beauty2Charm_DBuilder.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingB2OC/Beauty2Charm_DBuilder.py
@@ -385,7 +385,6 @@ class DBuilder(object):
         # self.k3pi_ddx_pid = [filterSelection('D2k3pi_for_DDX',LoKiCuts(['VCHI2DOF','BPVVDCHI2'],config_for_ddx).code(),self.k3pi_pid)]
 
         # use this below
-        d_cf_noMassWin = d_cf
         d_cf = LoKiCuts.combine([d_cf, "in_range(%s,MM,%s)" % (d_min, d_max)])
         ds_cf = LoKiCuts.combine(
             [ds_cf, "in_range(%s,MM,%s)" % (ds_min, ds_max)])
@@ -2050,9 +2049,6 @@ class DBuilder(object):
 
     def _makeD2PhiMuNu(self, up=False):
         '''makes Ds->phi mu nu'''
-        decays = [['phi(1020)', 'mu+']]
-        min = '1125.13*MeV'
-        max = '2168.49*MeV'
         cpkk = CombineParticles(
             # ( hasTopoChild() )
             CombinationCut="ADAMASS('phi(1020)') < 150*MeV",
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingB2OC/Beauty2Charm_HHBuilder.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingB2OC/Beauty2Charm_HHBuilder.py
index 08f113046063b0225620e80b961f1c934caada99..83e86c72dbafe11cee4a83ba99c7328e94737144 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingB2OC/Beauty2Charm_HHBuilder.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingB2OC/Beauty2Charm_HHBuilder.py
@@ -10,7 +10,6 @@
 ###############################################################################
 # \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\#
 
-from copy import deepcopy
 from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 from PhysSelPython.Wrappers import Selection
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingB2OC/Beauty2Charm_HHHBuilder.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingB2OC/Beauty2Charm_HHHBuilder.py
index 4ca95e738689e28e73bea3eb642ac88f607712a1..28ca931f76590f11cdabcf62760db4c23769a749 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingB2OC/Beauty2Charm_HHHBuilder.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingB2OC/Beauty2Charm_HHHBuilder.py
@@ -10,9 +10,8 @@
 ###############################################################################
 # \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\#
 
-from copy import deepcopy
 from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N3BodyDecays
+from GaudiConfUtils.ConfigurableGenerators import DaVinci__N3BodyDecays
 from PhysSelPython.Wrappers import Selection
 from Beauty2Charm_LoKiCuts import LoKiCuts
 from Beauty2Charm_Utils import *
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingB2OC/Beauty2Charm_Lb2XBuilder.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingB2OC/Beauty2Charm_Lb2XBuilder.py
index dcd1e601c49b3297d24264a6d98a913f91f89a72..360fe99e73d9fbbe48f9065cb1246d7467de0572 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingB2OC/Beauty2Charm_Lb2XBuilder.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingB2OC/Beauty2Charm_Lb2XBuilder.py
@@ -1598,7 +1598,7 @@ class Lb2XBuilder(object):
 
     def _makeX2LcKPiPiPi(self):
         '''Makes RS + WS Xib -> Lc HH + c.c.'''
-        pions = self.pions
+        self.pions
         kaons = self.kaons
         pipipi = self.hhh.pipipi
         config = deepcopy(self.config)
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingB2OC/Beauty2Charm_LoKiCuts.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingB2OC/Beauty2Charm_LoKiCuts.py
index 54540ea2a223d554a751b02cf83000df4f3aa076..0fd327f8d32075591c9ca0e2d4dd434636c0ab35 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingB2OC/Beauty2Charm_LoKiCuts.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingB2OC/Beauty2Charm_LoKiCuts.py
@@ -10,11 +10,6 @@
 ###############################################################################
 # \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\#
 
-from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
-from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-from PhysSelPython.Wrappers import Selection, MergedSelection
-from StandardParticles import StdNoPIDsPions, StdNoPIDsKaons
 
 # \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\#
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingB2OC/Beauty2Charm_Utils.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingB2OC/Beauty2Charm_Utils.py
index 7949e5482cf0df4296d969b96966d2057310c75b..84d6df19648bdd16451bbfa4a21be153c20799e4 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingB2OC/Beauty2Charm_Utils.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingB2OC/Beauty2Charm_Utils.py
@@ -10,13 +10,11 @@
 ###############################################################################
 # \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\#
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-from PhysSelPython.Wrappers import DataOnDemand, Selection, MergedSelection, VoidEventSelection
+from PhysSelPython.Wrappers import DataOnDemand, Selection, VoidEventSelection
 from Beauty2Charm_LoKiCuts import LoKiCuts
 from Configurables import SubstitutePID
-from Configurables import ConeJetProxyFilter
 
 # \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\#
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingB2OC/StrippingB2DDphi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingB2OC/StrippingB2DDphi.py
index b0f8982f1efb389032da5f7becb2881e3c005379..92ca95c2ea3f7c46766aedbc04dbbc34c9c0b8ef 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingB2OC/StrippingB2DDphi.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingB2OC/StrippingB2DDphi.py
@@ -15,8 +15,7 @@ Author: M. Martinelli
 Notes: Excited states are included by placing the line in FULL.DST
 '''
 from PhysSelPython.Wrappers import Selection, DataOnDemand
-from Configurables import FilterDesktop, CombineParticles, DaVinci__N4BodyDecays
-from GaudiConfUtils.ConfigurableGenerators import CombineParticles
+from Configurables import DaVinci__N4BodyDecays, FilterDesktop
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 __author__ = ['Maurizio Martinelli']
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingB2OC/StrippingB2DXD2HMuNu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingB2OC/StrippingB2DXD2HMuNu.py
index 0c33c7610ceda08cc07fbbc35c72e2186d8d5d81..d01564ec9dde10135fe1fc2b84e567d131876e4c 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingB2OC/StrippingB2DXD2HMuNu.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingB2OC/StrippingB2DXD2HMuNu.py
@@ -12,13 +12,11 @@ __author__ = ['Wenbin Qian']
 __date__ = '09/11/2015'
 __version__ = '$Revision: 0.01 $'
 
-from Gaudi.Configuration import *
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, DaVinci__N4BodyDecays, DaVinci__N3BodyDecays
-from PhysSelPython.Wrappers import Selection, DataOnDemand
+from PhysSelPython.Wrappers import Selection
 from StandardParticles import StdLooseMuons, StdLoosePions, StdLooseKaons
-from GaudiKernel.SystemOfUnits import MeV, GeV, cm, mm
 
 __all__ = ('B2DXD2HMuNuBuilder',
            'default_config')
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingB2OC/StrippingB2nbody.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingB2OC/StrippingB2nbody.py
index 663bdbbf855c3d8d19dad3a29b6be667edaeedb9..04c84fc2dc39eb4b3d3d954f3c0083396e0c84fa 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingB2OC/StrippingB2nbody.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingB2OC/StrippingB2nbody.py
@@ -16,7 +16,6 @@ from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, MergedSelection, DataOnDemand, VoidEventSelection
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = ['Rudolf Oldeman']
 __date__ = '08/02/2011'
 __version__ = '$Revision: 1.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingB2OC/StrippingBeauty2Charm.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingB2OC/StrippingBeauty2Charm.py
index a421e32148d742d448b27f54fba26c87e40b5895..f5120a3fa4ee8a0825bc29d4073d1232811d83f7 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingB2OC/StrippingBeauty2Charm.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingB2OC/StrippingBeauty2Charm.py
@@ -28,11 +28,9 @@ from StandardParticles import (StdAllNoPIDsPions, StdAllNoPIDsKaons,
                                StdAllNoPIDsProtons, StdNoPIDsUpPions,
                                StdLooseMuons, StdNoPIDsUpKaons,
                                StdLooseResolvedPi0, StdLooseMergedPi0)
-from Configurables import LoKi__VoidFilter
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import EventSelection
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
+from PhysSelPython.Wrappers import MergedSelection, Selection
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
 from Gaudi.Configuration import *
 import re
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBandQ/StrippingB2Chic0KPi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBandQ/StrippingB2Chic0KPi.py
index 69e18721b3c6b45435046eaac0c9a79d5818b6da..030871800dfb7d9f6c18c93c207febaf3fad5cf8 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBandQ/StrippingB2Chic0KPi.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBandQ/StrippingB2Chic0KPi.py
@@ -17,7 +17,6 @@ from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
-from Gaudi.Configuration import *
 __author__ = ['Andrii Usachov']
 __date__ = '13/03/2018'
 __version__ = '$Revision: 1.2$'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBandQ/StrippingB2JpsiXforEM_s.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBandQ/StrippingB2JpsiXforEM_s.py
index d3aeeef75411f9cecca87053ee0faa991e8c7fd8..394fd7c3171d61beb9b93f762a890a248f2b190f 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBandQ/StrippingB2JpsiXforEM_s.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBandQ/StrippingB2JpsiXforEM_s.py
@@ -20,21 +20,11 @@ __version__ = '$Revision: 0.0 $'
 
 __all__ = ('B2JpsiXforEM_sConf', 'default_config')
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
 from Configurables import LoKi__PVReFitter, CombineParticles
-from CommonParticles.Utils import updateDoD
-from StandardParticles import StdLoosePions
-from StandardParticles import StdLooseKaons
-from StandardParticles import StdAllLooseKaons
-from StandardParticles import StdLooseResolvedPi0
-from StandardParticles import StdLooseMergedPi0
-from StandardParticles import StdNoPIDsPions
-from StandardParticles import StdLooseProtons
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
+from PhysSelPython.Wrappers import DataOnDemand, Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from GaudiKernel.SystemOfUnits import MeV
 
 default_config = {
     'NAME': 'B2JpsiXforEM',
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBandQ/StrippingBbbar2PhiPhi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBandQ/StrippingBbbar2PhiPhi.py
index 2c308991a8d9592619777fb7aad4c619a4a40437..fd4e526f5796889d5eb13efd1f1fca7adfbf4a97 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBandQ/StrippingBbbar2PhiPhi.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBandQ/StrippingBbbar2PhiPhi.py
@@ -21,12 +21,10 @@ confBbbar2PhiPhi = Bbbar2PhiPhiConf( name = 'Bbbar2PhiPhi', config = config_Bbba
 stream.appendLines( confBbbar2PhiPhi.lines() )
 '''
 
-from StandardParticles import StdNoPIDsProtons, StdNoPIDsPions, StdNoPIDsDownPions
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
+from PhysSelPython.Wrappers import DataOnDemand, Selection
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = ['Simone Stracka']
 __date__ = '10/03/2015'
 __all__ = (
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBandQ/StrippingBc2EtacMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBandQ/StrippingBc2EtacMu.py
index 8877c5bc3695f72c52af39f4f7af13d852e6e6d9..c522e1fc84c22650c7812568ffa4584c11d9a7f1 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBandQ/StrippingBc2EtacMu.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBandQ/StrippingBc2EtacMu.py
@@ -15,9 +15,8 @@ Module for B_c->eta_c mu
 
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand, AutomaticData
+from PhysSelPython.Wrappers import DataOnDemand, Selection
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = ['Valeriia Zhovkovska']
 __date__ = '15/03/2019'
 __version__ = '$Revision: 1.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBandQ/StrippingBc2JpsiHBDT.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBandQ/StrippingBc2JpsiHBDT.py
index d973f13d2bc8b32c5045776e5b5d3f96bc618e74..7b5a84a9de9b55f09a9ef0da7469b5cc113c4602 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBandQ/StrippingBc2JpsiHBDT.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBandQ/StrippingBc2JpsiHBDT.py
@@ -18,7 +18,6 @@ from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = ['Jibo He']
 __date__ = '02/11/2013'
 __version__ = '$Revision: 2.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBandQ/StrippingBc2JpsiMuXNew.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBandQ/StrippingBc2JpsiMuXNew.py
index 946bad8366ac6019498b9d14e89f0a8899cf70d4..bd156feb81f0deaaf2a07b14df76bcbbcdd03d5c 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBandQ/StrippingBc2JpsiMuXNew.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBandQ/StrippingBc2JpsiMuXNew.py
@@ -18,7 +18,6 @@ from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = ['Jibo He']
 __date__ = '02/09/2010'
 __version__ = '$Revision: 2.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBandQ/StrippingCC2DD.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBandQ/StrippingCC2DD.py
index 58f89513ddb6f5ae23ad89c616deb7d8f0c6f719..39a30438368c27a6a42f57688de187a8b1135e72 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBandQ/StrippingCC2DD.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBandQ/StrippingCC2DD.py
@@ -22,8 +22,7 @@ Module for construction of CC->D D, where CC is a particle decaying to D D
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 __author__ = ['Lucio Anderlini', 'Andrea Bizzeti']
 __date__ = '2015-12-01'
 __version__ = '$Revision: 0.4 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBandQ/StrippingCcbar2Baryons.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBandQ/StrippingCcbar2Baryons.py
index e5a87f652fa30a90026cc6172bb112eb157c1e0f..3e235742a82cc6b6eef181ba5871e7096a9e965d 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBandQ/StrippingCcbar2Baryons.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBandQ/StrippingCcbar2Baryons.py
@@ -20,7 +20,6 @@ stream.appendLines( [
 ])
 '''
 
-from StandardParticles import StdNoPIDsProtons, StdNoPIDsPions, StdNoPIDsDownPions
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBandQ/StrippingCcbar2KsKpi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBandQ/StrippingCcbar2KsKpi.py
index b6b5864ff95625b5e45b988663cfea44c0f42cdc..4fc4ffd7e775d5d46e7701adb4802707efae0b7c 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBandQ/StrippingCcbar2KsKpi.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBandQ/StrippingCcbar2KsKpi.py
@@ -18,9 +18,8 @@ Module for Charmonium->Ks K pi, including three lines
 
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand, AutomaticData
+from PhysSelPython.Wrappers import DataOnDemand, Selection
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = ['Valeriia Zhovkovska']
 __date__ = '07/03/2019'
 __version__ = '$Revision: 1.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBandQ/StrippingCcbar2LambdaLambda.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBandQ/StrippingCcbar2LambdaLambda.py
index 627203da22f81a94eda9c6247ea6c2a1fb128927..283be918e66c410e5d5d0c9fd13effb397d4b70b 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBandQ/StrippingCcbar2LambdaLambda.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBandQ/StrippingCcbar2LambdaLambda.py
@@ -12,14 +12,10 @@
 Module for selecting Ccbar->LambdaLambda detached line, with loose PT, PID cuts. 
 '''
 
-from StandardParticles import StdAllLoosePions
-from StandardParticles import StdLoosePions, StdNoPIDsDownPions
-from StandardParticles import StdNoPIDsProtons
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = ['Andrii Usachov']
 __date__ = '27/01/2019'
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBandQ/StrippingCcbar2LstLambda.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBandQ/StrippingCcbar2LstLambda.py
index 0c317712061ae5a153e89bd41b8390a4fc74e187..4937ef3626431e3998bb3086fe7c656fa4ec9e57 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBandQ/StrippingCcbar2LstLambda.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBandQ/StrippingCcbar2LstLambda.py
@@ -12,14 +12,10 @@
 Module for selecting Ccbar->LstLambda detached line, with loose PT, PID cuts. 
 '''
 
-from StandardParticles import StdAllLoosePions, StdAllLooseKaons
-from StandardParticles import StdLoosePions, StdNoPIDsDownPions, StdLooseKaons, StdLooseDownKaons
-from StandardParticles import StdNoPIDsProtons, StdNoPIDsKaons
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = ['Andrii Usachov']
 __date__ = '23/11/2017'
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBandQ/StrippingCcbar2LstLst.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBandQ/StrippingCcbar2LstLst.py
index cf2d3319f4c8d473c85741f08945e6d15bd1722b..fb7af606490052a513bd2a8433237fcbfca14aa4 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBandQ/StrippingCcbar2LstLst.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBandQ/StrippingCcbar2LstLst.py
@@ -12,12 +12,10 @@
 Module for selecting Ccbar->LstLst detached line, with loose PT, PID cuts. 
 '''
 
-from StandardParticles import StdNoPIDsProtons, StdNoPIDsKaons
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
+from PhysSelPython.Wrappers import DataOnDemand, Selection
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = ['Andrii Usachov']
 __date__ = '12/01/2017'
 
@@ -58,19 +56,19 @@ class Ccbar2LstLstConf(LineBuilder):
         self.name = name
         self.config = config
 
-        TRCHI2DOF = config['TRCHI2DOF']
-        KaonProbNNk = config['KaonProbNNk']
-        KaonPTSec = config['KaonPTSec']
-        ProtonProbNNp = config['ProtonProbNNp']
-        ProtonP = config['ProtonP']
-        ProtonPTSec = config['ProtonPTSec']
-        LstVtxChi2 = config['LstVtxChi2']
-        LstMinMass = config['LstMinMass']
-        LstMaxMass = config['LstMaxMass']
-        CombMaxMass = config['CombMaxMass']
-        CombMinMass = config['CombMinMass']
-        MaxMass = config['MaxMass']
-        MinMass = config['MinMass']
+        config['TRCHI2DOF']
+        config['KaonProbNNk']
+        config['KaonPTSec']
+        config['ProtonProbNNp']
+        config['ProtonP']
+        config['ProtonPTSec']
+        config['LstVtxChi2']
+        config['LstMinMass']
+        config['LstMaxMass']
+        config['CombMaxMass']
+        config['CombMinMass']
+        config['MaxMass']
+        config['MinMass']
 
         self.DetachedProtonForLst = self.createSubSel(OutputList="DetachedProtonForLst" + self.name,
                                                       InputList=DataOnDemand(
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBandQ/StrippingCcbar2PPPiPi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBandQ/StrippingCcbar2PPPiPi.py
index 28b6a56f5499cd8ecbce8b1d1e366f216f123073..91e5c78c655288eb933c6478d1eafcaee3904f84 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBandQ/StrippingCcbar2PPPiPi.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBandQ/StrippingCcbar2PPPiPi.py
@@ -12,12 +12,11 @@
 Module for selecting charmonium -> p pbar pi pi 
 '''
 
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
+from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
 from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
-from Gaudi.Configuration import *
 __author__ = ['Jibo He']
 __date__ = '12/11/2015'
 __version__ = '$Revision: 1.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBandQ/StrippingCcbar2PhiPhi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBandQ/StrippingCcbar2PhiPhi.py
index c21b9fa874a5dccb0d9c373c28e255bbe309ea95..101a8e21ba087c6c991fe35e18471728a0abe2e3 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBandQ/StrippingCcbar2PhiPhi.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBandQ/StrippingCcbar2PhiPhi.py
@@ -21,12 +21,10 @@ confCcbar2PhiPhi = Ccbar2PhiPhiConf( name = 'Ccbar2PhiPhi', config = config_Ccba
 stream.appendLines( confCcbar2PhiPhi.lines() )
 '''
 
-from StandardParticles import StdNoPIDsProtons, StdNoPIDsPions, StdNoPIDsDownPions
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
+from PhysSelPython.Wrappers import DataOnDemand, Selection
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = ['Jibo He']
 __date__ = '20/01/2012'
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBandQ/StrippingCcbar2PhiPhiDetached.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBandQ/StrippingCcbar2PhiPhiDetached.py
index 9cece8aa8a316b6c48d7062407ae3c5e4a4703e3..8d48d19f4b11b35402f710baec49d8b99bec7f11 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBandQ/StrippingCcbar2PhiPhiDetached.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBandQ/StrippingCcbar2PhiPhiDetached.py
@@ -15,12 +15,10 @@ Inherited from StrippingCcbar2PhiPhi.py; moved To FullDST
 
 '''
 
-from StandardParticles import StdNoPIDsProtons, StdNoPIDsPions, StdNoPIDsDownPions
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
+from PhysSelPython.Wrappers import DataOnDemand, Selection
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = ['Jibo He, Liupan An']
 __date__ = '11/01/2017'
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBandQ/StrippingCcbar2PhiPhiPiPi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBandQ/StrippingCcbar2PhiPhiPiPi.py
index 3255f0fb24ce2bf3d5dedf3d48901b1a3b7fdf4c..8ded03963ceb90126c111e3d53772e2529b17348 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBandQ/StrippingCcbar2PhiPhiPiPi.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBandQ/StrippingCcbar2PhiPhiPiPi.py
@@ -12,12 +12,11 @@
 Module for selecting charmonium -> phi phi pi pi 
 '''
 
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
+from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
 from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
-from Gaudi.Configuration import *
 __author__ = ['Andrii Usachov']
 __date__ = '10/04/2017'
 __version__ = '$Revision: 1.1 $'
@@ -60,12 +59,12 @@ class Ccbar2PhiPhiPiPiConf(LineBuilder):
         self.name = name
         self.config = config
 
-        PhiVtxChi2 = config['PhiVtxChi2']
-        PhiMassW = config['PhiMassW']
-        KaonPT = config['KaonPT']
-        TRCHI2DOF = config['TRCHI2DOF']
-        KaonProbNNk = config['KaonProbNNk']
-        KaonIPCHI2 = config['KaonIPCHI2']
+        config['PhiVtxChi2']
+        config['PhiMassW']
+        config['KaonPT']
+        config['TRCHI2DOF']
+        config['KaonProbNNk']
+        config['KaonIPCHI2']
 
         self.SelPions = self.createSubSel(OutputList=self.name + "SelPions",
                                           InputList=DataOnDemand(
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBandQ/StrippingCcbar2PpbarNew.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBandQ/StrippingCcbar2PpbarNew.py
index 7b897199b13de2dc141c8f7cbc7d68b45c57f609..247fee87e88715cbf6df1707199f9b596c0115a8 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBandQ/StrippingCcbar2PpbarNew.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBandQ/StrippingCcbar2PpbarNew.py
@@ -18,9 +18,8 @@ Module for Charmonium->p pbar, including three lines
 
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
+from PhysSelPython.Wrappers import Selection
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 __author__ = ['Jibo He']
 __date__ = '03/10/2010'
 __version__ = '$Revision: 1.2 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBandQ/StrippingChiCJPsiGammaConv.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBandQ/StrippingChiCJPsiGammaConv.py
index 0974ad33bc785e6c21ccfbd8abd76c1de3c8330d..13c82277579b4165c559b3e45a8dc8a26f329028 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBandQ/StrippingChiCJPsiGammaConv.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBandQ/StrippingChiCJPsiGammaConv.py
@@ -11,8 +11,7 @@
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
-from Configurables import FilterDesktop, CombineParticles, OfflineVertexFitter
-from Gaudi.Configuration import *
+from Configurables import CombineParticles, FilterDesktop
 __author__ = 'Edwige Tournefier'
 __date__ = '08/06/2012'
 __version__ = '$ 1.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBandQ/StrippingDiMuonForXsection.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBandQ/StrippingDiMuonForXsection.py
index 99d45c194f644de10f8a90371ed1079dcd2e147e..7ceb214bd70cc59ffa52391a7a3321cce9dba642 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBandQ/StrippingDiMuonForXsection.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBandQ/StrippingDiMuonForXsection.py
@@ -16,7 +16,6 @@ from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
-from Gaudi.Configuration import *
 __author__ = ['Jibo He']
 __date__ = '28/03/2012'
 __version__ = '$Revision: 1.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBandQ/StrippingDiMuonNew.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBandQ/StrippingDiMuonNew.py
index 7c60c2e0a15b0e700724dae73d54a428fd669c7a..dd539e9d69fb0fa229c32fd245d281db456c4fed 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBandQ/StrippingDiMuonNew.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBandQ/StrippingDiMuonNew.py
@@ -60,7 +60,6 @@ from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand, EventSelection
 from Configurables import LoKi__VoidFilter
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
-from Gaudi.Configuration import *
 __author__ = ['Jibo He']
 __date__ = '30/09/2010'
 __version__ = '$Revision: 1.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBandQ/StrippingEtap2pipimumu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBandQ/StrippingEtap2pipimumu.py
index d3d1d1ace791be2cf505fc6059dff04cd92af55b..af48f7c83025956348c7d9b1611c8e902321aa5f 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBandQ/StrippingEtap2pipimumu.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBandQ/StrippingEtap2pipimumu.py
@@ -13,9 +13,7 @@ from StandardParticles import StdAllLooseMuons, StdAllLoosePions, StdAllLooseKao
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, OfflineVertexFitter
-from Gaudi.Configuration import *
-from copy import copy
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop
 __author__ = ['Xabier Cid Vidal']
 # inspired by StrippingD2XMuMuSSConf, from Malcolm John, B. Viaud and O. Kochebina
 __date__ = '25/1/2019'
@@ -149,10 +147,10 @@ class StrippingEtap2pipimumuConf(LineBuilder):
 
         LineBuilder.__init__(self, name, config)
 
-        Ds2EtapLine_name = name+"_Ds2Etap"
-        Bu2EtapLine_name = name+"_Bu2Etap"
-        Ds2Phi3PiLine_name = name+"_Ds2Phi3Pi"
-        Bu2JPsiKLine_name = name+"_Bu2JPsiK"
+        name+"_Ds2Etap"
+        name+"_Bu2Etap"
+        name+"_Ds2Phi3Pi"
+        name+"_Bu2JPsiK"
 
         # 1 : Make pions and kaons
         selPionsEta = makeDaughters(
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBandQ/StrippingHeavyBaryons.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBandQ/StrippingHeavyBaryons.py
index fdc48e45e9d8cddbdbd0c89c4f67663a329603f3..500f8829198f1352b6129c8bf22fff77d3f04e68 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBandQ/StrippingHeavyBaryons.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBandQ/StrippingHeavyBaryons.py
@@ -12,14 +12,10 @@
 Stripping line for HeavyBaryons studies : Xi_b-, Xi_b0 and Omega_b-
 Author: Yasmine Amhis
 '''
-from GaudiKernel.SystemOfUnits import MeV
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
-from StandardParticles import StdAllLoosePions, StdAllLooseKaons
-from StandardParticles import StdLoosePions, StdNoPIDsDownPions, StdLooseKaons, StdLooseDownKaons
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = ['Yasmine Amhis']
 __date__ = '19/05/2011'
 __version__ = '$Revision: 1.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBandQ/StrippingInclusiveCharmBaryons.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBandQ/StrippingInclusiveCharmBaryons.py
index a64e6452e0858c91aeb86cc42eebceee0762821f..56181c2008f1c579eb3fe7d29d46c1f0ef3a29fb 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBandQ/StrippingInclusiveCharmBaryons.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBandQ/StrippingInclusiveCharmBaryons.py
@@ -17,13 +17,10 @@ Author: M. Stahl
 Notes: Be creative!
 '''
 from PhysSelPython.Wrappers import Selection, AutomaticData
-import math
 from LoKiProtoParticles.decorators import *
 from LoKiArrayFunctors.decorators import *
 from LoKiPhys.decorators import *
-from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-from Configurables import FilterDesktop
-from PhysConf.Selections import FilterSelection, CombineSelection, Combine4BodySelection, Combine3BodySelection, LimitSelection, MergedSelection
+from PhysConf.Selections import Combine3BodySelection, Combine4BodySelection, FilterSelection, MergedSelection
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 __author__ = ['Marian Stahl']
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBandQ/StrippingInclusiveDoubleD.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBandQ/StrippingInclusiveDoubleD.py
index 3bb5f912fc5f4b7d935b2372622aaf76e01b2ed4..f78227698244a8dcef2b4170c65ff0781e60729a 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBandQ/StrippingInclusiveDoubleD.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBandQ/StrippingInclusiveDoubleD.py
@@ -18,12 +18,9 @@ Author: M. Stahl
 Notes: Be creative!
 '''
 from PhysSelPython.Wrappers import Selection, AutomaticData
-import math
 from LoKiProtoParticles.decorators import *
 from LoKiArrayFunctors.decorators import *
 from LoKiPhys.decorators import *
-from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-from Configurables import FilterDesktop
 from PhysConf.Selections import FilterSelection, CombineSelection, Combine3BodySelection, MergedSelection
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBandQ/StrippingLb2EtacKp.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBandQ/StrippingLb2EtacKp.py
index 595b70726ad9e4327f73d63a9aed16d30c954c9e..f21e96937e0a0f4934eb8717cbd5c1562a53ba43 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBandQ/StrippingLb2EtacKp.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBandQ/StrippingLb2EtacKp.py
@@ -18,7 +18,6 @@ from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = ['Liming Zhang', 'Xuesong Liu']
 __date__ = '23/11/2016'
 __version__ = '$Revision: 2.0$'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBandQ/StrippingOmegabDecays.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBandQ/StrippingOmegabDecays.py
index 6cb9b0c8ab26d14b40905a6b266eb3f859e415cb..445c8816a29eef4ec56c715fd44e85bbab2a5a0f 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBandQ/StrippingOmegabDecays.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBandQ/StrippingOmegabDecays.py
@@ -26,8 +26,7 @@ __all__ = ('OmegabDecaysConf', 'makeXic', 'makeOmegac', 'makeXic0',
            'makeOmegab2Omegacpi', 'makeOmegab2Omegacpi0pi',
            'makeOmegab2Omegacgammapi', 'default_config')
 
-from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBandQ/StrippingPPMuMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBandQ/StrippingPPMuMu.py
index cfa93241546b8cb1958f0c080bce3ed3974eb196..1e28adc9f8419151808afa067316d7a0f98387fb 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBandQ/StrippingPPMuMu.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBandQ/StrippingPPMuMu.py
@@ -12,12 +12,11 @@
 Module for selecting Hc -> p pbar mu mu
 '''
 
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
+from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
 from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
-from Gaudi.Configuration import *
 __author__ = ['Liupan An']
 __date__ = '18/05/2017'
 __version__ = '$Revision: 1.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBandQ/StrippingXib2LcKpiDecays.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBandQ/StrippingXib2LcKpiDecays.py
index 7d0962de93c0a70d6a707584ddbd31872e92b9e0..b1f2adb65e934b4fa528ea5d459b36bd5fe0ffce 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBandQ/StrippingXib2LcKpiDecays.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBandQ/StrippingXib2LcKpiDecays.py
@@ -24,8 +24,7 @@ __version__ = '$Revision: 1.0 $'
 __all__ = ('XibDecaysConf', 'makeLc', 'makeXic0', 'makeXib2LcKpi',
            'makeXib2Xicpi', 'default_config')
 
-from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBandQ/StrippingXibc.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBandQ/StrippingXibc.py
index ed73d91a4d03fe2ff6427b7cd54ccc7ed18aeaa7..d0446cddfd42feba526eaf11c9d8cf13a4160779 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBandQ/StrippingXibc.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBandQ/StrippingXibc.py
@@ -47,17 +47,11 @@ __all__ = ('XibcBuilder'  # LineBuilder class specialization
            )
 
 
-from Gaudi.Configuration import *
-
 from Configurables import FilterDesktop, CombineParticles
 from PhysSelPython.Wrappers import Selection, AutomaticData, MergedSelection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 
-from CommonParticles.StdLooseLambda import StdLooseLambdaLL, StdLooseLambdaDD
-from GaudiKernel.SystemOfUnits import MeV, GeV, mm
-from Configurables import TisTosParticleTagger
-
 
 default_name = "Xibc"
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBandQ/StrippingXibcBDT.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBandQ/StrippingXibcBDT.py
index 5520ac91aac71eded5064eb9daf551c6b35891fe..28b1ca4c2d5b6567ed207d4b3cd2e8dcd52a9324 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBandQ/StrippingXibcBDT.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBandQ/StrippingXibcBDT.py
@@ -33,8 +33,6 @@ from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticle
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, MergedSelection, DataOnDemand
-from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays
-from Gaudi.Configuration import *
 __author__ = ['Jibo He']
 __date__ = '20/11/2016'
 __version__ = '$Revision: 1.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBandQ/StrippingXiccBDT.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBandQ/StrippingXiccBDT.py
index 0fda677dfb8d63acd803c2278c95da8b32d22700..7dde23cf7ee6e3329158f6ed2ef36ed1b1c5655c 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBandQ/StrippingXiccBDT.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBandQ/StrippingXiccBDT.py
@@ -30,9 +30,7 @@ Xicc+  -> D+ p+ K-
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, MergedSelection, DataOnDemand
-from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays
-from Gaudi.Configuration import *
+from PhysSelPython.Wrappers import DataOnDemand, Selection
 __author__ = ['Jibo He']
 __date__ = '20/11/2016'
 __version__ = '$Revision: 1.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBnoC/StrippingB24pLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBnoC/StrippingB24pLines.py
index fed91323554dd309e9a4137174eba46ba8676d87..2c744f40e0299eacf7acf157af33557db0eec23d 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBnoC/StrippingB24pLines.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBnoC/StrippingB24pLines.py
@@ -54,12 +54,10 @@ Exported symbols (use python help!):
    - 
 """
 
-from GaudiKernel.PhysicalConstants import c_light
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
-from Configurables import FilterDesktop, CombineParticles, DaVinci__N4BodyDecays
-from Gaudi.Configuration import *
+from Configurables import DaVinci__N4BodyDecays
 __author__ = ["Pietro Marino", "Oliver Gruenberg"]
 __date__ = "13.10.2017"
 __version__ = "$Revision: 3.0 $"
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBnoC/StrippingB2CharmlessInclusive.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBnoC/StrippingB2CharmlessInclusive.py
index 056df1189d8c6e124a4dcb4201ec68d8ac1fc40d..8ae9f04166a6ba66089d684f07c4dfc79cbbc333 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBnoC/StrippingB2CharmlessInclusive.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBnoC/StrippingB2CharmlessInclusive.py
@@ -16,9 +16,8 @@ from StandardParticles import StdLooseKsDD, StdLooseKsLL
 from StandardParticles import StdNoPIDsPions, StdLooseAllPhotons, StdLooseMergedPi0, StdLooseResolvedPi0
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand, SimpleSelection, MergedSelection
+from PhysSelPython.Wrappers import MergedSelection, Selection, SimpleSelection
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = ['Fred Blanc', 'Luca Pescatore']
 __date__ = '23/01/2019'
 __version__ = '$Revision: 3.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBnoC/StrippingB2HHBDT.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBnoC/StrippingB2HHBDT.py
index 58ec12b040a0d920e656286d4bfc1dda9cf9a73f..e6d9ba6ae39bf426ebdfb99b036c32ac4554915e 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBnoC/StrippingB2HHBDT.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBnoC/StrippingB2HHBDT.py
@@ -24,16 +24,13 @@ __all__ = ('B2HHBDTLines',
            'applyBDT',
            'default_config')
 
-from Gaudi.Configuration import *
 
-from GaudiKernel.SystemOfUnits import *
-
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 from StandardParticles import StdNoPIDsPions
 
 from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
-from StrippingUtils.Utils import LineBuilder, checkConfig
+from StrippingUtils.Utils import LineBuilder
 
 
 default_config = {
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBnoC/StrippingB2HHPi0.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBnoC/StrippingB2HHPi0.py
index bb255a96ff5e37e3059e4fd6df5cfadc8cfb0b7a..f8813f46fcbbc60b4f1ff068547e0ee3c7d07454 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBnoC/StrippingB2HHPi0.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBnoC/StrippingB2HHPi0.py
@@ -27,9 +27,8 @@ __all__ = ('StrippingB2HHPi0Conf',
            'makeB2HHPi0M',
            'default_config')
 
-from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from PhysSelPython.Wrappers import Selection, DataOnDemand
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
+from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from StandardParticles import StdNoPIDsPions, StdLooseMergedPi0, StdLooseResolvedPi0
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBnoC/StrippingB2KShh.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBnoC/StrippingB2KShh.py
index f404e2a87328dc23eb64929a9a9f3cd002ddadcf..2dcd40aee03deb0e241de124f68de39f1abe783b 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBnoC/StrippingB2KShh.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBnoC/StrippingB2KShh.py
@@ -25,7 +25,6 @@ __version__ = 'Stripping24r1/Stripping26r1'
 __all__ = {'B2KShhConf',
            'default_config'}
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, DaVinci__N3BodyDecays
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBnoC/StrippingB2KShhh.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBnoC/StrippingB2KShhh.py
index f95cf109667b3401f5eb904c78285279c34d00b5..07d236ac77af02d637424d32f3f4e637192ba3e1 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBnoC/StrippingB2KShhh.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBnoC/StrippingB2KShhh.py
@@ -27,13 +27,13 @@ __all__ = ('B2KShhhConf',
 
 from Gaudi.Configuration import *
 
-from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N4BodyDecays
+from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays
 from StandardParticles import StdNoPIDsPions, StdNoPIDsKaons  # ipchi2 cut
 from StandardParticles import StdLooseKsDD, StdLooseKsLL
 
-from PhysSelPython.Wrappers import Selection, MergedSelection
+from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
-from StrippingUtils.Utils import LineBuilder, checkConfig
+from StrippingUtils.Utils import LineBuilder
 
 from Configurables import FilterDesktop
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBnoC/StrippingB2Ksthh.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBnoC/StrippingB2Ksthh.py
index 94a25a2714e9626cb22e6966b9ad7a1955d78eb9..a39998cb04eef71b62a1bf9337b6fb914d58a917 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBnoC/StrippingB2Ksthh.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBnoC/StrippingB2Ksthh.py
@@ -22,7 +22,6 @@ __version__ = 'Stripping26'
 __all__ = {'B2KsthhConf',
            'default_config'}
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
@@ -176,7 +175,7 @@ class B2KsthhConf(LineBuilder):
         _massCutHigh = "(AM<(5279+%s)*MeV)" % config['B_Mhigh']
         _aptCut = "(APT>%s*MeV)" % config['B_APTmin']
         _daugMedPtCut = "(ANUM(PT>%s*MeV)>=2)" % config['BDaug_MedPT_PT']
-        _daugMaxPtIPCut = "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['BDaug_MaxPT_IP']
+        "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['BDaug_MaxPT_IP']
         _daugPtSumCut = "((APT1+APT2+APT3)>%s*MeV)" % config['BDaug_PTsum']
 
         _combCuts = _aptCut
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBnoC/StrippingB2TwoBaryons.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBnoC/StrippingB2TwoBaryons.py
index 8911a3d3bdc4a0add9f550c63095470ab59d4fef..93fef262a5bd7d8cd0abd1063e287bef85404e66 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBnoC/StrippingB2TwoBaryons.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBnoC/StrippingB2TwoBaryons.py
@@ -31,11 +31,10 @@ from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
 from StandardParticles import StdLooseProtons
 from StandardParticles import StdNoPIDsPions as Pions
-from CommonParticles.StdLooseLambda import StdLooseLambdaLL, StdLooseLambdaDD
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
-from StrippingUtils.Utils import LineBuilder, checkConfig
-from GaudiKernel.SystemOfUnits import MeV, GeV, mm, ns
+from StrippingUtils.Utils import LineBuilder
+from GaudiKernel.SystemOfUnits import GeV, MeV, mm
 
 default_config = {'NAME': 'B2TwoBaryons',
                   'WGs': ['BnoC'],
@@ -157,7 +156,7 @@ class B2TwoBaryonLines(LineBuilder):
 
         B2PPbarName = name + "B2PPbar"
 
-        B2PPSameSignName = name + "B2PPSameSign"
+        name + "B2PPSameSign"
 
         B2Lp_dd_name = name+'B2PLambdabarDD'
         B2Lp_ll_name = name+'B2PLambdabarLL'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBnoC/StrippingB2XEta.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBnoC/StrippingB2XEta.py
index e1adec50004bf9392e263cc5cb3ba465d4e08bf7..95fbd42162ff7cf67819bcb2ccbe2b4f88c30155 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBnoC/StrippingB2XEta.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBnoC/StrippingB2XEta.py
@@ -25,9 +25,7 @@ from StandardParticles import StdLoosePions as Pions
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, DaVinci__N3BodyDecays
-from PhysSelPython.Wrappers import DataOnDemand, Selection, SelectionSequence, MergedSelection
-from GaudiKernel import SystemOfUnits as Units
-from Gaudi.Configuration import *
+from PhysSelPython.Wrappers import DataOnDemand, MergedSelection, Selection
 __author__ = ['Timothy Williams']
 __date__ = '1/12/2016'
 __version__ = 'Stripping26r1'
@@ -564,7 +562,7 @@ class B2XEtaConf(LineBuilder):
         _trackCuts = _track_PT+'&'+_track_Chi2+'&'+_track_GPCut+'&'+_track_PIDCut
         _combCuts = _massCut+'&'+_docaCut
         _combCut12Doca = "ACHI2DOCA(1,2)<%s" % config['eta_DOCA']
-        _combCut12Vtx = "(VFASPF(VCHI2/VDOF)<%s)" % config['eta_vtxChi2']
+        "(VFASPF(VCHI2/VDOF)<%s)" % config['eta_vtxChi2']
         _combCut12 = _combCut12Doca
 
         # _eta3Pi=CombineParticles("eta3Pi",
@@ -592,7 +590,7 @@ class B2XEtaConf(LineBuilder):
         _trackCuts = _track_PT+'&'+_track_Chi2+'&'+_track_GPCut+'&'+_track_PIDCut
         _combCuts = _massCut+'&'+_docaCut
         _combCut12Doca = "ACHI2DOCA(1,2)<%s" % config['eta_prime_DOCA']
-        _combCut12Vtx = "(VFASPF(VCHI2/VDOF)<%s)" % config['eta_prime_vtxChi2']
+        "(VFASPF(VCHI2/VDOF)<%s)" % config['eta_prime_vtxChi2']
         _combCut12 = _combCut12Doca
 
         # _etap=CombineParticles("etap",
@@ -883,7 +881,7 @@ class B2XEtaConf(LineBuilder):
         _combCuts = _massCut+'&'+_docaCut
         _allCuts = _PTCut+'&'+_vtxCut+'&'+_diraCut+'&'+_IPChi2Cut
         _combCut12Doca = "ACHI2DOCA(1,2)<%s" % config['LbDaug_LL_maxDocaChi2']
-        _combCut12Vtx = "(VFASPF(VCHI2/VDOF)<%s)" % config['Lb_VtxChi2']
+        "(VFASPF(VCHI2/VDOF)<%s)" % config['Lb_VtxChi2']
         _combCut12 = _combCut12Doca
 
         _Lb2pKetap = DaVinci__N3BodyDecays(DecayDescriptor="[Lambda_b0 -> p+ K- eta_prime]cc",
@@ -921,7 +919,7 @@ class B2XEtaConf(LineBuilder):
         _combCuts = _massCut
         _allCuts = _PTCut+'&'+_IPChi2Cut+'&'+_vtxCut+'&'+_diraCut
         _combCut12Doca = "ACHI2DOCA(1,2)<%s" % config['LbDaug_LL_maxDocaChi2']
-        _combCut12Vtx = "(VFASPF(VCHI2/VDOF)<%s)" % config['Lb_VtxChi2']
+        "(VFASPF(VCHI2/VDOF)<%s)" % config['Lb_VtxChi2']
         _combCut12 = _combCut12Doca
 
         _Lb2pKeta3Pi = DaVinci__N3BodyDecays(DecayDescriptor="[Lambda_b0 -> p+ K- eta]cc",
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBnoC/StrippingB2a1Pi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBnoC/StrippingB2a1Pi.py
index 29c0766744b242c4ed1be4817cca727495bcb265..9f701cc986294843a275fb204128fb9f3c88fb1d 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBnoC/StrippingB2a1Pi.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBnoC/StrippingB2a1Pi.py
@@ -17,7 +17,6 @@ from Configurables import DaVinci__N4BodyDecays
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
-from Gaudi.Configuration import *
 __author__ = ['Daniel Vieira, Jibo He']
 __date__ = '01/12/2016'
 __version__ = '$Revision: 1.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBnoC/StrippingB2hhpipiPhsSpcCut.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBnoC/StrippingB2hhpipiPhsSpcCut.py
index 08e1d2943eafcfa9ad7d1764a6d5aab6ce3c9526..9fe5c82af0b14937c33c30fd9627961fa0731c0a 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBnoC/StrippingB2hhpipiPhsSpcCut.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBnoC/StrippingB2hhpipiPhsSpcCut.py
@@ -17,7 +17,6 @@ from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = ['Daniel Vieira']
 __date__ = '29/11/2018'
 __version__ = '$Revision: 1.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBnoC/StrippingB2pphh.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBnoC/StrippingB2pphh.py
old mode 100755
new mode 100644
index 782d89e7466f93f490e15dd1095ac153359b502b..99d5b7265b684f2c69cc962f37bc4fe0b20ac220
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBnoC/StrippingB2pphh.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBnoC/StrippingB2pphh.py
@@ -25,16 +25,13 @@ __all__ = ('B2pphhConf',
            )
 
 
-from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop
+from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
 # from Configurables import DaVinci__N4BodyDecays
 from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays
 
-from StandardParticles import StdAllNoPIDsKaons, StdAllNoPIDsPions, StdAllNoPIDsProtons
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from Configurables import LoKi__VoidFilter as VoidFilter
 
 default_config = {
     'NAME': 'B2pphh',
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBnoC/StrippingBc2hhh_BnoC.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBnoC/StrippingBc2hhh_BnoC.py
index cc0952e7ed4c72dc5b618028ac8bc563928c126d..21b92fa5aab68df4d68f10c50e59c126b546bd31 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBnoC/StrippingBc2hhh_BnoC.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBnoC/StrippingBc2hhh_BnoC.py
@@ -23,13 +23,11 @@ Exported symbols (use python help!):
    - makeppK_excl  
 '''
 
-from Configurables import LoKi__VoidFilter as VoidFilter
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection
 import StandardParticles
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 __author__ = ['Alvaro Gomes', 'Adlene Hicheur']
 __date__ = '31/08/2014'
 __version__ = '$Revision: 1.5 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBnoC/StrippingBs2KKhh.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBnoC/StrippingBs2KKhh.py
index 8e1d82eebe3207f2b0821206169ad4c382873b63..9bc10b6c09e8b7c4b3ef80530670c7b690b78229 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBnoC/StrippingBs2KKhh.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBnoC/StrippingBs2KKhh.py
@@ -36,7 +36,6 @@ from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop
-from Gaudi.Configuration import *
 __author__ = ['Sean Benson', 'Adam Morris', 'Laurence Carson',
               'Emmy Pauline Maria Gabriel', 'Markus Roehrken']
 __date__ = '29/05/2019'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBnoC/StrippingBs2KSKS_Run2.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBnoC/StrippingBs2KSKS_Run2.py
index 629ca8140bd72d6380100393e840bf791f2f2cd9..6afaa37fab4f411e76010a848c09d7d72e5a05d9 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBnoC/StrippingBs2KSKS_Run2.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBnoC/StrippingBs2KSKS_Run2.py
@@ -22,15 +22,11 @@ __date__ = '13/09/2016'
 __version__ = 'Run2'
 __all__ = {'Bs2KSKSConf', 'default_config'}
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
+from PhysSelPython.Wrappers import DataOnDemand, Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 
-from StandardParticles import StdNoPIDsPions as Pions
-from StandardParticles import StdNoPIDsDownPions as DownPions
-
 
 default_config = {
     'NAME': 'Bs2KSKS',
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBnoC/StrippingBs2Kst_0Kst_0.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBnoC/StrippingBs2Kst_0Kst_0.py
index 6179c70e7f0f16586cd5a958eb2131e9f13bf1ad..7345868ade6e0cebd873ec58d7ea07808efe59f9 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBnoC/StrippingBs2Kst_0Kst_0.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBnoC/StrippingBs2Kst_0Kst_0.py
@@ -22,11 +22,8 @@ Rate estimated on 100K events using a 2017 data sample is: 0.027%
 
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, SelectionSequence, DataOnDemand
+from PhysSelPython.Wrappers import DataOnDemand, Selection
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-from CommonParticles.Utils import *
-from LHCbKernel.Configuration import *
-from Gaudi.Configuration import *
 __author__ = ['Brais Sanmartin Sedes']
 __date__ = '12/11/2015'
 __version__ = '5.1'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBnoC/StrippingBs2PhiKst0.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBnoC/StrippingBs2PhiKst0.py
index ceb8daa24373fc0cd210ec42fdbc56fd456f51e4..0c1ff7d620f2ef3058536bb8bbba7bedc35b168a 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBnoC/StrippingBs2PhiKst0.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBnoC/StrippingBs2PhiKst0.py
@@ -20,11 +20,8 @@ Exported symbols (use python help!):
 
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, SelectionSequence, DataOnDemand
+from PhysSelPython.Wrappers import DataOnDemand, Selection
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-from CommonParticles.Utils import *
-from LHCbKernel.Configuration import *
-from Gaudi.Configuration import *
 __author__ = ['Brais Sanmartin Sedes']
 __date__ = '01/12/2015'
 __version__ = '5.0'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBnoC/StrippingBs2PhiPhi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBnoC/StrippingBs2PhiPhi.py
index 0f280a3a06ba478759dc6e19bf80e278c15e5d40..1124dcdfd432c594fe79f1bc1e0b70fc24f9d21f 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBnoC/StrippingBs2PhiPhi.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBnoC/StrippingBs2PhiPhi.py
@@ -23,13 +23,10 @@ Exports the following stripping lines as instance data members:
 '''
 
 from StandardParticles import StdAllLooseANNKaons as MyLooseKaons
-from StandardParticles import StdLooseANNUpKaons as MyLooseUpKaons
-import StandardParticles
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
+from PhysSelPython.Wrappers import Selection
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 __author__ = ['Sean Benson']
 __date__ = '2013/08/15'
 __version__ = '3.0'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBnoC/StrippingBu2Ksthh.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBnoC/StrippingBu2Ksthh.py
index 5a06d1502605fd2037a6b16043d5efb150ce86d5..032717bced65040c1e6edaf12520110a1398cd1d 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBnoC/StrippingBu2Ksthh.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBnoC/StrippingBu2Ksthh.py
@@ -23,7 +23,6 @@ __version__ = 'Stripping26'
 __all__ = {'Bu2KsthhConf',
            'default_config'}
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
@@ -302,7 +301,7 @@ class Bu2KsthhConf(LineBuilder):
         _massCutHigh = "(AM<(5279+%s)*MeV)" % config['B_Mhigh']
         _aptCut = "(APT>%s*MeV)" % config['B_APTmin']
         _daugMedPtCut = "(ANUM(PT>%s*MeV)>=2)" % config['BDaug_MedPT_PT']
-        _daugMaxPtIPCut = "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['BDaug_MaxPT_IP']
+        "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['BDaug_MaxPT_IP']
         _maxDocaChi2Cut = "(ACUTDOCACHI2(%s,''))" % config['BDaug_DD_maxDocaChi2']
         _daugPtSumCut = "((APT1+APT2+APT3)>%s*MeV)" % config['BDaug_DD_PTsum']
 
@@ -359,7 +358,7 @@ class Bu2KsthhConf(LineBuilder):
         _massCutHigh = "(AM<(5279+%s)*MeV)" % config['B_Mhigh']
         _aptCut = "(APT>%s*MeV)" % config['B_APTmin']
         _daugMedPtCut = "(ANUM(PT>%s*MeV)>=2)" % config['BDaug_MedPT_PT']
-        _daugMaxPtIPCut = "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['BDaug_MaxPT_IP']
+        "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['BDaug_MaxPT_IP']
         _maxDocaChi2Cut = "(ACUTDOCACHI2(%s,''))" % config['BDaug_LL_maxDocaChi2']
         _daugPtSumCut = "((APT1+APT2+APT3)>%s*MeV)" % config['BDaug_LL_PTsum']
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBnoC/StrippingBu2hhh.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBnoC/StrippingBu2hhh.py
index 890eba4692dbe06517c0d7aee8f51d320cca8a64..62ede4129b7f2bd6ff173b27d26ebf7e47e4e6ea 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBnoC/StrippingBu2hhh.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBnoC/StrippingBu2hhh.py
@@ -22,13 +22,11 @@ Exported symbols (use python help!):
    - makepph_incl
 '''
 
-from Configurables import LoKi__VoidFilter as VoidFilter
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection
 import StandardParticles
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 __author__ = ['Irina Nasteva', 'Jussara Miranda', 'Alvaro Gomes']
 __date__ = '19/05/2017'
 __version__ = 'Stripping29'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBnoC/StrippingBu2rho0rhoPlus.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBnoC/StrippingBu2rho0rhoPlus.py
index 6ff36ce6304e5d819eb96fe6ca06587bb1baa6cc..51df1d5067b9100ee67537610b0005b048a5d51f 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBnoC/StrippingBu2rho0rhoPlus.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBnoC/StrippingBu2rho0rhoPlus.py
@@ -21,7 +21,6 @@ from StrippingUtils.Utils import LineBuilder, checkConfig
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = "Jason E Andrews"
 __date__ = "26/11/2016"
 __version__ = "4.0"
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBnoC/StrippingButo5h.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBnoC/StrippingButo5h.py
index be4eeb8a2dc0617afde7aab5929540d3bc8d05c7..65e1b29f0dde00492a6a5432e53292b9bc4c81a7 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBnoC/StrippingButo5h.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBnoC/StrippingButo5h.py
@@ -23,13 +23,11 @@ Exported symbols (use python help!):
    - makeppKpipi_excl
 '''
 
-from Configurables import LoKi__VoidFilter as VoidFilter
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection
 import StandardParticles
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 __author__ = ['Luiz Gustavo de Oliveira',
               'Alvaro Gomes', 'Bruno Souza de Paula']
 __date__ = '22/Aug/2014'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBnoC/StrippingD2HHBDT.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBnoC/StrippingD2HHBDT.py
index 6bee345112d54e258044f31f0e7d809849b112f7..98ef43000bc5732a81fe2e10bace645263334787 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBnoC/StrippingD2HHBDT.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBnoC/StrippingD2HHBDT.py
@@ -23,14 +23,13 @@ __all__ = ('D2HHBDTLines',
            'makeD2HHBDT',
            'default_config')
 
-from Gaudi.Configuration import *
 
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
 from StandardParticles import StdNoPIDsKaons, StdAllNoPIDsPions
 
 from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
-from StrippingUtils.Utils import LineBuilder, checkConfig
+from StrippingUtils.Utils import LineBuilder
 
 
 default_config = {
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBnoC/StrippingHb2Charged2Body.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBnoC/StrippingHb2Charged2Body.py
index 11da99218434ae71c894fa73b708dca4ee60de5d..3b3424d2fb6688333e151f52793701a7a2c00dbe 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBnoC/StrippingHb2Charged2Body.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBnoC/StrippingHb2Charged2Body.py
@@ -23,14 +23,13 @@ __all__ = ('Hb2Charged2BodyLines',
            'makeB2Charged2Body',
            'default_config')
 
-from Gaudi.Configuration import *
 
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-from StandardParticles import StdNoPIDsPions, StdLooseProtons, StdLooseKaons
+from StandardParticles import StdNoPIDsPions
 
 from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
-from StrippingUtils.Utils import LineBuilder, checkConfig
+from StrippingUtils.Utils import LineBuilder
 
 
 default_config = {
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBnoC/StrippingHb2V0V0h.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBnoC/StrippingHb2V0V0h.py
index 6b1c9eb94b261dbc185e979f0314ffe2bd69f930..f3104c9b58e73817c70f7fa7e3d68a0b9ecf0860 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBnoC/StrippingHb2V0V0h.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBnoC/StrippingHb2V0V0h.py
@@ -22,7 +22,6 @@ __date__ = '10/02/2017'
 __version__ = 'Stripping28'
 __all__ = 'Hb2V0V0hConf'
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBnoC/StrippingLb2V04h.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBnoC/StrippingLb2V04h.py
index 9581b3a3c8ca532b0fcd72075b16cc16ae289eea..a344f55b8065990dea1a13cd3f596086b2c4c743 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBnoC/StrippingLb2V04h.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBnoC/StrippingLb2V04h.py
@@ -24,7 +24,6 @@ __date__ = '28/05/2019'
 __version__ = 'Stripping28r2'
 __all__ = 'Lb2V04hConf'
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
@@ -381,7 +380,7 @@ class Lb2V04hConf(LineBuilder):
         _vtxChi2Cut = "(VFASPF(VCHI2)<%s)" % config['Lb_VtxChi2']
         _diraCut = "(BPVDIRA>%s)" % config['Lb_DD_Dira']
         _ipChi2Cut = "(MIPCHI2DV(PRIMARY)<%s)" % config['Lb_DD_IPCHI2wrtPV']
-        _fdCut = "(VFASPF(VMINVDDV(PRIMARY))>%s)" % config['Lb_FDwrtPV']
+        "(VFASPF(VMINVDDV(PRIMARY))>%s)" % config['Lb_FDwrtPV']
         _fdChi2Cut = "(BPVVDCHI2>%s)" % config['Lb_DD_FDChi2']
 
         _motherCuts = _ptCut
@@ -556,7 +555,7 @@ class Lb2V04hConf(LineBuilder):
         _vtxChi2Cut = "(VFASPF(VCHI2)<%s)" % config['Lb_VtxChi2']
         _diraCut = "(BPVDIRA>%s)" % config['Lb_LD_Dira']
         _ipChi2Cut = "(MIPCHI2DV(PRIMARY)<%s)" % config['Lb_LD_IPCHI2wrtPV']
-        _fdCut = "(VFASPF(VMINVDDV(PRIMARY))>%s)" % config['Lb_FDwrtPV']
+        "(VFASPF(VMINVDDV(PRIMARY))>%s)" % config['Lb_FDwrtPV']
         _fdChi2Cut = "(BPVVDCHI2>%s)" % config['Lb_LD_FDChi2']
 
         _motherCuts = _ptCut
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBnoC/StrippingLb2V0hh.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBnoC/StrippingLb2V0hh.py
index f63034e02f45426009146384bed4036d16056a26..e896944db6cf521ad12d86186f9bda930b5bfd87 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBnoC/StrippingLb2V0hh.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBnoC/StrippingLb2V0hh.py
@@ -25,7 +25,6 @@ __date__ = '11/01/2017'
 __version__ = 'Stripping28'
 __all__ = 'Lb2V0hhConf'
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
@@ -211,8 +210,8 @@ class Lb2V0hhConf(LineBuilder):
         _vtxCut = "(VFASPF(VCHI2)<%s)   " % config['Lambda_DD_VtxChi2']
         _fdChi2Cut = "(BPVVDCHI2>%s)" % config['Lambda_DD_FDChi2']
         _momCut = "(P>%s*MeV)" % config['Lambda_DD_Pmin']
-        _trkGhostProbCut1 = "(CHILDCUT((TRGHOSTPROB<%s),1))" % config['Trk_GhostProb']
-        _trkGhostProbCut2 = "(CHILDCUT((TRGHOSTPROB<%s),2))" % config['Trk_GhostProb']
+        "(CHILDCUT((TRGHOSTPROB<%s),1))" % config['Trk_GhostProb']
+        "(CHILDCUT((TRGHOSTPROB<%s),2))" % config['Trk_GhostProb']
 
         _allCuts = _momCut
         _allCuts += '&'+_massCut
@@ -268,8 +267,8 @@ class Lb2V0hhConf(LineBuilder):
         _vtxCut = "(VFASPF(VCHI2)<%s)   " % config['Lambda_DD_VtxChi2']
         _fdChi2Cut = "(BPVVDCHI2>%s)" % config['Lambda_DD_FDChi2']
         _momCut = "(P>%s*MeV)" % config['Lambda_DD_Pmin']
-        _trkGhostProbCut1 = "(CHILDCUT((TRGHOSTPROB<%s),1))" % config['Trk_GhostProb']
-        _trkGhostProbCut2 = "(CHILDCUT((TRGHOSTPROB<%s),2))" % config['Trk_GhostProb']
+        "(CHILDCUT((TRGHOSTPROB<%s),1))" % config['Trk_GhostProb']
+        "(CHILDCUT((TRGHOSTPROB<%s),2))" % config['Trk_GhostProb']
 
         _allCuts = _momCut
         _allCuts += '&'+_massCut
@@ -302,7 +301,7 @@ class Lb2V0hhConf(LineBuilder):
         _massCutHigh = "(AM<(5619+%s)*MeV)" % config['Lb_2bodyMhigh']
         _aptCut = "(APT>%s*MeV)" % config['Lb_APTmin']
         _daugMedPtCut = "(ANUM(PT>%s*MeV)>=2)" % config['LbDaug_MedPT_PT']
-        _daugMaxPtIPCut = "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP']
+        "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP']
         _maxDocaChi2Cut = "(ACUTDOCACHI2(%s,''))" % config['LbDaug_DD_maxDocaChi2']
         _daugPtSumCut = "(APT1>%s*MeV)" % config['Lbh_DD_PTMin']
 
@@ -353,7 +352,7 @@ class Lb2V0hhConf(LineBuilder):
         _massCutHigh = "(AM<(5619+%s)*MeV)" % config['Lb_Mhigh']
         _aptCut = "(APT>%s*MeV)" % config['Lb_APTmin']
         _daugMedPtCut = "(ANUM(PT>%s*MeV)>=2)" % config['LbDaug_MedPT_PT']
-        _daugMaxPtIPCut = "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP']
+        "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP']
         _maxDocaChi2Cut = "(ACUTDOCACHI2(%s,''))" % config['LbDaug_DD_maxDocaChi2']
         _daugPtSumCut = "((APT1+APT2+APT3)>%s*MeV)" % config['LbDaug_DD_PTsum']
 
@@ -369,7 +368,7 @@ class Lb2V0hhConf(LineBuilder):
         _vtxChi2Cut = "(VFASPF(VCHI2)<%s)" % config['Lb_VtxChi2']
         _diraCut = "(BPVDIRA>%s)" % config['Lb_DD_Dira']
         _ipChi2Cut = "(MIPCHI2DV(PRIMARY)<%s)" % config['Lb_DD_IPCHI2wrtPV']
-        _fdCut = "(VFASPF(VMINVDDV(PRIMARY))>%s)" % config['Lb_FDwrtPV']
+        "(VFASPF(VMINVDDV(PRIMARY))>%s)" % config['Lb_FDwrtPV']
         _fdChi2Cut = "(BPVVDCHI2>%s)" % config['Lb_DD_FDChi2']
 
         _motherCuts = _ptCut
@@ -541,7 +540,7 @@ class Lb2V0hhConf(LineBuilder):
         _massCutHigh = "(AM<(5619+%s)*MeV)" % config['Lb_2bodyMhigh']
         _aptCut = "(APT>%s*MeV)" % config['Lb_APTmin']
         _daugMedPtCut = "(ANUM(PT>%s*MeV)>=2)" % config['LbDaug_MedPT_PT']
-        _daugMaxPtIPCut = "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP']
+        "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP']
         _maxDocaChi2Cut = "(ACUTDOCACHI2(%s,''))" % config['LbDaug_LD_maxDocaChi2']
         _daugPtSumCut = "(APT1>%s*MeV)" % config['Lbh_LD_PTMin']
 
@@ -592,7 +591,7 @@ class Lb2V0hhConf(LineBuilder):
         _massCutHigh = "(AM<(5619+%s)*MeV)" % config['Lb_Mhigh']
         _aptCut = "(APT>%s*MeV)" % config['Lb_APTmin']
         _daugMedPtCut = "(ANUM(PT>%s*MeV)>=2)" % config['LbDaug_MedPT_PT']
-        _daugMaxPtIPCut = "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP']
+        "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP']
         _maxDocaChi2Cut = "(ACUTDOCACHI2(%s,''))" % config['LbDaug_LD_maxDocaChi2']
         _daugPtSumCut = "((APT1+APT2+APT3)>%s*MeV)" % config['LbDaug_LD_PTsum']
 
@@ -608,7 +607,7 @@ class Lb2V0hhConf(LineBuilder):
         _vtxChi2Cut = "(VFASPF(VCHI2)<%s)" % config['Lb_VtxChi2']
         _diraCut = "(BPVDIRA>%s)" % config['Lb_LD_Dira']
         _ipChi2Cut = "(MIPCHI2DV(PRIMARY)<%s)" % config['Lb_LD_IPCHI2wrtPV']
-        _fdCut = "(VFASPF(VMINVDDV(PRIMARY))>%s)" % config['Lb_FDwrtPV']
+        "(VFASPF(VMINVDDV(PRIMARY))>%s)" % config['Lb_FDwrtPV']
         _fdChi2Cut = "(BPVVDCHI2>%s)" % config['Lb_LD_FDChi2']
 
         _motherCuts = _ptCut
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBnoC/StrippingLb2V0pp.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBnoC/StrippingLb2V0pp.py
index 23c63deba0a566efad08463be4f9e9577abecd08..77385a7d77c2a03b1678f32801ca31cd7356be5c 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBnoC/StrippingLb2V0pp.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBnoC/StrippingLb2V0pp.py
@@ -24,7 +24,6 @@ __date__ = '06/01/2019'
 __version__ = 'Stripping34'
 __all__ = 'Lb2V0ppConf'
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
@@ -210,8 +209,8 @@ class Lb2V0ppConf(LineBuilder):
         _vtxCut = "(VFASPF(VCHI2)<%s)   " % config['Lambda_DD_VtxChi2']
         _fdChi2Cut = "(BPVVDCHI2>%s)" % config['Lambda_DD_FDChi2']
         _momCut = "(P>%s*MeV)" % config['Lambda_DD_Pmin']
-        _trkGhostProbCut1 = "(CHILDCUT((TRGHOSTPROB<%s),1))" % config['Trk_GhostProb']
-        _trkGhostProbCut2 = "(CHILDCUT((TRGHOSTPROB<%s),2))" % config['Trk_GhostProb']
+        "(CHILDCUT((TRGHOSTPROB<%s),1))" % config['Trk_GhostProb']
+        "(CHILDCUT((TRGHOSTPROB<%s),2))" % config['Trk_GhostProb']
 
         _allCuts = _momCut
         _allCuts += '&'+_massCut
@@ -266,8 +265,8 @@ class Lb2V0ppConf(LineBuilder):
         _vtxCut = "(VFASPF(VCHI2)<%s)   " % config['Lambda_DD_VtxChi2']
         _fdChi2Cut = "(BPVVDCHI2>%s)" % config['Lambda_DD_FDChi2']
         _momCut = "(P>%s*MeV)" % config['Lambda_DD_Pmin']
-        _trkGhostProbCut1 = "(CHILDCUT((TRGHOSTPROB<%s),1))" % config['Trk_GhostProb']
-        _trkGhostProbCut2 = "(CHILDCUT((TRGHOSTPROB<%s),2))" % config['Trk_GhostProb']
+        "(CHILDCUT((TRGHOSTPROB<%s),1))" % config['Trk_GhostProb']
+        "(CHILDCUT((TRGHOSTPROB<%s),2))" % config['Trk_GhostProb']
 
         _allCuts = _momCut
         _allCuts += '&'+_massCut
@@ -300,7 +299,7 @@ class Lb2V0ppConf(LineBuilder):
         _massCutHigh = "(AM<(5619+%s)*MeV)" % config['Lb_2bodyMhigh']
         _aptCut = "(APT>%s*MeV)" % config['Lb_APTmin']
         _daugMedPtCut = "(ANUM(PT>%s*MeV)>=2)" % config['LbDaug_MedPT_PT']
-        _daugMaxPtIPCut = "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP']
+        "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP']
         _maxDocaChi2Cut = "(ACUTDOCACHI2(%s,''))" % config['LbDaug_DD_maxDocaChi2']
         _daugPtSumCut = "(APT1>%s*MeV)" % config['Lbh_DD_PTMin']
 
@@ -351,7 +350,7 @@ class Lb2V0ppConf(LineBuilder):
         _massCutHigh = "(AM<(5619+%s)*MeV)" % config['Lb_Mhigh']
         _aptCut = "(APT>%s*MeV)" % config['Lb_APTmin']
         _daugMedPtCut = "(ANUM(PT>%s*MeV)>=2)" % config['LbDaug_MedPT_PT']
-        _daugMaxPtIPCut = "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP']
+        "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP']
         _maxDocaChi2Cut = "(ACUTDOCACHI2(%s,''))" % config['LbDaug_DD_maxDocaChi2']
         _daugPtSumCut = "((APT1+APT2+APT3)>%s*MeV)" % config['LbDaug_DD_PTsum']
 
@@ -540,7 +539,7 @@ class Lb2V0ppConf(LineBuilder):
         _massCutHigh = "(AM<(5619+%s)*MeV)" % config['Lb_2bodyMhigh']
         _aptCut = "(APT>%s*MeV)" % config['Lb_APTmin']
         _daugMedPtCut = "(ANUM(PT>%s*MeV)>=2)" % config['LbDaug_MedPT_PT']
-        _daugMaxPtIPCut = "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP']
+        "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP']
         _maxDocaChi2Cut = "(ACUTDOCACHI2(%s,''))" % config['LbDaug_LD_maxDocaChi2']
         _daugPtSumCut = "(APT1>%s*MeV)" % config['Lbh_LD_PTMin']
 
@@ -591,7 +590,7 @@ class Lb2V0ppConf(LineBuilder):
         _massCutHigh = "(AM<(5619+%s)*MeV)" % config['Lb_Mhigh']
         _aptCut = "(APT>%s*MeV)" % config['Lb_APTmin']
         _daugMedPtCut = "(ANUM(PT>%s*MeV)>=2)" % config['LbDaug_MedPT_PT']
-        _daugMaxPtIPCut = "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP']
+        "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP']
         _maxDocaChi2Cut = "(ACUTDOCACHI2(%s,''))" % config['LbDaug_LD_maxDocaChi2']
         _daugPtSumCut = "((APT1+APT2+APT3)>%s*MeV)" % config['LbDaug_LD_PTsum']
 
@@ -607,7 +606,7 @@ class Lb2V0ppConf(LineBuilder):
         _vtxChi2Cut = "(VFASPF(VCHI2)<%s)" % config['Lb_VtxChi2']
         _diraCut = "(BPVDIRA>%s)" % config['Lb_LD_Dira']
         _ipChi2Cut = "(MIPCHI2DV(PRIMARY)<%s)" % config['Lb_LD_IPCHI2wrtPV']
-        _fdCut = "(VFASPF(VMINVDDV(PRIMARY))>%s)" % config['Lb_FDwrtPV']
+        "(VFASPF(VMINVDDV(PRIMARY))>%s)" % config['Lb_FDwrtPV']
         _fdChi2Cut = "(BPVVDCHI2>%s)" % config['Lb_LD_FDChi2']
 
         _motherCuts = _ptCut
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBnoC/StrippingXb23ph.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBnoC/StrippingXb23ph.py
index 44ba838d436b418c4eaef7372eccd95c28426134..ef24837631cfc50b46aabe0cc7dba0c8cdeb66fd 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBnoC/StrippingXb23ph.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBnoC/StrippingXb23ph.py
@@ -22,7 +22,6 @@ from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, DaVinci__N4Body
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection
-from Gaudi.Configuration import *
 __author__ = ['Jinlin Fu', 'Maurizio Martinelli', 'Andrea Merli']
 __date__ = '12/11/2015'
 __version__ = 'v1r0'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBnoC/StrippingXb2p3h.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBnoC/StrippingXb2p3h.py
index d07d7e52c17b8a01201968b3a1b929751c31bc9d..2c10d1f20bf15892c5e8ef6a5861130250a0a8ae 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBnoC/StrippingXb2p3h.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBnoC/StrippingXb2p3h.py
@@ -22,7 +22,6 @@ from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, DaVinci__N4Body
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection
-from Gaudi.Configuration import *
 __author__ = ['Jan Mickelle V. Maratas', 'Stephane Monteil', 'Andrea Merli']
 __date__ = '01/04/2016'
 __version__ = 'v1r0'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBnoC/StrippingXb2phh.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBnoC/StrippingXb2phh.py
index ae62ac803dcda11696229820fa7bcb3737c75114..35432dcb4a93cdbf47f1ec738735037534d82c07 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBnoC/StrippingXb2phh.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingBnoC/StrippingXb2phh.py
@@ -22,7 +22,6 @@ from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, DaVinci__N3Body
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection
-from Gaudi.Configuration import *
 __author__ = ['Jan Mickelle V. Maratas', 'Stephane Monteil', 'Thomas Latham']
 __date__ = '24/11/2016'
 __version__ = 'v1r0'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCalib/StrippingCaloPID.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCalib/StrippingCaloPID.py
index 2f768ece0ec79881d379db3382b656e758d13866..cd04a1f6b3dcabb7d6e33f2e489a79ce889ce10b 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCalib/StrippingCaloPID.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCalib/StrippingCaloPID.py
@@ -23,16 +23,10 @@ __version__ = '$Revision: 1.1 $'
 
 __all__ = ('CaloPIDConf', 'default_config')
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from PhysSelPython.Wrappers import Combine3BodySelection
-from CommonParticles.Utils import updateDoD
-from StandardParticles import StdLoosePions
-from StandardParticles import StdLooseKaons
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
+from PhysSelPython.Wrappers import DataOnDemand, Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from GaudiKernel.SystemOfUnits import MeV, GeV, mm
 
 default_config = {
     'NAME': 'CaloPID',
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCalib/StrippingCharmFromBSemiForHadronAsy.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCalib/StrippingCharmFromBSemiForHadronAsy.py
index 08e7ce501b97c255a5b8e5a3de8395e4cbcf3cb6..6156fdca33abf5ffff5cbf8a3a9368f977dbcd6f 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCalib/StrippingCharmFromBSemiForHadronAsy.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCalib/StrippingCharmFromBSemiForHadronAsy.py
@@ -19,14 +19,12 @@ __author__ = ['Mika Vesterinen']
 __date__ = '10/03/2013'
 __version__ = '$Revision: 0.0 $'
 
-from Gaudi.Configuration import *
 
 from Configurables import FilterDesktop, CombineParticles
 from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from StandardParticles import StdAllLoosePions, StdLoosePions, StdLooseMuons, StdLooseKaons, StdLooseProtons
-from Configurables import TisTosParticleTagger
+from StandardParticles import StdLooseKaons, StdLooseMuons, StdLoosePions
 
 __all__ = ('CharmFromBSemiForHadronAsyAllLinesConf',
            'TOSFilter',
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCalib/StrippingCharmFromBSemiForProtonPID.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCalib/StrippingCharmFromBSemiForProtonPID.py
index 331ebd34b3e7842bbf2e94a73977d8b0cc10b450..a1e805b96edf80f3f08a3ba0f447e47d13b203c2 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCalib/StrippingCharmFromBSemiForProtonPID.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCalib/StrippingCharmFromBSemiForProtonPID.py
@@ -18,12 +18,11 @@ __author__ = ['Mika Vesterinen']
 __date__ = '19/03/2013'
 __version__ = '$Revision: 0.0 $'
 
-from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from StandardParticles import StdLoosePions, StdLooseMuons, StdLooseKaons, StdLooseProtons, StdNoPIDsProtons
+from StandardParticles import StdLooseKaons, StdLooseMuons, StdLoosePions, StdNoPIDsProtons
 
 __all__ = ('CharmFromBSemiForProtonPIDAllLinesConf',
            'default_config')
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCalib/StrippingD02KPiGamma.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCalib/StrippingD02KPiGamma.py
index 60507d78d4ed57865af9bc4a7d952b1be8f8cdab..9b3e955dfdbdad8eb3225f0bf7d204cc9ef6176b 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCalib/StrippingD02KPiGamma.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCalib/StrippingD02KPiGamma.py
@@ -25,9 +25,8 @@ __all__ = ('StrippingD02KPiGammaConf', 'makeD02KPiGamma', 'default_config')
 # Selections taken from Regis Lefevre D02Kpipi0 lines
 ####################################################################
 
-from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from PhysSelPython.Wrappers import Selection, DataOnDemand
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
+from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from StandardParticles import StdTightPions, StdTightKaons, StdLooseAllPhotons
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCalib/StrippingD02KPiPi0.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCalib/StrippingD02KPiPi0.py
index b0efbccbb69d5ac6209e0a251edf9943a222afe9..a431e7b970041f35d68bc9a765db0757832a6fdd 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCalib/StrippingD02KPiPi0.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCalib/StrippingD02KPiPi0.py
@@ -25,9 +25,8 @@ __all__ = ('StrippingD02KPiPi0Conf',
            'makeD02KPiPi0M',
            'default_config')
 
-from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from PhysSelPython.Wrappers import Selection, DataOnDemand
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
+from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from StandardParticles import StdTightPions, StdTightKaons, StdLooseMergedPi0, StdLooseResolvedPi0
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCalib/StrippingD02KPiPi0DalitzPartReco.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCalib/StrippingD02KPiPi0DalitzPartReco.py
index caaa8b1b857ec7efb302c62895c9b7a334961cbf..7a1c97e88520fb73f140818146de685e254df9f7 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCalib/StrippingD02KPiPi0DalitzPartReco.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCalib/StrippingD02KPiPi0DalitzPartReco.py
@@ -8,9 +8,7 @@
 # granted to it by virtue of its status as an Intergovernmental Organization  #
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
-import logging
 from StrippingUtils.Utils import LineBuilder
-from Gaudi.Configuration import *
 __author__ = ['Greg Ciezarek', 'Liang Sun', 'Adam Davis']
 __date__ = '18/05/2017'
 __version__ = '$Revision: 0.01 $'
@@ -75,7 +73,6 @@ class D2KPiPi0_PartRecoBuilder(LineBuilder):
     def __init__(self, name, config):
         LineBuilder.__init__(self, name, config)
         self._config = config
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
 
         # self.GECs = { "Code":"( recSummaryTrack(LHCb.RecSummary.nLongTracks, TrLONG) < %(GEC_nLongTrk)s )" % config,
         #              "Preambulo": ["from LoKiTracks.decorators import *"]}
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCalib/StrippingD0ForBXX.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCalib/StrippingD0ForBXX.py
index 836cb251bf6bed5dcdba32758964e9950e666b07..d9859abdb5e61ecd488fc22f98c91f6df28e248f 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCalib/StrippingD0ForBXX.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCalib/StrippingD0ForBXX.py
@@ -20,7 +20,7 @@ from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from StandardParticles import StdLoosePions, StdLooseKaons, StdLooseProtons, StdAllLoosePions
+from StandardParticles import StdAllLoosePions, StdLooseKaons, StdLoosePions
 
 
 name = 'confD0forBXX'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCalib/StrippingDst2D0Pi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCalib/StrippingDst2D0Pi.py
index e4131dad48242646fd6ae26b601f4cbb45780d56..3306ddfaa9cc14e117596053f278462c4fa8cee9 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCalib/StrippingDst2D0Pi.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCalib/StrippingDst2D0Pi.py
@@ -25,9 +25,8 @@ Stripping selection for D*0 -> [D0 -> K pi gamma] pi+
 __all__ = ('StrippingDst2D0PiConf', 'makeD02KPiGamma', 'makeDst2D0Pi',
            'default_config')
 
-from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from PhysSelPython.Wrappers import Selection, DataOnDemand
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
+from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from StandardParticles import StdTightPions, StdTightKaons, StdLooseAllPhotons, StdNoPIDsPions
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCalib/StrippingDstarD02hhPi0PartRecoForPhotonCalib.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCalib/StrippingDstarD02hhPi0PartRecoForPhotonCalib.py
index 644f0bd8f2b5adfdea5faa81ad39141eeea329f8..7e79ca79aec743366778e237cc1baefe1dfc7ad9 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCalib/StrippingDstarD02hhPi0PartRecoForPhotonCalib.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCalib/StrippingDstarD02hhPi0PartRecoForPhotonCalib.py
@@ -31,15 +31,15 @@ from Gaudi.Configuration import *
 
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 from StandardParticles import StdAllNoPIDsPions, StdNoPIDsPions, StdNoPIDsKaons
-from StandardParticles import StdLooseAllPhotons, StdLooseResolvedPi0, StdLooseMergedPi0
+from StandardParticles import StdLooseAllPhotons
 
 from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
-from StrippingUtils.Utils import LineBuilder, checkConfig
+from StrippingUtils.Utils import LineBuilder
 
 from Configurables import FilterDesktop
 
-from GaudiKernel.SystemOfUnits import GeV, MeV, picosecond, mm
+from GaudiKernel.SystemOfUnits import GeV, MeV, picosecond
 
 default_config = {
     'NAME': 'DstarD2hhGammaCalib',
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCalib/StrippingElectronID.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCalib/StrippingElectronID.py
index f8385e403a664f2d870608e8c28ac1032d182cc0..1b5dd98b23444069027c372e85ae7f6f3318a423 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCalib/StrippingElectronID.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCalib/StrippingElectronID.py
@@ -23,9 +23,8 @@ stream.appendLines( [
 
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand
+from PhysSelPython.Wrappers import Selection
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = ['Jibo He']
 __date__ = '03/10/2010'
 __version__ = '$Revision: 1.2 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCalib/StrippingElectronRecoEff.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCalib/StrippingElectronRecoEff.py
index c19ff961c1db5ef3bfbfb03a4d9133a4c8888bdf..bdb2892004f5f8e6c93bb551bb939895eca5eb63 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCalib/StrippingElectronRecoEff.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCalib/StrippingElectronRecoEff.py
@@ -17,17 +17,15 @@ from StandardParticles import StdAllLoosePions as Hlt2Pions
 from StandardParticles import StdAllLooseKaons as Hlt2Kaons
 from StandardParticles import StdNoPIDsElectrons as Hlt2Electrons
 from StandardParticles import StdNoPIDsMuons as Hlt2Muons
-from TrackFitter.ConfiguredFitters import (ConfiguredEventFitter,
-                                           ConfiguredForwardStraightLineEventFitter)
+from TrackFitter.ConfiguredFitters import ConfiguredEventFitter
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import DataOnDemand, MergedSelection
 from PhysConf.Selections import L0TOSSelection
 from PhysConf.Selections import Hlt1TOSSelection
 from PhysConf.Selections import Hlt2TOSSelection
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 from StrippingUtils.Utils import LineBuilder
-from GaudiKernel.SystemOfUnits import GeV, MeV, mm
+from GaudiKernel.SystemOfUnits import MeV, mm
 from Gaudi.Configuration import *
 __author__ = ['Adam Davis', 'Laurent Dufour', 'V. V. Gligorov']
 __date__ = '14/1/2018'
@@ -45,10 +43,9 @@ from PhysSelPython.Wrappers import Selection, Hlt1Selection, Hlt2Selection, L0Se
 from SelPy.utils import (UniquelyNamedObject,
                          ClonableObject,
                          SelectionBase)
-from Configurables import (DecodeVeloRawBuffer, FastVeloTracking, TrackPrepareVelo,
-                           NoPIDsParticleMaker, DataOnDemandSvc, ChargedProtoParticleMaker,
-                           PrTrackAssociator, DelegatingTrackSelector, TrackContainerCopy, TrackAssociator,
-                           TrackStateInitAlg, TrackStateInitTool)
+from Configurables import (FastVeloTracking, NoPIDsParticleMaker, DataOnDemandSvc,
+                           ChargedProtoParticleMaker, DelegatingTrackSelector, TrackContainerCopy,
+                           TrackStateInitAlg)
 
 default_config = {'NAME': 'ElectronRecoEff',
                   'WGs': ['Calib'],
@@ -287,7 +284,6 @@ class StrippingElectronRecoEffLines(LineBuilder):
     def __init__(self, name, config):
         LineBuilder.__init__(self, name, config)
 
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
         self._config = config
         self.name = name
 
@@ -571,7 +567,7 @@ class StrippingElectronRecoEffLines(LineBuilder):
         )
 
     def DetachedEEKPair(self, _name):
-        configuration = self._config["DetachedEEK"]
+        self._config["DetachedEEK"]
 
         _DetachedEEKPair = self.getCPForEEK("DetachedEEK")
         _DetachedEEKPair_Sel = Selection("SelEEK_for_"+_name,
@@ -591,7 +587,7 @@ class StrippingElectronRecoEffLines(LineBuilder):
         return line
 
     def DetachedEEKstarPair(self, _name):
-        configuration = self._config["DetachedEEKstar"]
+        self._config["DetachedEEKstar"]
 
         _DetachedEEKstarPair = self.getCPForEEK("DetachedEEKstar")
         _DetachedEEKstarPair_Sel = Selection("SelEEKstar_for_"+_name,
@@ -611,7 +607,7 @@ class StrippingElectronRecoEffLines(LineBuilder):
         return line
 
     def DetachedEEPhiPair(self, _name):
-        configuration = self._config["DetachedEEPhi"]
+        self._config["DetachedEEPhi"]
 
         _DetachedEEPhiPair = self.getCPForEEK("DetachedEEPhi")
         _DetachedEEPhiPair_Sel = Selection("SelEEPhi_for_"+_name,
@@ -882,7 +878,6 @@ class StrippingElectronRecoEffLines(LineBuilder):
     def MakeVeloTracks(self, prefilter):
         if self._config["DoVeloDecoding"]:
             from DAQSys.Decoders import DecoderDB
-            from DAQSys.DecoderClass import decodersForBank
             decs = []
             vdec = DecoderDB["DecodeVeloRawBuffer/createBothVeloClusters"]
             vdec.Active = True
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCalib/StrippingJPsiForSL.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCalib/StrippingJPsiForSL.py
index 66d3cf569e7e3d642fb1e90689c09009970a9f91..f83a469f0d79f559f3b8f1ce7fa0a29617c07287 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCalib/StrippingJPsiForSL.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCalib/StrippingJPsiForSL.py
@@ -20,11 +20,10 @@ __version__ = '$Revision: 0.1 $'
 
 from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from PhysSelPython.Wrappers import Selection, DataOnDemand
+from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from StandardParticles import StdLoosePions, StdLooseMuons, StdLooseKaons, StdLooseProtons, StdNoPIDsPions, StdNoPIDsMuons, StdLooseMergedPi0, StdLooseResolvedPi0, StdLooseElectrons, StdNoPIDsKaons
-from Configurables import TisTosParticleTagger
+from StandardParticles import StdNoPIDsKaons, StdNoPIDsMuons
 
 __all__ = ('JPsiForSLAllLinesConf',
            'confdict')
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCalib/StrippingK23PiForDownstreamTrackEff.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCalib/StrippingK23PiForDownstreamTrackEff.py
index 5e95ecb40bf4a7b0d570152c6cb5a85c2e157431..9ea071dc760c1a4d2e8adb1bd47ddd464f85a7d1 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCalib/StrippingK23PiForDownstreamTrackEff.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCalib/StrippingK23PiForDownstreamTrackEff.py
@@ -14,10 +14,6 @@ one missing pion, using the corrected mass
 '''
 
 from StrippingUtils.Utils import LineBuilder
-from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = ['Michel De Cian']
 __date__ = '19/12/2018'
 __version__ = '$Revision: 1.0 $'
@@ -269,8 +265,8 @@ class K23PiForDownstreamTrackEffConf(LineBuilder):
         if self._dipionSelSSNarrowDownstream is not None:
             return self._dipionSelSSNarrowDownstream
 
-        from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
+        from GaudiConfUtils.ConfigurableGenerators import CombineParticles
+        from PhysSelPython.Wrappers import Selection
 
         _k2pipi = CombineParticles(
             DecayDescriptors=["[phi(1020) -> pi+ pi+]cc"],
@@ -293,8 +289,8 @@ class K23PiForDownstreamTrackEffConf(LineBuilder):
         if self._dipionSelSSNarrowLong is not None:
             return self._dipionSelSSNarrowLong
 
-        from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
+        from GaudiConfUtils.ConfigurableGenerators import CombineParticles
+        from PhysSelPython.Wrappers import Selection
 
         _k2pipi = CombineParticles(
             DecayDescriptors=["[phi(1020) -> pi+ pi+]cc"],
@@ -317,8 +313,8 @@ class K23PiForDownstreamTrackEffConf(LineBuilder):
         if self._dipionSelSSWide is not None:
             return self._dipionSelSSWide
 
-        from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
+        from GaudiConfUtils.ConfigurableGenerators import CombineParticles
+        from PhysSelPython.Wrappers import Selection
 
         _k2pipi = CombineParticles(
             DecayDescriptors=["[phi(1020) -> pi+ pi+]cc"],
@@ -342,8 +338,8 @@ class K23PiForDownstreamTrackEffConf(LineBuilder):
         if self._dipionSelOSNarrowDownstream is not None:
             return self._dipionSelOSNarrowDownstream
 
-        from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
+        from GaudiConfUtils.ConfigurableGenerators import CombineParticles
+        from PhysSelPython.Wrappers import Selection
 
         # Cut out the Kshort
         mCut = self._dipionSelectionNarrow() + " & (ADMASS('KS0') > 40)"
@@ -370,8 +366,8 @@ class K23PiForDownstreamTrackEffConf(LineBuilder):
         if self._dipionSelOSNarrowLong is not None:
             return self._dipionSelOSNarrowLong
 
-        from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
+        from GaudiConfUtils.ConfigurableGenerators import CombineParticles
+        from PhysSelPython.Wrappers import Selection
 
         # Cut out the Kshort
         mCut = self._dipionSelectionNarrow() + " & (ADMASS('KS0') > 40)"
@@ -398,8 +394,8 @@ class K23PiForDownstreamTrackEffConf(LineBuilder):
         if self._dipionSelOSWide is not None:
             return self._dipionSelOSWide
 
-        from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
+        from GaudiConfUtils.ConfigurableGenerators import CombineParticles
+        from PhysSelPython.Wrappers import Selection
 
         # Cut out the Kshort
         mCut = self._dipionSelectionWide() + " & (ADMASS('KS0') > 40)"
@@ -427,8 +423,8 @@ class K23PiForDownstreamTrackEffConf(LineBuilder):
         # if self._tripionSelDipionSS is not None:
         #   return self._tripionSelDipionSS
 
-        from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
+        from GaudiConfUtils.ConfigurableGenerators import CombineParticles
+        from PhysSelPython.Wrappers import Selection
 
         _k2pipipi = CombineParticles(
             DecayDescriptors=["[K+ -> phi(1020) pi-]cc"],
@@ -449,8 +445,8 @@ class K23PiForDownstreamTrackEffConf(LineBuilder):
         # if self._tripionSelDipionOS is not None:
         #   return self._tripionSelDipionOS
 
-        from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
+        from GaudiConfUtils.ConfigurableGenerators import CombineParticles
+        from PhysSelPython.Wrappers import Selection
 
         _k2pipipi = CombineParticles(
             DecayDescriptors=["[K+ -> phi(1020) pi+]cc"],
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCalib/StrippingLowPtMuID.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCalib/StrippingLowPtMuID.py
index c938bbfa4f325120436121227b8c9ba66d1420d7..96d9c592351659e6d677d1fb083266fb9f80f738 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCalib/StrippingLowPtMuID.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCalib/StrippingLowPtMuID.py
@@ -19,12 +19,9 @@ largely cloned from line written by 'S.Furcas', 'G.Lanfranchi', 'M.Palutan', 'A.
 
 from StandardParticles import StdAllNoPIDsMuons
 from StrippingUtils.Utils import LineBuilder
-from Configurables import LoKi__Hybrid__CoreFactory as CoreFactory
-from Configurables import LoKi__VoidFilter as VoidFilter
-from PhysSelPython.Wrappers import DataOnDemand, Selection, SelectionSequence, MergedSelection
+from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 __author__ = ['G.Ciezarek', ]
 __date__ = '03/12/2015'
 __version__ = '$Revision: 1.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCalib/StrippingMuIDCalib.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCalib/StrippingMuIDCalib.py
index 48473756334933bd76098e1f169f2fcac058f2d2..9647c11e74493f1b68f480afc92080ecc6f1c325 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCalib/StrippingMuIDCalib.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCalib/StrippingMuIDCalib.py
@@ -22,15 +22,12 @@ lb = builder( 'MuIDCalib', config_params )
 
 '''
 
-from StandardParticles import StdAllNoPIDsKaons, StdAllNoPIDsMuons, StdAllNoPIDsPions, StdAllNoPIDsProtons
+from StandardParticles import StdAllNoPIDsMuons
 from StandardParticles import StdNoPIDsKaons, StdNoPIDsMuons, StdNoPIDsPions, StdNoPIDsProtons
 from StrippingUtils.Utils import LineBuilder
-from Configurables import LoKi__Hybrid__CoreFactory as CoreFactory
-from Configurables import LoKi__VoidFilter as VoidFilter
-from PhysSelPython.Wrappers import DataOnDemand, Selection, SelectionSequence, MergedSelection
+from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 __author__ = ['S.Furcas', 'G.Lanfranchi',
               'M.Palutan', 'A.Sarti', 'D.Milanes', 'MuID Team']
 __date__ = '23/08/2011'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCalib/StrippingNoPIDDstarWithD02RSKPi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCalib/StrippingNoPIDDstarWithD02RSKPi.py
index 914c4a47cd048e3cd64e662985a9b4f35d9be508..5969dfaafb882830e2b62086af2a6274bffd846b 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCalib/StrippingNoPIDDstarWithD02RSKPi.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCalib/StrippingNoPIDDstarWithD02RSKPi.py
@@ -13,10 +13,8 @@
 from StandardParticles import StdAllNoPIDsKaons, StdAllNoPIDsPions
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from LHCbKernel.Configuration import *
-from Gaudi.Configuration import *
+from PhysSelPython.Wrappers import Selection
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 __author__ = ['Philip Xing', 'Andrew Powell']
 __date__ = '23rd August 2012'
 __version__ = '$Revision: 7.0 $'
@@ -42,7 +40,7 @@ StrippingReport                                                INFO Event 100000
 __all__ = ('NoPIDDstarWithD02RSKPiConf', 'default_config')
 
 
-from GaudiKernel.SystemOfUnits import mm, cm, MeV, GeV
+from GaudiKernel.SystemOfUnits import GeV, MeV
 # from Configurables import FilterDesktop, CombineParticles
 
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCalib/StrippingPIDCalib.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCalib/StrippingPIDCalib.py
index 8623a70bd54a0795643cfb82ff6fd7187bb2e331..14cb906598d89fb606bb271edd416b3ac28fcaef 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCalib/StrippingPIDCalib.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCalib/StrippingPIDCalib.py
@@ -34,9 +34,7 @@ from Configurables import DaVinci__N3BodyDecays
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
 from Configurables import CombineParticles
-from Gaudi.Configuration import *
 __author__ = ['Lucio Anderlini']
 __date__ = '25/02/2015'
 __version__ = '$Revision: 1.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCalib/StrippingTrackEffD0ToKPi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCalib/StrippingTrackEffD0ToKPi.py
index b93a420e3f50b2e4f8f1d92b1881f55e362e1bcf..1a0ca1d608bbe19c5586681674ba9a975871571b 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCalib/StrippingTrackEffD0ToKPi.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCalib/StrippingTrackEffD0ToKPi.py
@@ -17,7 +17,7 @@ from Configurables import FilterDesktop, CombineParticles
 from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from StandardParticles import StdLooseKaons, StdLoosePions, StdAllLoosePions, StdAllNoPIDsPions
+from StandardParticles import StdAllLoosePions, StdLooseKaons, StdLoosePions
 from SelPy.utils import (UniquelyNamedObject,
                          ClonableObject,
                          SelectionBase)
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCalib/StrippingTrackEffDownMuon.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCalib/StrippingTrackEffDownMuon.py
old mode 100755
new mode 100644
index 3e974208bdc310dc0dfe706a362628d140667861..b891dd1de3f622d45cfe8e52e9f01bbc709c238b
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCalib/StrippingTrackEffDownMuon.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCalib/StrippingTrackEffDownMuon.py
@@ -39,35 +39,27 @@ __all__ = ('StrippingTrackEffDownMuonConf', 'default_config', 'selMuonPParts',
 # FIXME Write includes in a cleaner way
 from Gaudi.Configuration import *
 from LHCbKernel.Configuration import *
-from DAQSys.DecoderClass import Decoder
 from Configurables import GaudiSequencer
 from Configurables import UnpackTrack, ChargedProtoParticleMaker, DelegatingTrackSelector, TrackSelector, BestPIDParticleMaker
-from TrackFitter.ConfiguredFitters import ConfiguredFit
 from Configurables import TrackStateInitAlg
 from StrippingConf.StrippingLine import StrippingLine
-from Configurables import ChargedProtoParticleAddMuonInfo, MuonIDAlgLite
+from Configurables import ChargedProtoParticleAddMuonInfo
 from MuonID import ConfiguredMuonIDs
 from Configurables import ChargedProtoCombineDLLsAlg, ProtoParticleMUONFilter
-from PhysSelPython.Wrappers import Selection, DataOnDemand
+from PhysSelPython.Wrappers import Selection
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
 from StandardParticles import StdLooseMuons
 
 from StrippingUtils.Utils import LineBuilder
-from Configurables import LoKi__VoidFilter
-from os import environ
 from Gaudi.Configuration import *
-import GaudiKernel.ProcessJobOptions
-from GaudiKernel.SystemOfUnits import mm
 
 from GaudiConfUtils.ConfigurableGenerators import TisTosParticleTagger
 from StandardParticles import StdAllLooseMuons
 from Configurables import GaudiSequencer
 from Configurables import TrackToDST
-from Configurables import TrackSys
 from Configurables import PatSeeding, PatSeedingTool, PatLongLivedTracking
-from PhysSelPython.Wrappers import AutomaticData
 # Get the fitters
-from TrackFitter.ConfiguredFitters import ConfiguredFit, ConfiguredFitSeed, ConfiguredFitDownstream
+from TrackFitter.ConfiguredFitters import ConfiguredFitDownstream
 from PatAlgorithms import PatAlgConf
 
 from SelPy.utils import (UniquelyNamedObject, ClonableObject, SelectionBase)
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCalib/StrippingTrackEffMuonTT.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCalib/StrippingTrackEffMuonTT.py
index ab3be8ab235c22a1beb144c04853bf520903700f..968289b5618b1b794af456ce34d7719b86a9dff9 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCalib/StrippingTrackEffMuonTT.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCalib/StrippingTrackEffMuonTT.py
@@ -52,11 +52,10 @@ __all__ = ('StrippingTrackEffMuonTTConf', 'default_config',
            'makeResonanceMuMuTrackEff', 'makeBJpsiKTrackEff',
            'filterHLT2ForBJpsiK')
 
-from Gaudi.Configuration import *
-from PhysSelPython.Wrappers import Selection, DataOnDemand, ChargedProtoParticleSelection
+from PhysSelPython.Wrappers import ChargedProtoParticleSelection, Selection
 from StrippingConf.StrippingLine import StrippingLine
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from StrippingUtils.Utils import LineBuilder, checkConfig
+from StrippingUtils.Utils import LineBuilder
 from StandardParticles import StdLooseKaons, StdLooseMuons, StdAllLooseMuons
 
 from Configurables import (MuonCombRec, MuonTTTrack, MuonHitDecode,
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCalib/StrippingTrackEffVeloMuon.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCalib/StrippingTrackEffVeloMuon.py
index c7da7abeddda6483ce8d3b57a6b3083ee07bdafe..3f821c02445e084449fcec8a684ab687eb7dca9a 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCalib/StrippingTrackEffVeloMuon.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCalib/StrippingTrackEffVeloMuon.py
@@ -29,25 +29,17 @@
 from SelPy.utils import (UniquelyNamedObject,
                          ClonableObject,
                          SelectionBase)
-from Configurables import TrackEventCloneKiller, VeloMuonBuilder
-from Configurables import TrackStateInitAlg, TrackEventFitter, TrackPrepareVelo, TrackContainerCopy, Tf__PatVeloSpaceTool, StandaloneMuonRec
+from Configurables import VeloMuonBuilder
+from Configurables import StandaloneMuonRec, TrackPrepareVelo
 from Configurables import CombineParticles
-from Configurables import TrackKalmanFilter, TrackMasterExtrapolator
-from Configurables import TrackEventFitter, TrackMasterFitter
-from TrackFitter.ConfiguredFitters import ConfiguredFit
-from PhysSelPython.Wrappers import AutomaticData
-from Configurables import TrackSys
 from Configurables import GaudiSequencer
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, TisTosParticleTagger
 from StandardParticles import StdLooseMuons
 from StrippingUtils.Utils import LineBuilder
-from Configurables import TrackCloneFinder
 from StrippingConf.StrippingLine import StrippingLine
 from Configurables import FastVeloTracking
-from Configurables import ChargedProtoParticleMaker, NoPIDsParticleMaker, DataOnDemandSvc, DelegatingTrackSelector, TrackSelector, CombinedParticleMaker, BestPIDParticleMaker
-from PhysSelPython.Wrappers import Selection, SelectionSequence, DataOnDemand
-from LHCbKernel.Configuration import *
-from Gaudi.Configuration import *
+from Configurables import ChargedProtoParticleMaker, DataOnDemandSvc, DelegatingTrackSelector, NoPIDsParticleMaker, TrackSelector
+from PhysSelPython.Wrappers import Selection
 __author__ = ['Flavio Archilli']
 __date__ = '30/10/2019'
 __version__ = '$Revision: 0.1 $'
@@ -159,8 +151,6 @@ class StrippingTrackEffVeloMuonConf(LineBuilder):
 
         _config = self.config[confLine]
 
-        _pchargeCut = None
-        _tchargeCut = None
         _tagCharge = None
         _probeCharge = None
         _chargename = None
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCharm/StrippingB2ppipiSigmacmm_Lcpi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCharm/StrippingB2ppipiSigmacmm_Lcpi.py
index 1932ea73632bfc335a5d650d07d5b01c5d455fa9..397b76425631bddc729ad4ce8bbb2a99c6f92bf2 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCharm/StrippingB2ppipiSigmacmm_Lcpi.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCharm/StrippingB2ppipiSigmacmm_Lcpi.py
@@ -31,12 +31,11 @@ __all__ = ('StrippingB2ppipiSigmacmm_Lcpi_Conf', 'makeLc2pKpi', 'makepifromSigma
            )
 
 from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, ConjugateNeutralPID, DaVinci__N3BodyDecays
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N3BodyDecays, FilterDesktop
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
-from StrippingUtils.Utils import checkConfig, LineBuilder
+from StrippingUtils.Utils import LineBuilder
 from GaudiKernel.SystemOfUnits import MeV, GeV, mm
-from copy import copy
 
 name = 'StrippingB2ppipiSigmacmm_Lcpi'
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCharm/StrippingChargedHyperons.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCharm/StrippingChargedHyperons.py
index 920c9faefc12697a4686bb708606c7aefce7c812..1e9ecbdf32eac322732659ae13423893f4c17ced 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCharm/StrippingChargedHyperons.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCharm/StrippingChargedHyperons.py
@@ -21,13 +21,9 @@ __version__ = '$Revision: 1.0 $'
 __all__ = ('StrippingChargedHyperonsConf', 'default_config')
 
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from StandardParticles import StdLoosePions, StdNoPIDsDownPions, StdLooseKaons, StdLooseDownKaons
-from StandardParticles import StdAllLoosePions, StdAllLooseKaons
 
 from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
-from PhysSelPython.Wrappers import MultiSelectionSequence
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from GaudiKernel.SystemOfUnits import MeV, mm, picosecond
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCharm/StrippingCharm2PPX.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCharm/StrippingCharm2PPX.py
index 8f420ab23681879eda33d3f11a9c1854083e6f5d..1776621bc50d11dd212c17cc7c967c25e7570f68 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCharm/StrippingCharm2PPX.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCharm/StrippingCharm2PPX.py
@@ -26,7 +26,7 @@ __all__ = (
     'StrippingCharm2PPXConf'  # ???
 )
 
-from GaudiKernel.SystemOfUnits import MeV, GeV, mm, mrad
+from GaudiKernel.SystemOfUnits import GeV, MeV, mm
 from Configurables import CombineParticles, FilterDesktop
 # from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop, DaVinci__N3BodyDecays
 from StandardParticles import (
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCharm/StrippingCharmForVub.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCharm/StrippingCharmForVub.py
index addb5112d833323e807d80a2fcd5d1c6ef104d89..196b7aca8b732e4ce87cfa408c9240c9d4ca9fe8 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCharm/StrippingCharmForVub.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCharm/StrippingCharmForVub.py
@@ -31,9 +31,8 @@ __all__ = ('CharmForVubConf',
            'makeDstarD02HMuNu')
 
 from Gaudi.Configuration import *
-from Configurables import SubstitutePID
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
+from PhysSelPython.Wrappers import MergedSelection, Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from StandardParticles import StdLooseMuons, StdLooseKaons, StdAllLoosePions, StdLoosePions
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCharm/StrippingCharmWeakDecays.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCharm/StrippingCharmWeakDecays.py
index 62cf538da90f04787baab5c812393440f86c3b23..72c36178501074aeada4d5d7f91bd305c974ec78 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCharm/StrippingCharmWeakDecays.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCharm/StrippingCharmWeakDecays.py
@@ -28,7 +28,7 @@ __all__ = ('CharmWeakDecaysConf',
            'default_config')
 
 from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCharm/StrippingD02KSKS.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCharm/StrippingD02KSKS.py
index 048a0f735673d789716920a6b813f3734a817158..2e831b063d5dd66449d672d2c0c14659bb9d9210 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCharm/StrippingD02KSKS.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCharm/StrippingD02KSKS.py
@@ -25,9 +25,8 @@ __date__ = '15/05/2014'
 __version__ = 'Stripping23'
 __all__ = 'D02KSKSConf'
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
+from PhysSelPython.Wrappers import DataOnDemand, Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 
@@ -556,7 +555,7 @@ class D02KSKSConf(LineBuilder):
         _daughterCuts = "(TRGHOSTPROB <=%s )" % config['slowPi_LLL_TRGHOSTPROB']
 
         # 40
-        _vertexChi2_cut = "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_LL']
+        "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_LL']
 
         # 200
         _combCuts = "(ADAMASS('D*(2010)+') < %s*MeV)" % config['Dst_mass_LL']
@@ -593,7 +592,7 @@ class D02KSKSConf(LineBuilder):
         _daughterCuts = "(TRGHOSTPROB <=%s )" % config['slowPi_LLU_TRGHOSTPROB']
 
         # 40
-        _vertexChi2_cut = "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_LL']
+        "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_LL']
 
         # 200
         _combCuts = "(ADAMASS('D*(2010)+') < %s*MeV)" % config['Dst_mass_LL']
@@ -630,7 +629,7 @@ class D02KSKSConf(LineBuilder):
         _daughterCuts = "(TRGHOSTPROB <=%s )" % config['slowPi_LDL_TRGHOSTPROB']
 
         # 40
-        _vertexChi2_cut = "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_LD']
+        "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_LD']
 
         # 200
         _combCuts = "(ADAMASS('D*(2010)+') < %s*MeV)" % config['Dst_mass_LD']
@@ -667,7 +666,7 @@ class D02KSKSConf(LineBuilder):
         _daughterCuts = "(TRGHOSTPROB <=%s )" % config['slowPi_LDU_TRGHOSTPROB']
 
         # 40
-        _vertexChi2_cut = "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_LD']
+        "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_LD']
 
         # 200
         _combCuts = "(ADAMASS('D*(2010)+') < %s*MeV)" % config['Dst_mass_LD']
@@ -704,7 +703,7 @@ class D02KSKSConf(LineBuilder):
         _daughterCuts = "(TRGHOSTPROB <=%s )" % config['slowPi_DDL_TRGHOSTPROB']
 
         # 40
-        _vertexChi2_cut = "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_DD']
+        "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_DD']
 
         # 200
         _combCuts = "(ADAMASS('D*(2010)+') < %s*MeV)" % config['Dst_mass_DD']
@@ -741,7 +740,7 @@ class D02KSKSConf(LineBuilder):
         _daughterCuts = "(TRGHOSTPROB <=%s )" % config['slowPi_DDU_TRGHOSTPROB']
 
         # 40
-        _vertexChi2_cut = "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_DD']
+        "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_DD']
 
         # 200
         _combCuts = "(ADAMASS('D*(2010)+') < %s*MeV)" % config['Dst_mass_DD']
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCharm/StrippingD2HHHGamma.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCharm/StrippingD2HHHGamma.py
index f493f6bd9021f7c482ad4f11110b31209e277d1e..e0da6bf833dec41ba4733267992c2593b1e66642 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCharm/StrippingD2HHHGamma.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCharm/StrippingD2HHHGamma.py
@@ -22,19 +22,18 @@ __version__ = '$Revision: 0.1 $'
 __all__ = ('D2HHHGammaLines',
            'default_config')
 
-from Gaudi.Configuration import *
 
-from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N4BodyDecays
+from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays
 from StandardParticles import StdNoPIDsPions, StdNoPIDsKaons
 from StandardParticles import StdLooseAllPhotons, StdAllLooseGammaLL, StdAllLooseGammaDD
 
 from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
-from StrippingUtils.Utils import LineBuilder, checkConfig
+from StrippingUtils.Utils import LineBuilder
 
 from Configurables import FilterDesktop
 
-from GaudiKernel.SystemOfUnits import GeV, MeV, picosecond, mm
+from GaudiKernel.SystemOfUnits import GeV, MeV, picosecond
 
 
 default_config = {
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCharm/StrippingD2HHHKs.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCharm/StrippingD2HHHKs.py
index e5639b90812290f4e2226c3b0c140285aa788b00..8b56f2ae08f0d364c45bed96aa90657daee77a7d 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCharm/StrippingD2HHHKs.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCharm/StrippingD2HHHKs.py
@@ -22,19 +22,18 @@ __version__ = '$Revision: 0.1 $'
 __all__ = ('D2HHHKsLines',
            'default_config')
 
-from Gaudi.Configuration import *
 
-from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N4BodyDecays
+from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays
 from StandardParticles import StdNoPIDsPions, StdNoPIDsKaons
 from StandardParticles import StdLooseKsDD, StdLooseKsLL
 
 from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
-from StrippingUtils.Utils import LineBuilder, checkConfig
+from StrippingUtils.Utils import LineBuilder
 
 from Configurables import FilterDesktop
 
-from GaudiKernel.SystemOfUnits import GeV, MeV, picosecond, mm
+from GaudiKernel.SystemOfUnits import MeV, mm, picosecond
 
 
 default_config = {
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCharm/StrippingD2HHHPi0.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCharm/StrippingD2HHHPi0.py
index 6083359069ac88d66ad4d2d0c3f6c4a785962da6..8557b0ed7b6ea3312ecd34ede82d7cbd720f6775 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCharm/StrippingD2HHHPi0.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCharm/StrippingD2HHHPi0.py
@@ -22,19 +22,18 @@ __version__ = '$Revision: 0.1 $'
 __all__ = ('D2HHHPi0Lines',
            'default_config')
 
-from Gaudi.Configuration import *
 
-from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N4BodyDecays
+from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays
 from StandardParticles import StdNoPIDsPions, StdNoPIDsKaons
 from StandardParticles import StdLooseResolvedPi0, StdLooseMergedPi0
 
 from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
-from StrippingUtils.Utils import LineBuilder, checkConfig
+from StrippingUtils.Utils import LineBuilder
 
 from Configurables import FilterDesktop
 
-from GaudiKernel.SystemOfUnits import GeV, MeV, picosecond, mm
+from GaudiKernel.SystemOfUnits import GeV, MeV, picosecond
 
 
 default_config = {
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCharm/StrippingD2HMuNu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCharm/StrippingD2HMuNu.py
index 2ceba3956453266f579b29b43ab66b82c4dc906a..0b1aa8422f7bb32ab3d194b98dead0e474772019 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCharm/StrippingD2HMuNu.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCharm/StrippingD2HMuNu.py
@@ -9,9 +9,7 @@
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
 
-import logging
 from StrippingUtils.Utils import LineBuilder
-from Gaudi.Configuration import *
 __author__ = ['Liang Sun', 'Adam Davis']
 __date__ = '09/11/2015'
 __version__ = '$Revision: 0.01 $'
@@ -98,7 +96,6 @@ class D2HLepNuBuilder(LineBuilder):
     def __init__(self, name, config):
         LineBuilder.__init__(self, name, config)
         self._config = config
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
 
         self.GECs = {"Code": "( recSummaryTrack(LHCb.RecSummary.nLongTracks, TrLONG) < %(GEC_nLongTrk)s )" % config,
                      "Preambulo": ["from LoKiTracks.decorators import *"]}
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCharm/StrippingD2KPiPiMuNu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCharm/StrippingD2KPiPiMuNu.py
index 98c15ef26f01b9fd72dfc1f76d2f9a4cdc798fcf..83a654c81ec0d3cdcc0b1452f1a33bbc93523d29 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCharm/StrippingD2KPiPiMuNu.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCharm/StrippingD2KPiPiMuNu.py
@@ -9,9 +9,7 @@
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
 
-import logging
 from StrippingUtils.Utils import LineBuilder
-from Gaudi.Configuration import *
 __author__ = ['Liang Sun']
 __date__ = '07/05/2019'
 __version__ = '$Revision: 0.01 $'
@@ -103,7 +101,6 @@ class D2KPiPiMuNuBuilder(LineBuilder):
     def __init__(self, name, config):
         LineBuilder.__init__(self, name, config)
         self._config = config
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
 
         self.GECs = {"Code": "( recSummaryTrack(LHCb.RecSummary.nLongTracks, TrLONG) < %(GEC_nLongTrk)s )" % config,
                      "Preambulo": ["from LoKiTracks.decorators import *"]}
@@ -200,7 +197,7 @@ class D2KPiPiMuNuBuilder(LineBuilder):
 
         from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
         from PhysSelPython.Wrappers import Selection
-        from StandardParticles import StdLooseMuons, StdAllLooseMuons, StdAllNoPIDsMuons
+        from StandardParticles import StdAllLooseMuons, StdAllNoPIDsMuons
         _mu = FilterDesktop(Code=self._NominalMuSelection() % self._config)
         _mupid = StdAllLooseMuons
         if self._config["NoPIDmu"]:
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCharm/StrippingD2KS0H_conf.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCharm/StrippingD2KS0H_conf.py
index d58964475590bc2e6571bcd929685425e3694bc1..e5b9f6c8683eaaab3109aca8686f163c2f08aef0 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCharm/StrippingD2KS0H_conf.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCharm/StrippingD2KS0H_conf.py
@@ -44,9 +44,9 @@ from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticle
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StandardParticles import StdLoosePions, StdLooseKaons
 from StrippingConf.StrippingLine import StrippingLine
-from StrippingUtils.Utils import LineBuilder, checkConfig
+from StrippingUtils.Utils import LineBuilder
 from Configurables import TisTosParticleTagger
-from GaudiKernel.SystemOfUnits import GeV, MeV, picosecond, mm
+from GaudiKernel.SystemOfUnits import MeV, mm, picosecond
 
 default_name = 'D2KS0H'
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCharm/StrippingD2PiPi0.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCharm/StrippingD2PiPi0.py
index 2cf2e1f2dfcc01187fa87b6b497e55c580034ef2..3593748cd50e6ab84496cfb7045a1b29f0016504 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCharm/StrippingD2PiPi0.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCharm/StrippingD2PiPi0.py
@@ -33,7 +33,7 @@ __all__ = (
 
 )
 
-from GaudiKernel.SystemOfUnits import MeV, GeV, mrad, picosecond
+from GaudiKernel.SystemOfUnits import MeV, picosecond
 
 from StandardParticles import (
     StdAllNoPIDsKaons,
@@ -51,7 +51,7 @@ from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 
 # from Configurables import CombineParticles, FilterDesktop
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, ConjugateNeutralPID, DaVinci__N3BodyDecays
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N3BodyDecays
 
 default_config = {
     'D2Pi0H': {
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCharm/StrippingD2XMuMuSS.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCharm/StrippingD2XMuMuSS.py
index 6cb43802872df951b5676b3b0a91f42091655f73..f2ecc06f375c01960838df612bae449a097161ea 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCharm/StrippingD2XMuMuSS.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCharm/StrippingD2XMuMuSS.py
@@ -9,14 +9,13 @@
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
 
-from StandardParticles import StdAllLooseElectrons, StdAllNoPIDsElectrons
+from StandardParticles import StdAllLooseElectrons
 from StandardParticles import StdAllLooseKaons, StdAllLoosePions, StdAllLooseMuons, StdAllNoPIDsPions, StdAllNoPIDsKaons
-from StandardParticles import StdLooseKaons, StdLoosePions, StdLooseMuons, StdNoPIDsPions, StdNoPIDsKaons, StdLooseProtons, StdAllNoPIDsProtons
+from StandardParticles import StdAllNoPIDsProtons, StdLooseKaons, StdLooseMuons, StdLoosePions, StdLooseProtons
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, OfflineVertexFitter
-from Gaudi.Configuration import *
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop
 import copy
 __author__ = ['Malcolm John', 'B. Viaud', 'O. Kochebina']
 __date__ = '25/6/2012'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCharm/StrippingD2hh.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCharm/StrippingD2hh.py
index 51c213ed2d3c259435dcd6aef0631877156b6bb0..a370c49abb16101fe062f7fa9fd7c27efecb37e3 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCharm/StrippingD2hh.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCharm/StrippingD2hh.py
@@ -24,7 +24,6 @@ __all__ = ('D2hhBuilder',
 '''
 This file contains stripping lines for time-dependent two-body charm analyses of mixing, yCP, and A_Gamma
 '''
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
@@ -129,7 +128,7 @@ class D2hhBuilder(LineBuilder):
         stdNoPIDsPions = StdAllNoPIDsPions
 
         d2kpi_name = name+'PromptD2KPi'
-        d0RS_name = name+'PromptD0RS'
+        name+'PromptD0RS'
         d0WS_name = name+'PromptD0WS'
         d2kk_name = name+'PromptD2KK'
         d2pipi_name = name+'PromptD2PiPi'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCharm/StrippingD2hhh_FTcalib.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCharm/StrippingD2hhh_FTcalib.py
index 4135055031043e8695ee88d1bb9ef372f937ca33..968b6ee94298cd1648477c4fc8322ffb29b1466c 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCharm/StrippingD2hhh_FTcalib.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCharm/StrippingD2hhh_FTcalib.py
@@ -28,12 +28,10 @@ __version__ = '$Revision: 0.0 $'
 
 __all__ = ('D2hhhFTCalibConf', 'makeStdD2hhhFT')
 
-from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
+from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from StandardParticles import (StdNoPIDsPions, StdTightKaons)
 
 name = "D2hhhFTCalib"
 # Cuts to be implemented vy the Stripping team in Stripping Settings
@@ -251,7 +249,6 @@ def globalEventCutFilter(name, MaxTrSIZE=None):
     if MaxTrSIZE == None:
         return None
 
-    from Configurables import LoKi__VoidFilter as VoidFilter
     from Configurables import LoKi__Hybrid__CoreFactory as CoreFactory
     modules = CoreFactory('CoreFactory').Modules
     for i in ['LoKiTracks.decorators']:
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCharm/StrippingD2hhh_conf.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCharm/StrippingD2hhh_conf.py
index 436d8a20ebfa69a07273b9fc952667e306a823fd..49374bf7789c8403fcf3e4660b179452634cef16 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCharm/StrippingD2hhh_conf.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCharm/StrippingD2hhh_conf.py
@@ -38,8 +38,7 @@ from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticle
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from StandardParticles import (StdNoPIDsPions,
-                               StdTightKaons)
+from StandardParticles import StdNoPIDsPions
 
 name = "D2hhh"
 # Cuts to be implemented vy the Stripping team in Stripping Settings
@@ -717,7 +716,6 @@ def globalEventCutFilter(name,
     if MaxTrSIZE == None:
         return None
 
-    from Configurables import LoKi__VoidFilter as VoidFilter
     from Configurables import LoKi__Hybrid__CoreFactory as CoreFactory
     modules = CoreFactory('CoreFactory').Modules
     for i in ['LoKiTracks.decorators']:
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCharm/StrippingDstarD02xx.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCharm/StrippingDstarD02xx.py
index ce2ac8d8facde4ad7816e78bcb9fd402160bb81a..e052e20eec4a83a6f489851d64e937c3ee00b05f 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCharm/StrippingDstarD02xx.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCharm/StrippingDstarD02xx.py
@@ -22,8 +22,7 @@ __all__ = ('StrippingDstarD02xxConf', 'combinetwobody', 'combineDstar', 'default
             where xx = {mu mu, pi pi, pi mu, k mu, ... }
             
 '''
-from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCharm/StrippingDstarD0ToHHPi0.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCharm/StrippingDstarD0ToHHPi0.py
index fd5188441bc83f651edf601e0fc081e5761b90a2..9f366f1a65e17dac9704f2cda14ac7c90073bb1d 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCharm/StrippingDstarD0ToHHPi0.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCharm/StrippingDstarD0ToHHPi0.py
@@ -17,13 +17,11 @@ Module for D* tagged D0 -> hhpi0.
 Supersedes StrippingDstarD2hhpi0
 """
 
-from Gaudi.Configuration import *
 from Configurables import FilterDesktop, CombineParticles, OfflineVertexFitter
 from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from StandardParticles import StdAllLoosePions, StdLoosePions, StdLooseKaons, StdLooseResolvedPi0, StdLooseMergedPi0
-from Configurables import TisTosParticleTagger
 
 __all__ = ('DstarD0ToHHPi0AllLinesBuilder',
            'DstarMaker',
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCharm/StrippingDstarD2HHHH.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCharm/StrippingDstarD2HHHH.py
index 79b905d65e08f76846da8aeebd29e1bd52022454..15c8bc47e0445328a0083162a53a4335865cca1b 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCharm/StrippingDstarD2HHHH.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCharm/StrippingDstarD2HHHH.py
@@ -22,16 +22,15 @@ __version__ = '$Revision: 1.0 $'
 __all__ = ('DstarD2HHHHLines',
            'default_config')
 
-from Gaudi.Configuration import *
 
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N4BodyDecays
 from StandardParticles import StdAllNoPIDsPions, StdNoPIDsPions, StdNoPIDsKaons
 
 from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
-from StrippingUtils.Utils import LineBuilder, checkConfig
+from StrippingUtils.Utils import LineBuilder
 
-from GaudiKernel.SystemOfUnits import GeV, MeV, picosecond, mm
+from GaudiKernel.SystemOfUnits import MeV, picosecond
 
 
 default_config = {
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCharm/StrippingDstarD2KSHHPi0.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCharm/StrippingDstarD2KSHHPi0.py
index 1a1c91b788986c0a547216e92ee30ee234979f5e..2cf7967d07c7867df16b8b2cfa45c3c0ddd24ac4 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCharm/StrippingDstarD2KSHHPi0.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCharm/StrippingDstarD2KSHHPi0.py
@@ -22,18 +22,17 @@ __version__ = '$Revision: 1.0 $'
 __all__ = ('DstarD2KSHHPi0Lines',
            'default_config')
 
-from Gaudi.Configuration import *
 
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N4BodyDecays
 from StandardParticles import StdAllNoPIDsPions, StdNoPIDsPions, StdNoPIDsKaons, StdLooseResolvedPi0, StdLooseMergedPi0, StdLooseKsDD, StdLooseKsLL
 
 from PhysSelPython.Wrappers import Selection, MergedSelection
 from StrippingConf.StrippingLine import StrippingLine
-from StrippingUtils.Utils import LineBuilder, checkConfig
+from StrippingUtils.Utils import LineBuilder
 
 from Configurables import FilterDesktop
 
-from GaudiKernel.SystemOfUnits import GeV, MeV, picosecond, mm
+from GaudiKernel.SystemOfUnits import MeV, mm, picosecond
 
 
 default_config = {
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCharm/StrippingDstarD2KShh.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCharm/StrippingDstarD2KShh.py
index 0446a490bf8b78aaa6a090c0170ee5d84241b931..8bb88c690db0782705ee07f1579b03266ff72d96 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCharm/StrippingDstarD2KShh.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCharm/StrippingDstarD2KShh.py
@@ -34,7 +34,6 @@ __all__ = ('DstarD2KShhBuilder',
            'makeD2KShh',
            'makeDstar')
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCharm/StrippingDstarD2XGamma.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCharm/StrippingDstarD2XGamma.py
index bf59f6f837edb8f442786e16807458e40dc309b3..188f8b4147978915021b16bdb12f423af3d17739 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCharm/StrippingDstarD2XGamma.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCharm/StrippingDstarD2XGamma.py
@@ -28,7 +28,6 @@ __version__ = '$Revision: 0.3 $'
 
 __all__ = ('DstarD2XGammaLines', 'default_config')
 
-from Gaudi.Configuration import *
 
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 from StandardParticles import StdAllNoPIDsPions, StdNoPIDsPions, StdNoPIDsKaons
@@ -36,11 +35,11 @@ from StandardParticles import StdLooseAllPhotons, StdAllLooseGammaLL, StdAllLoos
 
 from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
-from StrippingUtils.Utils import LineBuilder, checkConfig
+from StrippingUtils.Utils import LineBuilder
 
 from Configurables import FilterDesktop
 
-from GaudiKernel.SystemOfUnits import GeV, MeV, picosecond, mm
+from GaudiKernel.SystemOfUnits import GeV, MeV, picosecond
 
 default_config = {
     'NAME': 'DstarD2XGamma',
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCharm/StrippingDstarPromptWithD02HHHH.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCharm/StrippingDstarPromptWithD02HHHH.py
index 13343e4031d3c9fe7ad9b92cfb6f3c3fff754d98..22e9ffd46fd5a0b8ab4623cae0293fe3c10c129d 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCharm/StrippingDstarPromptWithD02HHHH.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCharm/StrippingDstarPromptWithD02HHHH.py
@@ -36,11 +36,10 @@ __version__ = '$Revision: 1.2 $'
 __all__ = ('DstarPromptWithD02HHHHConf', 'makeD02hhhh',
            'makePromptDstar', 'default_config')
 
-from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, ConjugateNeutralPID
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles, ConjugateNeutralPID
 from PhysSelPython.Wrappers import Selection, MergedSelection
 from StrippingConf.StrippingLine import StrippingLine
-from StrippingUtils.Utils import checkConfig, LineBuilder
+from StrippingUtils.Utils import LineBuilder
 from GaudiKernel.SystemOfUnits import MeV, GeV, mm
 from copy import copy
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCharm/StrippingDstarPromptWithD02HHMuMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCharm/StrippingDstarPromptWithD02HHMuMu.py
index e83ad60bb1ff3c30f6cfd21e7ea0e2fb6ead7646..a1c41727aab9df91366ea29963944e783d29f676 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCharm/StrippingDstarPromptWithD02HHMuMu.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCharm/StrippingDstarPromptWithD02HHMuMu.py
@@ -29,11 +29,10 @@ __version__ = '$Revision: 2.0 $'
 __all__ = ('DstarPromptWithD02HHLLConf', 'makeD02hhll',
            'makePromptDstar', 'default_config')
 
-from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, ConjugateNeutralPID
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles, ConjugateNeutralPID
 from PhysSelPython.Wrappers import Selection, MergedSelection
 from StrippingConf.StrippingLine import StrippingLine
-from StrippingUtils.Utils import checkConfig, LineBuilder
+from StrippingUtils.Utils import LineBuilder
 from GaudiKernel.SystemOfUnits import MeV, GeV, mm
 from copy import copy
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCharm/StrippingExcitedDsSpectroscopy.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCharm/StrippingExcitedDsSpectroscopy.py
index 6b08898929e9ee290d51640d43d073b4a548a98b..dadd6c5c25c094fb4e5dfdef695cd98af0384ee1 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCharm/StrippingExcitedDsSpectroscopy.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCharm/StrippingExcitedDsSpectroscopy.py
@@ -321,7 +321,6 @@ def globalEventCutFilter(name,
     if MaxTrSIZE == None:
         return None
 
-    from Configurables import LoKi__VoidFilter as VoidFilter
     from Configurables import LoKi__Hybrid__CoreFactory as CoreFactory
     modules = CoreFactory('CoreFactory').Modules
     for i in ['LoKiTracks.decorators']:
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCharm/StrippingHc2V02H.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCharm/StrippingHc2V02H.py
index 6bdf6a7bffd07e3e7c001fd4de61f7a4bd934d6f..b32a173f2c8c885c8f785ae8a69631f5f80b99fd 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCharm/StrippingHc2V02H.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCharm/StrippingHc2V02H.py
@@ -26,7 +26,7 @@ __date__ = '18/07/2019'
 __all__ = ('default_config', 'StrippingHc2V02HConf')
 
 from GaudiKernel.SystemOfUnits import MeV, GeV, mm, mrad
-from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop, DaVinci__N3BodyDecays
+from GaudiConfUtils.ConfigurableGenerators import DaVinci__N3BodyDecays, FilterDesktop
 # from StandardParticles import StdNoPIDsPions as InputPionsPiPi
 # from StandardParticles import StdNoPIDsKaons as InputKaons
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCharm/StrippingHc2V03H.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCharm/StrippingHc2V03H.py
index d3888168faa1cbed51e85b5dd40fa51f82370dcd..2c9fd008996a8b8f7f34cbf4a6617f8d731b378b 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCharm/StrippingHc2V03H.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCharm/StrippingHc2V03H.py
@@ -24,11 +24,9 @@ __date__ = '13/10/2017'
 __all__ = ('default_config', 'StrippingHc2V03HConf')
 
 from GaudiKernel.SystemOfUnits import MeV, GeV, mm, mrad
-from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop, DaVinci__N4BodyDecays
+from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays, FilterDesktop
 from StandardParticles import StdAllLoosePions as InputPions
 from StandardParticles import StdAllLooseKaons as InputKaons
-from StandardParticles import StdVeryLooseLambdaLL as InputLambdasLL
-from StandardParticles import StdLooseLambdaDD as InputLambdasDD
 
 from PhysSelPython.Wrappers import Selection, MergedSelection, DataOnDemand
 from StrippingUtils.Utils import LineBuilder
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCharm/StrippingHc2V2H.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCharm/StrippingHc2V2H.py
index 1cc1e18bb59332589773894f931054575d3bd57d..62f83f01a95c995d84514559ea3eb725d34e7335 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCharm/StrippingHc2V2H.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCharm/StrippingHc2V2H.py
@@ -29,8 +29,6 @@ from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDeskto
 from StandardParticles import StdNoPIDsDownPions as InputDownPions
 from StandardParticles import StdNoPIDsPions as InputPions
 from StandardParticles import StdNoPIDsKaons as InputKaons
-from StandardParticles import StdLooseLambdaLL as InputLambdasLL
-from StandardParticles import StdLooseLambdaDD as InputLambdasDD
 
 from PhysSelPython.Wrappers import Selection, MergedSelection, DataOnDemand
 from StrippingUtils.Utils import LineBuilder
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCharm/StrippingHc2V3H.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCharm/StrippingHc2V3H.py
index 8860909e6ec1c8f2862b43d64f75e5158a1c67e3..05d0ef19028d88f3cf40161b0e7b207226c117e3 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCharm/StrippingHc2V3H.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCharm/StrippingHc2V3H.py
@@ -31,8 +31,6 @@ from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDeskto
 from StandardParticles import StdNoPIDsDownPions as InputDownPions
 from StandardParticles import StdNoPIDsPions as InputPions
 from StandardParticles import StdNoPIDsKaons as InputKaons
-from StandardParticles import StdLooseLambdaLL as InputLambdasLL
-from StandardParticles import StdLooseLambdaDD as InputLambdasDD
 
 from PhysSelPython.Wrappers import Selection, MergedSelection, DataOnDemand
 from StrippingUtils.Utils import LineBuilder
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCharm/StrippingKKPiPi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCharm/StrippingKKPiPi.py
index cedaab2089da1034f1207a1c958ba82c6e694ba7..767a1fdbf50445fb204987a0cc70c2f97dfb5421 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCharm/StrippingKKPiPi.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCharm/StrippingKKPiPi.py
@@ -12,12 +12,11 @@
 Module for selecting [cs][ubar dbar] -> K+ K+ pi- pi-
 '''
 
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
+from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
 from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
-from Gaudi.Configuration import *
 __author__ = ['Mengzhen Wang']
 __date__ = '10/10/2017'
 __version__ = '$Revision: 1.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCharm/StrippingLambdac2V03H.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCharm/StrippingLambdac2V03H.py
index 8c19d9d3aeebd29855bd2d76b366fe9611b08aaf..9689bee39c9e7d84a61e56605ba3bb5f443ec5d1 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCharm/StrippingLambdac2V03H.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCharm/StrippingLambdac2V03H.py
@@ -27,7 +27,7 @@ __all__ = (
 )
 
 from GaudiKernel.SystemOfUnits import MeV, GeV, mm, mrad
-from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop, DaVinci__N4BodyDecays
+from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays, FilterDesktop
 from StandardParticles import StdNoPIDsPions as InputPions
 from StandardParticles import StdNoPIDsKaons as InputKaons
 from StandardParticles import StdLooseLambdaLL as InputLambdasLL
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCharm/StrippingLc2L0LLpi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCharm/StrippingLc2L0LLpi.py
index 0165e116e9da33c044fd297b7fa4c1090c6cbf39..0a027afeb1d2d303ea6a37758bc2b3bf4bb5f79d 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCharm/StrippingLc2L0LLpi.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCharm/StrippingLc2L0LLpi.py
@@ -12,17 +12,10 @@
 Module for selecting Lambda_c+->Lambda pi+
 '''
 
-from StandardParticles import (StdAllLoosePions, StdLooseProtons,
-                               StdLoosePions, StdNoPIDsUpPions)
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from StandardParticles import StdLooseAllPhotons, StdVeryLooseAllPhotons
-from Configurables import LoKi__VoidFilter
-from PhysSelPython.Wrappers import MergedSelection
-from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
-from Gaudi.Configuration import *
 __author__ = ['Guiyun Ding', 'Jiesheng Yu', 'Yuehong Xie']
 __date__ = '28/11/2016'
 __version__ = '$Revision: 2.0$'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCharm/StrippingNeutralCBaryons.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCharm/StrippingNeutralCBaryons.py
index bf6d1603296752d86c0e7c13ec03b037aa4b7dd0..165e0fbf71ca71084e7f0b7ac538d4257975d87f 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCharm/StrippingNeutralCBaryons.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCharm/StrippingNeutralCBaryons.py
@@ -23,13 +23,9 @@ __version__ = '$Revision: 1.0 $'
 __all__ = ('StrippingNeutralCBaryonsConf', 'default_config')
 
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from StandardParticles import StdLoosePions, StdNoPIDsDownPions, StdLooseKaons, StdLooseDownKaons
-from StandardParticles import StdAllLoosePions, StdAllLooseKaons
 
 from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
-from PhysSelPython.Wrappers import MultiSelectionSequence
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from GaudiKernel.SystemOfUnits import MeV, mm, picosecond
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCharm/StrippingXic2HHH.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCharm/StrippingXic2HHH.py
index e34807cd11d54a2a33e0a1189dffe5a4b8d17475..32300611aa84de3bdf0390670c07b3849c390e20 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCharm/StrippingXic2HHH.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCharm/StrippingXic2HHH.py
@@ -8,18 +8,15 @@
 # granted to it by virtue of its status as an Intergovernmental Organization  #
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
-from StandardParticles import StdNoPIDsPions, StdNoPIDsKaons, StdNoPIDsProtons, StdAllNoPIDsProtons
-from Configurables import TisTosParticleTagger
+from StandardParticles import StdNoPIDsKaons, StdNoPIDsPions, StdNoPIDsProtons
 from StrippingUtils.Utils import LineBuilder
-from PhysSelPython.Wrappers import MultiSelectionSequence
-from PhysSelPython.Wrappers import Selection, DataOnDemand, AutomaticData, MergedSelection
+from PhysSelPython.Wrappers import DataOnDemand, MergedSelection, Selection
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
 from Configurables import FilterDesktop, CombineParticles
 from LHCbKernel.Configuration import *
-from GaudiKernel.SystemOfUnits import MeV, mm, ns
+from GaudiKernel.SystemOfUnits import MeV, mm
 from StrippingConf.StrippingLine import StrippingLine
 from Gaudi.Configuration import *
-import re
 all
 ''' Xic+ and Theta+ lines Designed by Yury Shcheglov, Alexey Dzyuba, Nelya Sagidova to study Xic+ and Theta+ particles '''
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCharm/StrippingXic2LambdaKPi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCharm/StrippingXic2LambdaKPi.py
index 968b10448f5ff96bf5069b19d8e2a65d00f3f3bd..5f91de838fcaa1d4ecdf89cb5a647f42841f946b 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCharm/StrippingXic2LambdaKPi.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCharm/StrippingXic2LambdaKPi.py
@@ -14,8 +14,6 @@ Exclusive lines for Xic+ -> Lambda0 KS0 pi+ and Xic0 -> Lambda0 K- pi+
 
 Author: M. Stahl
 '''
-from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-from Configurables import FilterDesktop
 from PhysConf.Selections import FilterSelection, Combine3BodySelection, MergedSelection
 from PhysSelPython.Wrappers import AutomaticData
 from StrippingUtils.Utils import LineBuilder
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCharm/StrippingXicc.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCharm/StrippingXicc.py
index 2468c2d79739511bfdefe170463aa125124d506e..45478d9be226dbd5e3fdd09b0ff769294d99d064 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCharm/StrippingXicc.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingCharm/StrippingXicc.py
@@ -52,9 +52,6 @@ from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticle
 from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from StandardParticles import StdAllLoosePions, StdAllLooseKaons, StdAllLooseProtons
-from StandardParticles import StdLoosePions
-from CommonParticles.StdLooseLambda import StdLooseLambdaLL, StdLooseLambdaDD
 from GaudiKernel.SystemOfUnits import MeV, GeV, mm
 from Configurables import TisTosParticleTagger
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingIFT/StrippingHeavyIonConvertedPhoton.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingIFT/StrippingHeavyIonConvertedPhoton.py
index b38a84b86b368e54eb7956ef92addf71154d1923..c8361ce1732d1f9749491ad6fa0d7449522abd70 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingIFT/StrippingHeavyIonConvertedPhoton.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingIFT/StrippingHeavyIonConvertedPhoton.py
@@ -23,7 +23,7 @@ __all__ = (
 
 from Gaudi.Configuration import *
 from CommonParticles.Utils import *
-from GaudiKernel.SystemOfUnits import MeV, GeV, mm
+from GaudiKernel.SystemOfUnits import MeV, mm
 from Configurables import (DiElectronMaker,
                            ProtoParticleCALOFilter,
                            ParticleTransporter,
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingIFT/StrippingHeavyIonD02KPiPi0.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingIFT/StrippingHeavyIonD02KPiPi0.py
index 3e380b9342ba9bebae1a3195dcadf08a1b598fc9..8ffdf55b27ce401ff26b2fe355cc99597f755347 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingIFT/StrippingHeavyIonD02KPiPi0.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingIFT/StrippingHeavyIonD02KPiPi0.py
@@ -25,9 +25,8 @@ __all__ = ('StrippingHeavyIonD02KPiPi0Conf',
            'makeD02KPiPi0M',
            'default_config')
 
-from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from PhysSelPython.Wrappers import Selection, DataOnDemand
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
+from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from StandardParticles import StdTightPions, StdTightKaons, StdLooseMergedPi0, StdLooseResolvedPi0
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingIFT/StrippingHeavyIonDiMuon.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingIFT/StrippingHeavyIonDiMuon.py
index 0c2b044b5fe850934f513781b14f5faf5b8fc181..e97c2ed82a33c94fba2489f2b078001b5dc839e6 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingIFT/StrippingHeavyIonDiMuon.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingIFT/StrippingHeavyIonDiMuon.py
@@ -17,8 +17,7 @@ from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 from StandardParticles import StdAllLooseMuons
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand
-from Gaudi.Configuration import *
+from PhysSelPython.Wrappers import Selection
 __author__ = ['Emilie MAURICE']
 __date__ = ''
 __version__ = '$Revision: 2.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingIFT/StrippingHeavyIonDst2D0KPiForPID.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingIFT/StrippingHeavyIonDst2D0KPiForPID.py
index 4282eb3c7b386840ce3bb3a47569a6a981e3194c..c3ba0aa8f46df637625d1f88481903dd9414f15e 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingIFT/StrippingHeavyIonDst2D0KPiForPID.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingIFT/StrippingHeavyIonDst2D0KPiForPID.py
@@ -13,10 +13,8 @@
 from StandardParticles import StdAllNoPIDsKaons, StdAllNoPIDsPions
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from LHCbKernel.Configuration import *
-from Gaudi.Configuration import *
+from PhysSelPython.Wrappers import Selection
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 __author__ = ['Philip Xing', 'Andrew Powell']
 __date__ = '23rd August 2012'
 __version__ = '$Revision: 7.0 $'
@@ -36,7 +34,7 @@ Usage:
 __all__ = ('HeavyIonDst2D0KPiForPIDConf', 'default_config', "D0", "Dstar")
 
 
-from GaudiKernel.SystemOfUnits import mm, cm, MeV, GeV
+from GaudiKernel.SystemOfUnits import GeV, MeV
 # from Configurables import FilterDesktop, CombineParticles
 
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingIFT/StrippingHeavyIonGammaHadron.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingIFT/StrippingHeavyIonGammaHadron.py
index df8ad92d7e7813151437ff0a0a8d2dfe8e9bab68..42c4e64093225339c3ada6e6ee97e25c483ed75e 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingIFT/StrippingHeavyIonGammaHadron.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingIFT/StrippingHeavyIonGammaHadron.py
@@ -13,13 +13,10 @@ Stripping selections or Gamma+Hadron physics.
 Based on those by Patrick K.
 '''
 
-from Configurables import RelInfoConeVariables
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from Configurables import FilterDesktop, CombineParticles
-from StandardParticles import StdLoosePhotons, StdAllLooseGammaLL, StdAllLooseGammaDD, StandardBasic
-from Gaudi.Configuration import *
+from Configurables import FilterDesktop
 __author__ = 'Cesar da Silva'
 __date__ = '30/04/2017'
 __version__ = '$Revision: 0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingIFT/StrippingHeavyIonMiniBias.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingIFT/StrippingHeavyIonMiniBias.py
index c63f00873a80c36c86290265b6ec4e0371de1408..685921c79f00fd6435fb915aaa8333675a7dfcff 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingIFT/StrippingHeavyIonMiniBias.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingIFT/StrippingHeavyIonMiniBias.py
@@ -13,7 +13,6 @@ Stripping selections or Minimum Bias physics.
 Based on those by Patrick K.
 '''
 
-from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 __author__ = 'Yanxi ZHANG, Emilie MAURICE'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingIFT/StrippingHeavyIonOpenCharm.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingIFT/StrippingHeavyIonOpenCharm.py
index 89ba90160c11f4ec225daca0022e27ee258efe57..75ee902a2bf417dec38a7240d3cd97c6aad266c4 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingIFT/StrippingHeavyIonOpenCharm.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingIFT/StrippingHeavyIonOpenCharm.py
@@ -31,8 +31,8 @@ __all__ = (
 )
 
 
-from GaudiKernel.SystemOfUnits import MeV, GeV, mrad, mm
-from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop
+from GaudiKernel.SystemOfUnits import GeV, MeV, mrad
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 # from Configurables import CombineParticles, FilterDesktop
 from StandardParticles import (
     StdAllNoPIDsKaons,
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingIFT/StrippingHeavyIonOthercc.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingIFT/StrippingHeavyIonOthercc.py
index 68874ffb4319386ba39c68da21a84cb3498f7c28..efc32ecd43b218de32e707b4d5f132d518d9658d 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingIFT/StrippingHeavyIonOthercc.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingIFT/StrippingHeavyIonOthercc.py
@@ -17,8 +17,7 @@ from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 from StandardParticles import StdNoPIDsElectrons, StdAllLooseProtons, StdLooseMuons
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand
-from Gaudi.Configuration import *
+from PhysSelPython.Wrappers import Selection
 __author__ = ['Emilie MAURICE']
 __date__ = ''
 __version__ = '$Revision: 1.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingIFT/StrippingHeavyIonPIDCalib.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingIFT/StrippingHeavyIonPIDCalib.py
index 4d96b70412efeeaa567401f7247511c02704fc0f..635480e78d2cba544bf3537d6a6d0e92293ac75f 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingIFT/StrippingHeavyIonPIDCalib.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingIFT/StrippingHeavyIonPIDCalib.py
@@ -37,7 +37,6 @@ from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
 from Gaudi.Configuration import *
 __author__ = ['Yanxi ZHANG']
 __date__ = '25/02/2015'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingIFT/StrippingHeavyIonSingleElectron.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingIFT/StrippingHeavyIonSingleElectron.py
index 4751a2767bc4a63d9d78087de7b67a9493851237..ce4c263cd6870c12d9bbbfccb585bedc00c300f9 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingIFT/StrippingHeavyIonSingleElectron.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingIFT/StrippingHeavyIonSingleElectron.py
@@ -14,7 +14,7 @@ Stripping selections for single scattered electrons
 
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
 from StandardParticles import StdAllNoPIDsElectrons
-from PhysSelPython.Wrappers import Selection, DataOnDemand
+from PhysSelPython.Wrappers import Selection
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 __author__ = 'Giacomo Graziani'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingIFT/StrippingHeavyIonTopology.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingIFT/StrippingHeavyIonTopology.py
index 19f3d03c95644de38c49321c5c0b7fb0636739e4..8308d72b5faed1731235c6cd48d682ca5b65d690 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingIFT/StrippingHeavyIonTopology.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingIFT/StrippingHeavyIonTopology.py
@@ -12,13 +12,9 @@
 Module for selecting specific topology
 '''
 
-from Configurables import FilterDesktop, CombineParticles
-from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-from StandardParticles import StdAllLooseMuons, StdAllLoosePions, StdAllNoPIDsPions, StdLoosePhotons
+from Configurables import FilterDesktop
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand
-from Gaudi.Configuration import *
 __author__ = ['Emilie MAURICE']
 __date__ = ''
 __version__ = '$Revision: 1.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingIFT/StrippingHeavyIonTrackEffDownMuon.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingIFT/StrippingHeavyIonTrackEffDownMuon.py
index 6e7eb7567d6f9a66f2e89cffa4cea4c71115f9cf..0880e97b075e2bc495173b6acf653ff01884be82 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingIFT/StrippingHeavyIonTrackEffDownMuon.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingIFT/StrippingHeavyIonTrackEffDownMuon.py
@@ -43,34 +43,26 @@ __all__ = ('StrippingHeavyIonTrackEffDownMuonConf',
 # FIXME Write includes in a cleaner way
 from Gaudi.Configuration import *
 from LHCbKernel.Configuration import *
-from DAQSys.DecoderClass import Decoder
 from Configurables import GaudiSequencer
 from Configurables import UnpackTrack, ChargedProtoParticleMaker, DelegatingTrackSelector, TrackSelector, BestPIDParticleMaker
-from TrackFitter.ConfiguredFitters import ConfiguredFit
 from Configurables import TrackStateInitAlg
 from StrippingConf.StrippingLine import StrippingLine
-from Configurables import ChargedProtoParticleAddMuonInfo, MuonIDAlgLite
+from Configurables import ChargedProtoParticleAddMuonInfo
 from MuonID import ConfiguredMuonIDs
 from Configurables import ChargedProtoCombineDLLsAlg, ProtoParticleMUONFilter
-from PhysSelPython.Wrappers import Selection, DataOnDemand
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
+from PhysSelPython.Wrappers import Selection
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 
 from StrippingUtils.Utils import LineBuilder
-from Configurables import LoKi__VoidFilter
-from os import environ
 from Gaudi.Configuration import *
-import GaudiKernel.ProcessJobOptions
-from GaudiKernel.SystemOfUnits import mm
 
 from GaudiConfUtils.ConfigurableGenerators import TisTosParticleTagger
 from StandardParticles import StdAllLooseMuons
 from Configurables import GaudiSequencer
 from Configurables import TrackToDST
-from Configurables import TrackSys
 from Configurables import PatSeeding, PatSeedingTool, PatLongLivedTracking
-from PhysSelPython.Wrappers import AutomaticData
 # Get the fitters
-from TrackFitter.ConfiguredFitters import ConfiguredFit, ConfiguredFitSeed, ConfiguredFitDownstream
+from TrackFitter.ConfiguredFitters import ConfiguredFitDownstream
 from PatAlgorithms import PatAlgConf
 
 from SelPy.utils import (UniquelyNamedObject,
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingIFT/StrippingHeavyIonTrackEffMuonTT.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingIFT/StrippingHeavyIonTrackEffMuonTT.py
index 56d4a18efe2b562eed3412a268bb47e35915eb37..3af84c0e2ed472dd795c0b18c8d095381ac3715c 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingIFT/StrippingHeavyIonTrackEffMuonTT.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingIFT/StrippingHeavyIonTrackEffMuonTT.py
@@ -63,10 +63,10 @@ __all__ = ('StrippingHeavyionTrackEffMuonTTConf',
            'filterHLT2ForBJpsiK')
 
 from Gaudi.Configuration import *
-from PhysSelPython.Wrappers import Selection, DataOnDemand, ChargedProtoParticleSelection
+from PhysSelPython.Wrappers import ChargedProtoParticleSelection, Selection
 from StrippingConf.StrippingLine import StrippingLine
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from StrippingUtils.Utils import LineBuilder, checkConfig
+from StrippingUtils.Utils import LineBuilder
 from StandardParticles import StdLooseKaons, StdLooseMuons, StdAllLooseMuons
 
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingIFT/StrippingHeavyIonTrackEffVeloMuon.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingIFT/StrippingHeavyIonTrackEffVeloMuon.py
index 0e07045325c58f87f6345eafe88988d9f7a3f147..7cd8b2c0d6f462f14fd64f8f6c50386fc74e091e 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingIFT/StrippingHeavyIonTrackEffVeloMuon.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingIFT/StrippingHeavyIonTrackEffVeloMuon.py
@@ -40,17 +40,14 @@ __all__ = ('HeavyIonTrackEffVeloMuonConf',
            )
 
 
-from Gaudi.Configuration import *
-from LHCbKernel.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 # from Configurables import CombineParticles
-from PhysSelPython.Wrappers import Selection, SelectionSequence, DataOnDemand
-from Configurables import ChargedProtoParticleMaker, NoPIDsParticleMaker, DataOnDemandSvc, DelegatingTrackSelector, TrackSelector, CombinedParticleMaker, BestPIDParticleMaker
+from PhysSelPython.Wrappers import Selection
+from Configurables import ChargedProtoParticleMaker, DataOnDemandSvc, DelegatingTrackSelector, NoPIDsParticleMaker, TrackSelector
 from Configurables import FastVeloTracking
 
 from StrippingConf.StrippingLine import StrippingLine
-from Configurables import TrackStateInitAlg, TrackEventFitter, TrackPrepareVelo, TrackContainerCopy, Tf__PatVeloSpaceTool, StandaloneMuonRec
-from Configurables import TrackCloneFinder
+from Configurables import StandaloneMuonRec, TrackPrepareVelo
 from StrippingUtils.Utils import LineBuilder
 # changed from StdLooseMuons, yanxi
 from StandardParticles import StdAllLooseMuons
@@ -59,14 +56,9 @@ from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, TisTosParticleT
 # from Configurables import TisTosParticleTagger
 
 from Configurables import GaudiSequencer
-from Configurables import TrackSys
-from PhysSelPython.Wrappers import AutomaticData
 # Get the fitters
-from TrackFitter.ConfiguredFitters import ConfiguredFit
 
-from Configurables import TrackEventCloneKiller, VeloMuonBuilder
-from Configurables import TrackEventFitter, TrackMasterFitter
-from Configurables import TrackKalmanFilter, TrackMasterExtrapolator
+from Configurables import VeloMuonBuilder
 # from TrackFitter.ConfiguredFitters import ConfiguredFastFitter
 # from Configurables import TrackCloneFinder
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingMiniBias/StrippingBadEvents.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingMiniBias/StrippingBadEvents.py
index 4d837a2f722d72d1c7683e8f61d6316db037f332..460036843530f41526b7139b73c204dba3cf9160 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingMiniBias/StrippingBadEvents.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingMiniBias/StrippingBadEvents.py
@@ -8,7 +8,6 @@
 # granted to it by virtue of its status as an Intergovernmental Organization  #
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
-from PhysSelPython.Wrappers import Selection
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 __author__ = 'Andrea Contu'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingMiniBias/StrippingMiniBias.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingMiniBias/StrippingMiniBias.py
index 7ba890fe41b117c0dcaaac7777296c741c397754..f791c6cd1cfac775c9b2357307a4044a5100eb87 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingMiniBias/StrippingMiniBias.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingMiniBias/StrippingMiniBias.py
@@ -8,7 +8,6 @@
 # granted to it by virtue of its status as an Intergovernmental Organization  #
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
-from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 __author__ = 'Patrick Koppenburg'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingQEE/DisplVertices_Utils.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingQEE/DisplVertices_Utils.py
index 96c2f57f73e7b9b1e76dbe63397e2210046dbfbd..38ecb854268d3d33d2086b442d573ac6517fd931 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingQEE/DisplVertices_Utils.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingQEE/DisplVertices_Utils.py
@@ -14,13 +14,12 @@ Utilities for displaced vertex stripping: wrapper class around PatPV3D
 
 __all__ = ("SelectionFromAlgorithmWithTools", "SelectionPatPV3DWrapper")
 
-from GaudiConfUtils import isConfigurable
 
 from SelPy.utils import (UniquelyNamedObject, ClonableObject, SelectionBase,
                          compatibleSequences, IncompatibleInputLocations,
-                         CloneCallable, makeOutputLocation, setOutputLocation)
+                         makeOutputLocation, setOutputLocation)
 
-from PhysSelPython.Wrappers import checkConfigurable, checkName
+from PhysSelPython.Wrappers import checkName
 
 
 def connectToRequiredSelections(selection, inputSetter):
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingQEE/StrippingA1MuMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingQEE/StrippingA1MuMu.py
old mode 100755
new mode 100644
index abe503359313f7d3122ef96d84150915e13aba4c..3eacb151a1458052c87f07b1310f376035f94132
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingQEE/StrippingA1MuMu.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingQEE/StrippingA1MuMu.py
@@ -22,11 +22,9 @@ A_1 -> mu+ mu-, based on functionality from StrippingDiMuonNew by Jibo He.
 
 """
 
-from Gaudi.Configuration import *
-from LHCbKernel.Configuration import *
 
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
-from PhysSelPython.Wrappers import Selection, DataOnDemand, SimpleSelection
+from PhysSelPython.Wrappers import SimpleSelection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from GaudiKernel.SystemOfUnits import MeV
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingQEE/StrippingA2MuMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingQEE/StrippingA2MuMu.py
index fb0c0e5bde7e9d42f576efe9574e89f0b25b1352..dbb90795e4701667afcb062a45650c23e39a212e 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingQEE/StrippingA2MuMu.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingQEE/StrippingA2MuMu.py
@@ -21,7 +21,7 @@ from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from StandardParticles import StdAllLooseMuons, StdAllNoPIDsMuons
+from StandardParticles import StdAllLooseMuons
 from GaudiKernel.SystemOfUnits import GeV
 
 default_config = {
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingQEE/StrippingA2MuMuSameSign.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingQEE/StrippingA2MuMuSameSign.py
index 0b9ad4036a8a1efcddc43f3605366c7e8d390b48..8593dce8251de65e8125a56be3f510899461f649 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingQEE/StrippingA2MuMuSameSign.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingQEE/StrippingA2MuMuSameSign.py
@@ -21,7 +21,7 @@ from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from StandardParticles import StdAllLooseMuons, StdAllNoPIDsMuons
+from StandardParticles import StdAllLooseMuons
 from GaudiKernel.SystemOfUnits import GeV
 
 default_config = {
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingQEE/StrippingB2LLP2HH.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingQEE/StrippingB2LLP2HH.py
index 3a1106bd62aadf5fe227262f7427cf483b7a92f9..458ae43447788d81e1f54bedab9ce400857754fb 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingQEE/StrippingB2LLP2HH.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingQEE/StrippingB2LLP2HH.py
@@ -20,13 +20,11 @@ __date__ = '25/01/2019'
 
 __all__ = ('B2LLPV0_sConf', 'default_config')
 
-from Gaudi.Configuration import *
 from StandardParticles import StdAllNoPIDsPions
 from PhysSelPython.Wrappers import CombineSelection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from GaudiKernel.SystemOfUnits import GeV
-from LoKiPhys.functions import SOURCE, SIZE
 
 default_config = {
     'NAME': 'B2LLPV0',
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingQEE/StrippingConvertedPhoton.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingQEE/StrippingConvertedPhoton.py
index ff470d2d68d8acbac080718b50f8ec5992aa1277..23dcde2c3661a33c459cf0c28b0b4c6b2d50908b 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingQEE/StrippingConvertedPhoton.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingQEE/StrippingConvertedPhoton.py
@@ -20,7 +20,7 @@ __all__ = ('ConvertedPhotonConf', 'default_config')
 
 from Gaudi.Configuration import *
 from CommonParticles.Utils import *
-from GaudiKernel.SystemOfUnits import MeV, GeV, mm
+from GaudiKernel.SystemOfUnits import MeV, mm
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
 from Configurables import (
     DiElectronMaker,
@@ -28,8 +28,7 @@ from Configurables import (
     ParticleTransporter,
     LoKi__VertexFitter,
 )
-from PhysSelPython.Wrappers import (Selection, SimpleSelection,
-                                    MergedSelection, AutomaticData)
+from PhysSelPython.Wrappers import (Selection, MergedSelection)
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingQEE/StrippingDY2MuMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingQEE/StrippingDY2MuMu.py
index 87815b149ed487be0e29a168b8cd1e83a2d7062f..98a521ed9af49eae4df29c7e66ad90a8e731565d 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingQEE/StrippingDY2MuMu.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingQEE/StrippingDY2MuMu.py
@@ -26,9 +26,8 @@ __author__ = ['J. Anderson']
 
 __all__ = 'DY2MuMuConf', 'default_config'
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-from PhysSelPython.Wrappers import Selection, SimpleSelection
+from PhysSelPython.Wrappers import SimpleSelection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from StandardParticles import StdAllLooseMuons
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingQEE/StrippingDY2ee.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingQEE/StrippingDY2ee.py
index 04dec7ea97eef81e8c032fef4a80fbf549a7016a..36bd711e12685876d348c8ba3b561241ecf2e1bc 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingQEE/StrippingDY2ee.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingQEE/StrippingDY2ee.py
@@ -20,9 +20,8 @@ __author__ = ['S.Bifani', 'D.Ward']
 
 __all__ = ('DY2eeConf', 'default_config')
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-from PhysSelPython.Wrappers import Selection, DataOnDemand
+from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from StandardParticles import StdAllNoPIDsElectrons
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingQEE/StrippingDisplJets.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingQEE/StrippingDisplJets.py
index 153e6a08fc0522eb4a46021b0a6b379d1c119505..594bbe8670b04bf181d93f97cb6e4c49bce6754d 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingQEE/StrippingDisplJets.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingQEE/StrippingDisplJets.py
@@ -9,8 +9,6 @@
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
 
-from Gaudi.Configuration import *
-from CommonParticles.Utils import *
 # from Configurables import FilterDesktop
 # from PhysSelPython.Wrappers import Selection, DataOnDemand, FilterSelection
 from StrippingConf.StrippingLine import StrippingLine
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingQEE/StrippingDisplVertices.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingQEE/StrippingDisplVertices.py
index adc6e51963c535e381c38c219f49b6cc33f3be9d..2fed6d3264f281fa2094960fa79385b29e34bdec 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingQEE/StrippingDisplVertices.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingQEE/StrippingDisplVertices.py
@@ -40,7 +40,6 @@ __all__ = ('DisplVerticesConf', 'default_config')
 
 from Gaudi.Configuration import *
 from GaudiKernel import SystemOfUnits as units
-from LHCbKernel.Configuration import DEBUG, VERBOSE
 
 import logging
 logger = logging.getLogger(__name__)
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingQEE/StrippingDitau.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingQEE/StrippingDitau.py
old mode 100755
new mode 100644
index 774669335119a9a7c61534f34240c273f191b236..344691f63922986ebf8c047347d2ff7246fb3369
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingQEE/StrippingDitau.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingQEE/StrippingDitau.py
@@ -154,8 +154,7 @@ Derived from works of S.Farry & P. Ilten
 
 """
 
-import os
-from GaudiKernel.SystemOfUnits import MeV, GeV, micrometer
+from GaudiKernel.SystemOfUnits import GeV, MeV
 from PhysSelPython.Wrappers import Selection, SimpleSelection, PassThroughSelection, MergedSelection, AutomaticData
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
@@ -936,7 +935,7 @@ def Tuples():
 
   """
     import re
-    from DecayTreeTuple.Configuration import DecayTreeTuple, EventTuple
+    from DecayTreeTuple.Configuration import DecayTreeTuple
 
     seq = GaudiSequencer('TupleSeq')
     seq.ModeOR = True
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingQEE/StrippingExotica.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingQEE/StrippingExotica.py
old mode 100755
new mode 100644
index 544d195e6128309244c2f0542c06359cabc9f2f6..0212fcbde49bb732638a9f83eafa0910648cd63b
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingQEE/StrippingExotica.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingQEE/StrippingExotica.py
@@ -33,7 +33,7 @@ Hlt2ExoticaEtaToDiEGamma
 from GaudiKernel.SystemOfUnits import MeV, GeV, mm, picosecond
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-from PhysSelPython.Wrappers import Selection, SimpleSelection, MergedSelection, AutomaticData
+from PhysSelPython.Wrappers import AutomaticData, SimpleSelection
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingQEE/StrippingFullDiJets.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingQEE/StrippingFullDiJets.py
index 1e54dc4e2fad7924399b2b4775d0d6fb951bfc0d..bebda7a47815b284905127138fece6475cc118ef 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingQEE/StrippingFullDiJets.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingQEE/StrippingFullDiJets.py
@@ -9,14 +9,10 @@
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
 
-from Gaudi.Configuration import *
-from Configurables import FilterDesktop, CombineParticles, LoKi__VertexFitter
+from Configurables import CombineParticles, LoKi__VertexFitter
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from StandardParticles import StdJets
-from CommonParticles.Utils import *
-from Configurables import FilterJet
 from GaudiKernel.SystemOfUnits import GeV
 
 __author__ = "Xabier Cid Vidal", "Cedric Potterat", "William Barter"
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingQEE/StrippingGluinos.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingQEE/StrippingGluinos.py
index cce1aef99f43134e31fba47d2da7f03efdc613f0..6ecf1b2aeb4830730c6e516e948fbb385438e36f 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingQEE/StrippingGluinos.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingQEE/StrippingGluinos.py
@@ -15,11 +15,10 @@ __all__ = ('GluinosJetsConf', 'default_config')
 
 from Gaudi.Configuration import *
 from StandardParticles import StdJets
-from PhysSelPython.Wrappers import FilterSelection, PassThroughSelection, DataOnDemand
+from PhysSelPython.Wrappers import FilterSelection, PassThroughSelection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from GaudiKernel.SystemOfUnits import GeV
-from LoKiPhys.functions import SOURCE, SIZE
 from CommonParticles.Utils import *
 from Configurables import FilterDesktop, JetVertexAlg
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingQEE/StrippingLFVExotica.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingQEE/StrippingLFVExotica.py
old mode 100755
new mode 100644
index 0b04ec6ed0781154cc6991a1b147a28a81e9385a..1e18590e79ff5c8ebf1464abd69557f5104e0401
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingQEE/StrippingLFVExotica.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingQEE/StrippingLFVExotica.py
@@ -171,7 +171,7 @@ def create_stdjets(strob, line_location, stdjets_name_ban):
         strob.StdJetsNoJetIDBan = [myconf1]
 
     # configure Data-On-Demand service
-    locations = updateDoD(myconf1)
+    updateDoD(myconf1)
 
 
 relInfoJetsVars = [
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingQEE/StrippingLLP2HH.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingQEE/StrippingLLP2HH.py
index cbb3d601d46ef4105435903a6c9f13438b8a2520..0a07d3ff43e1c8fbcbabe32fd722c27f2216e3fe 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingQEE/StrippingLLP2HH.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingQEE/StrippingLLP2HH.py
@@ -18,13 +18,11 @@ __date__ = '24/01/2019'
 
 __all__ = ('LLPV0_sConf', 'default_config')
 
-from Gaudi.Configuration import *
 from StandardParticles import StdAllNoPIDsPions
 from PhysSelPython.Wrappers import CombineSelection, PassThroughSelection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from GaudiKernel.SystemOfUnits import GeV
-from LoKiPhys.functions import SOURCE, SIZE
 
 default_config = {
     'NAME': 'LLPV0',
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingQEE/StrippingLLP2Jets.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingQEE/StrippingLLP2Jets.py
index ad5869ed214adcbde275b0c3ad4c7000508947ad..05b9288c09ef152fafa5462ae40861122b2a48ab 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingQEE/StrippingLLP2Jets.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingQEE/StrippingLLP2Jets.py
@@ -18,7 +18,6 @@ __date__ = '25/01/2019'
 
 __all__ = ('LLP2Jets_sConf', 'default_config')
 
-from Gaudi.Configuration import *
 from Configurables import JetVertexAlg
 from StandardParticles import StdJets
 from CommonParticles.Utils import updateDoD
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingQEE/StrippingLLP2MuX.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingQEE/StrippingLLP2MuX.py
index 1fe569976baccf5738ded8f9e14ba38e2062bce1..d224b684cf3b12e8b7e63ec633e51105e156d9cd 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingQEE/StrippingLLP2MuX.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingQEE/StrippingLLP2MuX.py
@@ -15,7 +15,6 @@ __author__ = "Pieter David"
 __date__ = "2014-08-28"
 __all__ = ("LLP2MuXConf", "default_config")
 
-from LHCbKernel.Configuration import *
 from GaudiKernel import SystemOfUnits as units
 
 from PhysSelPython.Wrappers import AutomaticData, Selection
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingQEE/StrippingLb2dp.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingQEE/StrippingLb2dp.py
old mode 100755
new mode 100644
index e9720d9e0d4ced6c0005bb768400a9b5a837b6cb..71e00421e9099135e65173a6ccef16e12d6db41b
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingQEE/StrippingLb2dp.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingQEE/StrippingLb2dp.py
@@ -20,15 +20,11 @@ __version__ = 'v2r1'
 
 __all__ = ('Lb2dpConf', 'default_config')
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop
-from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays
 
-from StandardParticles import StdAllNoPIDsPions, StdAllNoPIDsProtons, StdAllNoPIDsKaons
 from PhysSelPython.Wrappers import Selection, DataOnDemand, SimpleSelection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from Configurables import LoKi__VoidFilter as VoidFilter
 
 default_config = {
     'NAME': 'Lb2dp',
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingQEE/StrippingMicroDiJets.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingQEE/StrippingMicroDiJets.py
index 53504471c8e931317af19ca7d746e2d2abe8d5f7..48a3e7beab4c76bee2a321cba6add6aef3c3ca13 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingQEE/StrippingMicroDiJets.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingQEE/StrippingMicroDiJets.py
@@ -10,13 +10,12 @@
 ###############################################################################
 
 from Gaudi.Configuration import *
-from Configurables import FilterDesktop, CombineParticles, LoKi__VertexFitter
+from Configurables import CombineParticles
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from StandardParticles import StdJets
 from CommonParticles.Utils import *
-from Configurables import FilterJet, ClearDaughters
+from Configurables import ClearDaughters
 from GaudiKernel.SystemOfUnits import GeV
 
 __author__ = "Xabier Cid Vidal", "Cedric Potterat", "William Barter"
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingQEE/StrippingMuMuSS.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingQEE/StrippingMuMuSS.py
index 431547890dd20f39862974d095aa8d3b16fa4e71..40f9804480afd1b456501ad2ecf96958b9b00306 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingQEE/StrippingMuMuSS.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingQEE/StrippingMuMuSS.py
@@ -26,7 +26,7 @@ __author__ = (
 )
 
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-from PhysSelPython.Wrappers import Selection, SimpleSelection
+from PhysSelPython.Wrappers import SimpleSelection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from StandardParticles import StdAllLooseMuons
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingQEE/StrippingSbarSCorrelations.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingQEE/StrippingSbarSCorrelations.py
index 29103497b00fb1fd631b389a1828c38468beab4b..2ebd6f4795d6389519bf74a08d6ae9e8f730d6ff 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingQEE/StrippingSbarSCorrelations.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingQEE/StrippingSbarSCorrelations.py
@@ -23,10 +23,8 @@ __date__ = '24/08/2013'
 __version__ = '$Revision: 1.0 $'
 __all__ = ('SbarSCorrelationsConf', 'default_config')
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from StandardParticles import StdAllNoPIDsPions, StdTightKaons, StdAllNoPIDsProtons
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
+from PhysSelPython.Wrappers import DataOnDemand, Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from GaudiKernel.SystemOfUnits import MeV, GeV
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingQEE/StrippingStrangeBaryons.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingQEE/StrippingStrangeBaryons.py
index 840a332bb95130322ebeeacf51c7ce137afe692e..b11f2d20b979fdfb88cfaa78037a6ede6fe85ddb 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingQEE/StrippingStrangeBaryons.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingQEE/StrippingStrangeBaryons.py
@@ -23,14 +23,10 @@ __date__ = '26/06/2012'
 __version__ = '$Revision: 0.3 $'
 __all__ = ('StrippingStrangeBaryonsConf', 'default_config')
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from StandardParticles import StdLoosePions, StdNoPIDsDownPions, StdLooseKaons, StdLooseDownKaons, StdLooseProtons, StdNoPIDsDownProtons
-from CommonParticles import StdLooseLambda
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
+from PhysSelPython.Wrappers import DataOnDemand, Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from GaudiKernel.SystemOfUnits import MeV
 
 default_config = {
     'NAME': 'StrangeBaryons',
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingQEE/StrippingStrangeBaryonsNoPID.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingQEE/StrippingStrangeBaryonsNoPID.py
index 13d95b4418ce78b3e4267b8fe1d395645df53fdd..28c41c8196b437671af596b33c5ff1039546de59 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingQEE/StrippingStrangeBaryonsNoPID.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingQEE/StrippingStrangeBaryonsNoPID.py
@@ -23,12 +23,10 @@ __date__ = '13/01/2014'
 __version__ = '$Revision: 0.0 $'
 __all__ = ('StrippingStrangeBaryonsNoPIDConf', 'default_config')
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
+from PhysSelPython.Wrappers import DataOnDemand, Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from GaudiKernel.SystemOfUnits import MeV
 
 default_config = {
     'NAME': 'StrangeBaryonsNoPID',
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingQEE/StrippingTaggedJets.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingQEE/StrippingTaggedJets.py
old mode 100755
new mode 100644
index 795832ef101973402b32eed0cf236b0c8fe9113d..fb75194bafe04c781ae4135e8952e89fe988678f
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingQEE/StrippingTaggedJets.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingQEE/StrippingTaggedJets.py
@@ -10,11 +10,10 @@
 ###############################################################################
 
 from Gaudi.Configuration import *
-from Configurables import FilterDesktop, CombineParticles, LoKi__VertexFitter
+from Configurables import CombineParticles, LoKi__VertexFitter
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from StandardParticles import StdJets
 from CommonParticles.Utils import *
 from Configurables import FilterJet
 from GaudiKernel.SystemOfUnits import GeV
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingQEE/StrippingW2nH.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingQEE/StrippingW2nH.py
index 7de8fc5d98991b45cf653570e60060825876567a..8a3b772f636664161ba9a5347e87c69830cd676c 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingQEE/StrippingW2nH.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingQEE/StrippingW2nH.py
@@ -25,7 +25,6 @@ from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from StandardParticles import StdAllNoPIDsPions
 from GaudiKernel.SystemOfUnits import GeV
-from GaudiKernel.SystemOfUnits import MeV
 
 default_config = {
     'NAME': 'W2nH',
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingQEE/StrippingWJets.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingQEE/StrippingWJets.py
old mode 100755
new mode 100644
index 043f1547c9b13a4b480f39eba3a2db3e1163a118..94742800d76e6a7cdbff25a473322b23cdf8819a
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingQEE/StrippingWJets.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingQEE/StrippingWJets.py
@@ -22,14 +22,12 @@ They are then cover a phasespace complementarily on each other.
 
 """
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
 from Configurables import CombineParticles, LoKi__VertexFitter
 from PhysSelPython.Wrappers import Selection, SimpleSelection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from StandardParticles import StdAllLooseMuons, StdAllNoPIDsElectrons, StdJets
-from CommonParticles.Utils import *
 from GaudiKernel.SystemOfUnits import GeV, MeV
 
 __author__ = "Xabier Cid Vidal"
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingQEE/StrippingWRareDecay.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingQEE/StrippingWRareDecay.py
index 54df080283962944cdd4c56e31d205c882182fc7..e2ae1d62d7a73b722d0c46e08077a587bf00ae73 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingQEE/StrippingWRareDecay.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingQEE/StrippingWRareDecay.py
@@ -22,8 +22,7 @@ __version__ = '$Revision: 2.0 $'
 
 __all__ = 'default_config', 'WRareDecayConf'
 
-from Gaudi.Configuration import *
-from GaudiKernel.SystemOfUnits import MeV, GeV, mm, picosecond
+from GaudiKernel.SystemOfUnits import MeV, picosecond
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
 from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
 from StrippingConf.StrippingLine import StrippingLine
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingQEE/StrippingWe.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingQEE/StrippingWe.py
index 59f63e96c4976855f2369e7bb422bc9d1a8ed49f..c42ba0b0d3f7fcbeebf74859905d20c1704f2d49 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingQEE/StrippingWe.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingQEE/StrippingWe.py
@@ -21,7 +21,6 @@ We control: StdAllNoPIDsElectrons, PRS>50Mev & E_ECal/P>0.1 & E_HCal/P<0.05 & pT
 __all__ = 'WeConf', 'default_config'
 __author__ = 'S. Bifani', 'D. Ward'
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
 from PhysSelPython.Wrappers import SimpleSelection
 from StrippingConf.StrippingLine import StrippingLine
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingQEE/StrippingZ02ee.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingQEE/StrippingZ02ee.py
index 0f6bc7a98fee17e01830d4327504b1524e06ec84..1abd32cad5da9bd00b29ad3dcd3763ddd9f9b42b 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingQEE/StrippingZ02ee.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingQEE/StrippingZ02ee.py
@@ -23,7 +23,6 @@ __all__ = (
     'default_config',
 )
 
-from Gaudi.Configuration import *
 from GaudiKernel.SystemOfUnits import GeV, MeV
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 from PhysSelPython.Wrappers import SimpleSelection
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingQEE/StrippingZ02nH.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingQEE/StrippingZ02nH.py
index 447780b6cac5c0f6861741d621d1aa0d0fa1258a..b1f0290f055986c6990926ef39c95ef00c08f479 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingQEE/StrippingZ02nH.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingQEE/StrippingZ02nH.py
@@ -25,7 +25,6 @@ from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from StandardParticles import StdAllNoPIDsPions
 from GaudiKernel.SystemOfUnits import GeV
-from GaudiKernel.SystemOfUnits import MeV
 
 default_config = {
     'NAME': 'Z02nH',
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingQEE/StrippingZ0RareDecay.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingQEE/StrippingZ0RareDecay.py
index ab636e06a8665d27e9527e63a2283bdf07caa5dc..4b366b8cb379754fb214b3ec2942433b8d3f9c2c 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingQEE/StrippingZ0RareDecay.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingQEE/StrippingZ0RareDecay.py
@@ -22,8 +22,7 @@ __version__ = '$Revision: 2.0 $'
 
 __all__ = 'default_config', 'Z0RareDecayConf'
 
-from Gaudi.Configuration import *
-from GaudiKernel.SystemOfUnits import MeV, GeV, mm
+from GaudiKernel.SystemOfUnits import MeV
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
 from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
 from StrippingConf.StrippingLine import StrippingLine
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingQEE/depreciated/StrippingDijets.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingQEE/depreciated/StrippingDijets.py
index f55d8734a938685c0ec76ac2af3183cf9799d2d3..0f8c3d7c3d59e597ace36ffca0b9acc5da6d67b3 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingQEE/depreciated/StrippingDijets.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingQEE/depreciated/StrippingDijets.py
@@ -14,8 +14,7 @@
 
 __all__ = ('DijetsConf', 'default_config')
 
-from Gaudi.Configuration import *
-from GaudiKernel.SystemOfUnits import MeV, GeV, mm
+from GaudiKernel.SystemOfUnits import GeV, MeV
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingQEE/depreciated/StrippingHighPtTopoJets.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingQEE/depreciated/StrippingHighPtTopoJets.py
index cc4053e60549f8b04bc10755d8efa01db3f8ad84..ebb09a00758373cf01d149b4d83255b7a9b62799 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingQEE/depreciated/StrippingHighPtTopoJets.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingQEE/depreciated/StrippingHighPtTopoJets.py
@@ -20,8 +20,6 @@ __all__ = ('default_config', 'HighPtTopoJetsConf')
 
 # \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\#
 
-from Gaudi.Configuration import *
-from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from PhysSelPython.Wrappers import EventSelection
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingQEE/depreciated/StrippingJets.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingQEE/depreciated/StrippingJets.py
index f4449288c9497cfabcbcf6600cced56c6a67c113..fe0b8c3cb36b8e0698ff2cb3f95cdfedd2ea4c9f 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingQEE/depreciated/StrippingJets.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingQEE/depreciated/StrippingJets.py
@@ -14,13 +14,11 @@
 
 __all__ = ('JetsConf', 'default_config')
 
-from Gaudi.Configuration import *
-from GaudiKernel.SystemOfUnits import MeV, GeV, mm
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
+from GaudiKernel.SystemOfUnits import GeV, MeV
+from PhysSelPython.Wrappers import MergedSelection, Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
-from JetAccessories.JetMaker_Config import JetMakerConf
 from StandardParticles import StdJets, StdAllNoPIDsPions
 from Configurables import CombineParticles
 from Configurables import TopologicalTagging
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingQEE/depreciated/StrippingZ02nH.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingQEE/depreciated/StrippingZ02nH.py
index 447780b6cac5c0f6861741d621d1aa0d0fa1258a..b1f0290f055986c6990926ef39c95ef00c08f479 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingQEE/depreciated/StrippingZ02nH.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingQEE/depreciated/StrippingZ02nH.py
@@ -25,7 +25,6 @@ from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from StandardParticles import StdAllNoPIDsPions
 from GaudiKernel.SystemOfUnits import GeV
-from GaudiKernel.SystemOfUnits import MeV
 
 default_config = {
     'NAME': 'Z02nH',
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/Beauty2Charm_LoKiCuts.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/Beauty2Charm_LoKiCuts.py
index ce5265655cf518aa12121d3a5728d84c36da26cd..666cef80aacee423a071365fe7281c63e506e27d 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/Beauty2Charm_LoKiCuts.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/Beauty2Charm_LoKiCuts.py
@@ -10,11 +10,6 @@
 ###############################################################################
 # \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\#
 
-from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
-from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-from PhysSelPython.Wrappers import Selection, MergedSelection
-from StandardParticles import StdNoPIDsPions, StdNoPIDsKaons
 
 # \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\#
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingB02Lcmu_pKpi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingB02Lcmu_pKpi.py
index 3d6992fd337683bf5bcf97e994e4fd64705add4f..93bd54fbf8871329e8e7bcb95f7722d9913e1cff 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingB02Lcmu_pKpi.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingB02Lcmu_pKpi.py
@@ -14,7 +14,6 @@ from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = ['Nikita Beliy', 'Jibo He']
 __date__ = '28/11/2016'
 __version__ = '$Revision: 1.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingB23MuLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingB23MuLines.py
index a6e53abda621d1f1b0efe6185553c1b46aae67e6..15ea2076dcaea1a75c4fec8295e895be19887b4a 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingB23MuLines.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingB23MuLines.py
@@ -55,13 +55,11 @@ __all__ = ("B23MuLinesConf",
 
 #############################################################################
 
-from Gaudi.Configuration import *
-from Configurables import FilterDesktop, CombineParticles, DaVinci__N3BodyDecays
+from Configurables import DaVinci__N3BodyDecays
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 # from StrippingSelections.Utils import checkConfig
-from GaudiKernel.PhysicalConstants import c_light
 
 #############################################################################
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingB2EtaMuMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingB2EtaMuMu.py
index f381d03d4c48f11bd00893be7f33743af8c8f237..ba15a0b21f0277cd2962cbc8596db2f5b1d9392a 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingB2EtaMuMu.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingB2EtaMuMu.py
@@ -12,13 +12,12 @@
 B->etamumuselection
 '''
 
-from StandardParticles import StdAllNoPIDsMuons, StdAllLooseMuons
+from StandardParticles import StdAllNoPIDsMuons
 from StandardParticles import StdNoPIDsPions, StdLooseAllPhotons, StdLooseMergedPi0, StdLooseResolvedPi0
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand, SimpleSelection, MergedSelection
+from PhysSelPython.Wrappers import MergedSelection, Selection, SimpleSelection
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = ['Fred Blanc']
 __date__ = '12/03/2019'
 __version__ = '$Revision: 1.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingB2KLLXInclusive.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingB2KLLXInclusive.py
index a9d2ffd4e4d8d6444da6c3df3731248c13fce6e7..61a740d6b5d3d92a7f2015b59a5021738a7a2958 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingB2KLLXInclusive.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingB2KLLXInclusive.py
@@ -19,15 +19,12 @@ __all__ = ('B2KLLXInclusiveConf', 'default_config')
 Stripping selection for inclusively selected B->KmumuX decays.
 """
 
-from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop
+from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
 
 from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from LHCbKernel.Configuration import *  # check if needed
-from Configurables import SubstitutePID
-from Configurables import SubPIDMMFilter
 
 
 #################
@@ -333,7 +330,6 @@ class B2KLLXInclusiveConf(LineBuilder):
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         CombineDiMuon = CombineParticles()
         CombineDiMuon.DecayDescriptors = ["[B+ -> J/psi(1S) K+]cc"]
-        sel_name = "InclKLL"
         CombineDiMuon.MotherCut = self.InclKLLCut
         # choose
         leptons = self.InclLeptons
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingB2KstTauTau.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingB2KstTauTau.py
index 0e62fb1a13ae5f9586b34995cc3f4f00d8de7dee..a236059c8ca69aa4aaf625cf6925165cda17c83a 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingB2KstTauTau.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingB2KstTauTau.py
@@ -15,8 +15,7 @@ from StandardParticles import StdTightMuons
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, OfflineVertexFitter, DaVinci__N3BodyDecays
-from Gaudi.Configuration import *
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N3BodyDecays, FilterDesktop
 __author__ = [' G. Mancinelli, J. Serrano']
 __date__ = '15/08/2014'
 __version__ = '$Revision: 0.1 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingB2LLXBDT.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingB2LLXBDT.py
index a54a8d62db8142ab3d222eadcd0fbb7cf94ce5ef..8222b357dbb8dec476454f264b2be33bb01560f5 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingB2LLXBDT.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingB2LLXBDT.py
@@ -19,9 +19,7 @@ Note:
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, MergedSelection
-from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = ['Jibo He']
 __date__ = '20/11/2015'
 __version__ = '$Revision: 1.0 $'
@@ -303,7 +301,7 @@ class B2LLXBDTConf(LineBuilder):
         """
         Kshort, both LL and DD
         """
-        from StandardParticles import StdLooseKsDD, StdLooseKsLL
+        from StandardParticles import StdLooseKsDD
 
         self.SelKsDD = self.createSubSel(
             OutputList=self.name + "SelKsDD",
@@ -337,7 +335,7 @@ class B2LLXBDTConf(LineBuilder):
         """
         Lambda, both LL and DD
         """
-        from StandardParticles import StdLooseLambdaDD, StdLooseLambdaLL
+        from StandardParticles import StdLooseLambdaDD
 
         self.SelLambdaDD = self.createSubSel(
             OutputList=self.name + "SelLambdaDD",
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingB2Lambda0ELines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingB2Lambda0ELines.py
index dcb376b6317e21a82d05511d6642d51a9139b1e0..beaae1e2b2d8fdb3ab6922b0b597f4f3735074b1 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingB2Lambda0ELines.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingB2Lambda0ELines.py
@@ -21,7 +21,6 @@ __all__ = ('B2Lambda0ELines',
            'default_config')
 
 from StandardParticles import StdLoosePions, StdLooseElectrons, StdNoPIDsDownElectrons, StdNoPIDsDownPions
-from Configurables import TisTosParticleTagger
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingB2Lambda0MuLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingB2Lambda0MuLines.py
index e758feafbbaf38bbf2c16b62697aeccc5044b5c0..8c8ebee90e957bb0642c7fb649a57f03d93eef97 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingB2Lambda0MuLines.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingB2Lambda0MuLines.py
@@ -21,7 +21,6 @@ __all__ = ('B2Lambda0MuLines',
            'default_config')
 
 from StandardParticles import StdLoosePions, StdLooseMuons, StdLooseDownMuons, StdNoPIDsDownPions
-from Configurables import TisTosParticleTagger
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingB2Lambda0MuOSLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingB2Lambda0MuOSLines.py
index 389b9bf695c2932c173a4ee768404acc14c2b153..4186a8554984cb039f3d149cda4700f95f9a9753 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingB2Lambda0MuOSLines.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingB2Lambda0MuOSLines.py
@@ -21,7 +21,6 @@ __all__ = ('B2Lambda0MuOSLines',
            'default_config')
 
 from StandardParticles import StdLoosePions, StdLooseMuons, StdLooseDownMuons, StdNoPIDsDownPions
-from Configurables import TisTosParticleTagger
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingB2Lambda0SSMuMu3PiLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingB2Lambda0SSMuMu3PiLines.py
index b829fcd48cd4d244f39b998208c83dfea4c65343..f47c81735abc7cb47558594658aaf83f1ca7bc36 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingB2Lambda0SSMuMu3PiLines.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingB2Lambda0SSMuMu3PiLines.py
@@ -21,7 +21,6 @@ __all__ = ('B2Lambda0SSMuMu3PiLines',
            'default_config')
 
 from StandardParticles import StdLoosePions, StdLooseMuons, StdLooseDownMuons, StdNoPIDsDownPions
-from Configurables import TisTosParticleTagger
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingB2MuMuMuMuLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingB2MuMuMuMuLines.py
index e8be535494b2f042b5e0ac87439ef9f4f7c4bd9d..e6a830521e3233715c6896a50d0ffe4616617755 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingB2MuMuMuMuLines.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingB2MuMuMuMuLines.py
@@ -19,7 +19,7 @@ from Beauty2Charm_LoKiCuts import LoKiCuts
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
-from Configurables import FilterDesktop, CombineParticles
+from Configurables import CombineParticles
 from Gaudi.Configuration import *
 __author__ = ['Diego Martinez Santos', 'Johannes Albrecht',
               'Konstantinos A. Petridis', 'Alexander Baranov']
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingB2XLL.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingB2XLL.py
old mode 100755
new mode 100644
index 893c8f7d24822aaf5128c145a0ea679b0efd25cc..54c9d8dbdf1774215b4f2574855ce20420b67924
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingB2XLL.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingB2XLL.py
@@ -10,9 +10,8 @@
 ###############################################################################
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection, AutomaticData
+from PhysSelPython.Wrappers import MergedSelection, Selection
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = 'Raja Nandakumar, Fergus Wilson, Stefania Ricciardi'
 __date__ = '04/11/2015'
 __version__ = '$Revision: 0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingB2XMuMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingB2XMuMu.py
index d4fe321dc6b6467f22d50384ab0c3055ac1359bc..976ac58d3d5f0c7d376f6245456b23b6eb4144a3 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingB2XMuMu.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingB2XMuMu.py
@@ -18,7 +18,6 @@ __version__ = '$Revision: 1.2 $'
 
 __all__ = ('B2XMuMuConf', 'default_config')
 
-from Gaudi.Configuration import *
 from LHCbKernel.Configuration import *  # check if needed
 
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop, DaVinci__N3BodyDecays, DaVinci__N4BodyDecays
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingB2XTau.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingB2XTau.py
index 89967ffc1bd10cb56544c7233004d1b229731f9c..9050443393da5af1c9abb3eee3ba2e1eda76009d 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingB2XTau.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingB2XTau.py
@@ -8,16 +8,13 @@
 # granted to it by virtue of its status as an Intergovernmental Organization  #
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
-from StandardParticles import StdAllLoosePions, StdAllNoPIDsPions
-from copy import deepcopy
 from StandardParticles import StdLooseKaons
-from StandardParticles import StdLoosePions, StdTightPions
-from StandardParticles import StdNoPIDsKaons, StdNoPIDsPions, StdTightMuons
+from StandardParticles import StdLoosePions
+from StandardParticles import StdNoPIDsPions, StdTightMuons
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, OfflineVertexFitter, DaVinci__N3BodyDecays
-from Gaudi.Configuration import *
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N3BodyDecays, FilterDesktop
 __author__ = ['G. Dujany, G. Mancinelli, J. Serrano']
 __date__ = '24/05/2010,15/01/2014, 19/10/2017'
 __version__ = '$Revision: 1.3 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingB2XTauMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingB2XTauMu.py
index 1539daf38aad3280d179e42101b30c7b9367dc90..3bf392ac2eb839b14fbb1f75d9e94e760e94edd9 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingB2XTauMu.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingB2XTauMu.py
@@ -25,8 +25,6 @@ __all__ = ('B2XTauMuConf',
            'default_config')
 
 
-from Gaudi.Configuration import *
-
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
 from PhysSelPython.Wrappers import Selection, MergedSelection
 from StrippingConf.StrippingLine import StrippingLine
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingB2XTauTau.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingB2XTauTau.py
index 44cd40b223f3cc0f18f50a09a1e6f2fad19f1ae6..f25de253e9360d45277265567601c6f09dd87a01 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingB2XTauTau.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingB2XTauTau.py
@@ -14,8 +14,7 @@ from StandardParticles import StdNoPIDsPions, StdLoosePions
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand, SimpleSelection
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, OfflineVertexFitter, DaVinci__N3BodyDecays
-from Gaudi.Configuration import *
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N3BodyDecays, FilterDesktop
 __author__ = [' L. Pescatore', 'F. Blanc']
 __date__ = '12/03/2019'
 __version__ = '$Revision: 0.1$'
@@ -23,7 +22,6 @@ __version__ = '$Revision: 0.1$'
 # Stripping line for B->Htautau
 
 from GaudiKernel.SystemOfUnits import MeV
-from GaudiKernel.SystemOfUnits import mm
 """
   B->KstarTauTau, B->KTauTau, B->PhiTauTau, B->Eta'TauTau
 """
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingBLVLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingBLVLines.py
index 8bf68933cf866f19e4931849021862745276afe7..a5196ce34b14f3f32b717e3c7fcb254e2f21f2fa 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingBLVLines.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingBLVLines.py
@@ -95,8 +95,7 @@ __all__ = ("BLVLinesConf",
 
 ###################################################################################################
 
-from Gaudi.Configuration import *
-from Configurables import FilterDesktop, CombineParticles, DaVinci__N3BodyDecays
+from Configurables import CombineParticles, DaVinci__N3BodyDecays
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingBd2KSLLX.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingBd2KSLLX.py
index 419b0f7505b9bb8f7a0008bd6bd040167c12c60a..54c987ef8b72fd7e148a11fb44cebadb12188639 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingBd2KSLLX.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingBd2KSLLX.py
@@ -10,9 +10,8 @@
 ###############################################################################
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection, AutomaticData
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, DaVinci__N3BodyDecays
-from Gaudi.Configuration import *
+from PhysSelPython.Wrappers import MergedSelection, Selection
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop
 __author__ = 'SB'
 __date__ = '08/10/2017'
 __version__ = '$Revision: 1 $'
@@ -47,15 +46,8 @@ class Bd2KSLLXConf(LineBuilder):
         mmXLine_name = name + "_mm"
         eeXLine_name = name + "_ee"
 
-        from StandardParticles import StdLoosePions as Pions
-        from StandardParticles import StdLooseKaons as Kaons
-        from StandardParticles import StdLooseKstar2Kpi as Kstars
-        from StandardParticles import StdLoosePhi2KK as Phis
         from StandardParticles import StdLooseKsLL as KshortsLL
         from StandardParticles import StdLooseKsDD as KshortsDD
-        from StandardParticles import StdLooseLambdaLL as LambdasLL
-        from StandardParticles import StdLooseLambdaDD as LambdasDD
-        from StandardParticles import StdLooseLambdastar2pK as Lambdastars
 
         SelKshortsLL = self._filterHadron(name="KshortsLLFor" + self._name,
                                           sel=KshortsLL,
@@ -64,12 +56,10 @@ class Bd2KSLLXConf(LineBuilder):
                                           sel=KshortsDD,
                                           params=config)
 
-        from StandardParticles import StdDiElectronFromTracks as DiElectronsFromTracks
         from StandardParticles import StdLooseDiElectron as DiElectrons
         from StandardParticles import StdLooseDiMuon as DiMuons
 
-        ElecID = "(PIDe > %(PIDe)s)" % config
-        MuonID = "(HASMUON)&(ISMUON)"
+        "(PIDe > %(PIDe)s)" % config
 
         DiElectronID = "(2 == NINTREE((ABSID==11)&(PIDe > %(PIDe)s)))" % config
         DiMuonID = "(2 == NINTREE((ABSID==13)&(HASMUON)&(ISMUON)))"
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingBd2eeKstarBDT.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingBd2eeKstarBDT.py
index 1a6b3547113e58f48bff1e36952cfc3fb4d30295..6776dcdf27807a56103010584c7a22734b4a8a3f 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingBd2eeKstarBDT.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingBd2eeKstarBDT.py
@@ -18,7 +18,6 @@ from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = ['Marie-Helene Schune', 'Jibo He']
 __date__ = '20/01/2012'
 __version__ = '$Revision: 1.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingBeauty2XGamma.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingBeauty2XGamma.py
index d21b9a25bc2714ed14237d6218c1dad601dc1240..05e9c9cf0af28c167f2cc98f655c56f432f3ea6b 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingBeauty2XGamma.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingBeauty2XGamma.py
@@ -12,7 +12,7 @@
 B-> X Gamma selections
 '''
 
-from StandardParticles import StdAllNoPIDsKaons, StdAllNoPIDsPions, StdLooseAllPhotons, StdLooseMergedPi0, StdLooseResolvedPi0, StdAllLooseGammaDD, StdAllLooseGammaLL, StdAllNoPIDsProtons
+from StandardParticles import StdAllLooseGammaDD, StdAllLooseGammaLL, StdAllNoPIDsPions, StdLooseAllPhotons, StdLooseMergedPi0, StdLooseResolvedPi0
 from Configurables import TisTosParticleTagger
 from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays as Combine4Particles
 from GaudiConfUtils.ConfigurableGenerators import DaVinci__N3BodyDecays as Combine3Particles
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingBs2MuMuGamma.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingBs2MuMuGamma.py
index 0cfb5425d7a51fe618e72a66a2e6e2062510e41d..f1f37c46035071eccb7cf880d283aafb532e0b8f 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingBs2MuMuGamma.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingBs2MuMuGamma.py
@@ -15,7 +15,7 @@ Authors: Meril Reboud, Jean-Francois Marchand
 """
 
 ########################################################################
-from StrippingUtils.Utils import LineBuilder, checkConfig
+from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Combine3BodySelection
 from StandardParticles import StdLooseMuons, StdLooseAllPhotons
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingBs2MuMuLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingBs2MuMuLines.py
index 28fab868cccc6d58e46553f2585cd743326a977c..8bf0a80a0ffc3aa0267bf6dfb6cc948d4a90331a 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingBs2MuMuLines.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingBs2MuMuLines.py
@@ -26,7 +26,7 @@ from Gaudi.Configuration import *
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
-from Configurables import FilterDesktop, CombineParticles
+from Configurables import CombineParticles
 from JetAccessories.JetMaker_Config import JetMakerConf
 from CommonParticles.Utils import *
 from Gaudi.Configuration import *
@@ -159,7 +159,7 @@ def create_stdjets(strob, line_location, stdjets_name_ban, stdjets_name_addb):
         strob.StdJetsNoJetIDBan = [myconf1]
 
     # configure Data-On-Demand service
-    locations = updateDoD(myconf1)
+    updateDoD(myconf1)
 
     myconf2 = JetMakerConf(stdjets_name_addb,
                            Inputs=['Phys/PFParticles/Particles', line_location],
@@ -173,7 +173,7 @@ def create_stdjets(strob, line_location, stdjets_name_ban, stdjets_name_addb):
         strob.StdJetsNoJetIDAddB = [myconf2]
 
     # configure Data-On-Demand service
-    locations = updateDoD(myconf2)
+    updateDoD(myconf2)
 
 ##########################################
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingBs2gammagamma.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingBs2gammagamma.py
index a19590514ce1912b186311ffed8d51783a633f9c..5dd7a2cdce789ca4b9dbc99b6ec9ffef3e98e01e 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingBs2gammagamma.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingBs2gammagamma.py
@@ -21,16 +21,11 @@ Exports the following stripping lines as instance data members:
 - Bs2gammagamma_NoConvWideLine  : wide line with 0 conversions
 '''
 
-from Configurables import (DiElectronMaker, ProtoParticleCALOFilter,
-                           ParticleTransporter, BremAdder)
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop  # , CombineParticles
-from CommonParticles import StdLooseAllPhotons
-from CommonParticles import StdAllLooseGammaConversion
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
 from Configurables import CombineParticles
-from Gaudi.Configuration import *
 __author__ = ['Sean Benson']
 __date__ = '2016/04/08'
 __version__ = '1.2'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingBs2st2KKMuX.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingBs2st2KKMuX.py
index 86d2fbe036d44821a158f2fba4fe7e558c1d3d55..22e9c5c994936c1db65ca0b5c70f9d8f5601bd3b 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingBs2st2KKMuX.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingBs2st2KKMuX.py
@@ -22,9 +22,8 @@ Stripping lines:
 from StandardParticles import StdLooseMuons, StdLooseKaons, StdAllLooseKaons, StdMassConstrainedJpsi2MuMu
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand
+from PhysSelPython.Wrappers import Selection
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = ['Jianchun Wang']
 __date__ = '03/22/2015'
 __version__ = '$Revision: 0.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingBu2LLK.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingBu2LLK.py
index 92fae7bab7e025e403c7b9b7fcd2fdc42d0bd59e..f267c86a869b3ba202ca57507bdff38dda60e6fc 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingBu2LLK.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingBu2LLK.py
@@ -10,7 +10,7 @@
 ###############################################################################
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection, AutomaticData
+from PhysSelPython.Wrappers import DataOnDemand, MergedSelection, Selection
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, DaVinci__N3BodyDecays
 from Gaudi.Configuration import *
 __author__ = 'Patrick Koppenburg, Alex Shires, Thomas Blake, Luca Pescatore, Simone Bifani, Yasmine Amhis, Paula Alvarez Cartelle, Harry Cliff, Rafael Silva Coutinho, Guido Andreassi, Mick Mulder, Maarten van Veghel, John Smeaton, Vitalii Lisovskyi'
@@ -451,7 +451,6 @@ class Bu2LLKConf(LineBuilder):
         from StandardParticles import StdLoosePions as Pions
         from StandardParticles import StdLooseKaons as Kaons
         from StandardParticles import StdLooseProtons as Protons
-        from StandardParticles import StdAllLoosePions as AllPions
         from StandardParticles import StdAllLooseKaons as AllKaons
         from StandardParticles import StdAllLooseProtons as AllProtons
         from StandardParticles import StdLooseKstar2Kpi as Kstars
@@ -1773,7 +1772,6 @@ class Bu2LLKConf(LineBuilder):
         from StandardParticles import StdLooseMuons as Muons
         # from CommonParticles import StdLooseDetachedTau
         # Taus = DataOnDemand(Location = "Phys/StdLooseDetachedTau3pi/Particles")
-        from CommonParticles import StdTightDetachedTau
         Taus = DataOnDemand(Location="Phys/StdTightDetachedTau3pi/Particles")
 
         _DecayDescriptor = "[J/psi(1S) -> mu+ tau-]cc"
@@ -1948,7 +1946,6 @@ class Bu2LLKConf(LineBuilder):
             linename,
             outputlocprefix="Leptonic/Phys/",
             photonloc="Phys/StdVeryLooseAllPhotons/Particles"):
-        from PhysSelPython.Wrappers import FilterSelection, DataOnDemand, SelectionSequence
         from Configurables import (CopyParticles, ParticleCloner,
                                    ProtoParticleCloner, CaloHypoCloner,
                                    CaloClusterCloner)
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingBu2MajoLep.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingBu2MajoLep.py
index 5a96cdedd562ea723f6b2b20d6b2cf30f98f517f..850c2f87ccfaddc8f68a9b6e087f3f6d41cebbb1 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingBu2MajoLep.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingBu2MajoLep.py
@@ -19,12 +19,10 @@ __version__ = 'V0.9'
 __all__ = ('Bu2MajoLepConf',
            'default_config')
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
+from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from GaudiKernel.SystemOfUnits import *
 
 from StandardParticles import StdLooseMuons as Muons
 from StandardParticles import StdLoosePions as Pions
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingBu2MuNu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingBu2MuNu.py
index 19ce21e90e54ca7bc0f65d55187d37c95520c6d9..4163901dd65f50c70f659de9c335932f2c9649fa 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingBu2MuNu.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingBu2MuNu.py
@@ -25,12 +25,11 @@ __all__ = ('Bu2MuNuConf',
            'default_config')
 
 from Gaudi.Configuration import *
-from PhysSelPython.Wrappers import Selection, DataOnDemand
+from PhysSelPython.Wrappers import DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from StandardParticles import StdTightMuons, StdTightANNMuons
 from CommonParticles.Utils import *
-from Configurables import FilterDesktop, CombineParticles
+from Configurables import FilterDesktop
 from JetAccessories.JetMaker_Config import JetMakerConf
 
 default_name = 'Bu2MuNu'
@@ -72,7 +71,7 @@ def create_stdjets(strobj, line_location, stdjets_name_ban):
         strobj.StdJetsNoJetIDBan = [myconf1]
 
     # configure Data-On-Demand service
-    locations = updateDoD(myconf1)
+    updateDoD(myconf1)
 
 
 relInfoJetsVars = ["JETNOMU1PX", "JETNOMU1PY", "JETNOMU1PZ", "JETNOMU1PT", "JETNOMU1JETWIDTH", "JETNOMU1NNTAG", "JETNOMU1MNF", "JETNOMU2PX", "JETNOMU2PY", "JETNOMU2PZ", "JETNOMU2PT", "JETNOMU2JETWIDTH", "JETNOMU2NNTAG",
@@ -255,7 +254,7 @@ class Bu2MuNuConf(LineBuilder):
                                            JetIDCut=False).algorithms[0]
 
         # configure Data-On-Demand service
-        locations = updateDoD(StdJetsNoJetIDNoBan)
+        updateDoD(StdJetsNoJetIDNoBan)
 
         # add the jets with the specific banning
         create_stdjets(self, self.ControlLine.outputLocation(),
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingD23MuLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingD23MuLines.py
index 9d9153bde02604dd6518511524323b953c58b810..a119c6aadabeb6405ae23f48d28004723f035a3b 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingD23MuLines.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingD23MuLines.py
@@ -51,12 +51,11 @@ __all__ = ("D23MuLinesConf",
 #############################################################################
 
 from Gaudi.Configuration import *
-from Configurables import FilterDesktop, CombineParticles, DaVinci__N3BodyDecays
+from Configurables import DaVinci__N3BodyDecays
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 # from StrippingSelections.Utils import checkConfig
-from GaudiKernel.PhysicalConstants import c_light
 
 #############################################################################
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingDarkBoson.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingDarkBoson.py
index 0601486c8f5015f4eb64f73e79d9f06b0495a45a..655431951c82a16dc7805ee36b01262b6f7f88eb 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingDarkBoson.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingDarkBoson.py
@@ -17,23 +17,18 @@ Author: M. Williams, D. Craik
 from GaudiConfUtils.ConfigurableGenerators import DaVinci__N3BodyDecays
 from Configurables import DiElectronMaker, ProtoParticleCALOFilter
 from CommonParticles.Utils import *
-from copy import deepcopy
 from Configurables import SubstitutePID
 from StandardParticles import StdAllLooseGammaLL, StdAllLooseGammaDD, \
     StdAllLooseElectrons, StdLooseAllPhotons  # , StdDiElectronFromTracks
 from Beauty2Charm_LoKiCuts import LoKiCuts
 from StandardParticles import StdAllNoPIDsPions, StdAllNoPIDsKaons, \
-    StdAllNoPIDsProtons, StdNoPIDsUpPions, StdAllLooseMuons, \
-    StdLooseDownMuons
-from Configurables import LoKi__VoidFilter
+    StdAllLooseMuons, StdLooseDownMuons
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import EventSelection
 from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
 from Gaudi.Configuration import *
-import re
 __author__ = ['Mike Williams', 'Dan Craik']
 
 moduleName = 'DarkBoson'
@@ -364,7 +359,7 @@ class DarkBosonConf(LineBuilder):
         mmDDX = makeX('MuMuDD', default_config['XDD'], 'KS0 -> mu+ mu-',
                       [muDX])
         kkX = makeX('KK', default_config['XLL'], 'KS0 -> K+ K-', [kX])
-        kkDDX = makeX('KKDD', default_config['XDD'], 'KS0 -> K+ K-', [kDX])
+        makeX('KKDD', default_config['XDD'], 'KS0 -> K+ K-', [kDX])
         pipiX = makeX('PiPi', default_config['XLLhard'], 'KS0 -> pi+ pi-',
                       [piX])
         pipiDDX = makeX('PiPiDD', default_config['XDD'], 'KS0 -> pi+ pi-',
@@ -418,7 +413,7 @@ class DarkBosonConf(LineBuilder):
                           '[KS0 -> pi+ pi+]cc', [piDX])
         preSS = default_config['Prescales']['SS']
 
-        preDD = default_config['Prescales']['DD']
+        default_config['Prescales']['DD']
         preKK = default_config['Prescales']['KK']
 
         j = makeJ(default_config['J'], [muJ])
@@ -629,7 +624,7 @@ class DarkBosonConf(LineBuilder):
         kst = filterKst()
         self._makeBLine('B2JKst', ['[B0 -> J/psi(1S) K*(892)0]cc'], [j, kst],
                         default_config['B2KX'])
-        rho = makeRho([piB])
+        makeRho([piB])
         # self._makeBLine('B2RhoX2MuMu',['B0 -> rho(770)0 KS0'],[rho,mmX],
         #                default_config['B2HHX'])
         # self._makeBLine('B2RhoX2MuMuDD',['B0 -> rho(770)0 KS0'],[rho,mmDDX],
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingDoubleSLForRX.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingDoubleSLForRX.py
index f7e5ccc228e7525247584f38f94bf53502f3cdea..3116bd40e9e8d6da906924d79ac8c85fabf37565 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingDoubleSLForRX.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingDoubleSLForRX.py
@@ -19,7 +19,6 @@ from GaudiConfUtils.ConfigurableGenerators import (CombineParticles,
                                                    DaVinci__N3BodyDecays)
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from Gaudi.Configuration import *
 __author__ = 'M. Kreps, T. Blake, D. Loh'
 __date__ = '10/11/2016'
 __version__ = '$Revision: 1.0$'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingHypb2L0HGamma.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingHypb2L0HGamma.py
index 83e2745fd58ace3d154d5c84e17588243850ee63..e33667deb325d3bc47009996d2c37915a3a42fd3 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingHypb2L0HGamma.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingHypb2L0HGamma.py
@@ -16,8 +16,8 @@ __all__ = ('Hypb2L0HGammaConf',
            'default_config', )
 
 from Gaudi.Configuration import *
-from Configurables import FilterDesktop, CombineParticles, TisTosParticleTagger
-from PhysSelPython.Wrappers import Selection, MergedSelection, DataOnDemand
+from Configurables import CombineParticles, FilterDesktop
+from PhysSelPython.Wrappers import DataOnDemand, Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from StandardParticles import StdLooseAllPhotons
@@ -495,7 +495,7 @@ def tisTosSelection(sel, TISTOSdict):
 
 
 def makevelotracks(name):
-    from Configurables import FastVeloTracking, TrackPrepareVelo, DecodeVeloRawBuffer, TrackEventFitter, TrackStateInitAlg,  TrackContainerCopy
+    from Configurables import FastVeloTracking, TrackContainerCopy, TrackStateInitAlg
     from TrackFitter.ConfiguredFitters import ConfiguredEventFitter
 
     MyFastVeloTracking = FastVeloTracking(
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingK0s2XXMuMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingK0s2XXMuMu.py
index 454c44356bf363573cfae8fad85f13e9b83e92ea..dc8a94331712da6fda2d902eeaadf4a4c7f30f0f 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingK0s2XXMuMu.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingK0s2XXMuMu.py
@@ -19,9 +19,7 @@ from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection
 from StandardParticles import StdAllLoosePions, StdAllLooseMuons
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-from GaudiKernel.PhysicalConstants import c_light
-from GaudiKernel.SystemOfUnits import MeV, m, mm, picosecond
-from Gaudi.Configuration import *
+from GaudiKernel.SystemOfUnits import MeV, mm, picosecond
 __author__ = ['Miguel Ramos Pernas']
 __date__ = '10/10/2017'
 __version__ = '$Revision: 0.00 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingKshort2Leptons.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingKshort2Leptons.py
index 9fac7dec5fafb0649cd301f2324589dc0d20acb8..e7856b8d27f550715c579c88eb7e34377ffd2867 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingKshort2Leptons.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingKshort2Leptons.py
@@ -18,7 +18,6 @@ from StandardParticles import StdAllNoPIDsElectrons
 from StandardParticles import StdNoPIDsUpPions
 from StandardParticles import StdAllNoPIDsPions
 from StandardParticles import StdAllLooseMuons
-from StandardParticles import StdAllNoPIDsMuons
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingKshort2MuMuMuMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingKshort2MuMuMuMu.py
index 86a943e5a6fb41852c6a9f29c92389947b9c890f..81ef82f2043ed504638103a44bd0a0e915d41771 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingKshort2MuMuMuMu.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingKshort2MuMuMuMu.py
@@ -15,15 +15,12 @@ derived, in large measure, from StrippingKshort2PiPiMuMu.py
 '''
 
 from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays
-from GaudiKernel.SystemOfUnits import MeV
-from StandardParticles import StdNoPIDsDownPions, StdLooseDownMuons
-from StandardParticles import StdAllLoosePions, StdAllLooseMuons, StdAllNoPIDsPions
-from StandardParticles import StdLoosePions, StdLooseMuons, StdNoPIDsPions
+from StandardParticles import StdLooseDownMuons
+from StandardParticles import StdAllLooseMuons
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
+from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
 __author__ = ['Mike Sokoloff']
 __date__ = '07 January 2014'
 __version__ = '$Revision: 0.1 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingKshort2PiPiMuMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingKshort2PiPiMuMu.py
index 0955f65fa0e2efdcb575b1c11a7ad439f53a1944..07b134c737342e2921702f4d74fa30eda7121cf9 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingKshort2PiPiMuMu.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingKshort2PiPiMuMu.py
@@ -10,15 +10,12 @@
 ###############################################################################
 
 from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays
-from GaudiKernel.SystemOfUnits import MeV
 from StandardParticles import StdNoPIDsDownPions, StdLooseDownMuons
-from StandardParticles import StdAllLoosePions, StdAllLooseMuons, StdAllNoPIDsPions
-from StandardParticles import StdLoosePions, StdLooseMuons, StdNoPIDsPions
+from StandardParticles import StdAllLooseMuons, StdAllLoosePions
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
+from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
 __author__ = ['Mike Sokoloff']
 __date__ = '25/10/2012'
 __version__ = '$Revision: 0.1 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingKshort2eePiPi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingKshort2eePiPi.py
index 5ac8f83630db4b9cf4e5a235dd3ceeb48b0a2a95..d8b95bcb790eaafc5b7c90a8f83fe5663eee0c11 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingKshort2eePiPi.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingKshort2eePiPi.py
@@ -23,7 +23,6 @@ from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection
 from GaudiConfUtils.ConfigurableGenerators import DaVinci__N3BodyDecays as Combine3Particles
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
-from Gaudi.Configuration import *
 __author__ = ['Carla Marin', 'Xabier Cid Vidal',  'Adrian Casais Vidal']
 __date__ = '23/02/2018'
 __version__ = '$2.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingLFVLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingLFVLines.py
index 4a7726e9b33f8cb67d0e0e1c4052c9f7f01e78b5..279eff2f3e813fb4043b2104ebb0bf7955e48339 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingLFVLines.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingLFVLines.py
@@ -23,14 +23,12 @@ __all__ = ('LFVLinesConf',
            'default_config',
            )
 
-from Gaudi.Configuration import *
 # from Configurables import FilterDesktop, CombineParticles
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, DaVinci__N3BodyDecays
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N3BodyDecays
 from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from GaudiKernel.PhysicalConstants import c_light
-from GaudiKernel.SystemOfUnits import GeV, MeV, mm
+from GaudiKernel.SystemOfUnits import MeV, mm
 from copy import deepcopy
 #
 # Configure related info tools
@@ -1284,7 +1282,7 @@ class LFVLinesConf(LineBuilder):
         hemu_name = name+'B2heMu'
         pmu_name = name+'B2hMu'
         bu_name = name+'Bu2KJPsiee'
-        taumu_name = name+'B2TauMu'
+        name+'B2TauMu'
         htaumu_name = name+'B2hTauMu'
         muetap_gamma_name = name+'Tau2MuEtaP2pipig'
         muetap_pi_name = name+'Tau2MuEtaP2pipipi'
@@ -1778,7 +1776,6 @@ def makeB2TauMu(name):
         "& (BPVVDCHI2> 225)"\
         "& (BPVIPCHI2()< 25) "
 
-    from CommonParticles import StdLooseDetachedTau, StdLooseDipion
     _stdLooseMuons = DataOnDemand(Location="Phys/StdLooseMuons/Particles")
     _stdLooseDetachedTaus = DataOnDemand(
         Location="Phys/StdLooseDetachedTau3pi/Particles")
@@ -2418,7 +2415,6 @@ def makeB2hTauMu(name):
                           "& (BPVVDCHI2> 225)"\
                           "& (BPVIPCHI2()< 16) "  # maybe 16
 
-    from CommonParticles import StdLooseDetachedTau, StdLooseDipion
     _stdLooseMuons = DataOnDemand(Location="Phys/StdLooseMuons/Particles")
     _stdLooseDetachedTaus = DataOnDemand(
         Location="Phys/StdLooseDetachedTau3pi/Particles")
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingLb2L0Gamma.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingLb2L0Gamma.py
index 802119884510c53e5cf00d3e4788223b09ab5a71..bfcf8336af14cb0e5ff39ae2da6502181e9066d9 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingLb2L0Gamma.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingLb2L0Gamma.py
@@ -25,9 +25,6 @@ __date__ = "14.11.2016"
 __version__ = "2.0"
 __all__ = ("default_config", "StrippingLb2L0GammaConf")
 
-import os
-
-from Gaudi.Configuration import *
 
 from Configurables import CombineParticles
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
@@ -36,9 +33,7 @@ from PhysSelPython.Wrappers import Selection, MergedSelection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 
-from StandardParticles import StdAllNoPIDsPions, StdAllNoPIDsProtons
 from StandardParticles import StdLooseAllPhotons, StdAllLooseGammaDD, StdAllLooseGammaLL
-from StandardParticles import StdVeryLooseDetachedKst2Kpi
 from StandardParticles import StdLooseJpsi2MuMu
 
 default_config = {'NAME': 'Lb2L0Gamma',
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingLc23MuLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingLc23MuLines.py
index b2244bd7aa9f116d9783ce03a8fc1944cde17b39..3d97e939f7633e3e700dd756976cae1b815955f7 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingLc23MuLines.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingLc23MuLines.py
@@ -68,12 +68,11 @@ __all__ = ("Lc23MuLinesConf",
 ###################################################################################################
 
 from Gaudi.Configuration import *
-from Configurables import FilterDesktop, CombineParticles, DaVinci__N3BodyDecays, DaVinci__N4BodyDecays
+from Configurables import CombineParticles, DaVinci__N3BodyDecays, DaVinci__N4BodyDecays
 # from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from GaudiKernel.PhysicalConstants import c_light
 
 ###################################################################################################
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingPhiToKSKS.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingPhiToKSKS.py
index ff157859dd3877ab38f9cad234fb49a80418e50d..1a62ef5db16a204dc0a3d66d1fd1d1f75d4a04d4 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingPhiToKSKS.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingPhiToKSKS.py
@@ -23,8 +23,7 @@ from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from StandardParticles import StdAllLooseKaons, StdAllLooseMuons
-from Configurables import FitDecayTrees
-from PhysSelPython.Wrappers import AutomaticData, MergedSelection
+from PhysSelPython.Wrappers import MergedSelection
 
 __all__ = ('PhiToKSKSAllLinesConf',
            'TOSFilter',
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingRareNStrange.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingRareNStrange.py
index 95f70d0b641829f0a44259b730566f4c68fa1093..98b3814df4bee7388e334a0c9969c741474a9f63 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingRareNStrange.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingRareNStrange.py
@@ -10,9 +10,8 @@
 ###############################################################################
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection, AutomaticData
+from PhysSelPython.Wrappers import Selection
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = 'Diego Martinez Santos, Carlos Vazquez, Xabier Cid, Jessica Prisciandaro, Miguel Ramos Pernas'
 __date__ = '08/05/2015'
 __version__ = '$Revision: Not sure $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingRareStrange.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingRareStrange.py
index 6f7264e1db8f4045b2b139a11daa3e90056e3c44..bba73d994ee42cf94a9237f00597a4d7be7cc54d 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingRareStrange.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingRareStrange.py
@@ -59,15 +59,11 @@ __all__ = ('RareStrangeLinesConf',
 from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 from GaudiConfUtils.ConfigurableGenerators import DaVinci__N3BodyDecays as Combine3Particles
-from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays as Combine4Particles
-from CommonParticles import StdNoPIDsDownElectrons
 from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from GaudiKernel.PhysicalConstants import c_light
-from StandardParticles import (StdAllNoPIDsPions, StdNoPIDsDownPions,
-                               StdLoosePions, StdLooseDownMuons,
-                               StdLooseMergedPi0, StdLooseResolvedPi0, StdLooseDalitzPi0)
+from StandardParticles import (StdLooseMergedPi0, StdLooseResolvedPi0,
+                               StdLooseDalitzPi0)
 
 # from CommonParticles.StdLooseDalitzPi0 import (StdLoosePi02gee, StdLoosePi024e)
 
@@ -2786,7 +2782,7 @@ def makeLambdaPPiEE(name, config, inputs):
 
 
 def makevelotracks(name):
-    from Configurables import FastVeloTracking, TrackPrepareVelo, DecodeVeloRawBuffer, TrackEventFitter, TrackStateInitAlg,  TrackContainerCopy
+    from Configurables import FastVeloTracking, TrackContainerCopy, TrackStateInitAlg
     from TrackFitter.ConfiguredFitters import ConfiguredEventFitter
 
     MyFastVeloTracking = FastVeloTracking(
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingStrangeHadrons.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingStrangeHadrons.py
index 5c16fb7fd63ec1f15df76e17b03a96af7c5a4c61..e2488a937f3c160c5d1dc0bbb81310ee8ff58466 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingStrangeHadrons.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingStrangeHadrons.py
@@ -35,23 +35,12 @@ __all__ = ('default_config',
            'StrangeHadronsConf',
            )
 
-import os
 
-from Gaudi.Configuration import *
-
-from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-
-from GaudiConfUtils.ConfigurableGenerators import DaVinci__N3BodyDecays as Combine3Particles
-from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays as Combine4Particles
-from CommonParticles import StdNoPIDsDownElectrons
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
+from PhysSelPython.Wrappers import DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from GaudiKernel.PhysicalConstants import c_light
 from GaudiKernel.SystemOfUnits import MeV
 
-from StandardParticles import StdAllNoPIDsPions, StdLoosePions, StdLooseProtons, StdAllLoosePions, StdAllLooseMuons
-from StandardParticles import StdLooseAllPhotons
 ##
 from PhysConf.Selections import CombineSelection
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingStrangeSL.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingStrangeSL.py
index 5134ef5434ea3f244733fc6ac26485b868c228fb..26590be4ba73ad6710f007e7e831cea2a4a4b23a 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingStrangeSL.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingStrangeSL.py
@@ -36,23 +36,12 @@ __all__ = ('default_config',
            'StrangeSLConf',
            )
 
-import os
 
-from Gaudi.Configuration import *
-
-from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-
-from GaudiConfUtils.ConfigurableGenerators import DaVinci__N3BodyDecays as Combine3Particles
-from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays as Combine4Particles
-from CommonParticles import StdNoPIDsDownElectrons
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
+from PhysSelPython.Wrappers import DataOnDemand, Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from GaudiKernel.PhysicalConstants import c_light
 from GaudiKernel.SystemOfUnits import MeV
 
-from StandardParticles import StdAllNoPIDsPions, StdLoosePions, StdLooseProtons, StdAllLoosePions, StdAllLooseMuons, StdAllLooseElectrons
-from StandardParticles import StdLooseMergedPi0, StdLooseResolvedPi0, StdLooseDalitzPi0
 from PhysConf.Selections import CombineSelection
 
 default_config = {
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingTau23MuLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingTau23MuLines.py
index 6adb37dd06aeeb58dcd798447fe8b5ee90fa6e99..b2fa9b13c2441549d3939f19589727c3e261e09d 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingTau23MuLines.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingTau23MuLines.py
@@ -35,7 +35,6 @@ from GaudiConfUtils.ConfigurableGenerators import DaVinci__N5BodyDecays as Combi
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from GaudiKernel.PhysicalConstants import c_light
 
 default_config = {
     'NAME': 'Tau23Mu',
@@ -70,7 +69,7 @@ class Tau23MuLinesConf(LineBuilder):
         # checkConfig(Bs2MuMuLinesConf.__configuration_keys__,config)
 
         tau_name = name+'Tau23Mu'
-        ds23PiTIS_name = name+'Ds23PiTIS'
+        name+'Ds23PiTIS'
         ds23Pi_name = name+'Ds23Pi'
         ds2PhiPi_name = name+'Ds2PhiPi'
         tau25_name = name+'Tau25Mu'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingTau2LambdaMuLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingTau2LambdaMuLines.py
index 6f7caa01d008433cca4a3184d6bdfeb2a9bcd909..2e5401740f914b698345c335bfe29788f1e7ed2e 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingTau2LambdaMuLines.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingTau2LambdaMuLines.py
@@ -16,12 +16,10 @@ Exported symbols (use python help!):
    - 
 '''
 
-from GaudiKernel.PhysicalConstants import c_light
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
-from Configurables import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
+from Configurables import CombineParticles
 __author__ = ['Marcin Chrzaszcz']
 __date__ = '14/12/2012'
 __version__ = '$Revision: 1.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingZVTOP.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingZVTOP.py
index f4ee63f69c4320486335e4fa797004ccb36ecca4..6b5cbfa74e249908ea9e854e9c0f238ebdd2d9cf 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingZVTOP.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingRD/StrippingZVTOP.py
@@ -9,14 +9,12 @@
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
 from Configurables import TopoTauAlg, TopoVertexTool
-from StandardParticles import StdLooseKaons
-from StandardParticles import StdLoosePions, StdTightPions
-from StandardParticles import StdNoPIDsKaons, StdNoPIDsPions
+from StandardParticles import StdLoosePions
+from StandardParticles import StdNoPIDsPions
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, OfflineVertexFitter
-from Gaudi.Configuration import *
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop
 __author__ = ['Giampi Mancinelli', 'Julien Cogan', 'Justine Serrano']
 
 __date__ = '14/01/2014'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingSL/StrippingB23MuNu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingSL/StrippingB23MuNu.py
index 11d81c34fb0178677727235bc3bd636b83427207..97c4220c4e62f1a00d3c320d5f76806aba8c4c4a 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingSL/StrippingB23MuNu.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingSL/StrippingB23MuNu.py
@@ -19,15 +19,12 @@ __all__ = ('B23MuNuConf')
 Stripping selection for B to three muons and a neutrino.
 """
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop
 
-from PhysSelPython.Wrappers import Selection, AutomaticData, MergedSelection
+from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from LHCbKernel.Configuration import *  # check if needed
-from Configurables import SubstitutePID
-from Configurables import SubPIDMMFilter
 
 
 #################
@@ -161,15 +158,13 @@ class B23MuNuConf(LineBuilder):
         """
         Creates Jpsi as proxy for dimuon
         """
-        from PhysSelPython.Wrappers import AutomaticData, Selection, SelectionSequence, DataOnDemand, MergedSelection
+        from PhysSelPython.Wrappers import Selection
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         # from Configurables import CombineParticles
 
         CombineJpsi = CombineParticles(DecayDescriptors=["J/psi(1S) -> mu+ mu-", "[J/psi(1S) -> mu+ mu+]cc"],
                                        MotherCut="ALL")
 
-        sel_name = "Jpsi"
-
         from PhysSelPython.Wrappers import Selection
         SelJpsi = Selection("Sel_" + self.name + "_Jpsi", Algorithm=CombineJpsi,
                             RequiredSelections=[self.Muons])
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingSL/StrippingB2DMuForTauMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingSL/StrippingB2DMuForTauMu.py
index bbb6591f636c547192b1c9759ebfeedf27b88e2b..8bd9a436ea3d941e0b4ec5b3610d262206579753 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingSL/StrippingB2DMuForTauMu.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingSL/StrippingB2DMuForTauMu.py
@@ -18,12 +18,10 @@ __version__ = '$Revision: 2.0 $'
 
 from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from PhysSelPython.Wrappers import Selection, DataOnDemand
+from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from StandardParticles import StdLoosePions, StdAllLooseMuons, StdLooseKaons, StdLooseProtons, StdAllLoosePions, StdLooseMergedPi0, StdLooseResolvedPi0, StdAllNoPIDsMuons, StdLooseANNUpPions
-from Configurables import ConjugateNeutralPID
-from PhysSelPython.Wrappers import MergedSelection
+from StandardParticles import StdAllLooseMuons, StdAllNoPIDsMuons, StdLooseKaons, StdLoosePions, StdLooseProtons
 
 __all__ = ('B2DMuForTauMuconf',
            # 'makeb2DMuX',
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingSL/StrippingB2DMuNuX.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingSL/StrippingB2DMuNuX.py
index 7fbc22fc579e9906ec73dc1565f73ff8a7135da2..34974681b85312d8b611810697feb4e07ec1b5fe 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingSL/StrippingB2DMuNuX.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingSL/StrippingB2DMuNuX.py
@@ -13,14 +13,13 @@ __date__ = '23/07/2010'
 __version__ = '$Revision: 5.0 $'
 
 from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
+from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
 from PhysSelPython.Wrappers import Selection
-from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from StandardParticles import StdLoosePions, StdLooseMuons, StdLooseKaons, StdLooseProtons, StdLooseElectrons
 from StandardParticles import StdNoPIDsPions, StdNoPIDsKaons, StdNoPIDsProtons, StdNoPIDsMuons
 from StrippingB2DMuNuXUtils import *
-from GaudiKernel.SystemOfUnits import MeV, GeV, cm, mm
+from GaudiKernel.SystemOfUnits import GeV, MeV, mm
 
 __all__ = ('B2DMuNuXAllLinesConf', 'default_config')
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingSL/StrippingB2DMuNuXUtils.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingSL/StrippingB2DMuNuXUtils.py
index 98dff760c0e0b881f30158091e8c6e53a0ee2fd1..c0162b92c48147384955d02657959c69645f8a0c 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingSL/StrippingB2DMuNuXUtils.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingSL/StrippingB2DMuNuXUtils.py
@@ -13,11 +13,9 @@ __date__ = '06/03/2015'
 __version__ = '$Revision: 0.0 $'
 
 from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
-from StrippingUtils.Utils import LineBuilder
-from StandardParticles import StdLoosePions, StdLooseMuons, StdLooseKaons, StdLooseProtons, StdNoPIDsPions, StdLooseElectrons, StdNoPIDsMuons
 
 
 def BtoDlnuLine(module_name,
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingSL/StrippingB2Dlnu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingSL/StrippingB2Dlnu.py
index 0c8d00bd94717af821926626f5446a85cb20a902..b05a05c95319c31661cfe61524eca70e234905c3 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingSL/StrippingB2Dlnu.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingSL/StrippingB2Dlnu.py
@@ -17,12 +17,10 @@ __version__ = '$Revision: 1.0 $'
 
 from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from PhysSelPython.Wrappers import Selection, DataOnDemand
+from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from StandardParticles import StdLoosePions, StdLooseMuons, StdLooseKaons, StdLooseProtons, StdAllLoosePions, StdLooseMergedPi0, StdLooseResolvedPi0, StdAllNoPIDsMuons, StdLooseANNUpPions, StdLooseElectrons
-from Configurables import ConjugateNeutralPID
-from PhysSelPython.Wrappers import MergedSelection
+from StandardParticles import StdAllNoPIDsMuons, StdLooseElectrons, StdLooseKaons, StdLooseMuons, StdLoosePions
 
 __all__ = ('B2DMuForLNuconf',
            # 'makeb2DMuX',
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingSL/StrippingB2Dst0MuNu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingSL/StrippingB2Dst0MuNu.py
index 3f6fd96ade4433b51152a37ee46ccbd072892fbe..e98d2b4850975113ec77abeed5a53c59a6ba950c 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingSL/StrippingB2Dst0MuNu.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingSL/StrippingB2Dst0MuNu.py
@@ -12,12 +12,11 @@ __author__ = ['Michel De Cian']
 __date__ = '12/12/2018'
 __version__ = '$Revision: 0.0 $'
 
-from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from PhysSelPython.Wrappers import Selection, DataOnDemand
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
+from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from StandardParticles import StdLoosePions, StdLooseMuons, StdLooseKaons, StdAllLoosePions, StdAllLooseElectrons, StdLooseResolvedPi0, StdLooseMergedPi0, StdLooseDalitzPi0
+from StandardParticles import StdAllLooseElectrons, StdLooseDalitzPi0, StdLooseKaons, StdLooseMergedPi0, StdLooseMuons, StdLoosePions, StdLooseResolvedPi0
 
 __all__ = ('B2Dst0MuNuAllLinesConf',
            'TOSFilter',
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingSL/StrippingB2DstMuNuIncl.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingSL/StrippingB2DstMuNuIncl.py
index 6abd041bf344194b0ad86747d5d5622ae5fdddf9..3a91f70e613b554c2c0d5b7095d89a8eb3c67f3d 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingSL/StrippingB2DstMuNuIncl.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingSL/StrippingB2DstMuNuIncl.py
@@ -12,9 +12,8 @@ __author__ = ['Mika Vesterinen']
 __date__ = '04/04/2015'
 __version__ = '$Revision: 0.0 $'
 
-from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from PhysSelPython.Wrappers import Selection, DataOnDemand
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
+from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from StandardParticles import StdLoosePions, StdLooseMuons, StdLooseKaons, StdAllLoosePions
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingSL/StrippingB2PPbarMuForTauMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingSL/StrippingB2PPbarMuForTauMu.py
index 1d97e42a98b40f8bef4d02281e5fd0b77ab45300..5eaa8cff0ccedf2007a0fc0b82bdb43f18bff30a 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingSL/StrippingB2PPbarMuForTauMu.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingSL/StrippingB2PPbarMuForTauMu.py
@@ -9,9 +9,7 @@
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
 
-import logging
 from StrippingUtils.Utils import LineBuilder
-from Gaudi.Configuration import *
 __author__ = ['Mark Smith']
 __date__ = '17/10/2016'
 __version__ = '$Revision: 1.0 $'
@@ -107,8 +105,6 @@ class B2PPbarMuForTauMuBuilder(LineBuilder):
     def __init__(self, name, config):
         LineBuilder.__init__(self, name, config)
 
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
-
         self.GECs = {"Code": "( recSummary(LHCb.RecSummary.nSPDhits,'Raw/Spd/Digits') < %(GEC_nSPDHits)s )" % config,
                      "Preambulo": ["from LoKiTracks.decorators import *"]}
 
@@ -437,7 +433,7 @@ class B2PPbarMuForTauMuBuilder(LineBuilder):
     ###### B->ppMuNu Signal ######
     def _bhad2PMuX_B(self):
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-        from PhysSelPython.Wrappers import Selection, MergedSelection
+        from PhysSelPython.Wrappers import Selection
 
         _pMu = CombineParticles(
             DecayDescriptors=self._config["DECAYS"], ReFitPVs=True)
@@ -454,7 +450,7 @@ class B2PPbarMuForTauMuBuilder(LineBuilder):
     ###### B->ppMuNu Signal for Topo Line ######
     def _bhad2PMuX_BTopo(self):
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-        from PhysSelPython.Wrappers import Selection, MergedSelection
+        from PhysSelPython.Wrappers import Selection
 
         _pMu = CombineParticles(
             DecayDescriptors=self._config["DECAYS"], ReFitPVs=True)
@@ -471,7 +467,7 @@ class B2PPbarMuForTauMuBuilder(LineBuilder):
     ###### B->ppMuNu Same-Sign protons ######
     def _bhad2PMuX_B_SS(self):
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-        from PhysSelPython.Wrappers import Selection, MergedSelection
+        from PhysSelPython.Wrappers import Selection
 
         _pMu = CombineParticles(
             DecayDescriptors=self._config["DECAYS"], ReFitPVs=True)
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingSL/StrippingB2XTauNu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingSL/StrippingB2XTauNu.py
index 7e086d88664dbe28a77ab80ac882b7a7014366c9..6ace30c6ea487c9ee422ba92f199da4e11ac0085 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingSL/StrippingB2XTauNu.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingSL/StrippingB2XTauNu.py
@@ -610,7 +610,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         self.__MakeB0d2DdoubleStar2PiDstar02GammaD0TauNuNonPhysTau__()
 
         from StrippingConf.StrippingLine import StrippingLine
-        from PhysSelPython.Wrappers import SelectionSequence
 
         # TisTos filter
         def filterTisTos(name, Input, myTisTosSpecs):
@@ -1365,7 +1364,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
 
         from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseJpsi2MuMu
 
         JpsiForBc = FilterDesktop(
             Code=self.totalJpsiCut
@@ -1384,7 +1382,7 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
 
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
+        from PhysSelPython.Wrappers import Selection
         from StandardParticles import StdLoosePions
 
         CombDdoubleStar02DstarPi = CombineParticles(
@@ -1405,7 +1403,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3pi/Particles')
@@ -1428,7 +1425,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3pi/Particles')
@@ -1453,7 +1449,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3pi/Particles')
@@ -1477,7 +1472,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTauNonPhys
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3piNonPhys/Particles')
@@ -1501,7 +1495,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3pi/Particles')
@@ -1526,7 +1519,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3pi/Particles')
@@ -1551,7 +1543,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTauNonPhys
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3piNonPhys/Particles')
@@ -1575,7 +1566,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3pi/Particles')
@@ -1600,7 +1590,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3pi/Particles')
@@ -1625,7 +1614,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTauNonPhys
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3piNonPhys/Particles')
@@ -1650,7 +1638,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3pi/Particles')
@@ -1674,7 +1661,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTauNonPhys
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3piNonPhys/Particles')
@@ -1698,7 +1684,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3pi/Particles')
@@ -1723,7 +1708,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3pi/Particles')
@@ -1748,7 +1732,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTauNonPhys
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3piNonPhys/Particles')
@@ -1773,7 +1756,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3pi/Particles')
@@ -1799,7 +1781,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3pi/Particles')
@@ -1823,7 +1804,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3pi/Particles')
@@ -1849,7 +1829,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3pi/Particles')
@@ -1874,7 +1853,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTauNonPhys
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3piNonPhys/Particles')
@@ -1900,7 +1878,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3pi/Particles')
@@ -1924,7 +1901,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3pi/Particles')
@@ -1947,7 +1923,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3pi/Particles')
@@ -1971,7 +1946,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3pi/Particles')
@@ -1995,7 +1969,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTauNonPhys
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3piNonPhys/Particles')
@@ -2019,7 +1992,7 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
 
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
+        from PhysSelPython.Wrappers import Selection
         from StandardParticles import StdLooseResolvedPi0
 
         CombDStar02Pi0D0 = CombineParticles(
@@ -2039,7 +2012,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3pi/Particles')
@@ -2062,7 +2034,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3pi/Particles')
@@ -2085,7 +2056,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3piNonPhys/Particles')
@@ -2108,7 +2078,7 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
 
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
+        from PhysSelPython.Wrappers import Selection
         from StandardParticles import StdLooseAllPhotons
 
         CombDStar02GammaD0 = CombineParticles(
@@ -2128,7 +2098,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3pi/Particles')
@@ -2151,7 +2120,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3pi/Particles')
@@ -2174,7 +2142,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3piNonPhys/Particles')
@@ -2196,7 +2163,7 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
 
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
+        from PhysSelPython.Wrappers import Selection
         from StandardParticles import StdLoosePions
 
         CombDdoubleStar2PiDstar02Pi0D0 = CombineParticles(
@@ -2216,7 +2183,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3pi/Particles')
@@ -2239,7 +2205,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3pi/Particles')
@@ -2262,7 +2227,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3piNonPhys/Particles')
@@ -2284,7 +2248,7 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
 
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
+        from PhysSelPython.Wrappers import Selection
         from StandardParticles import StdLoosePions
 
         CombDdoubleStar2PiDstar02GammaD0 = CombineParticles(
@@ -2304,7 +2268,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3pi/Particles')
@@ -2327,7 +2290,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3pi/Particles')
@@ -2350,7 +2312,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3piNonPhys/Particles')
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingSL/StrippingB2XuENu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingSL/StrippingB2XuENu.py
index 73ab1a2a4e2c0a0a1016fb4040cc2e6b7b36c884..b59084d7969d22b0c34cc4c7c11b62ae657ce530 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingSL/StrippingB2XuENu.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingSL/StrippingB2XuENu.py
@@ -9,9 +9,7 @@
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
 
-import logging
 from StrippingUtils.Utils import LineBuilder
-from Gaudi.Configuration import *
 __author__ = ['Phillip Urquijo, Alessandra Borgia', 'Michel De Cian']
 __date__ = '11/01/2019'
 __version__ = '$Revision: 1.6 $'
@@ -243,7 +241,7 @@ class B2XuENuBuilder(LineBuilder):
     def __init__(self, name, config):
         LineBuilder.__init__(self, name, config)
         self.config = config
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
+        from PhysSelPython.Wrappers import DataOnDemand
         self._stdVeryLooseKsLL = DataOnDemand(
             "Phys/StdVeryLooseKsLL/Particles")
         self._stdLooseKsLD = DataOnDemand("Phys/StdLooseKsLD/Particles")
@@ -734,7 +732,7 @@ class B2XuENuBuilder(LineBuilder):
 
     # Bs -> K*/Kspi e nu lines
     def _Kstar_line(self):
-        NoPS = self.config['NoPrescales']
+        self.config['NoPrescales']
         from StrippingConf.StrippingLine import StrippingLine
         return StrippingLine(self._name+'Bs2Kstar_Line', prescale=1.0,
                              FILTER=self.GECs,
@@ -1055,8 +1053,8 @@ class B2XuENuBuilder(LineBuilder):
         if self._KSSel is not None:
             return self._KSSel
 
-        from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
+        from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
+        from PhysSelPython.Wrappers import Selection
 
         _code = FilterDesktop(Code=self._NominalKsSelection() % self._config)
 
@@ -1141,7 +1139,6 @@ class B2XuENuBuilder(LineBuilder):
 
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection
-        from StandardParticles import StdLoosePions
 
         _rho770 = CombineParticles(
             DecayDescriptors=["rho(770)0 -> pi- pi+"],
@@ -1171,7 +1168,6 @@ class B2XuENuBuilder(LineBuilder):
 
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection
-        from StandardParticles import StdLoosePions
 
         _rho770NoPID = CombineParticles(
             DecayDescriptors=["rho(770)0 -> pi- pi+"],
@@ -1201,7 +1197,6 @@ class B2XuENuBuilder(LineBuilder):
 
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection
-        from StandardParticles import StdLoosePions
 
         _rho770WS = CombineParticles(
             DecayDescriptors=["[rho(770)0 -> pi+ pi+]cc"],
@@ -1229,7 +1224,6 @@ class B2XuENuBuilder(LineBuilder):
 
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection
-        from StandardParticles import StdLoosePions
 
         _rho770SB = CombineParticles(
             DecayDescriptors=["rho(770)0 -> pi+ pi-"],
@@ -1341,7 +1335,7 @@ class B2XuENuBuilder(LineBuilder):
 
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection
-        from StandardParticles import StdLoosePions, StdLooseElectrons
+        from StandardParticles import StdLoosePions
 
         _Ksh = CombineParticles(
             DecayDescriptor="KS0 -> e- pi+",
@@ -1369,7 +1363,7 @@ class B2XuENuBuilder(LineBuilder):
 
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection
-        from StandardParticles import StdLoosePions, StdLooseElectrons
+        from StandardParticles import StdLoosePions
 
         _Ksh = CombineParticles(
             DecayDescriptor="KS0 -> e+ pi-",
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingSL/StrippingB2XuMuNu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingSL/StrippingB2XuMuNu.py
index e990a0f5fca381288d278a31edfe8c4be451c2d9..7dbf8f670c004436033f2172b635cf83469f0692 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingSL/StrippingB2XuMuNu.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingSL/StrippingB2XuMuNu.py
@@ -9,9 +9,7 @@
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
 
-import logging
 from StrippingUtils.Utils import LineBuilder
-from Gaudi.Configuration import *
 __author__ = ['Phillip Urquijo, Alessandra Borgia', 'Michel De Cian']
 __date__ = '11/01/2019'
 __version__ = '$Revision: 1.6 $'
@@ -238,7 +236,7 @@ class B2XuMuNuBuilder(LineBuilder):
     def __init__(self, name, config):
         LineBuilder.__init__(self, name, config)
         self.config = config
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
+        from PhysSelPython.Wrappers import DataOnDemand
         self._stdVeryLooseKsLL = DataOnDemand(
             "Phys/StdVeryLooseKsLL/Particles")
         self._stdLooseKsLD = DataOnDemand("Phys/StdLooseKsLD/Particles")
@@ -733,7 +731,7 @@ class B2XuMuNuBuilder(LineBuilder):
 
     # Bs -> K*/Kspi mu nu lines
     def _Kstar_line(self):
-        NoPS = self.config['NoPrescales']
+        self.config['NoPrescales']
         from StrippingConf.StrippingLine import StrippingLine
         return StrippingLine(self._name+'Bs2Kstar_Line', prescale=1.0,
                              FILTER=self.GECs,
@@ -1052,8 +1050,8 @@ class B2XuMuNuBuilder(LineBuilder):
         if self._KSSel is not None:
             return self._KSSel
 
-        from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
+        from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
+        from PhysSelPython.Wrappers import Selection
 
         _code = FilterDesktop(Code=self._NominalKsSelection() % self._config)
 
@@ -1138,7 +1136,6 @@ class B2XuMuNuBuilder(LineBuilder):
 
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection
-        from StandardParticles import StdLoosePions
 
         _rho770 = CombineParticles(
             DecayDescriptors=["rho(770)0 -> pi- pi+"],
@@ -1168,7 +1165,6 @@ class B2XuMuNuBuilder(LineBuilder):
 
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection
-        from StandardParticles import StdLoosePions
 
         _rho770NoPID = CombineParticles(
             DecayDescriptors=["rho(770)0 -> pi- pi+"],
@@ -1198,7 +1194,6 @@ class B2XuMuNuBuilder(LineBuilder):
 
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection
-        from StandardParticles import StdLoosePions
 
         _rho770WS = CombineParticles(
             DecayDescriptors=["[rho(770)0 -> pi+ pi+]cc"],
@@ -1226,7 +1221,6 @@ class B2XuMuNuBuilder(LineBuilder):
 
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection
-        from StandardParticles import StdLoosePions
 
         _rho770SB = CombineParticles(
             DecayDescriptors=["rho(770)0 -> pi+ pi-"],
@@ -1338,7 +1332,7 @@ class B2XuMuNuBuilder(LineBuilder):
 
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection
-        from StandardParticles import StdLoosePions, StdLooseMuons
+        from StandardParticles import StdLoosePions
 
         _Ksh = CombineParticles(
             DecayDescriptor="KS0 -> mu- pi+",
@@ -1366,7 +1360,7 @@ class B2XuMuNuBuilder(LineBuilder):
 
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection
-        from StandardParticles import StdLoosePions, StdLooseMuons
+        from StandardParticles import StdLoosePions
 
         _Ksh = CombineParticles(
             DecayDescriptor="KS0 -> mu+ pi-",
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingSL/StrippingCharmFromBSemiForHadronAsy.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingSL/StrippingCharmFromBSemiForHadronAsy.py
index a80fcb301fa6917bd97160506a3b0a679ff40777..ddaec2925512363daba54947938f97bdafffeb41 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingSL/StrippingCharmFromBSemiForHadronAsy.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingSL/StrippingCharmFromBSemiForHadronAsy.py
@@ -25,8 +25,7 @@ from Configurables import FilterDesktop, CombineParticles
 from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from StandardParticles import StdAllLoosePions, StdLoosePions, StdLooseMuons, StdLooseKaons, StdLooseProtons
-from Configurables import TisTosParticleTagger
+from StandardParticles import StdLooseKaons, StdLooseMuons, StdLoosePions
 
 __all__ = ('CharmFromBSemiForHadronAsyAllLinesConf',
            'TOSFilter',
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingSL/StrippingLb2LcMuNuX_Lc2L0Pi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingSL/StrippingLb2LcMuNuX_Lc2L0Pi.py
index 074ba01a451ce4cf74c483e687d7a71c404d4adb..729f75ac3c69725569c584dc08bdd9610f2b693a 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingSL/StrippingLb2LcMuNuX_Lc2L0Pi.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingSL/StrippingLb2LcMuNuX_Lc2L0Pi.py
@@ -16,14 +16,13 @@ __author__ = ['Scott Ely']
 __date__ = '23/01/2019'
 __version__ = '$Revision: 1.0 $'
 
-from Gaudi.Configuration import *
 from Configurables import FilterDesktop, CombineParticles
-from PhysSelPython.Wrappers import Selection, DataOnDemand
+from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from StandardParticles import StdLoosePions, StdLooseMuons, StdLooseKaons, StdLooseProtons, StdLooseElectrons, StdVeryLooseLambdaLL
-from StandardParticles import StdNoPIDsPions, StdNoPIDsKaons, StdNoPIDsProtons, StdNoPIDsMuons
-from GaudiKernel.SystemOfUnits import MeV, GeV, cm, mm
+from StandardParticles import StdLooseMuons, StdLoosePions, StdVeryLooseLambdaLL
+from StandardParticles import StdNoPIDsMuons
+from GaudiKernel.SystemOfUnits import GeV, MeV, mm
 
 __all__ = ('Lb2LcMuNuX_Lc2L0PiConf', 'default_config')
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingSL/StrippingLb2pMuNuVub.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingSL/StrippingLb2pMuNuVub.py
index cd969d689449a9dc069bd745b4acbc62f683dfda..e74c7de20e90982142bcf10f66be4a6cb90689e6 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingSL/StrippingLb2pMuNuVub.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingSL/StrippingLb2pMuNuVub.py
@@ -9,9 +9,7 @@
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
 
-import logging
 from StrippingUtils.Utils import LineBuilder
-from Gaudi.Configuration import *
 __author__ = ['William Sutcliffe']
 __date__ = '19/01/2014'
 __version__ = '$Revision: 1.0 $'
@@ -137,8 +135,6 @@ class Lb2pMuNuVubBuilder(LineBuilder):
     def __init__(self, name, config):
         LineBuilder.__init__(self, name, config)
 
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
-
         self.GECs = {"Code": "( recSummaryTrack(LHCb.RecSummary.nLongTracks, TrLONG) < %(GEC_nLongTrk)s )" % config,
                      "Preambulo": ["from LoKiTracks.decorators import *"]}
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingSL/Strippingbhad2PMuX.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingSL/Strippingbhad2PMuX.py
index e89305332152e8ebc4ee1e72a7f10cd8d9d2dfae..f46738721f8dbfce869e840a1aa8cbb13c6fdd2f 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingSL/Strippingbhad2PMuX.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2/StrippingSL/Strippingbhad2PMuX.py
@@ -9,9 +9,7 @@
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
 
-import logging
 from StrippingUtils.Utils import LineBuilder
-from Gaudi.Configuration import *
 __author__ = ['William Sutcliffe', 'Patrick Owen']
 __date__ = '02/12/2015'
 __version__ = '$Revision: 2.0 $'
@@ -132,8 +130,6 @@ class bhad2PMuXBuilder(LineBuilder):
     def __init__(self, name, config):
         LineBuilder.__init__(self, name, config)
 
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
-
         self.GECs = {"Code": "( recSummaryTrack(LHCb.RecSummary.nLongTracks, TrLONG) < %(GEC_nLongTrk)s )" % config,
                      "Preambulo": ["from LoKiTracks.decorators import *"]}
 
@@ -455,7 +451,7 @@ class bhad2PMuXBuilder(LineBuilder):
     ###### Lb->pMuNu High M_corr Opposite Sign ######
     def _bhad2PMuX_Lb(self):
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-        from PhysSelPython.Wrappers import Selection, MergedSelection
+        from PhysSelPython.Wrappers import Selection
 
         _pMu = CombineParticles(
             DecayDescriptors=self._config["DECAYS"], ReFitPVs=True)
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingB2CC/StrippingB2JpsiHH.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingB2CC/StrippingB2JpsiHH.py
index 8fdba29f0a96c73f62e3bac58ab9c2e15b2e5db7..e3ae4544669056ef7f03c5709d60510f6eef9f32 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingB2CC/StrippingB2JpsiHH.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingB2CC/StrippingB2JpsiHH.py
@@ -20,18 +20,10 @@ __date__ = '10/11/2016'
 
 __all__ = ('B2JpsiHHConf', 'default_config')
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from CommonParticles.Utils import updateDoD
-from StandardParticles import StdLoosePions
-from StandardParticles import StdLooseKaons
-from StandardParticles import StdLooseProtons
-from StandardParticles import StdAllLooseKaons
-from StandardParticles import StdAllLooseProtons
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
+from PhysSelPython.Wrappers import DataOnDemand, Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from GaudiKernel.SystemOfUnits import MeV
 
 default_config = {
     'NAME': 'B2JpsiHH',
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingB2CC/StrippingB2JpsiPi0.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingB2CC/StrippingB2JpsiPi0.py
index 90740f80b4fbe5d7cdd945fc3fb2a4331ac1e49d..170baf2fb63c5dbaab6735a4dbe697c61ed379a3 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingB2CC/StrippingB2JpsiPi0.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingB2CC/StrippingB2JpsiPi0.py
@@ -14,15 +14,10 @@ __version__ = '$Revision: 1.1$'
 
 __all__ = ('B2JpsiPi0Conf', 'default_config')
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from CommonParticles.Utils import updateDoD
-from StandardParticles import StdLooseResolvedPi0
-from StandardParticles import StdLooseMergedPi0
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
+from PhysSelPython.Wrappers import DataOnDemand, Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from GaudiKernel.SystemOfUnits import MeV
 
 default_config = {
     # The real name of the lines is BetaS, this is a reference this for the Settings.
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingB2CC/StrippingB2JpsiPi0_Run1.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingB2CC/StrippingB2JpsiPi0_Run1.py
index 3f5f0443aa9132ab2494cbb48813c4ad8991fc1b..1bf462e0083a2da3704b1f804d03b10239ecd920 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingB2CC/StrippingB2JpsiPi0_Run1.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingB2CC/StrippingB2JpsiPi0_Run1.py
@@ -14,15 +14,10 @@ __version__ = '$Revision: 1.2$'
 
 __all__ = ('B2JpsiPi0Conf_RI', 'default_config')
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from CommonParticles.Utils import updateDoD
-from StandardParticles import StdLooseResolvedPi0
-from StandardParticles import StdLooseMergedPi0
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
+from PhysSelPython.Wrappers import DataOnDemand, Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from GaudiKernel.SystemOfUnits import MeV
 
 default_config = {
     # The real name of the lines is BetaS, this is a reference this for the Settings.
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingB2CC/StrippingB2JpsiX0.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingB2CC/StrippingB2JpsiX0.py
index d93a42cce82d84a0ed23627a007cbaad6d469573..e15a04497fca1b721a890552c1359e732098a2be 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingB2CC/StrippingB2JpsiX0.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingB2CC/StrippingB2JpsiX0.py
@@ -20,18 +20,10 @@ __date__ = '22/01/2018'
 
 __all__ = ('B2JpsiX0Conf', 'default_config')
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from CommonParticles.Utils import updateDoD
-from StandardParticles import StdLoosePions
-from StandardParticles import StdLooseKaons
-from StandardParticles import StdLooseProtons
-from StandardParticles import StdAllLooseKaons
-from StandardParticles import StdAllLooseProtons
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
+from PhysSelPython.Wrappers import DataOnDemand, Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from GaudiKernel.SystemOfUnits import MeV
 
 default_config = {
     'NAME': 'B2JpsiX0',
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingB2CC/StrippingB2JpsiXforBeta_s.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingB2CC/StrippingB2JpsiXforBeta_s.py
index 523cdae393a5eaafcb013c51488bd213e0b0867a..e1c610266077a45330df6ee5d2d179deab4bdda5 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingB2CC/StrippingB2JpsiXforBeta_s.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingB2CC/StrippingB2JpsiXforBeta_s.py
@@ -26,16 +26,12 @@ __version__ = '$Revision: 4.0$'
 
 __all__ = ('B2JpsiXforBeta_sConf', 'default_config')
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from CommonParticles.Utils import updateDoD
 from StandardParticles import StdLoosePions
 from StandardParticles import StdLooseKaons
-from StandardParticles import StdAllLooseKaons
 from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from GaudiKernel.SystemOfUnits import MeV
 
 default_config = {
     'NAME': 'BetaS',
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingB2CC/StrippingBd2JpsieeKS.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingB2CC/StrippingBd2JpsieeKS.py
index b553711d64d89bc11f40ac43383517f536779ce6..2ca00a91b4fd73eb8d5af28f7937fd9a9c0e7ec0 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingB2CC/StrippingBd2JpsieeKS.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingB2CC/StrippingBd2JpsieeKS.py
@@ -8,16 +8,10 @@
 # granted to it by virtue of its status as an Intergovernmental Organization  #
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
-from GaudiKernel.SystemOfUnits import MeV
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
-from StandardParticles import StdAllLooseKaons
-from StandardParticles import StdLooseKaons
-from StandardParticles import StdLoosePions
-from CommonParticles.Utils import updateDoD
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = 'Ramon Niet'
 __date__ = '2014/10/23'
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingB2CC/StrippingBd2JpsieeKSFullDST.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingB2CC/StrippingBd2JpsieeKSFullDST.py
index 4c73451a58cef8538903ce8da801486bb748eb8b..0f5de6e613aed7291f6b1bb6805977096a4220ca 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingB2CC/StrippingBd2JpsieeKSFullDST.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingB2CC/StrippingBd2JpsieeKSFullDST.py
@@ -8,16 +8,10 @@
 # granted to it by virtue of its status as an Intergovernmental Organization  #
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
-from GaudiKernel.SystemOfUnits import MeV
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
-from StandardParticles import StdAllLooseKaons
-from StandardParticles import StdLooseKaons
-from StandardParticles import StdLoosePions
-from CommonParticles.Utils import updateDoD
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = 'Gerwin Meier'
 __date__ = '2019/08/12'
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingB2CC/StrippingBd2JpsieeKstar.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingB2CC/StrippingBd2JpsieeKstar.py
index 326fc7c342b5e8e69030f9e3aea12bdf3a65e950..b6ae6bfc4e2e904ff10e3e3ad1a791ff16f615cd 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingB2CC/StrippingBd2JpsieeKstar.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingB2CC/StrippingBd2JpsieeKstar.py
@@ -12,7 +12,6 @@ from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from Configurables import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = 'Artur Ukleja, Jibo He, Konrad Klimaszewski, Varvara Batozskaya'
 __date__ = '2019/01/22'
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingB2CC/StrippingBs2EtacPhiBDT.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingB2CC/StrippingBs2EtacPhiBDT.py
index b6e256eaa1235a84cbf3b68362eea9bf7f387897..30d69a2c110a19ab5a45303854da636781997f4f 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingB2CC/StrippingBs2EtacPhiBDT.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingB2CC/StrippingBs2EtacPhiBDT.py
@@ -17,7 +17,6 @@ from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
-from Gaudi.Configuration import *
 __author__ = ['Morgan Martin, Jibo He']
 __date__ = '20/08/2014'
 __version__ = '$Revision: 1.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingB2CC/StrippingBs2JpsieePhi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingB2CC/StrippingBs2JpsieePhi.py
index 933c2f46f93196ffa448a855cea7a82e5fca3652..ee8bf0cf2aad66cd3771f048a336fffb0ed8165d 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingB2CC/StrippingBs2JpsieePhi.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingB2CC/StrippingBs2JpsieePhi.py
@@ -12,7 +12,6 @@ from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from Configurables import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = 'Artur Ukleja, Jibo He, Konrad Klimaszewski'
 __date__ = '2011/03/01'
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingB2OC/Beauty2Charm_B2DXBuilder.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingB2OC/Beauty2Charm_B2DXBuilder.py
index 4837b0a432c56ee77aea8155db25430718414ee9..04c8a298f12306e527d3d76a0293573a09d67d96 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingB2OC/Beauty2Charm_B2DXBuilder.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingB2OC/Beauty2Charm_B2DXBuilder.py
@@ -12,11 +12,7 @@
 
 from copy import deepcopy
 from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-from PhysSelPython.Wrappers import Selection
-from Beauty2Charm_LoKiCuts import LoKiCuts
 from Beauty2Charm_Utils import *
-from Configurables import SubstitutePID
 
 # \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\#
 
@@ -1399,7 +1395,7 @@ class B2DXBuilder(object):
             'B2D0st2460D0Pi':
             ["B+ -> D*_2(2460)0 D0 pi+", "B- -> D*_2(2460)0 D0 pi-"]
         }
-        input = self.dst.dpi_2460_pid + self.d.kpi_pid + self.topoKaons_PID
+        self.dst.dpi_2460_pid + self.d.kpi_pid + self.topoKaons_PID
         inputs = {
             'B2D0st2460D0K':
             self.dst.dpi_2460_pid + self.d.kpi_pid + self.topoKaons_PID,
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingB2OC/Beauty2Charm_Bc2BXBuilder.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingB2OC/Beauty2Charm_Bc2BXBuilder.py
index 63ecc854364bae2f29d64ea2b95c3484988c7016..5bb9297a5c69f56bc7b9761489bf517623df7d3c 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingB2OC/Beauty2Charm_Bc2BXBuilder.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingB2OC/Beauty2Charm_Bc2BXBuilder.py
@@ -8,11 +8,9 @@
 # granted to it by virtue of its status as an Intergovernmental Organization  #
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
-from copy import deepcopy
 from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 from PhysSelPython.Wrappers import Selection, MergedSelection
-from Beauty2Charm_LoKiCuts import LoKiCuts
 from Beauty2Charm_Utils import *
 
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingB2OC/Beauty2Charm_Bc2DDBuilder.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingB2OC/Beauty2Charm_Bc2DDBuilder.py
index 17eda4547110606bb00b589ef9a9081a7ab985e7..44526bcd78bbc48eb6f8c6416c9eabdc38313ac4 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingB2OC/Beauty2Charm_Bc2DDBuilder.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingB2OC/Beauty2Charm_Bc2DDBuilder.py
@@ -11,10 +11,8 @@
 
 # \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\#
 
-from copy import deepcopy
 from Gaudi.Configuration import *
-from PhysSelPython.Wrappers import Selection, MergedSelection
-from Beauty2Charm_LoKiCuts import LoKiCuts
+from PhysSelPython.Wrappers import MergedSelection
 from Beauty2Charm_Utils import *
 # from Configurables import SubstitutePID
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingB2OC/Beauty2Charm_Bc2DXBuilder.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingB2OC/Beauty2Charm_Bc2DXBuilder.py
index af663b7592071fc14302f44aa5c2a5b5eb5608d2..7449f0734a1fbe2c6eafc03f67ed71d3bfd70c18 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingB2OC/Beauty2Charm_Bc2DXBuilder.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingB2OC/Beauty2Charm_Bc2DXBuilder.py
@@ -10,9 +10,6 @@
 ###############################################################################
 from copy import deepcopy
 from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-from PhysSelPython.Wrappers import Selection, MergedSelection
-from Beauty2Charm_LoKiCuts import LoKiCuts
 from Beauty2Charm_Utils import *
 
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingB2OC/Beauty2Charm_DBuilder.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingB2OC/Beauty2Charm_DBuilder.py
index b68548ee7cbf1a65c38743cd287babf14333673d..5b18c6b24da520630e58f2f2f1f209024f8f0c86 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingB2OC/Beauty2Charm_DBuilder.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingB2OC/Beauty2Charm_DBuilder.py
@@ -385,7 +385,6 @@ class DBuilder(object):
         # self.k3pi_ddx_pid = [filterSelection('D2k3pi_for_DDX',LoKiCuts(['VCHI2DOF','BPVVDCHI2'],config_for_ddx).code(),self.k3pi_pid)]
 
         # use this below
-        d_cf_noMassWin = d_cf
         d_cf = LoKiCuts.combine([d_cf, "in_range(%s,MM,%s)" % (d_min, d_max)])
         ds_cf = LoKiCuts.combine(
             [ds_cf, "in_range(%s,MM,%s)" % (ds_min, ds_max)])
@@ -2058,9 +2057,6 @@ class DBuilder(object):
 
     def _makeD2PhiMuNu(self, up=False):
         '''makes Ds->phi mu nu'''
-        decays = [['phi(1020)', 'mu+']]
-        min = '1125.13*MeV'
-        max = '2168.49*MeV'
         cpkk = CombineParticles(
             # ( hasTopoChild() )
             CombinationCut="ADAMASS('phi(1020)') < 150*MeV",
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingB2OC/Beauty2Charm_HHBuilder.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingB2OC/Beauty2Charm_HHBuilder.py
index 08f113046063b0225620e80b961f1c934caada99..83e86c72dbafe11cee4a83ba99c7328e94737144 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingB2OC/Beauty2Charm_HHBuilder.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingB2OC/Beauty2Charm_HHBuilder.py
@@ -10,7 +10,6 @@
 ###############################################################################
 # \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\#
 
-from copy import deepcopy
 from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 from PhysSelPython.Wrappers import Selection
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingB2OC/Beauty2Charm_HHHBuilder.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingB2OC/Beauty2Charm_HHHBuilder.py
index 7673d8fcabbf719d31d711cd2cf93068d1cc4a66..3e955dda832402d17b78c3aa269d144532889161 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingB2OC/Beauty2Charm_HHHBuilder.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingB2OC/Beauty2Charm_HHHBuilder.py
@@ -10,9 +10,8 @@
 ###############################################################################
 # \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\#
 
-from copy import deepcopy
 from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N3BodyDecays, DaVinci__N4BodyDecays
+from GaudiConfUtils.ConfigurableGenerators import DaVinci__N3BodyDecays, DaVinci__N4BodyDecays
 from PhysSelPython.Wrappers import Selection
 from Beauty2Charm_LoKiCuts import LoKiCuts
 from Beauty2Charm_Utils import *
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingB2OC/Beauty2Charm_Lb2XBuilder.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingB2OC/Beauty2Charm_Lb2XBuilder.py
index 6f58dbe55c235749264f965d9b872eccc05d4456..049552af8ac3b3b8985213d74d2faa71f8efc288 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingB2OC/Beauty2Charm_Lb2XBuilder.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingB2OC/Beauty2Charm_Lb2XBuilder.py
@@ -1704,7 +1704,7 @@ class Lb2XBuilder(object):
 
     def _makeX2LcKPiPiPi(self):
         '''Makes RS + WS Xib -> Lc HH + c.c.'''
-        pions = self.pions
+        self.pions
         kaons = self.kaons
         pipipi = self.hhh.pipipi
         config = deepcopy(self.config)
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingB2OC/Beauty2Charm_LoKiCuts.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingB2OC/Beauty2Charm_LoKiCuts.py
index 54540ea2a223d554a751b02cf83000df4f3aa076..0fd327f8d32075591c9ca0e2d4dd434636c0ab35 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingB2OC/Beauty2Charm_LoKiCuts.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingB2OC/Beauty2Charm_LoKiCuts.py
@@ -10,11 +10,6 @@
 ###############################################################################
 # \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\#
 
-from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
-from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-from PhysSelPython.Wrappers import Selection, MergedSelection
-from StandardParticles import StdNoPIDsPions, StdNoPIDsKaons
 
 # \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\#
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingB2OC/Beauty2Charm_Utils.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingB2OC/Beauty2Charm_Utils.py
index 7949e5482cf0df4296d969b96966d2057310c75b..84d6df19648bdd16451bbfa4a21be153c20799e4 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingB2OC/Beauty2Charm_Utils.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingB2OC/Beauty2Charm_Utils.py
@@ -10,13 +10,11 @@
 ###############################################################################
 # \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\#
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-from PhysSelPython.Wrappers import DataOnDemand, Selection, MergedSelection, VoidEventSelection
+from PhysSelPython.Wrappers import DataOnDemand, Selection, VoidEventSelection
 from Beauty2Charm_LoKiCuts import LoKiCuts
 from Configurables import SubstitutePID
-from Configurables import ConeJetProxyFilter
 
 # \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\#
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingB2OC/StrippingB2D0X0.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingB2OC/StrippingB2D0X0.py
index 830d1c34311f28a50fdd4feaa15d97116c87c823..ed453e6e991cc3147b6fb47390782f035edccf73 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingB2OC/StrippingB2D0X0.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingB2OC/StrippingB2D0X0.py
@@ -19,18 +19,10 @@ __date__ = '29/11/2021'
 
 __all__ = ('B2D0X0Conf', 'default_config')
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from CommonParticles.Utils import updateDoD
-from StandardParticles import StdLoosePions
-from StandardParticles import StdLooseKaons
-from StandardParticles import StdLooseProtons
-from StandardParticles import StdAllLooseKaons
-from StandardParticles import StdAllLooseProtons
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
+from PhysSelPython.Wrappers import DataOnDemand, Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from GaudiKernel.SystemOfUnits import MeV
 
 default_config = {
     'NAME': 'B2D0X0',
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingB2OC/StrippingB2DDphi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingB2OC/StrippingB2DDphi.py
index b0f8982f1efb389032da5f7becb2881e3c005379..92ca95c2ea3f7c46766aedbc04dbbc34c9c0b8ef 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingB2OC/StrippingB2DDphi.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingB2OC/StrippingB2DDphi.py
@@ -15,8 +15,7 @@ Author: M. Martinelli
 Notes: Excited states are included by placing the line in FULL.DST
 '''
 from PhysSelPython.Wrappers import Selection, DataOnDemand
-from Configurables import FilterDesktop, CombineParticles, DaVinci__N4BodyDecays
-from GaudiConfUtils.ConfigurableGenerators import CombineParticles
+from Configurables import DaVinci__N4BodyDecays, FilterDesktop
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 __author__ = ['Maurizio Martinelli']
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingB2OC/StrippingB2DXD2HMuNu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingB2OC/StrippingB2DXD2HMuNu.py
index 1ec2da4c2510e23471f7b6705c96553b8a859931..0711ca38847920ce87122f8d2d18c51c0f73cfc2 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingB2OC/StrippingB2DXD2HMuNu.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingB2OC/StrippingB2DXD2HMuNu.py
@@ -12,13 +12,11 @@ __author__ = ['Wenbin Qian']
 __date__ = '09/11/2015'
 __version__ = '$Revision: 0.01 $'
 
-from Gaudi.Configuration import *
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, DaVinci__N4BodyDecays, DaVinci__N3BodyDecays
-from PhysSelPython.Wrappers import Selection, DataOnDemand
+from PhysSelPython.Wrappers import Selection
 from StandardParticles import StdLooseMuons, StdLoosePions, StdLooseKaons
-from GaudiKernel.SystemOfUnits import MeV, GeV, cm, mm
 
 __all__ = ('B2DXD2HMuNuBuilder',
            'default_config')
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingB2OC/StrippingB2nbody.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingB2OC/StrippingB2nbody.py
index 663bdbbf855c3d8d19dad3a29b6be667edaeedb9..04c84fc2dc39eb4b3d3d954f3c0083396e0c84fa 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingB2OC/StrippingB2nbody.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingB2OC/StrippingB2nbody.py
@@ -16,7 +16,6 @@ from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, MergedSelection, DataOnDemand, VoidEventSelection
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = ['Rudolf Oldeman']
 __date__ = '08/02/2011'
 __version__ = '$Revision: 1.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingB2OC/StrippingBeauty2Charm.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingB2OC/StrippingBeauty2Charm.py
index 884208b81e1d3417e71df6bd6878c89f3ca70a86..fb3342063164f5f018bfbe1e76cf16aa528feae3 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingB2OC/StrippingBeauty2Charm.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingB2OC/StrippingBeauty2Charm.py
@@ -28,11 +28,9 @@ from StandardParticles import (StdAllNoPIDsPions, StdAllNoPIDsKaons,
                                StdAllNoPIDsProtons, StdNoPIDsUpPions,
                                StdLooseMuons, StdNoPIDsUpKaons,
                                StdLooseResolvedPi0, StdLooseMergedPi0)
-from Configurables import LoKi__VoidFilter
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import EventSelection
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
+from PhysSelPython.Wrappers import MergedSelection, Selection
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
 from Gaudi.Configuration import *
 import re
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBandQ/StrippingB2Chic0KPi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBandQ/StrippingB2Chic0KPi.py
index 69e18721b3c6b45435046eaac0c9a79d5818b6da..030871800dfb7d9f6c18c93c207febaf3fad5cf8 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBandQ/StrippingB2Chic0KPi.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBandQ/StrippingB2Chic0KPi.py
@@ -17,7 +17,6 @@ from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
-from Gaudi.Configuration import *
 __author__ = ['Andrii Usachov']
 __date__ = '13/03/2018'
 __version__ = '$Revision: 1.2$'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBandQ/StrippingB2JpsiXforEM_s.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBandQ/StrippingB2JpsiXforEM_s.py
index d3aeeef75411f9cecca87053ee0faa991e8c7fd8..394fd7c3171d61beb9b93f762a890a248f2b190f 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBandQ/StrippingB2JpsiXforEM_s.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBandQ/StrippingB2JpsiXforEM_s.py
@@ -20,21 +20,11 @@ __version__ = '$Revision: 0.0 $'
 
 __all__ = ('B2JpsiXforEM_sConf', 'default_config')
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
 from Configurables import LoKi__PVReFitter, CombineParticles
-from CommonParticles.Utils import updateDoD
-from StandardParticles import StdLoosePions
-from StandardParticles import StdLooseKaons
-from StandardParticles import StdAllLooseKaons
-from StandardParticles import StdLooseResolvedPi0
-from StandardParticles import StdLooseMergedPi0
-from StandardParticles import StdNoPIDsPions
-from StandardParticles import StdLooseProtons
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
+from PhysSelPython.Wrappers import DataOnDemand, Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from GaudiKernel.SystemOfUnits import MeV
 
 default_config = {
     'NAME': 'B2JpsiXforEM',
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBandQ/StrippingBbbar2PhiPhi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBandQ/StrippingBbbar2PhiPhi.py
index 2c308991a8d9592619777fb7aad4c619a4a40437..fd4e526f5796889d5eb13efd1f1fca7adfbf4a97 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBandQ/StrippingBbbar2PhiPhi.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBandQ/StrippingBbbar2PhiPhi.py
@@ -21,12 +21,10 @@ confBbbar2PhiPhi = Bbbar2PhiPhiConf( name = 'Bbbar2PhiPhi', config = config_Bbba
 stream.appendLines( confBbbar2PhiPhi.lines() )
 '''
 
-from StandardParticles import StdNoPIDsProtons, StdNoPIDsPions, StdNoPIDsDownPions
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
+from PhysSelPython.Wrappers import DataOnDemand, Selection
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = ['Simone Stracka']
 __date__ = '10/03/2015'
 __all__ = (
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBandQ/StrippingBc2EtacMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBandQ/StrippingBc2EtacMu.py
index c0e64ca5c35b4aab42f067e70aaf18cbe0accaf2..ce1d72039c532c0cfe3bddf32096f808952b47a6 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBandQ/StrippingBc2EtacMu.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBandQ/StrippingBc2EtacMu.py
@@ -15,9 +15,8 @@ Module for B_c->eta_c mu
 
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand, AutomaticData
+from PhysSelPython.Wrappers import DataOnDemand, Selection
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = ['Valeriia Zhovkovska']
 __date__ = '15/03/2019'
 __version__ = '$Revision: 1.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBandQ/StrippingBc2EtacSL.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBandQ/StrippingBc2EtacSL.py
index 2d376003a4c6571aaa08defa85c4fe790ab35c60..4fa26a1cb105f28e64c752c38b40f8e46a55a8fc 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBandQ/StrippingBc2EtacSL.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBandQ/StrippingBc2EtacSL.py
@@ -23,9 +23,8 @@ B_c->eta_c tau, with eta_c->K_s K pi and tau->3pi
 
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand, AutomaticData
+from PhysSelPython.Wrappers import DataOnDemand, Selection
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = ['Valeriia Zhovkovska']
 __date__ = '24/06/2021'
 __version__ = '$Revision: 1.1 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBandQ/StrippingBc2JpsiHBDT.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBandQ/StrippingBc2JpsiHBDT.py
index d973f13d2bc8b32c5045776e5b5d3f96bc618e74..7b5a84a9de9b55f09a9ef0da7469b5cc113c4602 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBandQ/StrippingBc2JpsiHBDT.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBandQ/StrippingBc2JpsiHBDT.py
@@ -18,7 +18,6 @@ from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = ['Jibo He']
 __date__ = '02/11/2013'
 __version__ = '$Revision: 2.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBandQ/StrippingBc2JpsiMuXNew.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBandQ/StrippingBc2JpsiMuXNew.py
index 946bad8366ac6019498b9d14e89f0a8899cf70d4..bd156feb81f0deaaf2a07b14df76bcbbcdd03d5c 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBandQ/StrippingBc2JpsiMuXNew.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBandQ/StrippingBc2JpsiMuXNew.py
@@ -18,7 +18,6 @@ from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = ['Jibo He']
 __date__ = '02/09/2010'
 __version__ = '$Revision: 2.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBandQ/StrippingCC2DD.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBandQ/StrippingCC2DD.py
index 58f89513ddb6f5ae23ad89c616deb7d8f0c6f719..39a30438368c27a6a42f57688de187a8b1135e72 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBandQ/StrippingCC2DD.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBandQ/StrippingCC2DD.py
@@ -22,8 +22,7 @@ Module for construction of CC->D D, where CC is a particle decaying to D D
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 __author__ = ['Lucio Anderlini', 'Andrea Bizzeti']
 __date__ = '2015-12-01'
 __version__ = '$Revision: 0.4 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBandQ/StrippingCcbar2Baryons.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBandQ/StrippingCcbar2Baryons.py
index e5a87f652fa30a90026cc6172bb112eb157c1e0f..3e235742a82cc6b6eef181ba5871e7096a9e965d 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBandQ/StrippingCcbar2Baryons.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBandQ/StrippingCcbar2Baryons.py
@@ -20,7 +20,6 @@ stream.appendLines( [
 ])
 '''
 
-from StandardParticles import StdNoPIDsProtons, StdNoPIDsPions, StdNoPIDsDownPions
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBandQ/StrippingCcbar2KsKpi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBandQ/StrippingCcbar2KsKpi.py
index b6b5864ff95625b5e45b988663cfea44c0f42cdc..4fc4ffd7e775d5d46e7701adb4802707efae0b7c 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBandQ/StrippingCcbar2KsKpi.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBandQ/StrippingCcbar2KsKpi.py
@@ -18,9 +18,8 @@ Module for Charmonium->Ks K pi, including three lines
 
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand, AutomaticData
+from PhysSelPython.Wrappers import DataOnDemand, Selection
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = ['Valeriia Zhovkovska']
 __date__ = '07/03/2019'
 __version__ = '$Revision: 1.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBandQ/StrippingCcbar2LambdaLambda.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBandQ/StrippingCcbar2LambdaLambda.py
index 8ce57a0eb47c3385d8d6e68abe18bd6e59dabdd6..a92e180d7ab857844ebe8f02f80e01b0e6d59a97 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBandQ/StrippingCcbar2LambdaLambda.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBandQ/StrippingCcbar2LambdaLambda.py
@@ -18,14 +18,12 @@ Apply very loose P/PT cuts on proton and pions
 '''
 
 from StandardParticles import StdAllLoosePions,  StdAllLooseProtons
-from StandardParticles import StdLoosePions, StdNoPIDsDownPions, StdNoPIDsDownProtons
-from StandardParticles import StdNoPIDsProtons
-from GaudiKernel.SystemOfUnits import MeV, GeV, mm, picosecond
+from StandardParticles import StdNoPIDsDownPions, StdNoPIDsDownProtons
+from GaudiKernel.SystemOfUnits import GeV, MeV, mm
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = ['Andrii Usachov', 'Jinlin Fu', 'Ziyi Wang']
 __date__ = '20/06/2021'
 __version__ = '$Revision: 0.1 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBandQ/StrippingCcbar2LstLambda.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBandQ/StrippingCcbar2LstLambda.py
index 0c317712061ae5a153e89bd41b8390a4fc74e187..4937ef3626431e3998bb3086fe7c656fa4ec9e57 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBandQ/StrippingCcbar2LstLambda.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBandQ/StrippingCcbar2LstLambda.py
@@ -12,14 +12,10 @@
 Module for selecting Ccbar->LstLambda detached line, with loose PT, PID cuts. 
 '''
 
-from StandardParticles import StdAllLoosePions, StdAllLooseKaons
-from StandardParticles import StdLoosePions, StdNoPIDsDownPions, StdLooseKaons, StdLooseDownKaons
-from StandardParticles import StdNoPIDsProtons, StdNoPIDsKaons
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = ['Andrii Usachov']
 __date__ = '23/11/2017'
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBandQ/StrippingCcbar2LstLst.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBandQ/StrippingCcbar2LstLst.py
index cf2d3319f4c8d473c85741f08945e6d15bd1722b..fb7af606490052a513bd2a8433237fcbfca14aa4 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBandQ/StrippingCcbar2LstLst.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBandQ/StrippingCcbar2LstLst.py
@@ -12,12 +12,10 @@
 Module for selecting Ccbar->LstLst detached line, with loose PT, PID cuts. 
 '''
 
-from StandardParticles import StdNoPIDsProtons, StdNoPIDsKaons
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
+from PhysSelPython.Wrappers import DataOnDemand, Selection
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = ['Andrii Usachov']
 __date__ = '12/01/2017'
 
@@ -58,19 +56,19 @@ class Ccbar2LstLstConf(LineBuilder):
         self.name = name
         self.config = config
 
-        TRCHI2DOF = config['TRCHI2DOF']
-        KaonProbNNk = config['KaonProbNNk']
-        KaonPTSec = config['KaonPTSec']
-        ProtonProbNNp = config['ProtonProbNNp']
-        ProtonP = config['ProtonP']
-        ProtonPTSec = config['ProtonPTSec']
-        LstVtxChi2 = config['LstVtxChi2']
-        LstMinMass = config['LstMinMass']
-        LstMaxMass = config['LstMaxMass']
-        CombMaxMass = config['CombMaxMass']
-        CombMinMass = config['CombMinMass']
-        MaxMass = config['MaxMass']
-        MinMass = config['MinMass']
+        config['TRCHI2DOF']
+        config['KaonProbNNk']
+        config['KaonPTSec']
+        config['ProtonProbNNp']
+        config['ProtonP']
+        config['ProtonPTSec']
+        config['LstVtxChi2']
+        config['LstMinMass']
+        config['LstMaxMass']
+        config['CombMaxMass']
+        config['CombMinMass']
+        config['MaxMass']
+        config['MinMass']
 
         self.DetachedProtonForLst = self.createSubSel(OutputList="DetachedProtonForLst" + self.name,
                                                       InputList=DataOnDemand(
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBandQ/StrippingCcbar2PPPiPi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBandQ/StrippingCcbar2PPPiPi.py
index 28b6a56f5499cd8ecbce8b1d1e366f216f123073..91e5c78c655288eb933c6478d1eafcaee3904f84 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBandQ/StrippingCcbar2PPPiPi.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBandQ/StrippingCcbar2PPPiPi.py
@@ -12,12 +12,11 @@
 Module for selecting charmonium -> p pbar pi pi 
 '''
 
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
+from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
 from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
-from Gaudi.Configuration import *
 __author__ = ['Jibo He']
 __date__ = '12/11/2015'
 __version__ = '$Revision: 1.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBandQ/StrippingCcbar2PhiPhi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBandQ/StrippingCcbar2PhiPhi.py
index c21b9fa874a5dccb0d9c373c28e255bbe309ea95..101a8e21ba087c6c991fe35e18471728a0abe2e3 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBandQ/StrippingCcbar2PhiPhi.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBandQ/StrippingCcbar2PhiPhi.py
@@ -21,12 +21,10 @@ confCcbar2PhiPhi = Ccbar2PhiPhiConf( name = 'Ccbar2PhiPhi', config = config_Ccba
 stream.appendLines( confCcbar2PhiPhi.lines() )
 '''
 
-from StandardParticles import StdNoPIDsProtons, StdNoPIDsPions, StdNoPIDsDownPions
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
+from PhysSelPython.Wrappers import DataOnDemand, Selection
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = ['Jibo He']
 __date__ = '20/01/2012'
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBandQ/StrippingCcbar2PhiPhiDetached.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBandQ/StrippingCcbar2PhiPhiDetached.py
index 9cece8aa8a316b6c48d7062407ae3c5e4a4703e3..8d48d19f4b11b35402f710baec49d8b99bec7f11 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBandQ/StrippingCcbar2PhiPhiDetached.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBandQ/StrippingCcbar2PhiPhiDetached.py
@@ -15,12 +15,10 @@ Inherited from StrippingCcbar2PhiPhi.py; moved To FullDST
 
 '''
 
-from StandardParticles import StdNoPIDsProtons, StdNoPIDsPions, StdNoPIDsDownPions
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
+from PhysSelPython.Wrappers import DataOnDemand, Selection
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = ['Jibo He, Liupan An']
 __date__ = '11/01/2017'
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBandQ/StrippingCcbar2PhiPhiPiPi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBandQ/StrippingCcbar2PhiPhiPiPi.py
index 3255f0fb24ce2bf3d5dedf3d48901b1a3b7fdf4c..8ded03963ceb90126c111e3d53772e2529b17348 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBandQ/StrippingCcbar2PhiPhiPiPi.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBandQ/StrippingCcbar2PhiPhiPiPi.py
@@ -12,12 +12,11 @@
 Module for selecting charmonium -> phi phi pi pi 
 '''
 
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
+from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
 from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
-from Gaudi.Configuration import *
 __author__ = ['Andrii Usachov']
 __date__ = '10/04/2017'
 __version__ = '$Revision: 1.1 $'
@@ -60,12 +59,12 @@ class Ccbar2PhiPhiPiPiConf(LineBuilder):
         self.name = name
         self.config = config
 
-        PhiVtxChi2 = config['PhiVtxChi2']
-        PhiMassW = config['PhiMassW']
-        KaonPT = config['KaonPT']
-        TRCHI2DOF = config['TRCHI2DOF']
-        KaonProbNNk = config['KaonProbNNk']
-        KaonIPCHI2 = config['KaonIPCHI2']
+        config['PhiVtxChi2']
+        config['PhiMassW']
+        config['KaonPT']
+        config['TRCHI2DOF']
+        config['KaonProbNNk']
+        config['KaonIPCHI2']
 
         self.SelPions = self.createSubSel(OutputList=self.name + "SelPions",
                                           InputList=DataOnDemand(
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBandQ/StrippingCcbar2PpbarNew.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBandQ/StrippingCcbar2PpbarNew.py
index 7b897199b13de2dc141c8f7cbc7d68b45c57f609..247fee87e88715cbf6df1707199f9b596c0115a8 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBandQ/StrippingCcbar2PpbarNew.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBandQ/StrippingCcbar2PpbarNew.py
@@ -18,9 +18,8 @@ Module for Charmonium->p pbar, including three lines
 
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
+from PhysSelPython.Wrappers import Selection
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 __author__ = ['Jibo He']
 __date__ = '03/10/2010'
 __version__ = '$Revision: 1.2 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBandQ/StrippingChiCJPsiGammaConv.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBandQ/StrippingChiCJPsiGammaConv.py
index 0974ad33bc785e6c21ccfbd8abd76c1de3c8330d..13c82277579b4165c559b3e45a8dc8a26f329028 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBandQ/StrippingChiCJPsiGammaConv.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBandQ/StrippingChiCJPsiGammaConv.py
@@ -11,8 +11,7 @@
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
-from Configurables import FilterDesktop, CombineParticles, OfflineVertexFitter
-from Gaudi.Configuration import *
+from Configurables import CombineParticles, FilterDesktop
 __author__ = 'Edwige Tournefier'
 __date__ = '08/06/2012'
 __version__ = '$ 1.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBandQ/StrippingDiMuonForXsection.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBandQ/StrippingDiMuonForXsection.py
index 99d45c194f644de10f8a90371ed1079dcd2e147e..7ceb214bd70cc59ffa52391a7a3321cce9dba642 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBandQ/StrippingDiMuonForXsection.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBandQ/StrippingDiMuonForXsection.py
@@ -16,7 +16,6 @@ from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
-from Gaudi.Configuration import *
 __author__ = ['Jibo He']
 __date__ = '28/03/2012'
 __version__ = '$Revision: 1.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBandQ/StrippingDiMuonNew.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBandQ/StrippingDiMuonNew.py
index 7c60c2e0a15b0e700724dae73d54a428fd669c7a..dd539e9d69fb0fa229c32fd245d281db456c4fed 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBandQ/StrippingDiMuonNew.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBandQ/StrippingDiMuonNew.py
@@ -60,7 +60,6 @@ from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand, EventSelection
 from Configurables import LoKi__VoidFilter
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
-from Gaudi.Configuration import *
 __author__ = ['Jibo He']
 __date__ = '30/09/2010'
 __version__ = '$Revision: 1.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBandQ/StrippingEtap2pipimumu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBandQ/StrippingEtap2pipimumu.py
index f03d28c2c9530e818efb5b81288a8e6a209e3ccb..89f19ca3d73d076e07c224f3c29ffd9def76e9f2 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBandQ/StrippingEtap2pipimumu.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBandQ/StrippingEtap2pipimumu.py
@@ -13,9 +13,7 @@ from StandardParticles import StdAllLooseMuons, StdAllLoosePions, StdAllLooseKao
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, OfflineVertexFitter
-from Gaudi.Configuration import *
-from copy import copy
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop
 __author__ = ['Xabier Cid Vidal']
 # inspired by StrippingD2XMuMuSSConf, from Malcolm John, B. Viaud and O. Kochebina
 __date__ = '10/3/2020'
@@ -178,10 +176,10 @@ class StrippingEtap2pipimumuConf(LineBuilder):
 
         LineBuilder.__init__(self, name, config)
 
-        Ds2EtapLine_name = name+"_Ds2Etap"
-        Bu2EtapLine_name = name+"_Bu2Etap"
-        Ds2Phi3PiLine_name = name+"_Ds2Phi3Pi"
-        Bu2JPsiKLine_name = name+"_Bu2JPsiK"
+        name+"_Ds2Etap"
+        name+"_Bu2Etap"
+        name+"_Ds2Phi3Pi"
+        name+"_Bu2JPsiK"
 
         # 1 : Make pions and kaons
         selPionsEta = makeDaughters(
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBandQ/StrippingHeavyBaryons.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBandQ/StrippingHeavyBaryons.py
index 92ada56965cd1abcfbbc08effe25cf9e9723c757..5547236ca6930272e5d54f7e2525f36a05c695fc 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBandQ/StrippingHeavyBaryons.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBandQ/StrippingHeavyBaryons.py
@@ -12,14 +12,10 @@
 Stripping line for HeavyBaryons studies : Xi_b-, Xi_b0 and Omega_b-
 Author: Yasmine Amhis
 '''
-from GaudiKernel.SystemOfUnits import MeV
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
-from StandardParticles import StdAllLoosePions, StdAllLooseKaons
-from StandardParticles import StdLoosePions, StdNoPIDsDownPions, StdLooseKaons, StdLooseDownKaons
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = ['Yasmine Amhis', 'updated by Vitalii Lisovskyi']
 __date__ = '19/05/2011'
 __version__ = '$Revision: 1.5 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBandQ/StrippingInclusiveCharmBaryons.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBandQ/StrippingInclusiveCharmBaryons.py
index 9e29771ddaf4fc3cd785402e1a97d9d43b6606ea..de3a1066b5ee29dc0aabf9b3bd15eab9da0aee69 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBandQ/StrippingInclusiveCharmBaryons.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBandQ/StrippingInclusiveCharmBaryons.py
@@ -17,13 +17,10 @@ Author: M. Stahl
 Notes: Be creative!
 '''
 from PhysSelPython.Wrappers import Selection, AutomaticData
-import math
 from LoKiProtoParticles.decorators import *
 from LoKiArrayFunctors.decorators import *
 from LoKiPhys.decorators import *
-from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-from Configurables import FilterDesktop
-from PhysConf.Selections import FilterSelection, CombineSelection, Combine4BodySelection, Combine3BodySelection, LimitSelection, MergedSelection
+from PhysConf.Selections import Combine3BodySelection, Combine4BodySelection, FilterSelection, MergedSelection
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 __author__ = ['Marian Stahl']
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBandQ/StrippingInclusiveDoubleD.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBandQ/StrippingInclusiveDoubleD.py
index 9372dd979fd52cd3e9f34725fde38533be716847..9454a8ad63da11230bfbc141844adb02ff4b29ef 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBandQ/StrippingInclusiveDoubleD.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBandQ/StrippingInclusiveDoubleD.py
@@ -18,12 +18,9 @@ Author: M. Stahl
 Notes: Be creative!
 '''
 from PhysSelPython.Wrappers import Selection, AutomaticData
-import math
 from LoKiProtoParticles.decorators import *
 from LoKiArrayFunctors.decorators import *
 from LoKiPhys.decorators import *
-from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-from Configurables import FilterDesktop
 from PhysConf.Selections import FilterSelection, CombineSelection, Combine3BodySelection, MergedSelection
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBandQ/StrippingLb2EtacKp.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBandQ/StrippingLb2EtacKp.py
index fa5c47368a954e4a868152465451cab11bf405b2..2596756ef885be2fb8c43b99c5aaa99d162d6f07 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBandQ/StrippingLb2EtacKp.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBandQ/StrippingLb2EtacKp.py
@@ -17,7 +17,6 @@ from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
-from Gaudi.Configuration import *
 __author__ = ['Liming Zhang', 'Xuesong Liu']
 __date__ = '23/11/2016'
 __version__ = '$Revision: 2.0$'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBandQ/StrippingLb2L0X3872.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBandQ/StrippingLb2L0X3872.py
index 0ef3e6ee6ba74c285b56b587d2fc3c0e7803324b..c9b94fd994845c1188d78d325a6c685e4534a067 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBandQ/StrippingLb2L0X3872.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBandQ/StrippingLb2L0X3872.py
@@ -15,7 +15,6 @@ from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = 'Xijun Wang'
 __date__ = '2021-3-18'
 __version__ = 'Stripping28'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBandQ/StrippingOmegab2XicKpi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBandQ/StrippingOmegab2XicKpi.py
index 8a70403dd8fa18dfaddeb8195f9451277a91f501..d421f354b44c7aabc1d6b1a430c6eb0805291530 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBandQ/StrippingOmegab2XicKpi.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBandQ/StrippingOmegab2XicKpi.py
@@ -25,8 +25,7 @@ __all__ = ('Omegab2XicKpiConf',
            'makeOmegab2XicKpi',
            'default_config')
 
-from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBandQ/StrippingOmegabDecays.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBandQ/StrippingOmegabDecays.py
index 6cb9b0c8ab26d14b40905a6b266eb3f859e415cb..445c8816a29eef4ec56c715fd44e85bbab2a5a0f 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBandQ/StrippingOmegabDecays.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBandQ/StrippingOmegabDecays.py
@@ -26,8 +26,7 @@ __all__ = ('OmegabDecaysConf', 'makeXic', 'makeOmegac', 'makeXic0',
            'makeOmegab2Omegacpi', 'makeOmegab2Omegacpi0pi',
            'makeOmegab2Omegacgammapi', 'default_config')
 
-from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBandQ/StrippingOniaPhotoProduction.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBandQ/StrippingOniaPhotoProduction.py
index 19c34eb3ad0d3c307e04c899fe215ee9911a2a3c..97685305212a68cd9bc2a94ad4f1ee4362dc0f7f 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBandQ/StrippingOniaPhotoProduction.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBandQ/StrippingOniaPhotoProduction.py
@@ -32,7 +32,6 @@ from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from StandardParticles import StdAllLooseMuons
 from GaudiKernel.SystemOfUnits import GeV
-from Configurables import HCRawBankDecoderHlt
 
 default_config = {
     'JpsiPhotoProduction':
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBandQ/StrippingOniaPhotoProductionPrescaled.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBandQ/StrippingOniaPhotoProductionPrescaled.py
index 3438f58588193fe8d418039e961472c72ab32630..f29c13fc38c4072fa17c7b7693e3b5bdb09959ea 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBandQ/StrippingOniaPhotoProductionPrescaled.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBandQ/StrippingOniaPhotoProductionPrescaled.py
@@ -27,7 +27,6 @@ from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from StandardParticles import StdAllLooseMuons
 from GaudiKernel.SystemOfUnits import GeV
-from Configurables import HCRawBankDecoderHlt
 
 default_config = {
     'JpsiPhotoProductionPrescaled':
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBandQ/StrippingPPMuMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBandQ/StrippingPPMuMu.py
index cfa93241546b8cb1958f0c080bce3ed3974eb196..1e28adc9f8419151808afa067316d7a0f98387fb 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBandQ/StrippingPPMuMu.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBandQ/StrippingPPMuMu.py
@@ -12,12 +12,11 @@
 Module for selecting Hc -> p pbar mu mu
 '''
 
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
+from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
 from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
-from Gaudi.Configuration import *
 __author__ = ['Liupan An']
 __date__ = '18/05/2017'
 __version__ = '$Revision: 1.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBandQ/StrippingXibc.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBandQ/StrippingXibc.py
index ed73d91a4d03fe2ff6427b7cd54ccc7ed18aeaa7..d0446cddfd42feba526eaf11c9d8cf13a4160779 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBandQ/StrippingXibc.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBandQ/StrippingXibc.py
@@ -47,17 +47,11 @@ __all__ = ('XibcBuilder'  # LineBuilder class specialization
            )
 
 
-from Gaudi.Configuration import *
-
 from Configurables import FilterDesktop, CombineParticles
 from PhysSelPython.Wrappers import Selection, AutomaticData, MergedSelection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 
-from CommonParticles.StdLooseLambda import StdLooseLambdaLL, StdLooseLambdaDD
-from GaudiKernel.SystemOfUnits import MeV, GeV, mm
-from Configurables import TisTosParticleTagger
-
 
 default_name = "Xibc"
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBandQ/StrippingXibcBDT.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBandQ/StrippingXibcBDT.py
index 5520ac91aac71eded5064eb9daf551c6b35891fe..28b1ca4c2d5b6567ed207d4b3cd2e8dcd52a9324 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBandQ/StrippingXibcBDT.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBandQ/StrippingXibcBDT.py
@@ -33,8 +33,6 @@ from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticle
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, MergedSelection, DataOnDemand
-from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays
-from Gaudi.Configuration import *
 __author__ = ['Jibo He']
 __date__ = '20/11/2016'
 __version__ = '$Revision: 1.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBandQ/StrippingXiccBDT.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBandQ/StrippingXiccBDT.py
index 0fda677dfb8d63acd803c2278c95da8b32d22700..7dde23cf7ee6e3329158f6ed2ef36ed1b1c5655c 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBandQ/StrippingXiccBDT.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBandQ/StrippingXiccBDT.py
@@ -30,9 +30,7 @@ Xicc+  -> D+ p+ K-
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, MergedSelection, DataOnDemand
-from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays
-from Gaudi.Configuration import *
+from PhysSelPython.Wrappers import DataOnDemand, Selection
 __author__ = ['Jibo He']
 __date__ = '20/11/2016'
 __version__ = '$Revision: 1.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBnoC/StrippingB24pLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBnoC/StrippingB24pLines.py
index db2b4d65bb393a5a34824d87b65ca2bcc983b9f0..a6b52e064494dc23ad635b49c2dc94e4e49e48a2 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBnoC/StrippingB24pLines.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBnoC/StrippingB24pLines.py
@@ -54,12 +54,10 @@ Exported symbols (use python help!):
    - 
 """
 
-from GaudiKernel.PhysicalConstants import c_light
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
-from Configurables import FilterDesktop, CombineParticles, DaVinci__N4BodyDecays
-from Gaudi.Configuration import *
+from Configurables import DaVinci__N4BodyDecays
 __author__ = ["Pietro Marino", "Oliver Gruenberg"]
 __date__ = "13.10.2017"
 __version__ = "$Revision: 3.0 $"
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBnoC/StrippingB2CharmlessInclusive.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBnoC/StrippingB2CharmlessInclusive.py
index 056df1189d8c6e124a4dcb4201ec68d8ac1fc40d..8ae9f04166a6ba66089d684f07c4dfc79cbbc333 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBnoC/StrippingB2CharmlessInclusive.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBnoC/StrippingB2CharmlessInclusive.py
@@ -16,9 +16,8 @@ from StandardParticles import StdLooseKsDD, StdLooseKsLL
 from StandardParticles import StdNoPIDsPions, StdLooseAllPhotons, StdLooseMergedPi0, StdLooseResolvedPi0
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand, SimpleSelection, MergedSelection
+from PhysSelPython.Wrappers import MergedSelection, Selection, SimpleSelection
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = ['Fred Blanc', 'Luca Pescatore']
 __date__ = '23/01/2019'
 __version__ = '$Revision: 3.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBnoC/StrippingB2HHBDT.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBnoC/StrippingB2HHBDT.py
index 79abd1433d68c905afd21b1351f2f1e6bf262fe2..766ad5b73bd949e01c06a43874566f2577422d8f 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBnoC/StrippingB2HHBDT.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBnoC/StrippingB2HHBDT.py
@@ -24,16 +24,13 @@ __all__ = ('B2HHBDTLines',
            'applyBDT',
            'default_config')
 
-from Gaudi.Configuration import *
 
-from GaudiKernel.SystemOfUnits import *
-
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 from StandardParticles import StdNoPIDsPions
 
 from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
-from StrippingUtils.Utils import LineBuilder, checkConfig
+from StrippingUtils.Utils import LineBuilder
 
 
 default_config = {
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBnoC/StrippingB2HHPi0.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBnoC/StrippingB2HHPi0.py
index 41030075a469c796d59ab39ed5a28a7259e9bfd5..e86c40013531bba411d27490eba92f97be414bac 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBnoC/StrippingB2HHPi0.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBnoC/StrippingB2HHPi0.py
@@ -27,9 +27,8 @@ __all__ = ('StrippingB2HHPi0Conf',
            'makeB2HHPi0M',
            'default_config')
 
-from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from PhysSelPython.Wrappers import Selection, DataOnDemand
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
+from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from StandardParticles import StdNoPIDsPions, StdLooseMergedPi0, StdLooseResolvedPi0
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBnoC/StrippingB2KShh.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBnoC/StrippingB2KShh.py
index f404e2a87328dc23eb64929a9a9f3cd002ddadcf..2dcd40aee03deb0e241de124f68de39f1abe783b 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBnoC/StrippingB2KShh.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBnoC/StrippingB2KShh.py
@@ -25,7 +25,6 @@ __version__ = 'Stripping24r1/Stripping26r1'
 __all__ = {'B2KShhConf',
            'default_config'}
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, DaVinci__N3BodyDecays
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBnoC/StrippingB2KShhh.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBnoC/StrippingB2KShhh.py
index f95cf109667b3401f5eb904c78285279c34d00b5..07d236ac77af02d637424d32f3f4e637192ba3e1 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBnoC/StrippingB2KShhh.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBnoC/StrippingB2KShhh.py
@@ -27,13 +27,13 @@ __all__ = ('B2KShhhConf',
 
 from Gaudi.Configuration import *
 
-from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N4BodyDecays
+from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays
 from StandardParticles import StdNoPIDsPions, StdNoPIDsKaons  # ipchi2 cut
 from StandardParticles import StdLooseKsDD, StdLooseKsLL
 
-from PhysSelPython.Wrappers import Selection, MergedSelection
+from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
-from StrippingUtils.Utils import LineBuilder, checkConfig
+from StrippingUtils.Utils import LineBuilder
 
 from Configurables import FilterDesktop
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBnoC/StrippingB2Ksthh.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBnoC/StrippingB2Ksthh.py
index 94a25a2714e9626cb22e6966b9ad7a1955d78eb9..a39998cb04eef71b62a1bf9337b6fb914d58a917 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBnoC/StrippingB2Ksthh.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBnoC/StrippingB2Ksthh.py
@@ -22,7 +22,6 @@ __version__ = 'Stripping26'
 __all__ = {'B2KsthhConf',
            'default_config'}
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
@@ -176,7 +175,7 @@ class B2KsthhConf(LineBuilder):
         _massCutHigh = "(AM<(5279+%s)*MeV)" % config['B_Mhigh']
         _aptCut = "(APT>%s*MeV)" % config['B_APTmin']
         _daugMedPtCut = "(ANUM(PT>%s*MeV)>=2)" % config['BDaug_MedPT_PT']
-        _daugMaxPtIPCut = "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['BDaug_MaxPT_IP']
+        "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['BDaug_MaxPT_IP']
         _daugPtSumCut = "((APT1+APT2+APT3)>%s*MeV)" % config['BDaug_PTsum']
 
         _combCuts = _aptCut
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBnoC/StrippingB2LambdapppLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBnoC/StrippingB2LambdapppLines.py
index 0ec9c6a5d1fcdda0149e8b14dea2ba22646ce64f..0ba12bf37a1af7f76282b079a6bb65d8b1d21f7e 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBnoC/StrippingB2LambdapppLines.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBnoC/StrippingB2LambdapppLines.py
@@ -23,7 +23,6 @@ __date__ = '05/02/2021'
 __version__ = 'Stripping29r2p2'
 __all__ = 'B2LambdapppLinesConf'
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
@@ -214,8 +213,8 @@ class B2LambdapppLinesConf(LineBuilder):
         _vtxCut = "(VFASPF(VCHI2)<%s)   " % config['Lambda_DD_VtxChi2']
         _fdChi2Cut = "(BPVVDCHI2>%s)" % config['Lambda_DD_FDChi2']
         _momCut = "(P>%s*MeV)" % config['Lambda_DD_Pmin']
-        _trkGhostProbCut1 = "(CHILDCUT((TRGHOSTPROB<%s),1))" % config['Trk_GhostProb']
-        _trkGhostProbCut2 = "(CHILDCUT((TRGHOSTPROB<%s),2))" % config['Trk_GhostProb']
+        "(CHILDCUT((TRGHOSTPROB<%s),1))" % config['Trk_GhostProb']
+        "(CHILDCUT((TRGHOSTPROB<%s),2))" % config['Trk_GhostProb']
 
         _allCuts = _momCut
         _allCuts += '&'+_massCut
@@ -270,8 +269,8 @@ class B2LambdapppLinesConf(LineBuilder):
         _vtxCut = "(VFASPF(VCHI2)<%s)   " % config['Lambda_DD_VtxChi2']
         _fdChi2Cut = "(BPVVDCHI2>%s)" % config['Lambda_DD_FDChi2']
         _momCut = "(P>%s*MeV)" % config['Lambda_DD_Pmin']
-        _trkGhostProbCut1 = "(CHILDCUT((TRGHOSTPROB<%s),1))" % config['Trk_GhostProb']
-        _trkGhostProbCut2 = "(CHILDCUT((TRGHOSTPROB<%s),2))" % config['Trk_GhostProb']
+        "(CHILDCUT((TRGHOSTPROB<%s),1))" % config['Trk_GhostProb']
+        "(CHILDCUT((TRGHOSTPROB<%s),2))" % config['Trk_GhostProb']
 
         _allCuts = _momCut
         _allCuts += '&'+_massCut
@@ -304,7 +303,7 @@ class B2LambdapppLinesConf(LineBuilder):
         _massCutHigh = "(AM<(5279+%s)*MeV)" % config['B0_Mhigh']
         _aptCut = "(APT>%s*MeV)" % config['B0_APTmin']
         _daugMedPtCut = "(ANUM(PT>%s*MeV)>=2)" % config['B0Daug_MedPT_PT']
-        _daugMaxPtIPCut = "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['B0Daug_MaxPT_IP']
+        "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['B0Daug_MaxPT_IP']
         _maxDocaChi2Cut = "(ACUTDOCACHI2(%s,''))" % config['B0Daug_DD_maxDocaChi2']
         _daugPtSumCut = "((APT1+APT2+APT3+APT4)>%s*MeV)" % config['B0Daug_DD_PTsum']
 
@@ -436,7 +435,7 @@ class B2LambdapppLinesConf(LineBuilder):
         _massCutHigh = "(AM<(5279+%s)*MeV)" % config['B0_Mhigh']
         _aptCut = "(APT>%s*MeV)" % config['B0_APTmin']
         _daugMedPtCut = "(ANUM(PT>%s*MeV)>=2)" % config['B0Daug_MedPT_PT']
-        _daugMaxPtIPCut = "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['B0Daug_MaxPT_IP']
+        "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['B0Daug_MaxPT_IP']
         _maxDocaChi2Cut = "(ACUTDOCACHI2(%s,''))" % config['B0Daug_LD_maxDocaChi2']
         _daugPtSumCut = "((APT1+APT2+APT3+APT4)>%s*MeV)" % config['B0Daug_LD_PTsum']
 
@@ -452,7 +451,7 @@ class B2LambdapppLinesConf(LineBuilder):
         _vtxChi2Cut = "(VFASPF(VCHI2)<%s)" % config['B0_VtxChi2']
         _diraCut = "(BPVDIRA>%s)" % config['B0_Dira']
         _ipChi2Cut = "(MIPCHI2DV(PRIMARY)<%s)" % config['B0_LD_IPCHI2wrtPV']
-        _fdCut = "(VFASPF(VMINVDDV(PRIMARY))>%s)" % config['B0_FDwrtPV']
+        "(VFASPF(VMINVDDV(PRIMARY))>%s)" % config['B0_FDwrtPV']
         _fdChi2Cut = "(BPVVDCHI2>%s)" % config['B0_LD_FDChi2']
 
         _motherCuts = _ptCut
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBnoC/StrippingB2TwoBaryons.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBnoC/StrippingB2TwoBaryons.py
index 8911a3d3bdc4a0add9f550c63095470ab59d4fef..93fef262a5bd7d8cd0abd1063e287bef85404e66 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBnoC/StrippingB2TwoBaryons.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBnoC/StrippingB2TwoBaryons.py
@@ -31,11 +31,10 @@ from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
 from StandardParticles import StdLooseProtons
 from StandardParticles import StdNoPIDsPions as Pions
-from CommonParticles.StdLooseLambda import StdLooseLambdaLL, StdLooseLambdaDD
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
-from StrippingUtils.Utils import LineBuilder, checkConfig
-from GaudiKernel.SystemOfUnits import MeV, GeV, mm, ns
+from StrippingUtils.Utils import LineBuilder
+from GaudiKernel.SystemOfUnits import GeV, MeV, mm
 
 default_config = {'NAME': 'B2TwoBaryons',
                   'WGs': ['BnoC'],
@@ -157,7 +156,7 @@ class B2TwoBaryonLines(LineBuilder):
 
         B2PPbarName = name + "B2PPbar"
 
-        B2PPSameSignName = name + "B2PPSameSign"
+        name + "B2PPSameSign"
 
         B2Lp_dd_name = name+'B2PLambdabarDD'
         B2Lp_ll_name = name+'B2PLambdabarLL'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBnoC/StrippingB2XEta.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBnoC/StrippingB2XEta.py
index e1adec50004bf9392e263cc5cb3ba465d4e08bf7..95fbd42162ff7cf67819bcb2ccbe2b4f88c30155 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBnoC/StrippingB2XEta.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBnoC/StrippingB2XEta.py
@@ -25,9 +25,7 @@ from StandardParticles import StdLoosePions as Pions
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, DaVinci__N3BodyDecays
-from PhysSelPython.Wrappers import DataOnDemand, Selection, SelectionSequence, MergedSelection
-from GaudiKernel import SystemOfUnits as Units
-from Gaudi.Configuration import *
+from PhysSelPython.Wrappers import DataOnDemand, MergedSelection, Selection
 __author__ = ['Timothy Williams']
 __date__ = '1/12/2016'
 __version__ = 'Stripping26r1'
@@ -564,7 +562,7 @@ class B2XEtaConf(LineBuilder):
         _trackCuts = _track_PT+'&'+_track_Chi2+'&'+_track_GPCut+'&'+_track_PIDCut
         _combCuts = _massCut+'&'+_docaCut
         _combCut12Doca = "ACHI2DOCA(1,2)<%s" % config['eta_DOCA']
-        _combCut12Vtx = "(VFASPF(VCHI2/VDOF)<%s)" % config['eta_vtxChi2']
+        "(VFASPF(VCHI2/VDOF)<%s)" % config['eta_vtxChi2']
         _combCut12 = _combCut12Doca
 
         # _eta3Pi=CombineParticles("eta3Pi",
@@ -592,7 +590,7 @@ class B2XEtaConf(LineBuilder):
         _trackCuts = _track_PT+'&'+_track_Chi2+'&'+_track_GPCut+'&'+_track_PIDCut
         _combCuts = _massCut+'&'+_docaCut
         _combCut12Doca = "ACHI2DOCA(1,2)<%s" % config['eta_prime_DOCA']
-        _combCut12Vtx = "(VFASPF(VCHI2/VDOF)<%s)" % config['eta_prime_vtxChi2']
+        "(VFASPF(VCHI2/VDOF)<%s)" % config['eta_prime_vtxChi2']
         _combCut12 = _combCut12Doca
 
         # _etap=CombineParticles("etap",
@@ -883,7 +881,7 @@ class B2XEtaConf(LineBuilder):
         _combCuts = _massCut+'&'+_docaCut
         _allCuts = _PTCut+'&'+_vtxCut+'&'+_diraCut+'&'+_IPChi2Cut
         _combCut12Doca = "ACHI2DOCA(1,2)<%s" % config['LbDaug_LL_maxDocaChi2']
-        _combCut12Vtx = "(VFASPF(VCHI2/VDOF)<%s)" % config['Lb_VtxChi2']
+        "(VFASPF(VCHI2/VDOF)<%s)" % config['Lb_VtxChi2']
         _combCut12 = _combCut12Doca
 
         _Lb2pKetap = DaVinci__N3BodyDecays(DecayDescriptor="[Lambda_b0 -> p+ K- eta_prime]cc",
@@ -921,7 +919,7 @@ class B2XEtaConf(LineBuilder):
         _combCuts = _massCut
         _allCuts = _PTCut+'&'+_IPChi2Cut+'&'+_vtxCut+'&'+_diraCut
         _combCut12Doca = "ACHI2DOCA(1,2)<%s" % config['LbDaug_LL_maxDocaChi2']
-        _combCut12Vtx = "(VFASPF(VCHI2/VDOF)<%s)" % config['Lb_VtxChi2']
+        "(VFASPF(VCHI2/VDOF)<%s)" % config['Lb_VtxChi2']
         _combCut12 = _combCut12Doca
 
         _Lb2pKeta3Pi = DaVinci__N3BodyDecays(DecayDescriptor="[Lambda_b0 -> p+ K- eta]cc",
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBnoC/StrippingB2a1Pi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBnoC/StrippingB2a1Pi.py
index 29c0766744b242c4ed1be4817cca727495bcb265..9f701cc986294843a275fb204128fb9f3c88fb1d 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBnoC/StrippingB2a1Pi.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBnoC/StrippingB2a1Pi.py
@@ -17,7 +17,6 @@ from Configurables import DaVinci__N4BodyDecays
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
-from Gaudi.Configuration import *
 __author__ = ['Daniel Vieira, Jibo He']
 __date__ = '01/12/2016'
 __version__ = '$Revision: 1.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBnoC/StrippingB2hhpipiPhsSpcCut.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBnoC/StrippingB2hhpipiPhsSpcCut.py
index 08e1d2943eafcfa9ad7d1764a6d5aab6ce3c9526..9fe5c82af0b14937c33c30fd9627961fa0731c0a 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBnoC/StrippingB2hhpipiPhsSpcCut.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBnoC/StrippingB2hhpipiPhsSpcCut.py
@@ -17,7 +17,6 @@ from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = ['Daniel Vieira']
 __date__ = '29/11/2018'
 __version__ = '$Revision: 1.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBnoC/StrippingB2pphh.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBnoC/StrippingB2pphh.py
old mode 100755
new mode 100644
index 3ca4b3b8698468a5e9192f982a9e957cc8f04fcd..5ffc4a205258784dd7d6fa4f2db5b17ae8cab900
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBnoC/StrippingB2pphh.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBnoC/StrippingB2pphh.py
@@ -25,16 +25,13 @@ __all__ = ('B2pphhConf',
            )
 
 
-from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop
+from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
 # from Configurables import DaVinci__N4BodyDecays
 from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays
 
-from StandardParticles import StdAllNoPIDsKaons, StdAllNoPIDsPions, StdAllNoPIDsProtons
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from Configurables import LoKi__VoidFilter as VoidFilter
 
 default_config = {
     'NAME': 'B2pphh',
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBnoC/StrippingBc2hhh_BnoC.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBnoC/StrippingBc2hhh_BnoC.py
index cc0952e7ed4c72dc5b618028ac8bc563928c126d..21b92fa5aab68df4d68f10c50e59c126b546bd31 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBnoC/StrippingBc2hhh_BnoC.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBnoC/StrippingBc2hhh_BnoC.py
@@ -23,13 +23,11 @@ Exported symbols (use python help!):
    - makeppK_excl  
 '''
 
-from Configurables import LoKi__VoidFilter as VoidFilter
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection
 import StandardParticles
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 __author__ = ['Alvaro Gomes', 'Adlene Hicheur']
 __date__ = '31/08/2014'
 __version__ = '$Revision: 1.5 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBnoC/StrippingBs2KKhh.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBnoC/StrippingBs2KKhh.py
index cc743704a31afe9960dc904fcabf1a694c0af26c..1f66a1746034805023be6fad668962c1444b5bf3 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBnoC/StrippingBs2KKhh.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBnoC/StrippingBs2KKhh.py
@@ -27,7 +27,6 @@ from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop
-from Gaudi.Configuration import *
 __author__ = ['Sean Benson', 'Adam Morris', 'Laurence Carson']
 __date__ = '22/11/2016'
 __version__ = '3.2'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBnoC/StrippingBs2KSKS_Run2.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBnoC/StrippingBs2KSKS_Run2.py
index 629ca8140bd72d6380100393e840bf791f2f2cd9..6afaa37fab4f411e76010a848c09d7d72e5a05d9 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBnoC/StrippingBs2KSKS_Run2.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBnoC/StrippingBs2KSKS_Run2.py
@@ -22,15 +22,11 @@ __date__ = '13/09/2016'
 __version__ = 'Run2'
 __all__ = {'Bs2KSKSConf', 'default_config'}
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
+from PhysSelPython.Wrappers import DataOnDemand, Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 
-from StandardParticles import StdNoPIDsPions as Pions
-from StandardParticles import StdNoPIDsDownPions as DownPions
-
 
 default_config = {
     'NAME': 'Bs2KSKS',
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBnoC/StrippingBs2Kst_0Kst_0.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBnoC/StrippingBs2Kst_0Kst_0.py
index 1792d39779b6c777714cf764c9c63f95a9aa76d3..ada24235be261d5f47f53047325233ba3176b326 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBnoC/StrippingBs2Kst_0Kst_0.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBnoC/StrippingBs2Kst_0Kst_0.py
@@ -19,11 +19,8 @@ Exported symbols (use python help!):
 
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, SelectionSequence, DataOnDemand
+from PhysSelPython.Wrappers import DataOnDemand, Selection
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-from CommonParticles.Utils import *
-from LHCbKernel.Configuration import *
-from Gaudi.Configuration import *
 __author__ = ['Brais Sanmartin Sedes']
 __date__ = '12/11/2015'
 __version__ = '5.1'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBnoC/StrippingBs2PhiKst0.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBnoC/StrippingBs2PhiKst0.py
index ceb8daa24373fc0cd210ec42fdbc56fd456f51e4..0c1ff7d620f2ef3058536bb8bbba7bedc35b168a 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBnoC/StrippingBs2PhiKst0.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBnoC/StrippingBs2PhiKst0.py
@@ -20,11 +20,8 @@ Exported symbols (use python help!):
 
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, SelectionSequence, DataOnDemand
+from PhysSelPython.Wrappers import DataOnDemand, Selection
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-from CommonParticles.Utils import *
-from LHCbKernel.Configuration import *
-from Gaudi.Configuration import *
 __author__ = ['Brais Sanmartin Sedes']
 __date__ = '01/12/2015'
 __version__ = '5.0'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBnoC/StrippingBs2PhiPhi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBnoC/StrippingBs2PhiPhi.py
index 0f280a3a06ba478759dc6e19bf80e278c15e5d40..1124dcdfd432c594fe79f1bc1e0b70fc24f9d21f 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBnoC/StrippingBs2PhiPhi.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBnoC/StrippingBs2PhiPhi.py
@@ -23,13 +23,10 @@ Exports the following stripping lines as instance data members:
 '''
 
 from StandardParticles import StdAllLooseANNKaons as MyLooseKaons
-from StandardParticles import StdLooseANNUpKaons as MyLooseUpKaons
-import StandardParticles
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
+from PhysSelPython.Wrappers import Selection
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 __author__ = ['Sean Benson']
 __date__ = '2013/08/15'
 __version__ = '3.0'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBnoC/StrippingBu2KSh.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBnoC/StrippingBu2KSh.py
index c20e2b517354f75fd95c5fdb10df32120f6a94ad..19a07b4fb4e96e5bfa5e548af2c1c8fb62036be0 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBnoC/StrippingBu2KSh.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBnoC/StrippingBu2KSh.py
@@ -23,7 +23,6 @@ __date__ = '16/12/2020'
 __version__ = 'Stripping28'
 __all__ = 'Bu2KShConf'
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
@@ -258,7 +257,7 @@ class Bu2KShConf(LineBuilder):
 
         _massCutLow = "(AM>(5279-%s)*MeV)" % config['B_Mlow']
         _massCutHigh = "(AM<(5279+%s)*MeV)" % config['B_Mhigh']
-        _daugMaxPtIPCut = "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['BDaug_MaxPT_IP']
+        "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['BDaug_MaxPT_IP']
         _daugPtSumCut = "((APT1+APT2)>%s*MeV)" % config['BDaug_DD_PTsum']
 
         _combCuts = _massCutLow
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBnoC/StrippingBu2Ksthh.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBnoC/StrippingBu2Ksthh.py
index 5a06d1502605fd2037a6b16043d5efb150ce86d5..032717bced65040c1e6edaf12520110a1398cd1d 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBnoC/StrippingBu2Ksthh.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBnoC/StrippingBu2Ksthh.py
@@ -23,7 +23,6 @@ __version__ = 'Stripping26'
 __all__ = {'Bu2KsthhConf',
            'default_config'}
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
@@ -302,7 +301,7 @@ class Bu2KsthhConf(LineBuilder):
         _massCutHigh = "(AM<(5279+%s)*MeV)" % config['B_Mhigh']
         _aptCut = "(APT>%s*MeV)" % config['B_APTmin']
         _daugMedPtCut = "(ANUM(PT>%s*MeV)>=2)" % config['BDaug_MedPT_PT']
-        _daugMaxPtIPCut = "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['BDaug_MaxPT_IP']
+        "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['BDaug_MaxPT_IP']
         _maxDocaChi2Cut = "(ACUTDOCACHI2(%s,''))" % config['BDaug_DD_maxDocaChi2']
         _daugPtSumCut = "((APT1+APT2+APT3)>%s*MeV)" % config['BDaug_DD_PTsum']
 
@@ -359,7 +358,7 @@ class Bu2KsthhConf(LineBuilder):
         _massCutHigh = "(AM<(5279+%s)*MeV)" % config['B_Mhigh']
         _aptCut = "(APT>%s*MeV)" % config['B_APTmin']
         _daugMedPtCut = "(ANUM(PT>%s*MeV)>=2)" % config['BDaug_MedPT_PT']
-        _daugMaxPtIPCut = "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['BDaug_MaxPT_IP']
+        "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['BDaug_MaxPT_IP']
         _maxDocaChi2Cut = "(ACUTDOCACHI2(%s,''))" % config['BDaug_LL_maxDocaChi2']
         _daugPtSumCut = "((APT1+APT2+APT3)>%s*MeV)" % config['BDaug_LL_PTsum']
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBnoC/StrippingBu2hhh.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBnoC/StrippingBu2hhh.py
index 890eba4692dbe06517c0d7aee8f51d320cca8a64..62ede4129b7f2bd6ff173b27d26ebf7e47e4e6ea 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBnoC/StrippingBu2hhh.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBnoC/StrippingBu2hhh.py
@@ -22,13 +22,11 @@ Exported symbols (use python help!):
    - makepph_incl
 '''
 
-from Configurables import LoKi__VoidFilter as VoidFilter
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection
 import StandardParticles
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 __author__ = ['Irina Nasteva', 'Jussara Miranda', 'Alvaro Gomes']
 __date__ = '19/05/2017'
 __version__ = 'Stripping29'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBnoC/StrippingBu2rho0rhoPlus.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBnoC/StrippingBu2rho0rhoPlus.py
index 6ff36ce6304e5d819eb96fe6ca06587bb1baa6cc..51df1d5067b9100ee67537610b0005b048a5d51f 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBnoC/StrippingBu2rho0rhoPlus.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBnoC/StrippingBu2rho0rhoPlus.py
@@ -21,7 +21,6 @@ from StrippingUtils.Utils import LineBuilder, checkConfig
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = "Jason E Andrews"
 __date__ = "26/11/2016"
 __version__ = "4.0"
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBnoC/StrippingButo5h.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBnoC/StrippingButo5h.py
index be4eeb8a2dc0617afde7aab5929540d3bc8d05c7..65e1b29f0dde00492a6a5432e53292b9bc4c81a7 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBnoC/StrippingButo5h.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBnoC/StrippingButo5h.py
@@ -23,13 +23,11 @@ Exported symbols (use python help!):
    - makeppKpipi_excl
 '''
 
-from Configurables import LoKi__VoidFilter as VoidFilter
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection
 import StandardParticles
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 __author__ = ['Luiz Gustavo de Oliveira',
               'Alvaro Gomes', 'Bruno Souza de Paula']
 __date__ = '22/Aug/2014'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBnoC/StrippingD2HHBDT.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBnoC/StrippingD2HHBDT.py
index 6bee345112d54e258044f31f0e7d809849b112f7..98ef43000bc5732a81fe2e10bace645263334787 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBnoC/StrippingD2HHBDT.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBnoC/StrippingD2HHBDT.py
@@ -23,14 +23,13 @@ __all__ = ('D2HHBDTLines',
            'makeD2HHBDT',
            'default_config')
 
-from Gaudi.Configuration import *
 
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
 from StandardParticles import StdNoPIDsKaons, StdAllNoPIDsPions
 
 from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
-from StrippingUtils.Utils import LineBuilder, checkConfig
+from StrippingUtils.Utils import LineBuilder
 
 
 default_config = {
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBnoC/StrippingHb2Charged2Body.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBnoC/StrippingHb2Charged2Body.py
index 11da99218434ae71c894fa73b708dca4ee60de5d..3b3424d2fb6688333e151f52793701a7a2c00dbe 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBnoC/StrippingHb2Charged2Body.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBnoC/StrippingHb2Charged2Body.py
@@ -23,14 +23,13 @@ __all__ = ('Hb2Charged2BodyLines',
            'makeB2Charged2Body',
            'default_config')
 
-from Gaudi.Configuration import *
 
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-from StandardParticles import StdNoPIDsPions, StdLooseProtons, StdLooseKaons
+from StandardParticles import StdNoPIDsPions
 
 from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
-from StrippingUtils.Utils import LineBuilder, checkConfig
+from StrippingUtils.Utils import LineBuilder
 
 
 default_config = {
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBnoC/StrippingHb2V0V0h.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBnoC/StrippingHb2V0V0h.py
index 6b1c9eb94b261dbc185e979f0314ffe2bd69f930..f3104c9b58e73817c70f7fa7e3d68a0b9ecf0860 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBnoC/StrippingHb2V0V0h.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBnoC/StrippingHb2V0V0h.py
@@ -22,7 +22,6 @@ __date__ = '10/02/2017'
 __version__ = 'Stripping28'
 __all__ = 'Hb2V0V0hConf'
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBnoC/StrippingLb2V0hh.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBnoC/StrippingLb2V0hh.py
index f63034e02f45426009146384bed4036d16056a26..e896944db6cf521ad12d86186f9bda930b5bfd87 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBnoC/StrippingLb2V0hh.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBnoC/StrippingLb2V0hh.py
@@ -25,7 +25,6 @@ __date__ = '11/01/2017'
 __version__ = 'Stripping28'
 __all__ = 'Lb2V0hhConf'
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
@@ -211,8 +210,8 @@ class Lb2V0hhConf(LineBuilder):
         _vtxCut = "(VFASPF(VCHI2)<%s)   " % config['Lambda_DD_VtxChi2']
         _fdChi2Cut = "(BPVVDCHI2>%s)" % config['Lambda_DD_FDChi2']
         _momCut = "(P>%s*MeV)" % config['Lambda_DD_Pmin']
-        _trkGhostProbCut1 = "(CHILDCUT((TRGHOSTPROB<%s),1))" % config['Trk_GhostProb']
-        _trkGhostProbCut2 = "(CHILDCUT((TRGHOSTPROB<%s),2))" % config['Trk_GhostProb']
+        "(CHILDCUT((TRGHOSTPROB<%s),1))" % config['Trk_GhostProb']
+        "(CHILDCUT((TRGHOSTPROB<%s),2))" % config['Trk_GhostProb']
 
         _allCuts = _momCut
         _allCuts += '&'+_massCut
@@ -268,8 +267,8 @@ class Lb2V0hhConf(LineBuilder):
         _vtxCut = "(VFASPF(VCHI2)<%s)   " % config['Lambda_DD_VtxChi2']
         _fdChi2Cut = "(BPVVDCHI2>%s)" % config['Lambda_DD_FDChi2']
         _momCut = "(P>%s*MeV)" % config['Lambda_DD_Pmin']
-        _trkGhostProbCut1 = "(CHILDCUT((TRGHOSTPROB<%s),1))" % config['Trk_GhostProb']
-        _trkGhostProbCut2 = "(CHILDCUT((TRGHOSTPROB<%s),2))" % config['Trk_GhostProb']
+        "(CHILDCUT((TRGHOSTPROB<%s),1))" % config['Trk_GhostProb']
+        "(CHILDCUT((TRGHOSTPROB<%s),2))" % config['Trk_GhostProb']
 
         _allCuts = _momCut
         _allCuts += '&'+_massCut
@@ -302,7 +301,7 @@ class Lb2V0hhConf(LineBuilder):
         _massCutHigh = "(AM<(5619+%s)*MeV)" % config['Lb_2bodyMhigh']
         _aptCut = "(APT>%s*MeV)" % config['Lb_APTmin']
         _daugMedPtCut = "(ANUM(PT>%s*MeV)>=2)" % config['LbDaug_MedPT_PT']
-        _daugMaxPtIPCut = "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP']
+        "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP']
         _maxDocaChi2Cut = "(ACUTDOCACHI2(%s,''))" % config['LbDaug_DD_maxDocaChi2']
         _daugPtSumCut = "(APT1>%s*MeV)" % config['Lbh_DD_PTMin']
 
@@ -353,7 +352,7 @@ class Lb2V0hhConf(LineBuilder):
         _massCutHigh = "(AM<(5619+%s)*MeV)" % config['Lb_Mhigh']
         _aptCut = "(APT>%s*MeV)" % config['Lb_APTmin']
         _daugMedPtCut = "(ANUM(PT>%s*MeV)>=2)" % config['LbDaug_MedPT_PT']
-        _daugMaxPtIPCut = "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP']
+        "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP']
         _maxDocaChi2Cut = "(ACUTDOCACHI2(%s,''))" % config['LbDaug_DD_maxDocaChi2']
         _daugPtSumCut = "((APT1+APT2+APT3)>%s*MeV)" % config['LbDaug_DD_PTsum']
 
@@ -369,7 +368,7 @@ class Lb2V0hhConf(LineBuilder):
         _vtxChi2Cut = "(VFASPF(VCHI2)<%s)" % config['Lb_VtxChi2']
         _diraCut = "(BPVDIRA>%s)" % config['Lb_DD_Dira']
         _ipChi2Cut = "(MIPCHI2DV(PRIMARY)<%s)" % config['Lb_DD_IPCHI2wrtPV']
-        _fdCut = "(VFASPF(VMINVDDV(PRIMARY))>%s)" % config['Lb_FDwrtPV']
+        "(VFASPF(VMINVDDV(PRIMARY))>%s)" % config['Lb_FDwrtPV']
         _fdChi2Cut = "(BPVVDCHI2>%s)" % config['Lb_DD_FDChi2']
 
         _motherCuts = _ptCut
@@ -541,7 +540,7 @@ class Lb2V0hhConf(LineBuilder):
         _massCutHigh = "(AM<(5619+%s)*MeV)" % config['Lb_2bodyMhigh']
         _aptCut = "(APT>%s*MeV)" % config['Lb_APTmin']
         _daugMedPtCut = "(ANUM(PT>%s*MeV)>=2)" % config['LbDaug_MedPT_PT']
-        _daugMaxPtIPCut = "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP']
+        "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP']
         _maxDocaChi2Cut = "(ACUTDOCACHI2(%s,''))" % config['LbDaug_LD_maxDocaChi2']
         _daugPtSumCut = "(APT1>%s*MeV)" % config['Lbh_LD_PTMin']
 
@@ -592,7 +591,7 @@ class Lb2V0hhConf(LineBuilder):
         _massCutHigh = "(AM<(5619+%s)*MeV)" % config['Lb_Mhigh']
         _aptCut = "(APT>%s*MeV)" % config['Lb_APTmin']
         _daugMedPtCut = "(ANUM(PT>%s*MeV)>=2)" % config['LbDaug_MedPT_PT']
-        _daugMaxPtIPCut = "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP']
+        "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP']
         _maxDocaChi2Cut = "(ACUTDOCACHI2(%s,''))" % config['LbDaug_LD_maxDocaChi2']
         _daugPtSumCut = "((APT1+APT2+APT3)>%s*MeV)" % config['LbDaug_LD_PTsum']
 
@@ -608,7 +607,7 @@ class Lb2V0hhConf(LineBuilder):
         _vtxChi2Cut = "(VFASPF(VCHI2)<%s)" % config['Lb_VtxChi2']
         _diraCut = "(BPVDIRA>%s)" % config['Lb_LD_Dira']
         _ipChi2Cut = "(MIPCHI2DV(PRIMARY)<%s)" % config['Lb_LD_IPCHI2wrtPV']
-        _fdCut = "(VFASPF(VMINVDDV(PRIMARY))>%s)" % config['Lb_FDwrtPV']
+        "(VFASPF(VMINVDDV(PRIMARY))>%s)" % config['Lb_FDwrtPV']
         _fdChi2Cut = "(BPVVDCHI2>%s)" % config['Lb_LD_FDChi2']
 
         _motherCuts = _ptCut
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBnoC/StrippingLb2V0pp.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBnoC/StrippingLb2V0pp.py
index d92d1478ca2c73294da21c0b6bc19613f859f611..c412d7f27a1feaee550033f21cd6465948758d57 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBnoC/StrippingLb2V0pp.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBnoC/StrippingLb2V0pp.py
@@ -24,7 +24,6 @@ __date__ = '06/01/2019'
 __version__ = 'Stripping29r2p1'
 __all__ = 'Lb2V0ppConf'
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
@@ -210,8 +209,8 @@ class Lb2V0ppConf(LineBuilder):
         _vtxCut = "(VFASPF(VCHI2)<%s)   " % config['Lambda_DD_VtxChi2']
         _fdChi2Cut = "(BPVVDCHI2>%s)" % config['Lambda_DD_FDChi2']
         _momCut = "(P>%s*MeV)" % config['Lambda_DD_Pmin']
-        _trkGhostProbCut1 = "(CHILDCUT((TRGHOSTPROB<%s),1))" % config['Trk_GhostProb']
-        _trkGhostProbCut2 = "(CHILDCUT((TRGHOSTPROB<%s),2))" % config['Trk_GhostProb']
+        "(CHILDCUT((TRGHOSTPROB<%s),1))" % config['Trk_GhostProb']
+        "(CHILDCUT((TRGHOSTPROB<%s),2))" % config['Trk_GhostProb']
 
         _allCuts = _momCut
         _allCuts += '&'+_massCut
@@ -266,8 +265,8 @@ class Lb2V0ppConf(LineBuilder):
         _vtxCut = "(VFASPF(VCHI2)<%s)   " % config['Lambda_DD_VtxChi2']
         _fdChi2Cut = "(BPVVDCHI2>%s)" % config['Lambda_DD_FDChi2']
         _momCut = "(P>%s*MeV)" % config['Lambda_DD_Pmin']
-        _trkGhostProbCut1 = "(CHILDCUT((TRGHOSTPROB<%s),1))" % config['Trk_GhostProb']
-        _trkGhostProbCut2 = "(CHILDCUT((TRGHOSTPROB<%s),2))" % config['Trk_GhostProb']
+        "(CHILDCUT((TRGHOSTPROB<%s),1))" % config['Trk_GhostProb']
+        "(CHILDCUT((TRGHOSTPROB<%s),2))" % config['Trk_GhostProb']
 
         _allCuts = _momCut
         _allCuts += '&'+_massCut
@@ -300,7 +299,7 @@ class Lb2V0ppConf(LineBuilder):
         _massCutHigh = "(AM<(5619+%s)*MeV)" % config['Lb_2bodyMhigh']
         _aptCut = "(APT>%s*MeV)" % config['Lb_APTmin']
         _daugMedPtCut = "(ANUM(PT>%s*MeV)>=2)" % config['LbDaug_MedPT_PT']
-        _daugMaxPtIPCut = "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP']
+        "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP']
         _maxDocaChi2Cut = "(ACUTDOCACHI2(%s,''))" % config['LbDaug_DD_maxDocaChi2']
         _daugPtSumCut = "(APT1>%s*MeV)" % config['Lbh_DD_PTMin']
 
@@ -351,7 +350,7 @@ class Lb2V0ppConf(LineBuilder):
         _massCutHigh = "(AM<(5619+%s)*MeV)" % config['Lb_Mhigh']
         _aptCut = "(APT>%s*MeV)" % config['Lb_APTmin']
         _daugMedPtCut = "(ANUM(PT>%s*MeV)>=2)" % config['LbDaug_MedPT_PT']
-        _daugMaxPtIPCut = "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP']
+        "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP']
         _maxDocaChi2Cut = "(ACUTDOCACHI2(%s,''))" % config['LbDaug_DD_maxDocaChi2']
         _daugPtSumCut = "((APT1+APT2+APT3)>%s*MeV)" % config['LbDaug_DD_PTsum']
 
@@ -540,7 +539,7 @@ class Lb2V0ppConf(LineBuilder):
         _massCutHigh = "(AM<(5619+%s)*MeV)" % config['Lb_2bodyMhigh']
         _aptCut = "(APT>%s*MeV)" % config['Lb_APTmin']
         _daugMedPtCut = "(ANUM(PT>%s*MeV)>=2)" % config['LbDaug_MedPT_PT']
-        _daugMaxPtIPCut = "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP']
+        "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP']
         _maxDocaChi2Cut = "(ACUTDOCACHI2(%s,''))" % config['LbDaug_LD_maxDocaChi2']
         _daugPtSumCut = "(APT1>%s*MeV)" % config['Lbh_LD_PTMin']
 
@@ -591,7 +590,7 @@ class Lb2V0ppConf(LineBuilder):
         _massCutHigh = "(AM<(5619+%s)*MeV)" % config['Lb_Mhigh']
         _aptCut = "(APT>%s*MeV)" % config['Lb_APTmin']
         _daugMedPtCut = "(ANUM(PT>%s*MeV)>=2)" % config['LbDaug_MedPT_PT']
-        _daugMaxPtIPCut = "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP']
+        "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP']
         _maxDocaChi2Cut = "(ACUTDOCACHI2(%s,''))" % config['LbDaug_LD_maxDocaChi2']
         _daugPtSumCut = "((APT1+APT2+APT3)>%s*MeV)" % config['LbDaug_LD_PTsum']
 
@@ -607,7 +606,7 @@ class Lb2V0ppConf(LineBuilder):
         _vtxChi2Cut = "(VFASPF(VCHI2)<%s)" % config['Lb_VtxChi2']
         _diraCut = "(BPVDIRA>%s)" % config['Lb_LD_Dira']
         _ipChi2Cut = "(MIPCHI2DV(PRIMARY)<%s)" % config['Lb_LD_IPCHI2wrtPV']
-        _fdCut = "(VFASPF(VMINVDDV(PRIMARY))>%s)" % config['Lb_FDwrtPV']
+        "(VFASPF(VMINVDDV(PRIMARY))>%s)" % config['Lb_FDwrtPV']
         _fdChi2Cut = "(BPVVDCHI2>%s)" % config['Lb_LD_FDChi2']
 
         _motherCuts = _ptCut
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBnoC/StrippingXb23ph.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBnoC/StrippingXb23ph.py
index 44ba838d436b418c4eaef7372eccd95c28426134..ef24837631cfc50b46aabe0cc7dba0c8cdeb66fd 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBnoC/StrippingXb23ph.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBnoC/StrippingXb23ph.py
@@ -22,7 +22,6 @@ from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, DaVinci__N4Body
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection
-from Gaudi.Configuration import *
 __author__ = ['Jinlin Fu', 'Maurizio Martinelli', 'Andrea Merli']
 __date__ = '12/11/2015'
 __version__ = 'v1r0'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBnoC/StrippingXb2p3h.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBnoC/StrippingXb2p3h.py
index d07d7e52c17b8a01201968b3a1b929751c31bc9d..2c10d1f20bf15892c5e8ef6a5861130250a0a8ae 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBnoC/StrippingXb2p3h.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBnoC/StrippingXb2p3h.py
@@ -22,7 +22,6 @@ from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, DaVinci__N4Body
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection
-from Gaudi.Configuration import *
 __author__ = ['Jan Mickelle V. Maratas', 'Stephane Monteil', 'Andrea Merli']
 __date__ = '01/04/2016'
 __version__ = 'v1r0'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBnoC/StrippingXb2p3h_raw.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBnoC/StrippingXb2p3h_raw.py
index 54b56a99649dbbae2fa5505485204b16e7c17175..7b8a9c8dd3a6a8c7980cb3157c119b8bb1331c8c 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBnoC/StrippingXb2p3h_raw.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBnoC/StrippingXb2p3h_raw.py
@@ -27,7 +27,6 @@ from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, DaVinci__N4Body
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection
-from Gaudi.Configuration import *
 __author__ = ['Gediminas Sarpis', 'Hendrik Jage']
 __date__ = '06/04/2021'
 __version__ = 'v1r0'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBnoC/StrippingXb2phh.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBnoC/StrippingXb2phh.py
index ae62ac803dcda11696229820fa7bcb3737c75114..35432dcb4a93cdbf47f1ec738735037534d82c07 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBnoC/StrippingXb2phh.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBnoC/StrippingXb2phh.py
@@ -22,7 +22,6 @@ from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, DaVinci__N3Body
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection
-from Gaudi.Configuration import *
 __author__ = ['Jan Mickelle V. Maratas', 'Stephane Monteil', 'Thomas Latham']
 __date__ = '24/11/2016'
 __version__ = 'v1r0'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBnoC/StrippingXib2LbXLb2ph.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBnoC/StrippingXib2LbXLb2ph.py
index 2f1d600f02b741a026b3e2f28b3f1017b3d73a94..6f8394542abca63eac6f7c229f3b310eaa651423 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBnoC/StrippingXib2LbXLb2ph.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingBnoC/StrippingXib2LbXLb2ph.py
@@ -21,7 +21,6 @@ __version__ = "1.0"
 __all__ = ("Xib2LbXLb2phLines",
            "default_config")
 
-from Gaudi.Configuration import *
 
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop
 from StandardParticles import (StdAllNoPIDsPions,
@@ -30,7 +29,7 @@ from StandardParticles import (StdAllNoPIDsPions,
 
 from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
-from StrippingUtils.Utils import LineBuilder, checkConfig
+from StrippingUtils.Utils import LineBuilder
 
 
 default_config = {
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCalib/StrippingCharmFromBSemiForHadronAsy.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCalib/StrippingCharmFromBSemiForHadronAsy.py
index c458c3e6c38ed0b1337c2e69289afaa140b1e0f3..98fad852e24de6fd9dc371c05e6185a34f3863c8 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCalib/StrippingCharmFromBSemiForHadronAsy.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCalib/StrippingCharmFromBSemiForHadronAsy.py
@@ -19,14 +19,12 @@ __author__ = ['Mika Vesterinen']
 __date__ = '10/03/2013'
 __version__ = '$Revision: 0.0 $'
 
-from Gaudi.Configuration import *
 
 from Configurables import FilterDesktop, CombineParticles
 from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from StandardParticles import StdAllLoosePions, StdLoosePions, StdLooseMuons, StdLooseKaons, StdLooseProtons
-from Configurables import TisTosParticleTagger
+from StandardParticles import StdLooseKaons, StdLooseMuons, StdLoosePions
 
 __all__ = ('CharmFromBSemiForHadronAsyAllLinesConf',
            'TOSFilter',
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCalib/StrippingCharmFromBSemiForProtonPID.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCalib/StrippingCharmFromBSemiForProtonPID.py
index 6c6f284aa3e1a4515a633a71cb0e569c1bd4ad6f..4afa986a85d324f44e240132151f3ef9c83846fe 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCalib/StrippingCharmFromBSemiForProtonPID.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCalib/StrippingCharmFromBSemiForProtonPID.py
@@ -18,12 +18,11 @@ __author__ = ['Mika Vesterinen']
 __date__ = '19/03/2013'
 __version__ = '$Revision: 0.0 $'
 
-from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from StandardParticles import StdLoosePions, StdLooseMuons, StdLooseKaons, StdLooseProtons, StdNoPIDsProtons
+from StandardParticles import StdLooseKaons, StdLooseMuons, StdLoosePions, StdNoPIDsProtons
 
 __all__ = ('CharmFromBSemiForProtonPIDAllLinesConf',
            'default_config')
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCalib/StrippingD02KPiPi0.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCalib/StrippingD02KPiPi0.py
index b8f25c6552ad8b11e685418ec13a2ac622d2bef8..7fd939520aebcb1dc21eb98628f0836710acb20c 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCalib/StrippingD02KPiPi0.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCalib/StrippingD02KPiPi0.py
@@ -25,9 +25,8 @@ __all__ = ('StrippingD02KPiPi0Conf',
            'makeD02KPiPi0M',
            'default_config')
 
-from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from PhysSelPython.Wrappers import Selection, DataOnDemand
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
+from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from StandardParticles import StdTightPions, StdTightKaons, StdLooseMergedPi0, StdLooseResolvedPi0
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCalib/StrippingD02KPiPi0DalitzPartReco.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCalib/StrippingD02KPiPi0DalitzPartReco.py
index ac92a6c8cd5234f3436c2a8b2ed17b8fbf90700a..c14b9b11f394fd5c53a93657f063a53eb32b8e66 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCalib/StrippingD02KPiPi0DalitzPartReco.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCalib/StrippingD02KPiPi0DalitzPartReco.py
@@ -8,9 +8,7 @@
 # granted to it by virtue of its status as an Intergovernmental Organization  #
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
-import logging
 from StrippingUtils.Utils import LineBuilder
-from Gaudi.Configuration import *
 __author__ = ['Greg Ciezarek', 'Liang Sun', 'Adam Davis']
 __date__ = '18/05/2017'
 __version__ = '$Revision: 0.01 $'
@@ -75,7 +73,6 @@ class D2KPiPi0_PartRecoBuilder(LineBuilder):
     def __init__(self, name, config):
         LineBuilder.__init__(self, name, config)
         self._config = config
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
 
         # self.GECs = { "Code":"( recSummaryTrack(LHCb.RecSummary.nLongTracks, TrLONG) < %(GEC_nLongTrk)s )" % config,
         #              "Preambulo": ["from LoKiTracks.decorators import *"]}
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCalib/StrippingD02KPiPi0ForPid.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCalib/StrippingD02KPiPi0ForPid.py
index 6f502e7b92276310034a27e5fd188203063b8350..1f1c5f4a96bfdb04ae00ab2d5fb2184b92015419 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCalib/StrippingD02KPiPi0ForPid.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCalib/StrippingD02KPiPi0ForPid.py
@@ -26,9 +26,8 @@ __all__ = ('StrippingD02KPiPi0ForPidConf',
            'makeD02KPiPi0R',
            'default_config')
 
-from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from PhysSelPython.Wrappers import Selection, DataOnDemand
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
+from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from StandardParticles import StdTightPions, StdTightKaons, StdLoosePi02gg
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCalib/StrippingD0ForBXX.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCalib/StrippingD0ForBXX.py
index bd7db7dbc518eb886e4f9c11699b772d11dd126b..b5eea4d7cb0b283585ff2aa80e59a84aa67c7051 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCalib/StrippingD0ForBXX.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCalib/StrippingD0ForBXX.py
@@ -20,7 +20,7 @@ from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from StandardParticles import StdLoosePions, StdLooseKaons, StdLooseProtons, StdAllLoosePions
+from StandardParticles import StdAllLoosePions, StdLooseKaons, StdLoosePions
 
 
 name = 'confD0forBXX'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCalib/StrippingDst2D0Pi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCalib/StrippingDst2D0Pi.py
index 358d6686a90229ac8215c49a120d8d39a24f3782..950314e237b7c1d7dce7b114455055e68e74337a 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCalib/StrippingDst2D0Pi.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCalib/StrippingDst2D0Pi.py
@@ -40,9 +40,8 @@ __all__ = ('StrippingDst2D0PiConf',
            'makeDst2D0Pi',
            'default_config')
 
-from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from PhysSelPython.Wrappers import Selection, DataOnDemand
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
+from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from StandardParticles import StdTightPions, StdTightKaons, StdLooseAllPhotons, StdNoPIDsPions, StdLooseEta2gg, StdLoosePi02gg
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCalib/StrippingDstarD02hhPi0PartRecoForPhotonCalib.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCalib/StrippingDstarD02hhPi0PartRecoForPhotonCalib.py
index c047319a0d29671f7d4c7014634dc5022216c4b1..64e2e664295d9a3c9a8838dc88b17ef52239465f 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCalib/StrippingDstarD02hhPi0PartRecoForPhotonCalib.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCalib/StrippingDstarD02hhPi0PartRecoForPhotonCalib.py
@@ -33,15 +33,15 @@ from Gaudi.Configuration import *
 
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 from StandardParticles import StdAllNoPIDsPions, StdNoPIDsPions, StdNoPIDsKaons
-from StandardParticles import StdLooseAllPhotons, StdLooseResolvedPi0, StdLooseMergedPi0
+from StandardParticles import StdLooseAllPhotons
 
 from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
-from StrippingUtils.Utils import LineBuilder, checkConfig
+from StrippingUtils.Utils import LineBuilder
 
 from Configurables import FilterDesktop
 
-from GaudiKernel.SystemOfUnits import GeV, MeV, picosecond, mm
+from GaudiKernel.SystemOfUnits import GeV, MeV, picosecond
 
 default_config = {
     'NAME': 'DstarD2hhGammaCalib',
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCalib/StrippingElectronID.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCalib/StrippingElectronID.py
index 72e0b978a3903918cb2e81036f8a3395dc92c2ac..56eb58e212609824a2c911d14ada1ceb27e0fc98 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCalib/StrippingElectronID.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCalib/StrippingElectronID.py
@@ -23,9 +23,8 @@ stream.appendLines( [
 
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand
+from PhysSelPython.Wrappers import Selection
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = ['Jibo He', 'Vitalii Lisovskyi']
 __date__ = '21/06/2021'
 __version__ = '$Revision: 1.2 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCalib/StrippingElectronRecoEff.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCalib/StrippingElectronRecoEff.py
index c19ff961c1db5ef3bfbfb03a4d9133a4c8888bdf..bdb2892004f5f8e6c93bb551bb939895eca5eb63 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCalib/StrippingElectronRecoEff.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCalib/StrippingElectronRecoEff.py
@@ -17,17 +17,15 @@ from StandardParticles import StdAllLoosePions as Hlt2Pions
 from StandardParticles import StdAllLooseKaons as Hlt2Kaons
 from StandardParticles import StdNoPIDsElectrons as Hlt2Electrons
 from StandardParticles import StdNoPIDsMuons as Hlt2Muons
-from TrackFitter.ConfiguredFitters import (ConfiguredEventFitter,
-                                           ConfiguredForwardStraightLineEventFitter)
+from TrackFitter.ConfiguredFitters import ConfiguredEventFitter
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import DataOnDemand, MergedSelection
 from PhysConf.Selections import L0TOSSelection
 from PhysConf.Selections import Hlt1TOSSelection
 from PhysConf.Selections import Hlt2TOSSelection
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 from StrippingUtils.Utils import LineBuilder
-from GaudiKernel.SystemOfUnits import GeV, MeV, mm
+from GaudiKernel.SystemOfUnits import MeV, mm
 from Gaudi.Configuration import *
 __author__ = ['Adam Davis', 'Laurent Dufour', 'V. V. Gligorov']
 __date__ = '14/1/2018'
@@ -45,10 +43,9 @@ from PhysSelPython.Wrappers import Selection, Hlt1Selection, Hlt2Selection, L0Se
 from SelPy.utils import (UniquelyNamedObject,
                          ClonableObject,
                          SelectionBase)
-from Configurables import (DecodeVeloRawBuffer, FastVeloTracking, TrackPrepareVelo,
-                           NoPIDsParticleMaker, DataOnDemandSvc, ChargedProtoParticleMaker,
-                           PrTrackAssociator, DelegatingTrackSelector, TrackContainerCopy, TrackAssociator,
-                           TrackStateInitAlg, TrackStateInitTool)
+from Configurables import (FastVeloTracking, NoPIDsParticleMaker, DataOnDemandSvc,
+                           ChargedProtoParticleMaker, DelegatingTrackSelector, TrackContainerCopy,
+                           TrackStateInitAlg)
 
 default_config = {'NAME': 'ElectronRecoEff',
                   'WGs': ['Calib'],
@@ -287,7 +284,6 @@ class StrippingElectronRecoEffLines(LineBuilder):
     def __init__(self, name, config):
         LineBuilder.__init__(self, name, config)
 
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
         self._config = config
         self.name = name
 
@@ -571,7 +567,7 @@ class StrippingElectronRecoEffLines(LineBuilder):
         )
 
     def DetachedEEKPair(self, _name):
-        configuration = self._config["DetachedEEK"]
+        self._config["DetachedEEK"]
 
         _DetachedEEKPair = self.getCPForEEK("DetachedEEK")
         _DetachedEEKPair_Sel = Selection("SelEEK_for_"+_name,
@@ -591,7 +587,7 @@ class StrippingElectronRecoEffLines(LineBuilder):
         return line
 
     def DetachedEEKstarPair(self, _name):
-        configuration = self._config["DetachedEEKstar"]
+        self._config["DetachedEEKstar"]
 
         _DetachedEEKstarPair = self.getCPForEEK("DetachedEEKstar")
         _DetachedEEKstarPair_Sel = Selection("SelEEKstar_for_"+_name,
@@ -611,7 +607,7 @@ class StrippingElectronRecoEffLines(LineBuilder):
         return line
 
     def DetachedEEPhiPair(self, _name):
-        configuration = self._config["DetachedEEPhi"]
+        self._config["DetachedEEPhi"]
 
         _DetachedEEPhiPair = self.getCPForEEK("DetachedEEPhi")
         _DetachedEEPhiPair_Sel = Selection("SelEEPhi_for_"+_name,
@@ -882,7 +878,6 @@ class StrippingElectronRecoEffLines(LineBuilder):
     def MakeVeloTracks(self, prefilter):
         if self._config["DoVeloDecoding"]:
             from DAQSys.Decoders import DecoderDB
-            from DAQSys.DecoderClass import decodersForBank
             decs = []
             vdec = DecoderDB["DecodeVeloRawBuffer/createBothVeloClusters"]
             vdec.Active = True
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCalib/StrippingEta2MuMuGamma.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCalib/StrippingEta2MuMuGamma.py
index d630ed353d2eb2d94d19a56b244c69c9caf27e10..be5c53aa3ff42aae5af4ba267827e15e06181149 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCalib/StrippingEta2MuMuGamma.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCalib/StrippingEta2MuMuGamma.py
@@ -25,12 +25,10 @@ __all__ = ('StrippingEta2MuMuGammaConf',
            'makeMuMuGamma',
            'default_config')
 
-from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from PhysSelPython.Wrappers import Selection, DataOnDemand
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
+from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from StandardParticles import StdTightPions, StdTightKaons, StdLooseAllPhotons, StdNoPIDsPions, StdLooseEta2gg
 from StandardParticles import StdAllLooseGammaDD, StdAllLooseGammaLL, StdAllLooseMuons
 
 default_config = {
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCalib/StrippingJPsiForSL.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCalib/StrippingJPsiForSL.py
index 66d3cf569e7e3d642fb1e90689c09009970a9f91..f83a469f0d79f559f3b8f1ce7fa0a29617c07287 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCalib/StrippingJPsiForSL.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCalib/StrippingJPsiForSL.py
@@ -20,11 +20,10 @@ __version__ = '$Revision: 0.1 $'
 
 from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from PhysSelPython.Wrappers import Selection, DataOnDemand
+from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from StandardParticles import StdLoosePions, StdLooseMuons, StdLooseKaons, StdLooseProtons, StdNoPIDsPions, StdNoPIDsMuons, StdLooseMergedPi0, StdLooseResolvedPi0, StdLooseElectrons, StdNoPIDsKaons
-from Configurables import TisTosParticleTagger
+from StandardParticles import StdNoPIDsKaons, StdNoPIDsMuons
 
 __all__ = ('JPsiForSLAllLinesConf',
            'confdict')
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCalib/StrippingK23PiForDownstreamTrackEff.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCalib/StrippingK23PiForDownstreamTrackEff.py
index 5e95ecb40bf4a7b0d570152c6cb5a85c2e157431..9ea071dc760c1a4d2e8adb1bd47ddd464f85a7d1 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCalib/StrippingK23PiForDownstreamTrackEff.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCalib/StrippingK23PiForDownstreamTrackEff.py
@@ -14,10 +14,6 @@ one missing pion, using the corrected mass
 '''
 
 from StrippingUtils.Utils import LineBuilder
-from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = ['Michel De Cian']
 __date__ = '19/12/2018'
 __version__ = '$Revision: 1.0 $'
@@ -269,8 +265,8 @@ class K23PiForDownstreamTrackEffConf(LineBuilder):
         if self._dipionSelSSNarrowDownstream is not None:
             return self._dipionSelSSNarrowDownstream
 
-        from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
+        from GaudiConfUtils.ConfigurableGenerators import CombineParticles
+        from PhysSelPython.Wrappers import Selection
 
         _k2pipi = CombineParticles(
             DecayDescriptors=["[phi(1020) -> pi+ pi+]cc"],
@@ -293,8 +289,8 @@ class K23PiForDownstreamTrackEffConf(LineBuilder):
         if self._dipionSelSSNarrowLong is not None:
             return self._dipionSelSSNarrowLong
 
-        from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
+        from GaudiConfUtils.ConfigurableGenerators import CombineParticles
+        from PhysSelPython.Wrappers import Selection
 
         _k2pipi = CombineParticles(
             DecayDescriptors=["[phi(1020) -> pi+ pi+]cc"],
@@ -317,8 +313,8 @@ class K23PiForDownstreamTrackEffConf(LineBuilder):
         if self._dipionSelSSWide is not None:
             return self._dipionSelSSWide
 
-        from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
+        from GaudiConfUtils.ConfigurableGenerators import CombineParticles
+        from PhysSelPython.Wrappers import Selection
 
         _k2pipi = CombineParticles(
             DecayDescriptors=["[phi(1020) -> pi+ pi+]cc"],
@@ -342,8 +338,8 @@ class K23PiForDownstreamTrackEffConf(LineBuilder):
         if self._dipionSelOSNarrowDownstream is not None:
             return self._dipionSelOSNarrowDownstream
 
-        from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
+        from GaudiConfUtils.ConfigurableGenerators import CombineParticles
+        from PhysSelPython.Wrappers import Selection
 
         # Cut out the Kshort
         mCut = self._dipionSelectionNarrow() + " & (ADMASS('KS0') > 40)"
@@ -370,8 +366,8 @@ class K23PiForDownstreamTrackEffConf(LineBuilder):
         if self._dipionSelOSNarrowLong is not None:
             return self._dipionSelOSNarrowLong
 
-        from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
+        from GaudiConfUtils.ConfigurableGenerators import CombineParticles
+        from PhysSelPython.Wrappers import Selection
 
         # Cut out the Kshort
         mCut = self._dipionSelectionNarrow() + " & (ADMASS('KS0') > 40)"
@@ -398,8 +394,8 @@ class K23PiForDownstreamTrackEffConf(LineBuilder):
         if self._dipionSelOSWide is not None:
             return self._dipionSelOSWide
 
-        from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
+        from GaudiConfUtils.ConfigurableGenerators import CombineParticles
+        from PhysSelPython.Wrappers import Selection
 
         # Cut out the Kshort
         mCut = self._dipionSelectionWide() + " & (ADMASS('KS0') > 40)"
@@ -427,8 +423,8 @@ class K23PiForDownstreamTrackEffConf(LineBuilder):
         # if self._tripionSelDipionSS is not None:
         #   return self._tripionSelDipionSS
 
-        from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
+        from GaudiConfUtils.ConfigurableGenerators import CombineParticles
+        from PhysSelPython.Wrappers import Selection
 
         _k2pipipi = CombineParticles(
             DecayDescriptors=["[K+ -> phi(1020) pi-]cc"],
@@ -449,8 +445,8 @@ class K23PiForDownstreamTrackEffConf(LineBuilder):
         # if self._tripionSelDipionOS is not None:
         #   return self._tripionSelDipionOS
 
-        from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
+        from GaudiConfUtils.ConfigurableGenerators import CombineParticles
+        from PhysSelPython.Wrappers import Selection
 
         _k2pipipi = CombineParticles(
             DecayDescriptors=["[K+ -> phi(1020) pi+]cc"],
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCalib/StrippingLowPtMuID.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCalib/StrippingLowPtMuID.py
index e464daa38af084e2fe15b4361cf28811d5f35524..3d23ab459b03643fbc73c746b15dc3c53ffa71ed 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCalib/StrippingLowPtMuID.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCalib/StrippingLowPtMuID.py
@@ -19,12 +19,9 @@ largely cloned from line written by 'S.Furcas', 'G.Lanfranchi', 'M.Palutan', 'A.
 
 from StandardParticles import StdAllNoPIDsMuons
 from StrippingUtils.Utils import LineBuilder
-from Configurables import LoKi__Hybrid__CoreFactory as CoreFactory
-from Configurables import LoKi__VoidFilter as VoidFilter
-from PhysSelPython.Wrappers import DataOnDemand, Selection, SelectionSequence, MergedSelection
+from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 __author__ = ['G.Ciezarek', ]
 __date__ = '03/12/2015'
 __version__ = '$Revision: 1.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCalib/StrippingMuIDCalib.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCalib/StrippingMuIDCalib.py
index fa526c7de7798e9c785db1267e66b84f2fbda70c..5315ade7f441c7b2d725f402698ad8b2e8264931 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCalib/StrippingMuIDCalib.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCalib/StrippingMuIDCalib.py
@@ -22,15 +22,12 @@ lb = builder( 'MuIDCalib', config_params )
 
 '''
 
-from StandardParticles import StdAllNoPIDsKaons, StdAllNoPIDsMuons, StdAllNoPIDsPions, StdAllNoPIDsProtons
+from StandardParticles import StdAllNoPIDsMuons
 from StandardParticles import StdNoPIDsKaons, StdNoPIDsMuons, StdNoPIDsPions, StdNoPIDsProtons
 from StrippingUtils.Utils import LineBuilder
-from Configurables import LoKi__Hybrid__CoreFactory as CoreFactory
-from Configurables import LoKi__VoidFilter as VoidFilter
-from PhysSelPython.Wrappers import DataOnDemand, Selection, SelectionSequence, MergedSelection
+from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 __author__ = ['S.Furcas', 'G.Lanfranchi',
               'M.Palutan', 'A.Sarti', 'D.Milanes', 'MuID Team']
 __date__ = '23/08/2011'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCalib/StrippingNoPIDDstarWithD02RSKPi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCalib/StrippingNoPIDDstarWithD02RSKPi.py
index d2de08dbec94193a1a842401d5c2bbf7cb15672f..a43c58f879dc5fbfd3c8f5d9c3709d83caba97d9 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCalib/StrippingNoPIDDstarWithD02RSKPi.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCalib/StrippingNoPIDDstarWithD02RSKPi.py
@@ -13,10 +13,8 @@
 from StandardParticles import StdAllNoPIDsKaons, StdAllNoPIDsPions
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from LHCbKernel.Configuration import *
-from Gaudi.Configuration import *
+from PhysSelPython.Wrappers import Selection
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 __author__ = ['Philip Xing', 'Andrew Powell']
 __date__ = '23rd August 2012'
 __version__ = '$Revision: 7.0 $'
@@ -29,7 +27,7 @@ Configurable for the RICH calibration using D*+ -> pi+ D0( K- pi+).
 __all__ = ('NoPIDDstarWithD02RSKPiConf', 'default_config')
 
 
-from GaudiKernel.SystemOfUnits import mm, cm, MeV, GeV
+from GaudiKernel.SystemOfUnits import GeV, MeV
 # from Configurables import FilterDesktop, CombineParticles
 
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCalib/StrippingNoPIDDstarWithD02RSKPi_Brem.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCalib/StrippingNoPIDDstarWithD02RSKPi_Brem.py
index 23bbe71b41d1702d6293e9593e02c6febd2218b4..9232160ade3bbee50b593bf6d6993a3bfd5989ad 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCalib/StrippingNoPIDDstarWithD02RSKPi_Brem.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCalib/StrippingNoPIDDstarWithD02RSKPi_Brem.py
@@ -10,15 +10,12 @@
 ###############################################################################
 
 from CommonParticles.Utils import trackSelector, updateDoD
-from Configurables import NoPIDsParticleMaker, CombinedParticleMaker
-from Gaudi.Configuration import *
+from Configurables import NoPIDsParticleMaker
 from StandardParticles import StdAllNoPIDsKaons, StdAllNoPIDsPions, StdAllNoPIDsElectrons
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand, AutomaticData
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from LHCbKernel.Configuration import *
-from Gaudi.Configuration import *
+from PhysSelPython.Wrappers import AutomaticData, Selection
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 __author__ = 'Vitalii Lisovskyi'
 __date__ = '15/03/2021'
 __version__ = '$Revision: 0.0 $'
@@ -29,7 +26,7 @@ Configurable for the RICH calibration using D*+ -> pi+ D0( K- pi+) for hadron->e
 '''
 
 
-from GaudiKernel.SystemOfUnits import mm, cm, MeV, GeV
+from GaudiKernel.SystemOfUnits import GeV, MeV
 # from Configurables import FilterDesktop, CombineParticles
 
 
@@ -649,7 +646,7 @@ def brempion_PMaker(name,
                                        Particle='pion')
     algorithm_pi.AddBremPhotonTo = ['pi+']
     # configure the track selector
-    selector_pi = trackSelector(algorithm_pi)
+    trackSelector(algorithm_pi)
     # configure Data-On-Demand service
     updateDoD(algorithm_pi)
     # finally: define the symbol
@@ -694,7 +691,7 @@ def bremkaon_PMaker(name,
                                       Particle='kaon')
     algorithm_K.AddBremPhotonTo = ['K+']
     # configure the track selector
-    selector_K = trackSelector(algorithm_K)
+    trackSelector(algorithm_K)
     # configure Data-On-Demand service
     updateDoD(algorithm_K)
     # finally: define the symbol
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCalib/StrippingPIDCalib.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCalib/StrippingPIDCalib.py
index e82b56942c59e477e1ffb32c01de970afd9167d4..e6940ae61dbda7b537d24906799f4de48712e814 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCalib/StrippingPIDCalib.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCalib/StrippingPIDCalib.py
@@ -35,9 +35,7 @@ from Configurables import DaVinci__N3BodyDecays
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
 from Configurables import CombineParticles
-from Gaudi.Configuration import *
 __author__ = ['Lucio Anderlini']
 __date__ = '25/02/2015'
 __version__ = '$Revision: 1.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCalib/StrippingTrackEffD0ToKPi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCalib/StrippingTrackEffD0ToKPi.py
index c9b3c9d601a65f088de7340302fbce473317e417..ee9bc7b3c33e1df66f060255828429ab64903996 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCalib/StrippingTrackEffD0ToKPi.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCalib/StrippingTrackEffD0ToKPi.py
@@ -17,7 +17,7 @@ from Configurables import FilterDesktop, CombineParticles
 from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from StandardParticles import StdLooseKaons, StdLoosePions, StdAllLoosePions, StdAllNoPIDsPions
+from StandardParticles import StdAllLoosePions, StdLooseKaons, StdLoosePions
 from SelPy.utils import (UniquelyNamedObject,
                          ClonableObject,
                          SelectionBase)
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCalib/StrippingTrackEffDownMuon.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCalib/StrippingTrackEffDownMuon.py
old mode 100755
new mode 100644
index 02a389d2ce842d2ac2deac2f9caa869297babc56..ac589d4b1348cd5d250ce067700134d7879f4b9a
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCalib/StrippingTrackEffDownMuon.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCalib/StrippingTrackEffDownMuon.py
@@ -49,35 +49,27 @@ __all__ = ('StrippingTrackEffDownMuonConf',
 # FIXME Write includes in a cleaner way
 from Gaudi.Configuration import *
 from LHCbKernel.Configuration import *
-from DAQSys.DecoderClass import Decoder
 from Configurables import GaudiSequencer
 from Configurables import UnpackTrack, ChargedProtoParticleMaker, DelegatingTrackSelector, TrackSelector, BestPIDParticleMaker
-from TrackFitter.ConfiguredFitters import ConfiguredFit
 from Configurables import TrackStateInitAlg
 from StrippingConf.StrippingLine import StrippingLine
-from Configurables import ChargedProtoParticleAddMuonInfo, MuonIDAlgLite
+from Configurables import ChargedProtoParticleAddMuonInfo
 from MuonID import ConfiguredMuonIDs
 from Configurables import ChargedProtoCombineDLLsAlg, ProtoParticleMUONFilter
-from PhysSelPython.Wrappers import Selection, DataOnDemand
+from PhysSelPython.Wrappers import Selection
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
 from StandardParticles import StdLooseMuons
 
 from StrippingUtils.Utils import LineBuilder
-from Configurables import LoKi__VoidFilter
-from os import environ
 from Gaudi.Configuration import *
-import GaudiKernel.ProcessJobOptions
-from GaudiKernel.SystemOfUnits import mm
 
 from GaudiConfUtils.ConfigurableGenerators import TisTosParticleTagger
 from StandardParticles import StdAllLooseMuons
 from Configurables import GaudiSequencer
 from Configurables import TrackToDST
-from Configurables import TrackSys
 from Configurables import PatSeeding, PatSeedingTool, PatLongLivedTracking
-from PhysSelPython.Wrappers import AutomaticData
 # Get the fitters
-from TrackFitter.ConfiguredFitters import ConfiguredFit, ConfiguredFitSeed, ConfiguredFitDownstream
+from TrackFitter.ConfiguredFitters import ConfiguredFitDownstream
 from PatAlgorithms import PatAlgConf
 
 from SelPy.utils import (UniquelyNamedObject,
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCalib/StrippingTrackEffMuonTT.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCalib/StrippingTrackEffMuonTT.py
index 84b931c726b79044897787992617070caa220d92..aae7dfa49bb3687d2925d5d54a86204f51bd020c 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCalib/StrippingTrackEffMuonTT.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCalib/StrippingTrackEffMuonTT.py
@@ -65,11 +65,10 @@ __all__ = ('StrippingTrackEffMuonTTConf',
            'makeBJpsiKTrackEff',
            'filterHLT2ForBJpsiK')
 
-from Gaudi.Configuration import *
-from PhysSelPython.Wrappers import Selection, DataOnDemand, ChargedProtoParticleSelection
+from PhysSelPython.Wrappers import ChargedProtoParticleSelection, Selection
 from StrippingConf.StrippingLine import StrippingLine
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from StrippingUtils.Utils import LineBuilder, checkConfig
+from StrippingUtils.Utils import LineBuilder
 from StandardParticles import StdLooseKaons, StdLooseMuons, StdAllLooseMuons
 
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCalib/StrippingTrackEffVeloMuon.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCalib/StrippingTrackEffVeloMuon.py
index c7da7abeddda6483ce8d3b57a6b3083ee07bdafe..3f821c02445e084449fcec8a684ab687eb7dca9a 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCalib/StrippingTrackEffVeloMuon.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCalib/StrippingTrackEffVeloMuon.py
@@ -29,25 +29,17 @@
 from SelPy.utils import (UniquelyNamedObject,
                          ClonableObject,
                          SelectionBase)
-from Configurables import TrackEventCloneKiller, VeloMuonBuilder
-from Configurables import TrackStateInitAlg, TrackEventFitter, TrackPrepareVelo, TrackContainerCopy, Tf__PatVeloSpaceTool, StandaloneMuonRec
+from Configurables import VeloMuonBuilder
+from Configurables import StandaloneMuonRec, TrackPrepareVelo
 from Configurables import CombineParticles
-from Configurables import TrackKalmanFilter, TrackMasterExtrapolator
-from Configurables import TrackEventFitter, TrackMasterFitter
-from TrackFitter.ConfiguredFitters import ConfiguredFit
-from PhysSelPython.Wrappers import AutomaticData
-from Configurables import TrackSys
 from Configurables import GaudiSequencer
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, TisTosParticleTagger
 from StandardParticles import StdLooseMuons
 from StrippingUtils.Utils import LineBuilder
-from Configurables import TrackCloneFinder
 from StrippingConf.StrippingLine import StrippingLine
 from Configurables import FastVeloTracking
-from Configurables import ChargedProtoParticleMaker, NoPIDsParticleMaker, DataOnDemandSvc, DelegatingTrackSelector, TrackSelector, CombinedParticleMaker, BestPIDParticleMaker
-from PhysSelPython.Wrappers import Selection, SelectionSequence, DataOnDemand
-from LHCbKernel.Configuration import *
-from Gaudi.Configuration import *
+from Configurables import ChargedProtoParticleMaker, DataOnDemandSvc, DelegatingTrackSelector, NoPIDsParticleMaker, TrackSelector
+from PhysSelPython.Wrappers import Selection
 __author__ = ['Flavio Archilli']
 __date__ = '30/10/2019'
 __version__ = '$Revision: 0.1 $'
@@ -159,8 +151,6 @@ class StrippingTrackEffVeloMuonConf(LineBuilder):
 
         _config = self.config[confLine]
 
-        _pchargeCut = None
-        _tchargeCut = None
         _tagCharge = None
         _probeCharge = None
         _chargename = None
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingB2ppipiSigmacmm_Lcpi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingB2ppipiSigmacmm_Lcpi.py
index 316195569102a380d44bcad73ab40d9b4b2ffcc8..25cd049b1fac0d99feae2dbf2e80a306df5abcd1 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingB2ppipiSigmacmm_Lcpi.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingB2ppipiSigmacmm_Lcpi.py
@@ -31,12 +31,11 @@ __all__ = ('StrippingB2ppipiSigmacmm_Lcpi_Conf', 'makepifromSigmacmm', 'makeThre
            )
 
 from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, ConjugateNeutralPID, DaVinci__N3BodyDecays
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N3BodyDecays, FilterDesktop
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
-from StrippingUtils.Utils import checkConfig, LineBuilder
+from StrippingUtils.Utils import LineBuilder
 from GaudiKernel.SystemOfUnits import MeV, GeV, mm
-from copy import copy
 
 name = 'StrippingB2ppipiSigmacmm_Lcpi'
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingBs2st2pKpipipi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingBs2st2pKpipipi.py
index e71b5b307174aab16443a06ddea637e54f075fe7..41168201d309b7b385822ac32b1c7b78e38f4c15 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingBs2st2pKpipipi.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingBs2st2pKpipipi.py
@@ -23,7 +23,6 @@ from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, DaVinci__N4Body
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection
-from Gaudi.Configuration import *
 __author__ = ['Matt Rudolph']
 __date__ = '2021/3/14'
 __version__ = 'v1r0'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingChargedHyperons.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingChargedHyperons.py
index 920c9faefc12697a4686bb708606c7aefce7c812..1e9ecbdf32eac322732659ae13423893f4c17ced 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingChargedHyperons.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingChargedHyperons.py
@@ -21,13 +21,9 @@ __version__ = '$Revision: 1.0 $'
 __all__ = ('StrippingChargedHyperonsConf', 'default_config')
 
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from StandardParticles import StdLoosePions, StdNoPIDsDownPions, StdLooseKaons, StdLooseDownKaons
-from StandardParticles import StdAllLoosePions, StdAllLooseKaons
 
 from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
-from PhysSelPython.Wrappers import MultiSelectionSequence
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from GaudiKernel.SystemOfUnits import MeV, mm, picosecond
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingCharm2PPX.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingCharm2PPX.py
index 8f420ab23681879eda33d3f11a9c1854083e6f5d..1776621bc50d11dd212c17cc7c967c25e7570f68 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingCharm2PPX.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingCharm2PPX.py
@@ -26,7 +26,7 @@ __all__ = (
     'StrippingCharm2PPXConf'  # ???
 )
 
-from GaudiKernel.SystemOfUnits import MeV, GeV, mm, mrad
+from GaudiKernel.SystemOfUnits import GeV, MeV, mm
 from Configurables import CombineParticles, FilterDesktop
 # from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop, DaVinci__N3BodyDecays
 from StandardParticles import (
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingCharmForVub.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingCharmForVub.py
index addb5112d833323e807d80a2fcd5d1c6ef104d89..196b7aca8b732e4ce87cfa408c9240c9d4ca9fe8 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingCharmForVub.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingCharmForVub.py
@@ -31,9 +31,8 @@ __all__ = ('CharmForVubConf',
            'makeDstarD02HMuNu')
 
 from Gaudi.Configuration import *
-from Configurables import SubstitutePID
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
+from PhysSelPython.Wrappers import MergedSelection, Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from StandardParticles import StdLooseMuons, StdLooseKaons, StdAllLoosePions, StdLoosePions
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingCharmWeakDecays.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingCharmWeakDecays.py
index 62cf538da90f04787baab5c812393440f86c3b23..72c36178501074aeada4d5d7f91bd305c974ec78 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingCharmWeakDecays.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingCharmWeakDecays.py
@@ -28,7 +28,7 @@ __all__ = ('CharmWeakDecaysConf',
            'default_config')
 
 from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingCharmedBaryonSL.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingCharmedBaryonSL.py
index 636aeca53ef5c2747cf2ed521148fbd3fa327190..f88fa93a2a9f2d4c6bffa3bbfadb4fdf6059d639 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingCharmedBaryonSL.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingCharmedBaryonSL.py
@@ -37,16 +37,12 @@ __version__ = '$Revision: 0.1 $'
 __all__ = ('StrippingCharmedBaryonSL', 'default_config')
 
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from StandardParticles import StdLoosePions, StdNoPIDsDownPions, StdLooseKaons, StdLooseDownKaons
-from StandardParticles import StdAllLoosePions, StdAllLooseKaons, StdLooseMuons, StdAllLooseProtons, StdAllLooseMuons, StdAllVeryLooseMuons
+from StandardParticles import StdAllLooseKaons, StdAllLoosePions, StdAllLooseProtons, StdAllVeryLooseMuons
 from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
-from PhysSelPython.Wrappers import MultiSelectionSequence
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from GaudiKernel.SystemOfUnits import MeV, GeV, mm, picosecond
-import sys
+from GaudiKernel.SystemOfUnits import GeV, MeV, mm
 
 
 default_name = 'CharmedBaryonSL'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingD02KSKS.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingD02KSKS.py
index 048a0f735673d789716920a6b813f3734a817158..2e831b063d5dd66449d672d2c0c14659bb9d9210 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingD02KSKS.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingD02KSKS.py
@@ -25,9 +25,8 @@ __date__ = '15/05/2014'
 __version__ = 'Stripping23'
 __all__ = 'D02KSKSConf'
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
+from PhysSelPython.Wrappers import DataOnDemand, Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 
@@ -556,7 +555,7 @@ class D02KSKSConf(LineBuilder):
         _daughterCuts = "(TRGHOSTPROB <=%s )" % config['slowPi_LLL_TRGHOSTPROB']
 
         # 40
-        _vertexChi2_cut = "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_LL']
+        "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_LL']
 
         # 200
         _combCuts = "(ADAMASS('D*(2010)+') < %s*MeV)" % config['Dst_mass_LL']
@@ -593,7 +592,7 @@ class D02KSKSConf(LineBuilder):
         _daughterCuts = "(TRGHOSTPROB <=%s )" % config['slowPi_LLU_TRGHOSTPROB']
 
         # 40
-        _vertexChi2_cut = "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_LL']
+        "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_LL']
 
         # 200
         _combCuts = "(ADAMASS('D*(2010)+') < %s*MeV)" % config['Dst_mass_LL']
@@ -630,7 +629,7 @@ class D02KSKSConf(LineBuilder):
         _daughterCuts = "(TRGHOSTPROB <=%s )" % config['slowPi_LDL_TRGHOSTPROB']
 
         # 40
-        _vertexChi2_cut = "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_LD']
+        "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_LD']
 
         # 200
         _combCuts = "(ADAMASS('D*(2010)+') < %s*MeV)" % config['Dst_mass_LD']
@@ -667,7 +666,7 @@ class D02KSKSConf(LineBuilder):
         _daughterCuts = "(TRGHOSTPROB <=%s )" % config['slowPi_LDU_TRGHOSTPROB']
 
         # 40
-        _vertexChi2_cut = "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_LD']
+        "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_LD']
 
         # 200
         _combCuts = "(ADAMASS('D*(2010)+') < %s*MeV)" % config['Dst_mass_LD']
@@ -704,7 +703,7 @@ class D02KSKSConf(LineBuilder):
         _daughterCuts = "(TRGHOSTPROB <=%s )" % config['slowPi_DDL_TRGHOSTPROB']
 
         # 40
-        _vertexChi2_cut = "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_DD']
+        "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_DD']
 
         # 200
         _combCuts = "(ADAMASS('D*(2010)+') < %s*MeV)" % config['Dst_mass_DD']
@@ -741,7 +740,7 @@ class D02KSKSConf(LineBuilder):
         _daughterCuts = "(TRGHOSTPROB <=%s )" % config['slowPi_DDU_TRGHOSTPROB']
 
         # 40
-        _vertexChi2_cut = "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_DD']
+        "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_DD']
 
         # 200
         _combCuts = "(ADAMASS('D*(2010)+') < %s*MeV)" % config['Dst_mass_DD']
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingD2HHHKs.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingD2HHHKs.py
index e5639b90812290f4e2226c3b0c140285aa788b00..8b56f2ae08f0d364c45bed96aa90657daee77a7d 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingD2HHHKs.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingD2HHHKs.py
@@ -22,19 +22,18 @@ __version__ = '$Revision: 0.1 $'
 __all__ = ('D2HHHKsLines',
            'default_config')
 
-from Gaudi.Configuration import *
 
-from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N4BodyDecays
+from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays
 from StandardParticles import StdNoPIDsPions, StdNoPIDsKaons
 from StandardParticles import StdLooseKsDD, StdLooseKsLL
 
 from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
-from StrippingUtils.Utils import LineBuilder, checkConfig
+from StrippingUtils.Utils import LineBuilder
 
 from Configurables import FilterDesktop
 
-from GaudiKernel.SystemOfUnits import GeV, MeV, picosecond, mm
+from GaudiKernel.SystemOfUnits import MeV, mm, picosecond
 
 
 default_config = {
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingD2HHHPi0.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingD2HHHPi0.py
index 6083359069ac88d66ad4d2d0c3f6c4a785962da6..8557b0ed7b6ea3312ecd34ede82d7cbd720f6775 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingD2HHHPi0.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingD2HHHPi0.py
@@ -22,19 +22,18 @@ __version__ = '$Revision: 0.1 $'
 __all__ = ('D2HHHPi0Lines',
            'default_config')
 
-from Gaudi.Configuration import *
 
-from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N4BodyDecays
+from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays
 from StandardParticles import StdNoPIDsPions, StdNoPIDsKaons
 from StandardParticles import StdLooseResolvedPi0, StdLooseMergedPi0
 
 from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
-from StrippingUtils.Utils import LineBuilder, checkConfig
+from StrippingUtils.Utils import LineBuilder
 
 from Configurables import FilterDesktop
 
-from GaudiKernel.SystemOfUnits import GeV, MeV, picosecond, mm
+from GaudiKernel.SystemOfUnits import GeV, MeV, picosecond
 
 
 default_config = {
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingD2HMuNu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingD2HMuNu.py
index eacf772b484ddd36fae5781e3451f92b15a3cd88..efe5ef8931f1ac093eb21df5364224c7ac12261d 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingD2HMuNu.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingD2HMuNu.py
@@ -9,9 +9,7 @@
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
 
-import logging
 from StrippingUtils.Utils import LineBuilder
-from Gaudi.Configuration import *
 __author__ = ['Liang Sun', 'Adam Davis']
 __date__ = '03/19/2021'
 __version__ = '$Revision: 0.02 $'
@@ -97,7 +95,6 @@ class D2HLepNuBuilder(LineBuilder):
     def __init__(self, name, config):
         LineBuilder.__init__(self, name, config)
         self._config = config
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
 
         self.GECs = {"Code": "( recSummaryTrack(LHCb.RecSummary.nLongTracks, TrLONG) < %(GEC_nLongTrk)s )" % config,
                      "Preambulo": ["from LoKiTracks.decorators import *"]}
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingD2KPiPiMuNu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingD2KPiPiMuNu.py
index 7e19b796afb9529fe10c5a20b76141f6ff62f901..c3359cfd14f536eceeb83494769c53cfb7b8ed62 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingD2KPiPiMuNu.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingD2KPiPiMuNu.py
@@ -9,9 +9,7 @@
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
 
-import logging
 from StrippingUtils.Utils import LineBuilder
-from Gaudi.Configuration import *
 __author__ = ['Liang Sun']
 __date__ = '07/05/2019'
 __version__ = '$Revision: 0.01 $'
@@ -103,7 +101,6 @@ class D2KPiPiMuNuBuilder(LineBuilder):
     def __init__(self, name, config):
         LineBuilder.__init__(self, name, config)
         self._config = config
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
 
         self.GECs = {"Code": "( recSummaryTrack(LHCb.RecSummary.nLongTracks, TrLONG) < %(GEC_nLongTrk)s )" % config,
                      "Preambulo": ["from LoKiTracks.decorators import *"]}
@@ -200,7 +197,7 @@ class D2KPiPiMuNuBuilder(LineBuilder):
 
         from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
         from PhysSelPython.Wrappers import Selection
-        from StandardParticles import StdLooseMuons, StdAllLooseMuons, StdAllNoPIDsMuons
+        from StandardParticles import StdAllLooseMuons, StdAllNoPIDsMuons
         _mu = FilterDesktop(Code=self._NominalMuSelection() % self._config)
         _mupid = StdAllLooseMuons
         if self._config["NoPIDmu"]:
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingD2KS0H_conf.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingD2KS0H_conf.py
index d58964475590bc2e6571bcd929685425e3694bc1..e5b9f6c8683eaaab3109aca8686f163c2f08aef0 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingD2KS0H_conf.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingD2KS0H_conf.py
@@ -44,9 +44,9 @@ from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticle
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StandardParticles import StdLoosePions, StdLooseKaons
 from StrippingConf.StrippingLine import StrippingLine
-from StrippingUtils.Utils import LineBuilder, checkConfig
+from StrippingUtils.Utils import LineBuilder
 from Configurables import TisTosParticleTagger
-from GaudiKernel.SystemOfUnits import GeV, MeV, picosecond, mm
+from GaudiKernel.SystemOfUnits import MeV, mm, picosecond
 
 default_name = 'D2KS0H'
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingD2PiPi0.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingD2PiPi0.py
index d9497b537d62b4f47d50823fd91deba0eb2349fa..3ac31a1bcad019f7cd123dfa6682935c986f1026 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingD2PiPi0.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingD2PiPi0.py
@@ -33,7 +33,7 @@ __all__ = (
 
 )
 
-from GaudiKernel.SystemOfUnits import MeV, GeV, mrad, picosecond
+from GaudiKernel.SystemOfUnits import MeV, picosecond
 
 from StandardParticles import (
     StdAllNoPIDsKaons,
@@ -51,7 +51,7 @@ from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 
 # from Configurables import CombineParticles, FilterDesktop
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, ConjugateNeutralPID, DaVinci__N3BodyDecays
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N3BodyDecays
 
 default_config = {
     'D2Pi0H': {
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingD2XMuMuSS.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingD2XMuMuSS.py
index 6cb43802872df951b5676b3b0a91f42091655f73..f2ecc06f375c01960838df612bae449a097161ea 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingD2XMuMuSS.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingD2XMuMuSS.py
@@ -9,14 +9,13 @@
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
 
-from StandardParticles import StdAllLooseElectrons, StdAllNoPIDsElectrons
+from StandardParticles import StdAllLooseElectrons
 from StandardParticles import StdAllLooseKaons, StdAllLoosePions, StdAllLooseMuons, StdAllNoPIDsPions, StdAllNoPIDsKaons
-from StandardParticles import StdLooseKaons, StdLoosePions, StdLooseMuons, StdNoPIDsPions, StdNoPIDsKaons, StdLooseProtons, StdAllNoPIDsProtons
+from StandardParticles import StdAllNoPIDsProtons, StdLooseKaons, StdLooseMuons, StdLoosePions, StdLooseProtons
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, OfflineVertexFitter
-from Gaudi.Configuration import *
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop
 import copy
 __author__ = ['Malcolm John', 'B. Viaud', 'O. Kochebina']
 __date__ = '25/6/2012'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingD2hh.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingD2hh.py
index 51c213ed2d3c259435dcd6aef0631877156b6bb0..a370c49abb16101fe062f7fa9fd7c27efecb37e3 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingD2hh.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingD2hh.py
@@ -24,7 +24,6 @@ __all__ = ('D2hhBuilder',
 '''
 This file contains stripping lines for time-dependent two-body charm analyses of mixing, yCP, and A_Gamma
 '''
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
@@ -129,7 +128,7 @@ class D2hhBuilder(LineBuilder):
         stdNoPIDsPions = StdAllNoPIDsPions
 
         d2kpi_name = name+'PromptD2KPi'
-        d0RS_name = name+'PromptD0RS'
+        name+'PromptD0RS'
         d0WS_name = name+'PromptD0WS'
         d2kk_name = name+'PromptD2KK'
         d2pipi_name = name+'PromptD2PiPi'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingD2hhh_FTcalib.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingD2hhh_FTcalib.py
index 1ec2a52397a24a0cbc076e1b808944bfc5bf21da..eb622bead0fbe08c7b00587f38e94c60ed0a8ade 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingD2hhh_FTcalib.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingD2hhh_FTcalib.py
@@ -29,13 +29,10 @@ __version__ = '$Revision: 0.0 $'
 __all__ = ('D2hhhFTCalibConf',
            'makeStdD2hhhFT')
 
-from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
+from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from StandardParticles import (StdNoPIDsPions,
-                               StdTightKaons)
 
 name = "D2hhhFTCalib"
 # Cuts to be implemented vy the Stripping team in Stripping Settings
@@ -254,7 +251,6 @@ def globalEventCutFilter(name,
     if MaxTrSIZE == None:
         return None
 
-    from Configurables import LoKi__VoidFilter as VoidFilter
     from Configurables import LoKi__Hybrid__CoreFactory as CoreFactory
     modules = CoreFactory('CoreFactory').Modules
     for i in ['LoKiTracks.decorators']:
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingD2hhh_conf.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingD2hhh_conf.py
index 436d8a20ebfa69a07273b9fc952667e306a823fd..49374bf7789c8403fcf3e4660b179452634cef16 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingD2hhh_conf.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingD2hhh_conf.py
@@ -38,8 +38,7 @@ from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticle
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from StandardParticles import (StdNoPIDsPions,
-                               StdTightKaons)
+from StandardParticles import StdNoPIDsPions
 
 name = "D2hhh"
 # Cuts to be implemented vy the Stripping team in Stripping Settings
@@ -717,7 +716,6 @@ def globalEventCutFilter(name,
     if MaxTrSIZE == None:
         return None
 
-    from Configurables import LoKi__VoidFilter as VoidFilter
     from Configurables import LoKi__Hybrid__CoreFactory as CoreFactory
     modules = CoreFactory('CoreFactory').Modules
     for i in ['LoKiTracks.decorators']:
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingDstarD02xx.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingDstarD02xx.py
index ce2ac8d8facde4ad7816e78bcb9fd402160bb81a..e052e20eec4a83a6f489851d64e937c3ee00b05f 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingDstarD02xx.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingDstarD02xx.py
@@ -22,8 +22,7 @@ __all__ = ('StrippingDstarD02xxConf', 'combinetwobody', 'combineDstar', 'default
             where xx = {mu mu, pi pi, pi mu, k mu, ... }
             
 '''
-from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingDstarD0ToHHPi0.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingDstarD0ToHHPi0.py
index fd5188441bc83f651edf601e0fc081e5761b90a2..9f366f1a65e17dac9704f2cda14ac7c90073bb1d 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingDstarD0ToHHPi0.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingDstarD0ToHHPi0.py
@@ -17,13 +17,11 @@ Module for D* tagged D0 -> hhpi0.
 Supersedes StrippingDstarD2hhpi0
 """
 
-from Gaudi.Configuration import *
 from Configurables import FilterDesktop, CombineParticles, OfflineVertexFitter
 from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from StandardParticles import StdAllLoosePions, StdLoosePions, StdLooseKaons, StdLooseResolvedPi0, StdLooseMergedPi0
-from Configurables import TisTosParticleTagger
 
 __all__ = ('DstarD0ToHHPi0AllLinesBuilder',
            'DstarMaker',
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingDstarD2HHHH.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingDstarD2HHHH.py
index 79b905d65e08f76846da8aeebd29e1bd52022454..15c8bc47e0445328a0083162a53a4335865cca1b 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingDstarD2HHHH.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingDstarD2HHHH.py
@@ -22,16 +22,15 @@ __version__ = '$Revision: 1.0 $'
 __all__ = ('DstarD2HHHHLines',
            'default_config')
 
-from Gaudi.Configuration import *
 
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N4BodyDecays
 from StandardParticles import StdAllNoPIDsPions, StdNoPIDsPions, StdNoPIDsKaons
 
 from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
-from StrippingUtils.Utils import LineBuilder, checkConfig
+from StrippingUtils.Utils import LineBuilder
 
-from GaudiKernel.SystemOfUnits import GeV, MeV, picosecond, mm
+from GaudiKernel.SystemOfUnits import MeV, picosecond
 
 
 default_config = {
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingDstarD2KSHHPi0.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingDstarD2KSHHPi0.py
index bef9e3302843c26f34162c9fe043e91e2deefc77..bcfa561602e9ac949fda9edba160941b4c6f72fa 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingDstarD2KSHHPi0.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingDstarD2KSHHPi0.py
@@ -21,18 +21,17 @@ __version__ = '$Revision: 1.1 $'
 __all__ = ('DstarD2KSHHPi0Lines',
            'default_config')
 
-from Gaudi.Configuration import *
 
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N4BodyDecays
 from StandardParticles import StdAllNoPIDsPions, StdNoPIDsPions, StdNoPIDsKaons, StdLooseResolvedPi0, StdLooseMergedPi0, StdLooseKsDD, StdLooseKsLL
 
 from PhysSelPython.Wrappers import Selection, MergedSelection
 from StrippingConf.StrippingLine import StrippingLine
-from StrippingUtils.Utils import LineBuilder, checkConfig
+from StrippingUtils.Utils import LineBuilder
 
 from Configurables import FilterDesktop
 
-from GaudiKernel.SystemOfUnits import GeV, MeV, picosecond, mm
+from GaudiKernel.SystemOfUnits import MeV, mm, picosecond
 
 
 default_config = {
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingDstarD2KShh.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingDstarD2KShh.py
index 0446a490bf8b78aaa6a090c0170ee5d84241b931..8bb88c690db0782705ee07f1579b03266ff72d96 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingDstarD2KShh.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingDstarD2KShh.py
@@ -34,7 +34,6 @@ __all__ = ('DstarD2KShhBuilder',
            'makeD2KShh',
            'makeDstar')
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingDstarD2XGamma.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingDstarD2XGamma.py
index e7b224211810ea09aab099a5340dcc8c20dbd784..20835582f83db206c0f03a8161bb60b333bd4f72 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingDstarD2XGamma.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingDstarD2XGamma.py
@@ -32,7 +32,6 @@ __version__ = '$Revision: 0.5 $'
 __all__ = ('DstarD2XGammaLines',
            'default_config')
 
-from Gaudi.Configuration import *
 
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 from StandardParticles import StdAllNoPIDsPions, StdNoPIDsPions, StdNoPIDsKaons
@@ -40,11 +39,11 @@ from StandardParticles import StdLooseAllPhotons, StdAllLooseGammaLL, StdAllLoos
 
 from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
-from StrippingUtils.Utils import LineBuilder, checkConfig
+from StrippingUtils.Utils import LineBuilder
 
 from Configurables import FilterDesktop
 
-from GaudiKernel.SystemOfUnits import GeV, MeV, picosecond, mm
+from GaudiKernel.SystemOfUnits import GeV, MeV, picosecond
 
 default_config = {
     'NAME': 'DstarD2XGamma',
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingDstarPromptWithD02HHHH.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingDstarPromptWithD02HHHH.py
index 13343e4031d3c9fe7ad9b92cfb6f3c3fff754d98..22e9ffd46fd5a0b8ab4623cae0293fe3c10c129d 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingDstarPromptWithD02HHHH.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingDstarPromptWithD02HHHH.py
@@ -36,11 +36,10 @@ __version__ = '$Revision: 1.2 $'
 __all__ = ('DstarPromptWithD02HHHHConf', 'makeD02hhhh',
            'makePromptDstar', 'default_config')
 
-from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, ConjugateNeutralPID
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles, ConjugateNeutralPID
 from PhysSelPython.Wrappers import Selection, MergedSelection
 from StrippingConf.StrippingLine import StrippingLine
-from StrippingUtils.Utils import checkConfig, LineBuilder
+from StrippingUtils.Utils import LineBuilder
 from GaudiKernel.SystemOfUnits import MeV, GeV, mm
 from copy import copy
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingDstarPromptWithD02HHMuMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingDstarPromptWithD02HHMuMu.py
index e83ad60bb1ff3c30f6cfd21e7ea0e2fb6ead7646..a1c41727aab9df91366ea29963944e783d29f676 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingDstarPromptWithD02HHMuMu.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingDstarPromptWithD02HHMuMu.py
@@ -29,11 +29,10 @@ __version__ = '$Revision: 2.0 $'
 __all__ = ('DstarPromptWithD02HHLLConf', 'makeD02hhll',
            'makePromptDstar', 'default_config')
 
-from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, ConjugateNeutralPID
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles, ConjugateNeutralPID
 from PhysSelPython.Wrappers import Selection, MergedSelection
 from StrippingConf.StrippingLine import StrippingLine
-from StrippingUtils.Utils import checkConfig, LineBuilder
+from StrippingUtils.Utils import LineBuilder
 from GaudiKernel.SystemOfUnits import MeV, GeV, mm
 from copy import copy
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingExcitedDsSpectroscopy.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingExcitedDsSpectroscopy.py
index 6b08898929e9ee290d51640d43d073b4a548a98b..dadd6c5c25c094fb4e5dfdef695cd98af0384ee1 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingExcitedDsSpectroscopy.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingExcitedDsSpectroscopy.py
@@ -321,7 +321,6 @@ def globalEventCutFilter(name,
     if MaxTrSIZE == None:
         return None
 
-    from Configurables import LoKi__VoidFilter as VoidFilter
     from Configurables import LoKi__Hybrid__CoreFactory as CoreFactory
     modules = CoreFactory('CoreFactory').Modules
     for i in ['LoKiTracks.decorators']:
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingHc2V02H.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingHc2V02H.py
index c55a09ec52497f96d0d9333a1489935bbf3c3448..937669104501a4b75267fac361085e0e99535056 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingHc2V02H.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingHc2V02H.py
@@ -29,7 +29,7 @@ __all__ = (
 )
 
 from GaudiKernel.SystemOfUnits import MeV, GeV, mm, mrad
-from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop, DaVinci__N3BodyDecays
+from GaudiConfUtils.ConfigurableGenerators import DaVinci__N3BodyDecays, FilterDesktop
 # from StandardParticles import StdNoPIDsPions as InputPionsPiPi
 # from StandardParticles import StdNoPIDsKaons as InputKaons
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingHc2V03H.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingHc2V03H.py
index d3888168faa1cbed51e85b5dd40fa51f82370dcd..2c9fd008996a8b8f7f34cbf4a6617f8d731b378b 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingHc2V03H.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingHc2V03H.py
@@ -24,11 +24,9 @@ __date__ = '13/10/2017'
 __all__ = ('default_config', 'StrippingHc2V03HConf')
 
 from GaudiKernel.SystemOfUnits import MeV, GeV, mm, mrad
-from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop, DaVinci__N4BodyDecays
+from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays, FilterDesktop
 from StandardParticles import StdAllLoosePions as InputPions
 from StandardParticles import StdAllLooseKaons as InputKaons
-from StandardParticles import StdVeryLooseLambdaLL as InputLambdasLL
-from StandardParticles import StdLooseLambdaDD as InputLambdasDD
 
 from PhysSelPython.Wrappers import Selection, MergedSelection, DataOnDemand
 from StrippingUtils.Utils import LineBuilder
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingHc2V2H.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingHc2V2H.py
index 1cc1e18bb59332589773894f931054575d3bd57d..62f83f01a95c995d84514559ea3eb725d34e7335 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingHc2V2H.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingHc2V2H.py
@@ -29,8 +29,6 @@ from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDeskto
 from StandardParticles import StdNoPIDsDownPions as InputDownPions
 from StandardParticles import StdNoPIDsPions as InputPions
 from StandardParticles import StdNoPIDsKaons as InputKaons
-from StandardParticles import StdLooseLambdaLL as InputLambdasLL
-from StandardParticles import StdLooseLambdaDD as InputLambdasDD
 
 from PhysSelPython.Wrappers import Selection, MergedSelection, DataOnDemand
 from StrippingUtils.Utils import LineBuilder
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingHc2V3H.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingHc2V3H.py
index 8860909e6ec1c8f2862b43d64f75e5158a1c67e3..05d0ef19028d88f3cf40161b0e7b207226c117e3 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingHc2V3H.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingHc2V3H.py
@@ -31,8 +31,6 @@ from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDeskto
 from StandardParticles import StdNoPIDsDownPions as InputDownPions
 from StandardParticles import StdNoPIDsPions as InputPions
 from StandardParticles import StdNoPIDsKaons as InputKaons
-from StandardParticles import StdLooseLambdaLL as InputLambdasLL
-from StandardParticles import StdLooseLambdaDD as InputLambdasDD
 
 from PhysSelPython.Wrappers import Selection, MergedSelection, DataOnDemand
 from StrippingUtils.Utils import LineBuilder
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingKKPiPi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingKKPiPi.py
index cedaab2089da1034f1207a1c958ba82c6e694ba7..767a1fdbf50445fb204987a0cc70c2f97dfb5421 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingKKPiPi.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingKKPiPi.py
@@ -12,12 +12,11 @@
 Module for selecting [cs][ubar dbar] -> K+ K+ pi- pi-
 '''
 
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
+from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
 from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
-from Gaudi.Configuration import *
 __author__ = ['Mengzhen Wang']
 __date__ = '10/10/2017'
 __version__ = '$Revision: 1.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingLambdac2V03H.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingLambdac2V03H.py
index 8c19d9d3aeebd29855bd2d76b366fe9611b08aaf..9689bee39c9e7d84a61e56605ba3bb5f443ec5d1 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingLambdac2V03H.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingLambdac2V03H.py
@@ -27,7 +27,7 @@ __all__ = (
 )
 
 from GaudiKernel.SystemOfUnits import MeV, GeV, mm, mrad
-from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop, DaVinci__N4BodyDecays
+from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays, FilterDesktop
 from StandardParticles import StdNoPIDsPions as InputPions
 from StandardParticles import StdNoPIDsKaons as InputKaons
 from StandardParticles import StdLooseLambdaLL as InputLambdasLL
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingLambdacForNeutronPID.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingLambdacForNeutronPID.py
index ae08b01f2aa31c0c228ec259a500e8cc1745c997..a730881c70c46e14ca9ec93433ab423fefc51804 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingLambdacForNeutronPID.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingLambdacForNeutronPID.py
@@ -17,12 +17,10 @@ Exported selection makers: 'makeLc', 'makeSigmac', 'makeSigmacWS',
 
 """
 
-from GaudiKernel.PhysicalConstants import c_light
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 __author__ = ['Marco Pappagallo']
 __date__ = '17/03/2021'
 __version__ = '$Revision: 1.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingLc2L0LLpi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingLc2L0LLpi.py
index 0165e116e9da33c044fd297b7fa4c1090c6cbf39..0a027afeb1d2d303ea6a37758bc2b3bf4bb5f79d 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingLc2L0LLpi.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingLc2L0LLpi.py
@@ -12,17 +12,10 @@
 Module for selecting Lambda_c+->Lambda pi+
 '''
 
-from StandardParticles import (StdAllLoosePions, StdLooseProtons,
-                               StdLoosePions, StdNoPIDsUpPions)
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from StandardParticles import StdLooseAllPhotons, StdVeryLooseAllPhotons
-from Configurables import LoKi__VoidFilter
-from PhysSelPython.Wrappers import MergedSelection
-from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
-from Gaudi.Configuration import *
 __author__ = ['Guiyun Ding', 'Jiesheng Yu', 'Yuehong Xie']
 __date__ = '28/11/2016'
 __version__ = '$Revision: 2.0$'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingNeutralCBaryons.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingNeutralCBaryons.py
index 5cd5cf6bbca6fb372979b6519826d752a41a07f4..147241ad24ab468c7b7eb3cc624b5ea9b5b4e2e6 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingNeutralCBaryons.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingNeutralCBaryons.py
@@ -31,13 +31,9 @@ __version__ = '$Revision: 1.1 $'
 __all__ = ('StrippingNeutralCBaryonsConf', 'default_config')
 
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from StandardParticles import StdLoosePions, StdNoPIDsDownPions, StdLooseKaons, StdLooseDownKaons
-from StandardParticles import StdAllLoosePions, StdAllLooseKaons, StdAllLooseProtons
 
 from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
-from PhysSelPython.Wrappers import MultiSelectionSequence
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from GaudiKernel.SystemOfUnits import MeV, mm, picosecond
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingXcpToLambdaKSHp.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingXcpToLambdaKSHp.py
index 91757124df0a6c7aba56e01ec5212dc42c93a446..90176344c31ebcbf2d879f7e4fd54e3819a7d972 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingXcpToLambdaKSHp.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingXcpToLambdaKSHp.py
@@ -11,8 +11,6 @@
 """
 Exclusive lines for Xc+ -> Lambda0 KS0 h+
 """
-from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-from Configurables import FilterDesktop
 from PhysConf.Selections import FilterSelection, Combine3BodySelection, MergedSelection
 from PhysSelPython.Wrappers import AutomaticData
 from StrippingUtils.Utils import LineBuilder
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingXcpToXiPipHp.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingXcpToXiPipHp.py
index 8e47ddfa3566920bc32d53b21a332c5650139e6d..5a28d5b8ff5d02d3ec80f2e18a466d53f88f3cb1 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingXcpToXiPipHp.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingXcpToXiPipHp.py
@@ -13,10 +13,8 @@ Stripping lines for Xic+ -> Xi- pi+ pi+, Lc+ -> Xi- pi+ K+ and Xic+ -> Xi- pi+ K
 The lines are used to complement the inclusive Xi Turbo lines by adding
 Velo raw banks to study if the Xi- can be reconstructed as an upstream track.
 """
-from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-from Configurables import FilterDesktop
 from PhysConf.Selections import (
-    FilterSelection, CombineSelection, Combine3BodySelection, MergedSelection)
+    FilterSelection, CombineSelection, Combine3BodySelection)
 from PhysSelPython.Wrappers import AutomaticData
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingXic2HHH.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingXic2HHH.py
index e34807cd11d54a2a33e0a1189dffe5a4b8d17475..32300611aa84de3bdf0390670c07b3849c390e20 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingXic2HHH.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingXic2HHH.py
@@ -8,18 +8,15 @@
 # granted to it by virtue of its status as an Intergovernmental Organization  #
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
-from StandardParticles import StdNoPIDsPions, StdNoPIDsKaons, StdNoPIDsProtons, StdAllNoPIDsProtons
-from Configurables import TisTosParticleTagger
+from StandardParticles import StdNoPIDsKaons, StdNoPIDsPions, StdNoPIDsProtons
 from StrippingUtils.Utils import LineBuilder
-from PhysSelPython.Wrappers import MultiSelectionSequence
-from PhysSelPython.Wrappers import Selection, DataOnDemand, AutomaticData, MergedSelection
+from PhysSelPython.Wrappers import DataOnDemand, MergedSelection, Selection
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
 from Configurables import FilterDesktop, CombineParticles
 from LHCbKernel.Configuration import *
-from GaudiKernel.SystemOfUnits import MeV, mm, ns
+from GaudiKernel.SystemOfUnits import MeV, mm
 from StrippingConf.StrippingLine import StrippingLine
 from Gaudi.Configuration import *
-import re
 all
 ''' Xic+ and Theta+ lines Designed by Yury Shcheglov, Alexey Dzyuba, Nelya Sagidova to study Xic+ and Theta+ particles '''
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingXicToSigmaKPi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingXicToSigmaKPi.py
index 71b78eea79c254b8f1342818a4da5f885c3873cc..d6856b0e1d9b501ecb11f6e51aec7b5e300d7d50 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingXicToSigmaKPi.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingXicToSigmaKPi.py
@@ -15,7 +15,7 @@ Exclusive lines for Xic+ -> Sigma0 KS0 pi+, Xic0 -> Sigma0 K- pi+ and Xic+ -> Si
 from CommonParticles.Utils import updateDoD
 from GaudiKernel.SystemOfUnits import MeV
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-from Configurables import (FilterDesktop, ResolvedPi0Maker, PhotonMaker)
+from Configurables import (ResolvedPi0Maker, PhotonMaker)
 from PhysConf.Selections import (FilterSelection, Combine3BodySelection,
                                  MergedSelection, SimpleSelection)
 from PhysSelPython.Wrappers import AutomaticData
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingXicc.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingXicc.py
index 2468c2d79739511bfdefe170463aa125124d506e..45478d9be226dbd5e3fdd09b0ff769294d99d064 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingXicc.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingXicc.py
@@ -52,9 +52,6 @@ from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticle
 from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from StandardParticles import StdAllLoosePions, StdAllLooseKaons, StdAllLooseProtons
-from StandardParticles import StdLoosePions
-from CommonParticles.StdLooseLambda import StdLooseLambdaLL, StdLooseLambdaDD
 from GaudiKernel.SystemOfUnits import MeV, GeV, mm
 from Configurables import TisTosParticleTagger
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingXiccSL.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingXiccSL.py
index f5880e4d7a88ed9c0a4cf4e205003df5ac3ef7f6..d77d3c9301880fb517fa10a13186f9583159f3b6 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingXiccSL.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingCharm/StrippingXiccSL.py
@@ -38,17 +38,12 @@ __version__ = '$Revision: 0.3 $'
 __all__ = ('StrippingXiccSL', 'default_config')
 
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from StandardParticles import StdLoosePions, StdNoPIDsDownPions, StdLooseKaons, StdLooseDownKaons
-from StandardParticles import StdAllLoosePions, StdAllLooseKaons, StdLooseMuons, StdAllLooseProtons, StdAllLooseMuons, StdAllVeryLooseMuons
 from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
-from PhysSelPython.Wrappers import MultiSelectionSequence
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from GaudiKernel.SystemOfUnits import MeV, GeV, mm, picosecond
+from GaudiKernel.SystemOfUnits import GeV, MeV, mm
 from Configurables import TisTosParticleTagger
-import sys
 
 
 default_name = 'XiccSL'
@@ -400,7 +395,7 @@ class StrippingXiccSL(LineBuilder):
         _strCutMoth_Zero = "(CHILD(VFASPF(VZ),1) - VFASPF(VZ) > %(Omegacc_Lc_delta_VZ_Min)s)" \
             "& (BPVDIRA > %(Omegacc_Zero_BPVDIRA_Min)s)" % self.config
 
-        _strCutMoth2 = _strChi2Moth2 + '&' + _strCutMoth
+        _strChi2Moth2 + '&' + _strCutMoth
         _strCutMoth2_Zero = _strChi2Moth2 + '&' + _strCutMoth_Zero
 
         ''' Stripping Omega_cc+ -> Omega_c0 mu+ '''
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingIFT/StrippingHeL2ppppi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingIFT/StrippingHeL2ppppi.py
index 8e3831dccd93ea545d6bf6f807d397dfcfde7b34..8a38168041b6b03e929ec6060a465f11bee1d413 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingIFT/StrippingHeL2ppppi.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingIFT/StrippingHeL2ppppi.py
@@ -22,7 +22,6 @@ from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, DaVinci__N4Body
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection
-from Gaudi.Configuration import *
 __author__ = ['Hendrik Jage', 'Gediminas Sarpis']
 __date__ = '19/03/2021'
 __version__ = 'v1r0'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingIFT/StrippingHeMedian.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingIFT/StrippingHeMedian.py
index 46870fe2fe39e2196a3ab3621968cdffd177e5e1..940b716b24722cacb37acba8ce977affa0d57d72 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingIFT/StrippingHeMedian.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingIFT/StrippingHeMedian.py
@@ -19,15 +19,12 @@ __version__ = 'v0r1'
 
 __all__ = ('HeMedianConf', 'default_config')
 
-from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
 
 from StandardParticles import StdAllNoPIDsProtons as Protons
-from PhysSelPython.Wrappers import Selection, DataOnDemand, SimpleSelection
+from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from Configurables import LoKi__VoidFilter as VoidFilter
 
 default_config = {
     'NAME': 'HeMedian',
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingIFT/StrippingHeNOverflows.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingIFT/StrippingHeNOverflows.py
index 6e86f2745180d1fa6f865250139d4f7d553895b6..2b79ea417fb63eeff1d14b5e6a3a086911223d6f 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingIFT/StrippingHeNOverflows.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingIFT/StrippingHeNOverflows.py
@@ -19,15 +19,12 @@ __version__ = 'v0r1'
 
 __all__ = ('HeNOverflowsConf', 'default_config')
 
-from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
 
 from StandardParticles import StdAllNoPIDsProtons as Protons
-from PhysSelPython.Wrappers import Selection, DataOnDemand, SimpleSelection
+from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from Configurables import LoKi__VoidFilter as VoidFilter
 
 default_config = {
     'NAME': 'HeNOverflows',
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingIFT/StrippingHeavyIonD02KPiPi0.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingIFT/StrippingHeavyIonD02KPiPi0.py
index 3e380b9342ba9bebae1a3195dcadf08a1b598fc9..8ffdf55b27ce401ff26b2fe355cc99597f755347 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingIFT/StrippingHeavyIonD02KPiPi0.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingIFT/StrippingHeavyIonD02KPiPi0.py
@@ -25,9 +25,8 @@ __all__ = ('StrippingHeavyIonD02KPiPi0Conf',
            'makeD02KPiPi0M',
            'default_config')
 
-from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from PhysSelPython.Wrappers import Selection, DataOnDemand
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
+from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from StandardParticles import StdTightPions, StdTightKaons, StdLooseMergedPi0, StdLooseResolvedPi0
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingIFT/StrippingHeavyIonDiMuon.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingIFT/StrippingHeavyIonDiMuon.py
index 7006c283f4dc99f27a96ed4a998d84e5b1ad4cd0..b23478e8ffe6a49582c92df2422aeacc0c7cf127 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingIFT/StrippingHeavyIonDiMuon.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingIFT/StrippingHeavyIonDiMuon.py
@@ -17,8 +17,7 @@ from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 from StandardParticles import StdAllLooseMuons
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand
-from Gaudi.Configuration import *
+from PhysSelPython.Wrappers import Selection
 __author__ = ['Emilie MAURICE']
 __date__ = ''
 __version__ = '$Revision: 2.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingIFT/StrippingHeavyIonDst2D0KPiForPID.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingIFT/StrippingHeavyIonDst2D0KPiForPID.py
index 4282eb3c7b386840ce3bb3a47569a6a981e3194c..c3ba0aa8f46df637625d1f88481903dd9414f15e 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingIFT/StrippingHeavyIonDst2D0KPiForPID.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingIFT/StrippingHeavyIonDst2D0KPiForPID.py
@@ -13,10 +13,8 @@
 from StandardParticles import StdAllNoPIDsKaons, StdAllNoPIDsPions
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from LHCbKernel.Configuration import *
-from Gaudi.Configuration import *
+from PhysSelPython.Wrappers import Selection
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 __author__ = ['Philip Xing', 'Andrew Powell']
 __date__ = '23rd August 2012'
 __version__ = '$Revision: 7.0 $'
@@ -36,7 +34,7 @@ Usage:
 __all__ = ('HeavyIonDst2D0KPiForPIDConf', 'default_config', "D0", "Dstar")
 
 
-from GaudiKernel.SystemOfUnits import mm, cm, MeV, GeV
+from GaudiKernel.SystemOfUnits import GeV, MeV
 # from Configurables import FilterDesktop, CombineParticles
 
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingIFT/StrippingHeavyIonOthercc.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingIFT/StrippingHeavyIonOthercc.py
index d762548461ded44c7162840ccf9c84cab20bd60b..d4ecc7b6f1705d691173810a8a986c9de46b53f4 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingIFT/StrippingHeavyIonOthercc.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingIFT/StrippingHeavyIonOthercc.py
@@ -17,8 +17,7 @@ from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 from StandardParticles import StdNoPIDsElectrons, StdLooseProtons, StdLooseMuons
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand
-from Gaudi.Configuration import *
+from PhysSelPython.Wrappers import Selection
 __author__ = ['Emilie MAURICE']
 __date__ = ''
 __version__ = '$Revision: 1.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingIFT/StrippingHeavyIonPIDCalib.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingIFT/StrippingHeavyIonPIDCalib.py
index df8b9c18c542aa0b4edb413fca9457fc1b99b7d4..9b8d406ef75205f110369c006e8f733db08aa179 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingIFT/StrippingHeavyIonPIDCalib.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingIFT/StrippingHeavyIonPIDCalib.py
@@ -37,7 +37,6 @@ from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
 from Gaudi.Configuration import *
 __author__ = ['Yanxi ZHANG']
 __date__ = '25/02/2015'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingIFT/StrippingHeavyIonTopology.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingIFT/StrippingHeavyIonTopology.py
index 19f3d03c95644de38c49321c5c0b7fb0636739e4..8308d72b5faed1731235c6cd48d682ca5b65d690 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingIFT/StrippingHeavyIonTopology.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingIFT/StrippingHeavyIonTopology.py
@@ -12,13 +12,9 @@
 Module for selecting specific topology
 '''
 
-from Configurables import FilterDesktop, CombineParticles
-from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-from StandardParticles import StdAllLooseMuons, StdAllLoosePions, StdAllNoPIDsPions, StdLoosePhotons
+from Configurables import FilterDesktop
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand
-from Gaudi.Configuration import *
 __author__ = ['Emilie MAURICE']
 __date__ = ''
 __version__ = '$Revision: 1.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingIFT/StrippingHeavyIonTrackEffDownMuon.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingIFT/StrippingHeavyIonTrackEffDownMuon.py
index 4b221c471786b20ec59036a3b26e4f2096a6eea3..bd21417c5bdd6eabcfe4b156766331a8bd76155f 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingIFT/StrippingHeavyIonTrackEffDownMuon.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingIFT/StrippingHeavyIonTrackEffDownMuon.py
@@ -43,34 +43,26 @@ __all__ = ('HeavyIonTrackEffDownMuonConf',
 # FIXME Write includes in a cleaner way
 from Gaudi.Configuration import *
 from LHCbKernel.Configuration import *
-from DAQSys.DecoderClass import Decoder
 from Configurables import GaudiSequencer
 from Configurables import UnpackTrack, ChargedProtoParticleMaker, DelegatingTrackSelector, TrackSelector, BestPIDParticleMaker
-from TrackFitter.ConfiguredFitters import ConfiguredFit
 from Configurables import TrackStateInitAlg
 from StrippingConf.StrippingLine import StrippingLine
-from Configurables import ChargedProtoParticleAddMuonInfo, MuonIDAlgLite
+from Configurables import ChargedProtoParticleAddMuonInfo
 from MuonID import ConfiguredMuonIDs
 from Configurables import ChargedProtoCombineDLLsAlg, ProtoParticleMUONFilter
-from PhysSelPython.Wrappers import Selection, DataOnDemand
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
+from PhysSelPython.Wrappers import Selection
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 
 from StrippingUtils.Utils import LineBuilder
-from Configurables import LoKi__VoidFilter
-from os import environ
 from Gaudi.Configuration import *
-import GaudiKernel.ProcessJobOptions
-from GaudiKernel.SystemOfUnits import mm
 
 from GaudiConfUtils.ConfigurableGenerators import TisTosParticleTagger
 from StandardParticles import StdAllLooseMuons
 from Configurables import GaudiSequencer
 from Configurables import TrackToDST
-from Configurables import TrackSys
 from Configurables import PatSeeding, PatSeedingTool, PatLongLivedTracking
-from PhysSelPython.Wrappers import AutomaticData
 # Get the fitters
-from TrackFitter.ConfiguredFitters import ConfiguredFit, ConfiguredFitSeed, ConfiguredFitDownstream
+from TrackFitter.ConfiguredFitters import ConfiguredFitDownstream
 from PatAlgorithms import PatAlgConf
 
 from SelPy.utils import (UniquelyNamedObject,
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingIFT/StrippingHeavyIonTrackEffMuonTT.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingIFT/StrippingHeavyIonTrackEffMuonTT.py
index d45ec02acda032c5c4f8402c30d1bc094a63cceb..e2e32a543831c9767d793bae28337b3992789b78 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingIFT/StrippingHeavyIonTrackEffMuonTT.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingIFT/StrippingHeavyIonTrackEffMuonTT.py
@@ -62,12 +62,11 @@ __all__ = ('HeavyIonTrackEffMuonTTConf',
            'makeBJpsiKTrackEff',
            'filterHLT2ForBJpsiK')
 
-from Gaudi.Configuration import *
-from PhysSelPython.Wrappers import Selection, DataOnDemand, ChargedProtoParticleSelection
+from PhysSelPython.Wrappers import ChargedProtoParticleSelection, Selection
 from StrippingConf.StrippingLine import StrippingLine
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from StrippingUtils.Utils import LineBuilder, checkConfig
-from StandardParticles import StdLooseKaons, StdLooseMuons, StdAllLooseMuons
+from StrippingUtils.Utils import LineBuilder
+from StandardParticles import StdAllLooseMuons, StdLooseKaons
 
 
 from Configurables import (MuonCombRec,
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingIFT/StrippingHeavyIonTrackEffVeloMuon.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingIFT/StrippingHeavyIonTrackEffVeloMuon.py
index c0bb11bf8fca29661adbf8ebd509a6eceec327a5..38f843265825d75998c1de6ae518bf039af67a84 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingIFT/StrippingHeavyIonTrackEffVeloMuon.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingIFT/StrippingHeavyIonTrackEffVeloMuon.py
@@ -40,17 +40,14 @@ __all__ = ('HeavyIonTrackEffVeloMuonConf',
            )
 
 
-from Gaudi.Configuration import *
-from LHCbKernel.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 # from Configurables import CombineParticles
-from PhysSelPython.Wrappers import Selection, SelectionSequence, DataOnDemand
-from Configurables import ChargedProtoParticleMaker, NoPIDsParticleMaker, DataOnDemandSvc, DelegatingTrackSelector, TrackSelector, CombinedParticleMaker, BestPIDParticleMaker
+from PhysSelPython.Wrappers import Selection
+from Configurables import ChargedProtoParticleMaker, DataOnDemandSvc, DelegatingTrackSelector, NoPIDsParticleMaker, TrackSelector
 from Configurables import FastVeloTracking
 
 from StrippingConf.StrippingLine import StrippingLine
-from Configurables import TrackStateInitAlg, TrackEventFitter, TrackPrepareVelo, TrackContainerCopy, Tf__PatVeloSpaceTool, StandaloneMuonRec
-from Configurables import TrackCloneFinder
+from Configurables import StandaloneMuonRec, TrackPrepareVelo
 from StrippingUtils.Utils import LineBuilder
 # changed from StdLooseMuons, yanxi
 from StandardParticles import StdAllLooseMuons
@@ -59,14 +56,9 @@ from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, TisTosParticleT
 # from Configurables import TisTosParticleTagger
 
 from Configurables import GaudiSequencer
-from Configurables import TrackSys
-from PhysSelPython.Wrappers import AutomaticData
 # Get the fitters
-from TrackFitter.ConfiguredFitters import ConfiguredFit
 
-from Configurables import TrackEventCloneKiller, VeloMuonBuilder
-from Configurables import TrackEventFitter, TrackMasterFitter
-from Configurables import TrackKalmanFilter, TrackMasterExtrapolator
+from Configurables import VeloMuonBuilder
 # from TrackFitter.ConfiguredFitters import ConfiguredFastFitter
 # from Configurables import TrackCloneFinder
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingIFT/StrippingLb2V0pphh.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingIFT/StrippingLb2V0pphh.py
index 3ee7aeb4f38f8798b68eecc011e8af5189ed2af7..e7e59c7c8ac1dca0c6c0a9e08e0c83725d6facc0 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingIFT/StrippingLb2V0pphh.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingIFT/StrippingLb2V0pphh.py
@@ -24,7 +24,6 @@ __date__ = '19/03/2021'
 __version__ = 'v1r0'
 __all__ = {'Lb2V0pphhConf', 'default_config'}
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
 from PhysSelPython.Wrappers import Selection, DataOnDemand, SimpleSelection
 from StrippingConf.StrippingLine import StrippingLine
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingIFT/StrippingLb2dpX.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingIFT/StrippingLb2dpX.py
index c5a28128f1c971f8267afd05042345d05e19e0d1..ad0fc42d4ffbb2955abf25f92475e3c4281e6d14 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingIFT/StrippingLb2dpX.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingIFT/StrippingLb2dpX.py
@@ -24,7 +24,6 @@ __all__ = ('Lb2dpXConf',
            )
 
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop
 
 from StandardParticles import StdAllNoPIDsPions as Pions
@@ -33,7 +32,6 @@ from StandardParticles import StdAllNoPIDsKaons as Kaons
 from PhysSelPython.Wrappers import Selection, SimpleSelection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from Configurables import LoKi__VoidFilter as VoidFilter
 
 default_config = {
     'NAME': 'Lb2dpX',
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingMiniBias/StrippingBadEvents.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingMiniBias/StrippingBadEvents.py
index 4d837a2f722d72d1c7683e8f61d6316db037f332..460036843530f41526b7139b73c204dba3cf9160 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingMiniBias/StrippingBadEvents.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingMiniBias/StrippingBadEvents.py
@@ -8,7 +8,6 @@
 # granted to it by virtue of its status as an Intergovernmental Organization  #
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
-from PhysSelPython.Wrappers import Selection
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 __author__ = 'Andrea Contu'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingMiniBias/StrippingMiniBias.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingMiniBias/StrippingMiniBias.py
index 7ba890fe41b117c0dcaaac7777296c741c397754..f791c6cd1cfac775c9b2357307a4044a5100eb87 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingMiniBias/StrippingMiniBias.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingMiniBias/StrippingMiniBias.py
@@ -8,7 +8,6 @@
 # granted to it by virtue of its status as an Intergovernmental Organization  #
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
-from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 __author__ = 'Patrick Koppenburg'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingQEE/DisplVertices_Utils.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingQEE/DisplVertices_Utils.py
index f9e3c9136e46dcf7697209e381ff7735b840ed2e..bcd9752464adf9657cb3a290918226a7d0f05341 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingQEE/DisplVertices_Utils.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingQEE/DisplVertices_Utils.py
@@ -14,12 +14,11 @@ Utilities for displaced vertex stripping: wrapper class around PatPV3D
 
 __all__ = ("SelectionFromAlgorithmWithTools", "SelectionPatPV3DWrapper")
 
-from GaudiConfUtils import isConfigurable
 
 from SelPy.utils import (UniquelyNamedObject, ClonableObject, SelectionBase, compatibleSequences,
-                         IncompatibleInputLocations, CloneCallable, makeOutputLocation, setOutputLocation)
+                         IncompatibleInputLocations, makeOutputLocation, setOutputLocation)
 
-from PhysSelPython.Wrappers import checkConfigurable, checkName
+from PhysSelPython.Wrappers import checkName
 
 
 def connectToRequiredSelections(selection, inputSetter):
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingQEE/StrippingA1MuMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingQEE/StrippingA1MuMu.py
old mode 100755
new mode 100644
index 91e62b0b649d88ac57d91a3cf24db5351e7b19de..281aebf4be79ceaf5c90e7533eb04d49847e5185
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingQEE/StrippingA1MuMu.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingQEE/StrippingA1MuMu.py
@@ -23,11 +23,9 @@ A_1 -> mu+ mu-, based on functionality from StrippingDiMuonNew by Jibo He.
 
 """
 
-from Gaudi.Configuration import *
-from LHCbKernel.Configuration import *
 
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
-from PhysSelPython.Wrappers import Selection, DataOnDemand, SimpleSelection
+from PhysSelPython.Wrappers import SimpleSelection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from GaudiKernel.SystemOfUnits import MeV
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingQEE/StrippingA2MuMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingQEE/StrippingA2MuMu.py
index 64c106858ef1dd3206b2083b5ea5e630aec55ae8..cd47529d168278a387e79f1f772ca7cf3b1d8040 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingQEE/StrippingA2MuMu.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingQEE/StrippingA2MuMu.py
@@ -22,7 +22,7 @@ from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from StandardParticles import StdAllLooseMuons, StdAllNoPIDsMuons
+from StandardParticles import StdAllLooseMuons
 from GaudiKernel.SystemOfUnits import GeV
 
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingQEE/StrippingA2MuMuSameSign.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingQEE/StrippingA2MuMuSameSign.py
index 5911c40e36b1e66721231826c818abbc79aed758..a89a6a8b5ff2bf6571b4fe0fcaeb93088567f2a5 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingQEE/StrippingA2MuMuSameSign.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingQEE/StrippingA2MuMuSameSign.py
@@ -22,7 +22,7 @@ from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from StandardParticles import StdAllLooseMuons, StdAllNoPIDsMuons
+from StandardParticles import StdAllLooseMuons
 from GaudiKernel.SystemOfUnits import GeV
 
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingQEE/StrippingALP2TauTau.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingQEE/StrippingALP2TauTau.py
index a5398df14e536d20fbd7844f5841009a5b4a5ecd..db69855d7696c5ca2cf73c0a13c8653f621c1eac 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingQEE/StrippingALP2TauTau.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingQEE/StrippingALP2TauTau.py
@@ -9,12 +9,10 @@
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
 
-from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, OfflineVertexFitter
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop
 from PhysSelPython.Wrappers import Selection, DataOnDemand, SimpleSelection
 from StrippingConf.StrippingLine import StrippingLine
 from GaudiKernel.SystemOfUnits import MeV, GeV, mm
-from CommonParticles import StdAllNoPIDsPions
 from StrippingUtils.Utils import LineBuilder
 
 '''
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingQEE/StrippingB2EHNLLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingQEE/StrippingB2EHNLLines.py
index 0a74c48c6421c6ba225775eef6c8f6c0caae34ea..a3e372506454305727e3814f5b881be54e8e1c07 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingQEE/StrippingB2EHNLLines.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingQEE/StrippingB2EHNLLines.py
@@ -28,9 +28,8 @@ __version__ = '$Revision: 2.0 $'
 
 __all__ = ('B2EHNLLines', 'default_config')
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from StandardParticles import StdAllNoPIDsPions, StdLoosePions, StdLooseMuons, StdLooseDownMuons, StdNoPIDsDownPions, StdLooseElectrons, StdNoPIDsDownElectrons
+from StandardParticles import StdLooseDownMuons, StdLooseElectrons, StdLooseMuons, StdLoosePions, StdNoPIDsDownElectrons, StdNoPIDsDownPions
 from PhysSelPython.Wrappers import CombineSelection, DataOnDemand, Selection, MergedSelection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingQEE/StrippingB2LLP2HH.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingQEE/StrippingB2LLP2HH.py
index 073c098c3a38cbbfb2655b777880011ad219247a..179fe2f52ea095317c5a39508a99a578c806ae3a 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingQEE/StrippingB2LLP2HH.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingQEE/StrippingB2LLP2HH.py
@@ -18,13 +18,11 @@ __date__ = '25/01/2019'
 
 __all__ = ('B2LLPV0_sConf', 'default_config')
 
-from Gaudi.Configuration import *
 from StandardParticles import StdAllNoPIDsPions
 from PhysSelPython.Wrappers import CombineSelection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from GaudiKernel.SystemOfUnits import GeV
-from LoKiPhys.functions import SOURCE, SIZE
 
 default_config = {
     'NAME': 'B2LLPV0',
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingQEE/StrippingB2MuHNLLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingQEE/StrippingB2MuHNLLines.py
index 1b9907eed90607183570f83ae0f41e52fc421408..ababbe64f50dd1ca13074c06e1006ca7144a37fc 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingQEE/StrippingB2MuHNLLines.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingQEE/StrippingB2MuHNLLines.py
@@ -28,9 +28,8 @@ __version__ = '$Revision: 2.0 $'
 
 __all__ = ('B2MuHNLLines', 'default_config')
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from StandardParticles import StdAllNoPIDsPions, StdLoosePions, StdLooseMuons, StdLooseDownMuons, StdNoPIDsDownPions, StdLooseElectrons, StdNoPIDsDownElectrons
+from StandardParticles import StdLooseDownMuons, StdLooseElectrons, StdLooseMuons, StdLoosePions, StdNoPIDsDownElectrons, StdNoPIDsDownPions
 from PhysSelPython.Wrappers import CombineSelection, DataOnDemand, Selection, MergedSelection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingQEE/StrippingConvertedPhoton.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingQEE/StrippingConvertedPhoton.py
index 75d6970b1df2c63c192f20d524128d15f914343b..6a24e6a634b2578b9537332d82053d30b73013fd 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingQEE/StrippingConvertedPhoton.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingQEE/StrippingConvertedPhoton.py
@@ -23,7 +23,7 @@ __all__ = (
 
 from Gaudi.Configuration import *
 from CommonParticles.Utils import *
-from GaudiKernel.SystemOfUnits import MeV, GeV, mm
+from GaudiKernel.SystemOfUnits import MeV, mm
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
 from Configurables import (DiElectronMaker,
                            ProtoParticleCALOFilter,
@@ -31,9 +31,7 @@ from Configurables import (DiElectronMaker,
                            LoKi__VertexFitter,
                            )
 from PhysSelPython.Wrappers import (Selection,
-                                    SimpleSelection,
-                                    MergedSelection,
-                                    AutomaticData)
+                                    MergedSelection)
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingQEE/StrippingDY2MuMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingQEE/StrippingDY2MuMu.py
index 9c7c8a7706d666e3fac7a8f8316de58468cc8b74..6a28183b934ae8110dbdef65c4d96d44dd261b82 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingQEE/StrippingDY2MuMu.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingQEE/StrippingDY2MuMu.py
@@ -26,9 +26,8 @@ __author__ = ['J. Anderson']
 
 __all__ = 'DY2MuMuConf', 'default_config'
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-from PhysSelPython.Wrappers import Selection, SimpleSelection
+from PhysSelPython.Wrappers import SimpleSelection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from StandardParticles import StdAllLooseMuons
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingQEE/StrippingDY2ee.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingQEE/StrippingDY2ee.py
index e1e5fb0bec27db97687652501ba17ba46baca814..25b226c2dcf544b3b1e376446c208bdd7c266ceb 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingQEE/StrippingDY2ee.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingQEE/StrippingDY2ee.py
@@ -20,9 +20,8 @@ __author__ = ['S.Bifani', 'D.Ward']
 
 __all__ = ('DY2eeConf', 'default_config')
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-from PhysSelPython.Wrappers import Selection, DataOnDemand
+from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from StandardParticles import StdAllNoPIDsElectrons
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingQEE/StrippingDisplVertices.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingQEE/StrippingDisplVertices.py
index 5b0be7ca6bf6610767d8a683238e401caadf2f20..ce06625eaa039ad6c4e22c1a114beaf965dbb3b8 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingQEE/StrippingDisplVertices.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingQEE/StrippingDisplVertices.py
@@ -40,7 +40,6 @@ __all__ = ('DisplVerticesConf', 'default_config')
 
 from Gaudi.Configuration import *
 from GaudiKernel import SystemOfUnits as units
-from LHCbKernel.Configuration import DEBUG, VERBOSE
 
 import logging
 logger = logging.getLogger(__name__)
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingQEE/StrippingDitau.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingQEE/StrippingDitau.py
old mode 100755
new mode 100644
index fa049324f79a44e720a641aa2ed2cdc857f4435e..3e2dd3df509a4ead7bb1a73e4cccd6e5f2e99c0f
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingQEE/StrippingDitau.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingQEE/StrippingDitau.py
@@ -155,8 +155,7 @@ Derived from works of S.Farry & P. Ilten
 
 """
 
-import os
-from GaudiKernel.SystemOfUnits import MeV, GeV, micrometer
+from GaudiKernel.SystemOfUnits import GeV, MeV
 from PhysSelPython.Wrappers import Selection, SimpleSelection, PassThroughSelection, MergedSelection, AutomaticData
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
@@ -894,7 +893,7 @@ def Tuples():
 
     """
     import re
-    from DecayTreeTuple.Configuration import DecayTreeTuple, EventTuple
+    from DecayTreeTuple.Configuration import DecayTreeTuple
 
     seq = GaudiSequencer('TupleSeq')
     seq.ModeOR = True
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingQEE/StrippingExotica.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingQEE/StrippingExotica.py
old mode 100755
new mode 100644
index 53d4e78dbc02f72bc606ac4946ac8b3d4ffca135..8fde59168275d4997d6cc3f329999fbc92fcaee8
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingQEE/StrippingExotica.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingQEE/StrippingExotica.py
@@ -30,7 +30,7 @@ Hlt2ExoticaPrmptDiMuonHighMass
 from GaudiKernel.SystemOfUnits import MeV, GeV, mm, picosecond
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-from PhysSelPython.Wrappers import Selection, SimpleSelection, MergedSelection, AutomaticData
+from PhysSelPython.Wrappers import AutomaticData, SimpleSelection
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingQEE/StrippingFullDiJets.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingQEE/StrippingFullDiJets.py
index 9f9b7b90a54554d0ddb97629f1717b25aa1ff1a4..cf5af4522353ef4302dda2251df7b6096c0bbf73 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingQEE/StrippingFullDiJets.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingQEE/StrippingFullDiJets.py
@@ -9,14 +9,10 @@
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
 
-from Gaudi.Configuration import *
-from Configurables import FilterDesktop, CombineParticles, LoKi__VertexFitter
+from Configurables import CombineParticles, LoKi__VertexFitter
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from StandardParticles import StdJets
-from CommonParticles.Utils import *
-from Configurables import FilterJet
 from GaudiKernel.SystemOfUnits import GeV
 
 __author__ = "Xabier Cid Vidal", "Cedric Potterat", "William Barter"
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingQEE/StrippingGluinos.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingQEE/StrippingGluinos.py
index 0867cc3c369e7f5b06dfb5d1909d7eeda820e3f0..8070b81f174dd132e7ec9c150bbe87dc5befc9b9 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingQEE/StrippingGluinos.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingQEE/StrippingGluinos.py
@@ -10,11 +10,10 @@
 ###############################################################################
 from Configurables import FilterDesktop, JetVertexAlg
 from CommonParticles.Utils import *
-from LoKiPhys.functions import SOURCE, SIZE
 from GaudiKernel.SystemOfUnits import GeV
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import FilterSelection, PassThroughSelection, DataOnDemand
+from PhysSelPython.Wrappers import FilterSelection, PassThroughSelection
 from StandardParticles import StdJets
 from Gaudi.Configuration import *
 __author__ = ['Xabier Cid Vidal', 'Carlos Vazquez Sierra', 'Igor Kostiuk']
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingQEE/StrippingLFVExotica.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingQEE/StrippingLFVExotica.py
old mode 100755
new mode 100644
index 88da9dcd829a1905c1264408cac8e2e94c89b89f..fef9c145f071f0ab2fe36aeab16fc22bc5d9a283
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingQEE/StrippingLFVExotica.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingQEE/StrippingLFVExotica.py
@@ -174,7 +174,7 @@ def create_stdjets(strob, line_location, stdjets_name_ban):
         strob.StdJetsNoJetIDBan = [myconf1]
 
     # configure Data-On-Demand service
-    locations = updateDoD(myconf1)
+    updateDoD(myconf1)
 
 
 relInfoJetsVars = ["JETNOMU1PX", "JETNOMU1PY", "JETNOMU1PZ", "JETNOMU1PT", "JETNOMU1JETWIDTH", "JETNOMU1NNTAG", "JETNOMU1MNF", "JETNOMU2PX", "JETNOMU2PY", "JETNOMU2PZ", "JETNOMU2PT", "JETNOMU2JETWIDTH", "JETNOMU2NNTAG", "JETNOMU2MNF", "JETNOMU3PX", "JETNOMU3PY",
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingQEE/StrippingLLP2HH.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingQEE/StrippingLLP2HH.py
index 00c3a16a5b5121112043a13bce9b73a6fc558213..f3d787247a298460c19f1c5cad9114e1b7b2343e 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingQEE/StrippingLLP2HH.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingQEE/StrippingLLP2HH.py
@@ -18,13 +18,11 @@ __date__ = '23/06/2021'
 
 __all__ = ('LLPV0_sConf', 'default_config')
 
-from Gaudi.Configuration import *
 from StandardParticles import StdAllNoPIDsPions
 from PhysSelPython.Wrappers import CombineSelection, PassThroughSelection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from GaudiKernel.SystemOfUnits import GeV, picosecond
-from LoKiPhys.functions import SOURCE, SIZE
 
 default_config = {
     'NAME': 'LLPV0',
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingQEE/StrippingLLP2Hadrons.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingQEE/StrippingLLP2Hadrons.py
index 4db1eeb4fc5effa1706b7725ce0ebd5c721b0060..3aec384d4ea923e83a375c12b704df908bf8ceef 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingQEE/StrippingLLP2Hadrons.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingQEE/StrippingLLP2Hadrons.py
@@ -14,10 +14,9 @@
 Stripping lines selecting scalar long-lived particles decaying to hadrons
 """
 
-from GaudiKernel.SystemOfUnits import MeV, GeV, mm, picosecond
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-from PhysSelPython.Wrappers import Selection, SimpleSelection, MergedSelection, AutomaticData
+from PhysSelPython.Wrappers import AutomaticData, MergedSelection, Selection
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingQEE/StrippingLLP2Jets.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingQEE/StrippingLLP2Jets.py
index 8619ba15a78cfb147e8f2c955611f8cdd44bd2ba..9c25c3202184e96ffba87e12971ec43ac9362246 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingQEE/StrippingLLP2Jets.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingQEE/StrippingLLP2Jets.py
@@ -18,7 +18,6 @@ __date__ = '25/01/2019'
 
 __all__ = ('LLP2Jets_sConf', 'default_config')
 
-from Gaudi.Configuration import *
 from Configurables import JetVertexAlg
 from StandardParticles import StdJets
 from CommonParticles.Utils import updateDoD
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingQEE/StrippingLLP2MuX.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingQEE/StrippingLLP2MuX.py
index 5e11c78ecc6608d63fed19b2c7da80329d8b6164..6aa23424c0d1301265496b3cb2b3aa90d102171f 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingQEE/StrippingLLP2MuX.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingQEE/StrippingLLP2MuX.py
@@ -16,7 +16,6 @@ from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import AutomaticData, Selection
 from GaudiKernel import SystemOfUnits as units
-from LHCbKernel.Configuration import *
 __author__ = "Pieter David"
 __date__ = "2014-08-28"
 __all__ = ("LLP2MuXConf", "default_config")
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingQEE/StrippingLambdaDecaysDM.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingQEE/StrippingLambdaDecaysDM.py
index bc00d02ab9e92a936cf638348bad0d0c5359e894..a5598540a06cde096db44bd5262255253d5b0e48 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingQEE/StrippingLambdaDecaysDM.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingQEE/StrippingLambdaDecaysDM.py
@@ -13,18 +13,14 @@
 Lines for searches on DM candidates produced from Lambda decays (arXiv:2101.02706).
 """
 
-from Gaudi.Configuration import *
-from LHCbKernel.Configuration import *
 
-from CommonParticles.Utils import *
-from CommonParticles import StdAllNoPIDsPions
 from StandardParticles import StdAllLooseKaons, StdAllLooseProtons, StdAllLoosePions
 
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from GaudiKernel.SystemOfUnits import MeV, picosecond, millimeter
+from GaudiKernel.SystemOfUnits import MeV, millimeter
 
 __author__ = ['Xabier Cid Vidal', 'Carlos Vazquez Sierra', 'Saul Lopez Solino']
 __date__ = '18/03/2021'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingQEE/StrippingLb2dp.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingQEE/StrippingLb2dp.py
old mode 100755
new mode 100644
index cf2bf7494c36f78187f495fe46a2fcfe068338e0..cbd7593f597ef30b0f56f7070b78fe66905549e5
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingQEE/StrippingLb2dp.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingQEE/StrippingLb2dp.py
@@ -23,15 +23,11 @@ __all__ = ('Lb2dpConf',
            )
 
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop
-from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays
 
-from StandardParticles import StdAllNoPIDsPions, StdAllNoPIDsProtons,  StdAllNoPIDsKaons
 from PhysSelPython.Wrappers import Selection, DataOnDemand, SimpleSelection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from Configurables import LoKi__VoidFilter as VoidFilter
 
 default_config = {
     'NAME': 'Lb2dp',
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingQEE/StrippingMicroDiJets.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingQEE/StrippingMicroDiJets.py
index bad4ad03547afb3eb1d9a6db8a0584899cd101c9..6334bd68bc3e5b0ba62caddeaae6ed5407bb4f92 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingQEE/StrippingMicroDiJets.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingQEE/StrippingMicroDiJets.py
@@ -10,13 +10,12 @@
 ###############################################################################
 
 from Gaudi.Configuration import *
-from Configurables import FilterDesktop, CombineParticles, LoKi__VertexFitter
+from Configurables import CombineParticles
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from StandardParticles import StdJets
 from CommonParticles.Utils import *
-from Configurables import FilterJet, ClearDaughters
+from Configurables import ClearDaughters
 from GaudiKernel.SystemOfUnits import GeV
 
 __author__ = "Xabier Cid Vidal", "Cedric Potterat", "William Barter"
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingQEE/StrippingMuMuSS.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingQEE/StrippingMuMuSS.py
index 2624678f1fc33a1d4e6229645bb86db4dda018d1..36fb89fcb7c0d8920bb6af3e43213c4dc04aa22c 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingQEE/StrippingMuMuSS.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingQEE/StrippingMuMuSS.py
@@ -26,7 +26,7 @@ __author__ = (
 )
 
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-from PhysSelPython.Wrappers import Selection, SimpleSelection
+from PhysSelPython.Wrappers import SimpleSelection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from StandardParticles import StdAllLooseMuons
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingQEE/StrippingSbarSCorrelations.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingQEE/StrippingSbarSCorrelations.py
index 578635fa7ef787c7ed772e61fa98a130acd5ab9f..9c45d8c730a8ea34174573f64728abd920769a54 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingQEE/StrippingSbarSCorrelations.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingQEE/StrippingSbarSCorrelations.py
@@ -21,10 +21,8 @@ Long tracks only
 from GaudiKernel.SystemOfUnits import MeV, GeV
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
-from StandardParticles import StdAllNoPIDsPions, StdTightKaons, StdAllNoPIDsProtons
+from PhysSelPython.Wrappers import DataOnDemand, Selection
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = ['Florin MACIUC']
 __date__ = '24/08/2013'
 __version__ = '$Revision: 1.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingQEE/StrippingStrangeBaryons.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingQEE/StrippingStrangeBaryons.py
index f3dd8ebdec4e50abd2bed892959740435ac5d9b5..2405f0e9c6f1695dd9f652d6aae992473b3135a2 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingQEE/StrippingStrangeBaryons.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingQEE/StrippingStrangeBaryons.py
@@ -18,14 +18,10 @@ Xi -> Lambda pi,   Omega -> Lambda K
 LLL DDL DDD
 '''
 
-from GaudiKernel.SystemOfUnits import MeV
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
-from CommonParticles import StdLooseLambda
-from StandardParticles import StdLoosePions, StdNoPIDsDownPions, StdLooseKaons, StdLooseDownKaons, StdLooseProtons, StdNoPIDsDownProtons
+from PhysSelPython.Wrappers import DataOnDemand, Selection
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = ['Mihai Straticiuc', 'Florin Maciuc', 'Nguyen Thi Dung']
 __date__ = '26/06/2012'
 __version__ = '$Revision: 0.3 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingQEE/StrippingStrangeBaryonsNoPID.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingQEE/StrippingStrangeBaryonsNoPID.py
index 668986b834d39169c5ae15803bf5d5fb33cff67b..208ab8bad23a5e36e2a0a609a82dd6ca2fc9d012 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingQEE/StrippingStrangeBaryonsNoPID.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingQEE/StrippingStrangeBaryonsNoPID.py
@@ -18,12 +18,10 @@ Xi -> Lambda pi,   Omega -> Lambda K
 LLL
 '''
 
-from GaudiKernel.SystemOfUnits import MeV
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
+from PhysSelPython.Wrappers import DataOnDemand, Selection
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = ['Florin Maciuc']
 __date__ = '13/01/2014'
 __version__ = '$Revision: 0.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingQEE/StrippingTaggedJets.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingQEE/StrippingTaggedJets.py
old mode 100755
new mode 100644
index 295b8a41d2618b3fecf00a4f5a1b7c033637686d..bb3326270087d013f8ced34035ee104c1c23848b
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingQEE/StrippingTaggedJets.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingQEE/StrippingTaggedJets.py
@@ -10,11 +10,10 @@
 ###############################################################################
 
 from Gaudi.Configuration import *
-from Configurables import FilterDesktop, CombineParticles, LoKi__VertexFitter
+from Configurables import CombineParticles, LoKi__VertexFitter
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from StandardParticles import StdJets
 from CommonParticles.Utils import *
 from Configurables import FilterJet
 from GaudiKernel.SystemOfUnits import GeV
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingQEE/StrippingW2nH.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingQEE/StrippingW2nH.py
index cc373f666cb49309b9f3e2efe0dae8e52ac260a4..22eacc1d77ba55838726dc481db0fa8f76e6bf1d 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingQEE/StrippingW2nH.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingQEE/StrippingW2nH.py
@@ -26,7 +26,6 @@ from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from StandardParticles import StdAllNoPIDsPions
 from GaudiKernel.SystemOfUnits import GeV
-from GaudiKernel.SystemOfUnits import MeV
 
 
 default_config = {
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingQEE/StrippingWJets.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingQEE/StrippingWJets.py
old mode 100755
new mode 100644
index ae80ec7c3f67ef962664ed45183a235fcd9c9d4f..48a0b2de2b4dc719b98a7a0de39e0eae96ed4f4f
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingQEE/StrippingWJets.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingQEE/StrippingWJets.py
@@ -22,14 +22,12 @@ They are then cover a phasespace complementarily on each other.
 
 """
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
 from Configurables import CombineParticles, LoKi__VertexFitter
 from PhysSelPython.Wrappers import Selection, SimpleSelection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from StandardParticles import StdAllLooseMuons, StdAllNoPIDsElectrons, StdJets
-from CommonParticles.Utils import *
 from GaudiKernel.SystemOfUnits import GeV, MeV
 
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingQEE/StrippingWRareDecay.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingQEE/StrippingWRareDecay.py
index de1eaf98e07a599774f9667406768492a892a465..f599f543313af3af803cfd1ae503077a399fbebb 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingQEE/StrippingWRareDecay.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingQEE/StrippingWRareDecay.py
@@ -21,8 +21,7 @@ from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from GaudiKernel.SystemOfUnits import MeV, GeV, mm, picosecond
-from Gaudi.Configuration import *
+from GaudiKernel.SystemOfUnits import MeV, picosecond
 __author__ = ['Hang Yin', 'Qundong Han']
 __date__ = '11/29/2016'
 __version__ = '$Revision: 2.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingQEE/StrippingWe.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingQEE/StrippingWe.py
index 0820e8b431f0bb8891ac3f88f980c3fcbe0a181c..3e509fb26655db393ee396f8d85f74a24b0c62d7 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingQEE/StrippingWe.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingQEE/StrippingWe.py
@@ -21,7 +21,6 @@ We control: StdAllNoPIDsElectrons, PRS>50Mev & E_ECal/P>0.1 & E_HCal/P<0.05 & pT
 __all__ = 'WeConf', 'default_config'
 __author__ = 'S. Bifani', 'D. Ward'
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
 from PhysSelPython.Wrappers import SimpleSelection
 from StrippingConf.StrippingLine import StrippingLine
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingQEE/StrippingZ02ee.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingQEE/StrippingZ02ee.py
index e797011998c7d9201276f70cdabaa1b30ae4d70f..f6977308a75475dc2fd7e695d713190194177820 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingQEE/StrippingZ02ee.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingQEE/StrippingZ02ee.py
@@ -23,7 +23,6 @@ __all__ = (
     'default_config',
 )
 
-from Gaudi.Configuration import *
 from GaudiKernel.SystemOfUnits import GeV, MeV
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 from PhysSelPython.Wrappers import SimpleSelection
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingQEE/StrippingZ02nH.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingQEE/StrippingZ02nH.py
index 2f8d8eb612b1c353cf08c5e72ca77ae205eb7a72..35de5f4d789850497ba9aa5b71430ef065284077 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingQEE/StrippingZ02nH.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingQEE/StrippingZ02nH.py
@@ -26,7 +26,6 @@ from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from StandardParticles import StdAllNoPIDsPions
 from GaudiKernel.SystemOfUnits import GeV
-from GaudiKernel.SystemOfUnits import MeV
 
 
 default_config = {
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingQEE/StrippingZ0RareDecay.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingQEE/StrippingZ0RareDecay.py
index 57c2091f2ac6a4efcb43bd28c4251acba348f513..e181b28533d1769723804e5ccc2d55ce3dfbccea 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingQEE/StrippingZ0RareDecay.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingQEE/StrippingZ0RareDecay.py
@@ -22,8 +22,7 @@ __version__ = '$Revision: 2.0 $'
 
 __all__ = 'default_config', 'Z0RareDecayConf'
 
-from Gaudi.Configuration import *
-from GaudiKernel.SystemOfUnits import MeV, GeV, mm
+from GaudiKernel.SystemOfUnits import MeV
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
 from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
 from StrippingConf.StrippingLine import StrippingLine
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingQEE/depreciated/StrippingDijets.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingQEE/depreciated/StrippingDijets.py
index f0793d3411791797729ad540397e458f4646f78b..975321a6b30b00b6f80aee11878eb20ba9d16b84 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingQEE/depreciated/StrippingDijets.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingQEE/depreciated/StrippingDijets.py
@@ -15,8 +15,7 @@
 __all__ = ('DijetsConf',
            'default_config')
 
-from Gaudi.Configuration import *
-from GaudiKernel.SystemOfUnits import MeV, GeV, mm
+from GaudiKernel.SystemOfUnits import GeV, MeV
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingQEE/depreciated/StrippingHighPtTopoJets.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingQEE/depreciated/StrippingHighPtTopoJets.py
index 73ca61d9e7e0914a21b65e40361131e8f38c026d..6078cdec364615de35d547f813533d0a763afeef 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingQEE/depreciated/StrippingHighPtTopoJets.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingQEE/depreciated/StrippingHighPtTopoJets.py
@@ -21,8 +21,6 @@ __all__ = ('default_config', 'HighPtTopoJetsConf')
 # \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\#
 
 
-from Gaudi.Configuration import *
-from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from PhysSelPython.Wrappers import EventSelection
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingQEE/depreciated/StrippingJets.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingQEE/depreciated/StrippingJets.py
index 02e5fc43080729f2f38d0bc0bde65232a21f0202..55abf24d99577dcb8f10b30fda8803015b0c09f0 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingQEE/depreciated/StrippingJets.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingQEE/depreciated/StrippingJets.py
@@ -15,13 +15,11 @@
 __all__ = ('JetsConf',
            'default_config')
 
-from Gaudi.Configuration import *
-from GaudiKernel.SystemOfUnits import MeV, GeV, mm
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
+from GaudiKernel.SystemOfUnits import GeV, MeV
+from PhysSelPython.Wrappers import MergedSelection, Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
-from JetAccessories.JetMaker_Config import JetMakerConf
 from StandardParticles import StdJets, StdAllNoPIDsPions
 from Configurables import CombineParticles
 from Configurables import TopologicalTagging
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/Beauty2Charm_LoKiCuts.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/Beauty2Charm_LoKiCuts.py
index ce5265655cf518aa12121d3a5728d84c36da26cd..666cef80aacee423a071365fe7281c63e506e27d 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/Beauty2Charm_LoKiCuts.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/Beauty2Charm_LoKiCuts.py
@@ -10,11 +10,6 @@
 ###############################################################################
 # \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\#
 
-from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
-from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-from PhysSelPython.Wrappers import Selection, MergedSelection
-from StandardParticles import StdNoPIDsPions, StdNoPIDsKaons
 
 # \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\#
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingB02Lcmu_pKpi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingB02Lcmu_pKpi.py
index 3d6992fd337683bf5bcf97e994e4fd64705add4f..93bd54fbf8871329e8e7bcb95f7722d9913e1cff 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingB02Lcmu_pKpi.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingB02Lcmu_pKpi.py
@@ -14,7 +14,6 @@ from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = ['Nikita Beliy', 'Jibo He']
 __date__ = '28/11/2016'
 __version__ = '$Revision: 1.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingB23MuLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingB23MuLines.py
index a6e53abda621d1f1b0efe6185553c1b46aae67e6..15ea2076dcaea1a75c4fec8295e895be19887b4a 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingB23MuLines.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingB23MuLines.py
@@ -55,13 +55,11 @@ __all__ = ("B23MuLinesConf",
 
 #############################################################################
 
-from Gaudi.Configuration import *
-from Configurables import FilterDesktop, CombineParticles, DaVinci__N3BodyDecays
+from Configurables import DaVinci__N3BodyDecays
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 # from StrippingSelections.Utils import checkConfig
-from GaudiKernel.PhysicalConstants import c_light
 
 #############################################################################
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingB2DibaryonMuMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingB2DibaryonMuMu.py
index 3244d01c63302e316fc5389d89d96ffeeae19328..7c9eae26a3a3acea16b7970f07b704ca3dec2abd 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingB2DibaryonMuMu.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingB2DibaryonMuMu.py
@@ -10,9 +10,8 @@
 ###############################################################################
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection, AutomaticData
+from PhysSelPython.Wrappers import MergedSelection, Selection
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, DaVinci__N3BodyDecays
-from Gaudi.Configuration import *
 __author__ = 'Vitalii Lisovskyi; based on Bu2LLK lines'
 __date__ = '04/09/2019'
 __version__ = '$Revision: 1 $'
@@ -112,7 +111,6 @@ class B2DibaryonMuMuConf(LineBuilder):
         # 2 : Make Dileptons
 
         from StandardParticles import StdLooseDiMuon as DiMuons
-        MuonID = "(HASMUON)&(ISMUON)"
         DiMuonID = "(2 == NINTREE((ABSID==13)&(HASMUON)&(ISMUON)))"
 
         SelDiMuon = self._filterDiLepton("SelDiMuonsFor" + self._name,
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingB2EtaMuMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingB2EtaMuMu.py
index b614d11a7b9702109f6bc31332fcc68aef2d3cd9..6a856fa995234718f36df2e31af89417225452fa 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingB2EtaMuMu.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingB2EtaMuMu.py
@@ -12,13 +12,12 @@
 B->etamumuselection
 '''
 
-from StandardParticles import StdAllNoPIDsMuons, StdAllLooseMuons
+from StandardParticles import StdAllNoPIDsMuons
 from StandardParticles import StdNoPIDsPions, StdLooseAllPhotons, StdLooseMergedPi0, StdLooseResolvedPi0
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand, SimpleSelection, MergedSelection
+from PhysSelPython.Wrappers import MergedSelection, Selection, SimpleSelection
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = ['Fred Blanc']
 __date__ = '04/09/2019'
 __version__ = '$Revision: 1.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingB2KLLXInclusive.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingB2KLLXInclusive.py
index a9d2ffd4e4d8d6444da6c3df3731248c13fce6e7..61a740d6b5d3d92a7f2015b59a5021738a7a2958 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingB2KLLXInclusive.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingB2KLLXInclusive.py
@@ -19,15 +19,12 @@ __all__ = ('B2KLLXInclusiveConf', 'default_config')
 Stripping selection for inclusively selected B->KmumuX decays.
 """
 
-from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop
+from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
 
 from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from LHCbKernel.Configuration import *  # check if needed
-from Configurables import SubstitutePID
-from Configurables import SubPIDMMFilter
 
 
 #################
@@ -333,7 +330,6 @@ class B2KLLXInclusiveConf(LineBuilder):
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         CombineDiMuon = CombineParticles()
         CombineDiMuon.DecayDescriptors = ["[B+ -> J/psi(1S) K+]cc"]
-        sel_name = "InclKLL"
         CombineDiMuon.MotherCut = self.InclKLLCut
         # choose
         leptons = self.InclLeptons
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingB2KSKSMuMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingB2KSKSMuMu.py
index 60fc5ccbd40bc95a884b69e2b2b8c7d93b722665..b1a382095c4fd701f38e4fcada71554ecba26858 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingB2KSKSMuMu.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingB2KSKSMuMu.py
@@ -10,9 +10,8 @@
 ###############################################################################
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection, AutomaticData
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, DaVinci__N3BodyDecays
-from Gaudi.Configuration import *
+from PhysSelPython.Wrappers import MergedSelection, Selection
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop
 __author__ = 'Vitalii Lisovskyi'
 __date__ = '18/06/2021'
 __version__ = '$Revision: 1 $'
@@ -72,7 +71,6 @@ class B2KSKSMuMuConf(LineBuilder):
         # Make Dileptons
 
         from StandardParticles import StdLooseDiMuon as DiMuons
-        MuonID = "(HASMUON)&(ISMUON)"
         DiMuonID = "(2 == NINTREE((ABSID==13)&(HASMUON)&(ISMUON)&(PROBNNmu>0.01)))"
 
         SelDiMuon = self._filterDiLepton("SelDiMuonsFor" + self._name,
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingB2KstTauTau.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingB2KstTauTau.py
index 4bfb173d10ad2284c0c5e807ef7e994004f53eac..df476bc07228f66e5de7c80c69a4831bd6f17797 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingB2KstTauTau.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingB2KstTauTau.py
@@ -16,8 +16,7 @@ from StandardParticles import StdTightMuons
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, OfflineVertexFitter, DaVinci__N3BodyDecays
-from Gaudi.Configuration import *
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N3BodyDecays, FilterDesktop
 __author__ = [' G. Mancinelli, J. Serrano, F. Polci, T. Fulghesu']
 __date__ = '15/08/2014'
 __version__ = '$Revision: 0.1 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingB2LLXBDT.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingB2LLXBDT.py
index 33ad8193f48b0db42c11b2b0fdb770bc37fa1794..b45675d8906a352a37b4bdd5ca92e02e5c6279bf 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingB2LLXBDT.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingB2LLXBDT.py
@@ -20,8 +20,6 @@ from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticle
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, MergedSelection
-from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays
-from Gaudi.Configuration import *
 __author__ = ['Jibo He']
 __date__ = '20/11/2015'
 __version__ = '$Revision: 1.0 $'
@@ -261,7 +259,7 @@ class B2LLXBDTConf(LineBuilder):
         """
         Kshort, both LL and DD
         """
-        from StandardParticles import StdLooseKsDD, StdLooseKsLL
+        from StandardParticles import StdLooseKsDD
 
         self.SelKsDD = self.createSubSel(OutputList=self.name + "SelKsDD",
                                          InputList=StdLooseKsDD,
@@ -297,7 +295,7 @@ class B2LLXBDTConf(LineBuilder):
         """
         Lambda, both LL and DD
         """
-        from StandardParticles import StdLooseLambdaDD, StdLooseLambdaLL
+        from StandardParticles import StdLooseLambdaDD
 
         self.SelLambdaDD = self.createSubSel(OutputList=self.name + "SelLambdaDD",
                                              InputList=StdLooseLambdaDD,
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingB2LLXBDTSS.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingB2LLXBDTSS.py
index 6547c8d92952608cbce068992079d7eefcc9788f..9a503cdbdc4e4f4133951d4b663f5d7157875f5a 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingB2LLXBDTSS.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingB2LLXBDTSS.py
@@ -20,8 +20,6 @@ from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticle
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, MergedSelection
-from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays
-from Gaudi.Configuration import *
 __author__ = ['Jibo He', 'Yanting Fan', 'Angel Campoverde']
 __date__ = '17/06/2021'
 __version__ = '$Revision: 1.0 $'
@@ -228,7 +226,7 @@ class B2LLXBDTSSConf(LineBuilder):
         """
         Di letpons
         """
-        from StandardParticles import StdDiElectronFromTracks, StdLooseDiMuon, StdAllLooseANNElectrons, StdLooseDiMuonSameSign, StdAllLooseMuons
+        from StandardParticles import StdAllLooseANNElectrons, StdAllLooseMuons, StdLooseDiMuonSameSign
 
         self.SelDiElectron = self.createCombinationSel(OutputList=self.name + "SelDiElectron",
                                                        DecayDescriptor="[J/psi(1S) -> e+ e+]cc",
@@ -296,7 +294,7 @@ class B2LLXBDTSSConf(LineBuilder):
         """
         Kshort, both LL and DD
         """
-        from StandardParticles import StdLooseKsDD, StdLooseKsLL
+        from StandardParticles import StdLooseKsDD
 
         self.SelKsDD = self.createSubSel(OutputList=self.name + "SelKsDD",
                                          InputList=StdLooseKsDD,
@@ -332,7 +330,7 @@ class B2LLXBDTSSConf(LineBuilder):
         """
         Lambda, both LL and DD
         """
-        from StandardParticles import StdLooseLambdaDD, StdLooseLambdaLL
+        from StandardParticles import StdLooseLambdaDD
 
         self.SelLambdaDD = self.createSubSel(OutputList=self.name + "SelLambdaDD",
                                              InputList=StdLooseLambdaDD,
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingB2LLXBDT_Calib.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingB2LLXBDT_Calib.py
index 56119a8defd7314f20eac2f2f78263f57aa6849c..28e6f3608431fba0221fc067bd66c5cf7a6f355a 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingB2LLXBDT_Calib.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingB2LLXBDT_Calib.py
@@ -19,9 +19,7 @@ Note:
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, MergedSelection
-from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays
-from Gaudi.Configuration import *
+from PhysSelPython.Wrappers import Selection
 __author__ = ['Jibo He', 'Yanting Fan']
 __date__ = '10/03/2021'
 __version__ = '$Revision: 1.0 $'
@@ -194,7 +192,7 @@ class B2LLXBDT_CalibConf(LineBuilder):
         """
         Di letpons
         """
-        from StandardParticles import StdDiElectronFromTracks, StdLooseDiMuon, StdAllNoPIDsElectrons, StdAllNoPIDsMuons
+        from StandardParticles import StdAllNoPIDsElectrons, StdAllNoPIDsMuons
 
         self.SelDiElectron = self.createCombinationSel(OutputList=self.name + "SelDiElectron",
                                                        DecayDescriptor='J/psi(1S) -> e+ e-',
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingB2Lambda0ELines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingB2Lambda0ELines.py
index dcb376b6317e21a82d05511d6642d51a9139b1e0..beaae1e2b2d8fdb3ab6922b0b597f4f3735074b1 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingB2Lambda0ELines.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingB2Lambda0ELines.py
@@ -21,7 +21,6 @@ __all__ = ('B2Lambda0ELines',
            'default_config')
 
 from StandardParticles import StdLoosePions, StdLooseElectrons, StdNoPIDsDownElectrons, StdNoPIDsDownPions
-from Configurables import TisTosParticleTagger
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingB2Lambda0MuLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingB2Lambda0MuLines.py
index e758feafbbaf38bbf2c16b62697aeccc5044b5c0..8c8ebee90e957bb0642c7fb649a57f03d93eef97 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingB2Lambda0MuLines.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingB2Lambda0MuLines.py
@@ -21,7 +21,6 @@ __all__ = ('B2Lambda0MuLines',
            'default_config')
 
 from StandardParticles import StdLoosePions, StdLooseMuons, StdLooseDownMuons, StdNoPIDsDownPions
-from Configurables import TisTosParticleTagger
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingB2Lambda0MuOSLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingB2Lambda0MuOSLines.py
index 389b9bf695c2932c173a4ee768404acc14c2b153..4186a8554984cb039f3d149cda4700f95f9a9753 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingB2Lambda0MuOSLines.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingB2Lambda0MuOSLines.py
@@ -21,7 +21,6 @@ __all__ = ('B2Lambda0MuOSLines',
            'default_config')
 
 from StandardParticles import StdLoosePions, StdLooseMuons, StdLooseDownMuons, StdNoPIDsDownPions
-from Configurables import TisTosParticleTagger
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingB2Lambda0SSMuMu3PiLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingB2Lambda0SSMuMu3PiLines.py
index b829fcd48cd4d244f39b998208c83dfea4c65343..f47c81735abc7cb47558594658aaf83f1ca7bc36 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingB2Lambda0SSMuMu3PiLines.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingB2Lambda0SSMuMu3PiLines.py
@@ -21,7 +21,6 @@ __all__ = ('B2Lambda0SSMuMu3PiLines',
            'default_config')
 
 from StandardParticles import StdLoosePions, StdLooseMuons, StdLooseDownMuons, StdNoPIDsDownPions
-from Configurables import TisTosParticleTagger
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingB2MuMuMuMuLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingB2MuMuMuMuLines.py
index fa05d51ee2de3b49393863f88c1ea5b92412691c..290a038e170fc100b3d53f6d44d47d6e193f2ebd 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingB2MuMuMuMuLines.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingB2MuMuMuMuLines.py
@@ -21,7 +21,7 @@ from Beauty2Charm_LoKiCuts import LoKiCuts
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
-from Configurables import FilterDesktop, CombineParticles
+from Configurables import CombineParticles
 from Gaudi.Configuration import *
 __author__ = ['Diego Martinez Santos', 'Johannes Albrecht',
               'Konstantinos A. Petridis', 'Alexander Baranov']
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingB2OCMuMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingB2OCMuMu.py
index 85a7ae0f507641e942a8a8d127a0bfe50d047eb6..be3956da72885c84a4baf22412ecf87c0af293fa 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingB2OCMuMu.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingB2OCMuMu.py
@@ -9,14 +9,10 @@
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop  # as FilterDesktop_GC
-from GaudiKernel.SystemOfUnits import MeV
-from CommonParticles.Utils import updateDoD
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection, AutomaticData
-from Configurables import (ResolvedPi0Maker, PhotonMaker)
+from PhysSelPython.Wrappers import DataOnDemand, MergedSelection, Selection
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N3BodyDecays, DaVinci__N4BodyDecays
-from Gaudi.Configuration import *
 __author__ = 'Vitalii Lisovskyi'
 __date__ = '05/03/2021'
 __version__ = '$Revision: 0 $'
@@ -76,9 +72,7 @@ class B2OCMuMuConf(LineBuilder):
         BcLine_name = name+"Bc"
         BcNoPointLine_name = name+"BcNoPoint"
 
-        from StandardParticles import StdLoosePions as Pions
         from StandardParticles import StdLooseKaons as Kaons
-        from StandardParticles import StdLooseProtons as Protons
         from StandardParticles import StdAllNoPIDsPions as AllPions
         from StandardParticles import StdAllNoPIDsKaons as AllKaons
         from StandardParticles import StdAllNoPIDsProtons as AllProtons
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingB2XLL.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingB2XLL.py
old mode 100755
new mode 100644
index 893c8f7d24822aaf5128c145a0ea679b0efd25cc..54c9d8dbdf1774215b4f2574855ce20420b67924
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingB2XLL.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingB2XLL.py
@@ -10,9 +10,8 @@
 ###############################################################################
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection, AutomaticData
+from PhysSelPython.Wrappers import MergedSelection, Selection
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = 'Raja Nandakumar, Fergus Wilson, Stefania Ricciardi'
 __date__ = '04/11/2015'
 __version__ = '$Revision: 0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingB2XMuMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingB2XMuMu.py
index 018806639a8b82fc54e5d95d7cd845f454943b0a..e0f7a0afc6c02fc2f49bd755a2c0b78caaec7987 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingB2XMuMu.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingB2XMuMu.py
@@ -19,7 +19,6 @@ __version__ = '$Revision: 1.2 $'
 __all__ = ('B2XMuMuConf', 'default_config')
 
 
-from Gaudi.Configuration import *
 from LHCbKernel.Configuration import *  # check if needed
 
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingB2XMuTauMuonic.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingB2XMuTauMuonic.py
index 1273eebf7e8d1885ba9abc40fa20e1d3c391f3f5..822bfb329fc0e318ff8ade55ecd4efe9b18e20cb 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingB2XMuTauMuonic.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingB2XMuTauMuonic.py
@@ -22,8 +22,6 @@ __version__ = '$Revision: 0.0 $'
 
 __all__ = ('B2XMuTauMuonicConf', 'default_config')
 
-from Gaudi.Configuration import *
-from LHCbKernel.Configuration import *
 
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingB2XTau.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingB2XTau.py
index 89967ffc1bd10cb56544c7233004d1b229731f9c..9050443393da5af1c9abb3eee3ba2e1eda76009d 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingB2XTau.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingB2XTau.py
@@ -8,16 +8,13 @@
 # granted to it by virtue of its status as an Intergovernmental Organization  #
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
-from StandardParticles import StdAllLoosePions, StdAllNoPIDsPions
-from copy import deepcopy
 from StandardParticles import StdLooseKaons
-from StandardParticles import StdLoosePions, StdTightPions
-from StandardParticles import StdNoPIDsKaons, StdNoPIDsPions, StdTightMuons
+from StandardParticles import StdLoosePions
+from StandardParticles import StdNoPIDsPions, StdTightMuons
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, OfflineVertexFitter, DaVinci__N3BodyDecays
-from Gaudi.Configuration import *
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N3BodyDecays, FilterDesktop
 __author__ = ['G. Dujany, G. Mancinelli, J. Serrano']
 __date__ = '24/05/2010,15/01/2014, 19/10/2017'
 __version__ = '$Revision: 1.3 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingB2XTauMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingB2XTauMu.py
index 1539daf38aad3280d179e42101b30c7b9367dc90..3bf392ac2eb839b14fbb1f75d9e94e760e94edd9 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingB2XTauMu.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingB2XTauMu.py
@@ -25,8 +25,6 @@ __all__ = ('B2XTauMuConf',
            'default_config')
 
 
-from Gaudi.Configuration import *
-
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
 from PhysSelPython.Wrappers import Selection, MergedSelection
 from StrippingConf.StrippingLine import StrippingLine
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingB2XTauTau.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingB2XTauTau.py
index 44cd40b223f3cc0f18f50a09a1e6f2fad19f1ae6..f25de253e9360d45277265567601c6f09dd87a01 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingB2XTauTau.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingB2XTauTau.py
@@ -14,8 +14,7 @@ from StandardParticles import StdNoPIDsPions, StdLoosePions
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand, SimpleSelection
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, OfflineVertexFitter, DaVinci__N3BodyDecays
-from Gaudi.Configuration import *
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N3BodyDecays, FilterDesktop
 __author__ = [' L. Pescatore', 'F. Blanc']
 __date__ = '12/03/2019'
 __version__ = '$Revision: 0.1$'
@@ -23,7 +22,6 @@ __version__ = '$Revision: 0.1$'
 # Stripping line for B->Htautau
 
 from GaudiKernel.SystemOfUnits import MeV
-from GaudiKernel.SystemOfUnits import mm
 """
   B->KstarTauTau, B->KTauTau, B->PhiTauTau, B->Eta'TauTau
 """
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingB2XTauTauMuonic.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingB2XTauTauMuonic.py
index 7954d22e02ac3a771946dbff8a78defa432c581a..8cc4c1f52993764f26264b2bde93b69d57bf9794 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingB2XTauTauMuonic.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingB2XTauTauMuonic.py
@@ -23,8 +23,6 @@ __version__ = '$Revision: 0.2 $'
 
 __all__ = ('B2XTauTauMuonicConf', 'default_config')
 
-from Gaudi.Configuration import *
-from LHCbKernel.Configuration import *
 
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop, DaVinci__N3BodyDecays
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingBLVLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingBLVLines.py
index 8bf68933cf866f19e4931849021862745276afe7..a5196ce34b14f3f32b717e3c7fcb254e2f21f2fa 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingBLVLines.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingBLVLines.py
@@ -95,8 +95,7 @@ __all__ = ("BLVLinesConf",
 
 ###################################################################################################
 
-from Gaudi.Configuration import *
-from Configurables import FilterDesktop, CombineParticles, DaVinci__N3BodyDecays
+from Configurables import CombineParticles, DaVinci__N3BodyDecays
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingBaryonicLFV.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingBaryonicLFV.py
index a346ce2d29aade7bc06633bf054c0e8f5d5f1ccd..85c93efc5e1805384253264789630d08f7da5cad 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingBaryonicLFV.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingBaryonicLFV.py
@@ -32,14 +32,12 @@ __version__ = '$Revision: 0.0 $'
 __all__ = ('BaryonicLFVConf', 'default_config')
 
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import DaVinci__N3BodyDecays as Combine3Particles
 from GaudiConfUtils.ConfigurableGenerators import DaVinci__N5BodyDecays as Combine5Particles
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from GaudiKernel.PhysicalConstants import c_light
 
 default_config = {
     'NAME': 'BaryonicLFV',
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingBd2KSLLX.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingBd2KSLLX.py
index 419b0f7505b9bb8f7a0008bd6bd040167c12c60a..54c987ef8b72fd7e148a11fb44cebadb12188639 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingBd2KSLLX.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingBd2KSLLX.py
@@ -10,9 +10,8 @@
 ###############################################################################
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection, AutomaticData
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, DaVinci__N3BodyDecays
-from Gaudi.Configuration import *
+from PhysSelPython.Wrappers import MergedSelection, Selection
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop
 __author__ = 'SB'
 __date__ = '08/10/2017'
 __version__ = '$Revision: 1 $'
@@ -47,15 +46,8 @@ class Bd2KSLLXConf(LineBuilder):
         mmXLine_name = name + "_mm"
         eeXLine_name = name + "_ee"
 
-        from StandardParticles import StdLoosePions as Pions
-        from StandardParticles import StdLooseKaons as Kaons
-        from StandardParticles import StdLooseKstar2Kpi as Kstars
-        from StandardParticles import StdLoosePhi2KK as Phis
         from StandardParticles import StdLooseKsLL as KshortsLL
         from StandardParticles import StdLooseKsDD as KshortsDD
-        from StandardParticles import StdLooseLambdaLL as LambdasLL
-        from StandardParticles import StdLooseLambdaDD as LambdasDD
-        from StandardParticles import StdLooseLambdastar2pK as Lambdastars
 
         SelKshortsLL = self._filterHadron(name="KshortsLLFor" + self._name,
                                           sel=KshortsLL,
@@ -64,12 +56,10 @@ class Bd2KSLLXConf(LineBuilder):
                                           sel=KshortsDD,
                                           params=config)
 
-        from StandardParticles import StdDiElectronFromTracks as DiElectronsFromTracks
         from StandardParticles import StdLooseDiElectron as DiElectrons
         from StandardParticles import StdLooseDiMuon as DiMuons
 
-        ElecID = "(PIDe > %(PIDe)s)" % config
-        MuonID = "(HASMUON)&(ISMUON)"
+        "(PIDe > %(PIDe)s)" % config
 
         DiElectronID = "(2 == NINTREE((ABSID==11)&(PIDe > %(PIDe)s)))" % config
         DiMuonID = "(2 == NINTREE((ABSID==13)&(HASMUON)&(ISMUON)))"
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingBd2eeKstarBDT.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingBd2eeKstarBDT.py
index 1a6b3547113e58f48bff1e36952cfc3fb4d30295..6776dcdf27807a56103010584c7a22734b4a8a3f 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingBd2eeKstarBDT.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingBd2eeKstarBDT.py
@@ -18,7 +18,6 @@ from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = ['Marie-Helene Schune', 'Jibo He']
 __date__ = '20/01/2012'
 __version__ = '$Revision: 1.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingBeauty2MajoLep.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingBeauty2MajoLep.py
index 1c734bb1d50cad23296af38cdba5155be75087a1..61c847aced349d945e821dd2bde9314ce08d72fb 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingBeauty2MajoLep.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingBeauty2MajoLep.py
@@ -19,12 +19,10 @@ __version__ = 'V0.2'
 __all__ = ('Beauty2MajoLepConf',
            'default_config')
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
+from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from GaudiKernel.SystemOfUnits import *
 
 from StandardParticles import StdAllNoPIDsMuons as Muons
 from StandardParticles import StdAllNoPIDsPions as Pions
@@ -424,7 +422,7 @@ class Beauty2MajoLepConf(LineBuilder):
     def makeMu(self, name, config):
         # define all the cuts
         _bachPtCut = "(PT>%s*MeV)" % config['Lep_PTmin']
-        _bachIPChi2Cut = "(MIPCHI2DV(PRIMARY) > %s)" % config['Lep_IPChi2min']
+        "(MIPCHI2DV(PRIMARY) > %s)" % config['Lep_IPChi2min']
         _trkGPCut = "(TRGHOSTPROB<%s)" % config['Trk_GhostProb']
         _pidMuon = '(ISMUON)'
 
@@ -860,7 +858,7 @@ class Beauty2MajoLepConf(LineBuilder):
 
         _massCutHigh = "(AM<(%s*MeV))" % config['Majo_AMhigh']
         _docaCut = "(ADOCACHI2CUT(%s, ''))" % config['Majo_DocaChi2']
-        _massCutLow = "(AM>(%s*MeV))" % config['Majo_AMlow']
+        "(AM>(%s*MeV))" % config['Majo_AMlow']
 
         _combCuts = _massCutHigh + '&'+_docaCut
 
@@ -893,7 +891,7 @@ class Beauty2MajoLepConf(LineBuilder):
 
         _massCutHigh = "(AM<(%s*MeV))" % config['Majo_AMhigh']
         _docaCut = "(ADOCACHI2CUT(%s, ''))" % config['Majo_DocaChi2']
-        _massCutLow = "(AM>(%s*MeV))" % config['Majo_AMlow']
+        "(AM>(%s*MeV))" % config['Majo_AMlow']
         _combCuts = _massCutHigh + '&'+_docaCut
 
         _ptCut = "(PT>%s*MeV)" % config['Majo_PTmin']
@@ -1111,7 +1109,7 @@ class Beauty2MajoLepConf(LineBuilder):
 
         _massCutLow = "(AM>(%s*MeV))" % config['AM_Mlow']
         _massCutHigh = "(AM<(%s*MeV))" % config['AM_Mhigh']
-        _docaCut = "(ADOCACHI2CUT(%s, ''))" % config['Majo_DocaChi2']
+        "(ADOCACHI2CUT(%s, ''))" % config['Majo_DocaChi2']
 
         _combCuts = _massCutLow+'&'+_massCutHigh
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingBeauty2XGamma.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingBeauty2XGamma.py
index d21b9a25bc2714ed14237d6218c1dad601dc1240..05e9c9cf0af28c167f2cc98f655c56f432f3ea6b 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingBeauty2XGamma.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingBeauty2XGamma.py
@@ -12,7 +12,7 @@
 B-> X Gamma selections
 '''
 
-from StandardParticles import StdAllNoPIDsKaons, StdAllNoPIDsPions, StdLooseAllPhotons, StdLooseMergedPi0, StdLooseResolvedPi0, StdAllLooseGammaDD, StdAllLooseGammaLL, StdAllNoPIDsProtons
+from StandardParticles import StdAllLooseGammaDD, StdAllLooseGammaLL, StdAllNoPIDsPions, StdLooseAllPhotons, StdLooseMergedPi0, StdLooseResolvedPi0
 from Configurables import TisTosParticleTagger
 from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays as Combine4Particles
 from GaudiConfUtils.ConfigurableGenerators import DaVinci__N3BodyDecays as Combine3Particles
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingBs2MuMuGamma.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingBs2MuMuGamma.py
index 0cfb5425d7a51fe618e72a66a2e6e2062510e41d..f1f37c46035071eccb7cf880d283aafb532e0b8f 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingBs2MuMuGamma.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingBs2MuMuGamma.py
@@ -15,7 +15,7 @@ Authors: Meril Reboud, Jean-Francois Marchand
 """
 
 ########################################################################
-from StrippingUtils.Utils import LineBuilder, checkConfig
+from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Combine3BodySelection
 from StandardParticles import StdLooseMuons, StdLooseAllPhotons
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingBs2MuMuLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingBs2MuMuLines.py
index 28fab868cccc6d58e46553f2585cd743326a977c..8bf0a80a0ffc3aa0267bf6dfb6cc948d4a90331a 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingBs2MuMuLines.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingBs2MuMuLines.py
@@ -26,7 +26,7 @@ from Gaudi.Configuration import *
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
-from Configurables import FilterDesktop, CombineParticles
+from Configurables import CombineParticles
 from JetAccessories.JetMaker_Config import JetMakerConf
 from CommonParticles.Utils import *
 from Gaudi.Configuration import *
@@ -159,7 +159,7 @@ def create_stdjets(strob, line_location, stdjets_name_ban, stdjets_name_addb):
         strob.StdJetsNoJetIDBan = [myconf1]
 
     # configure Data-On-Demand service
-    locations = updateDoD(myconf1)
+    updateDoD(myconf1)
 
     myconf2 = JetMakerConf(stdjets_name_addb,
                            Inputs=['Phys/PFParticles/Particles', line_location],
@@ -173,7 +173,7 @@ def create_stdjets(strob, line_location, stdjets_name_ban, stdjets_name_addb):
         strob.StdJetsNoJetIDAddB = [myconf2]
 
     # configure Data-On-Demand service
-    locations = updateDoD(myconf2)
+    updateDoD(myconf2)
 
 ##########################################
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingBs2gammagamma.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingBs2gammagamma.py
index c9930debcb2ccccce2049ad31333cbad37dedf9b..6a5687b6925e10b4b0d3db8e5eb980c03ae5ffdf 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingBs2gammagamma.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingBs2gammagamma.py
@@ -21,16 +21,11 @@ Exports the following stripping lines as instance data members:
 - Bs2gammagamma_NoConvWideLine  : wide line with 0 conversions
 '''
 
-from Configurables import (DiElectronMaker, ProtoParticleCALOFilter,
-                           ParticleTransporter, BremAdder)
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop  # , CombineParticles
-from CommonParticles import StdLooseAllPhotons
-from CommonParticles import StdAllLooseGammaConversion
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
 from Configurables import CombineParticles
-from Gaudi.Configuration import *
 __author__ = ['Sean Benson']
 __date__ = '2016/04/08'
 __version__ = '1.2'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingBs2st2KKMuX.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingBs2st2KKMuX.py
index 86d2fbe036d44821a158f2fba4fe7e558c1d3d55..22e9c5c994936c1db65ca0b5c70f9d8f5601bd3b 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingBs2st2KKMuX.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingBs2st2KKMuX.py
@@ -22,9 +22,8 @@ Stripping lines:
 from StandardParticles import StdLooseMuons, StdLooseKaons, StdAllLooseKaons, StdMassConstrainedJpsi2MuMu
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand
+from PhysSelPython.Wrappers import Selection
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = ['Jianchun Wang']
 __date__ = '03/22/2015'
 __version__ = '$Revision: 0.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingBu2LLK.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingBu2LLK.py
index 1389759595e92bafa372681f8efb4b4b0b010b83..80bf866570af75a51beac3d3bc5214c97aed49f3 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingBu2LLK.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingBu2LLK.py
@@ -10,7 +10,7 @@
 ###############################################################################
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection, AutomaticData
+from PhysSelPython.Wrappers import DataOnDemand, MergedSelection, Selection
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, DaVinci__N3BodyDecays, DaVinci__N5BodyDecays
 from Gaudi.Configuration import *
 __author__ = 'Patrick Koppenburg, Alex Shires, Thomas Blake, Luca Pescatore, Simone Bifani, Yasmine Amhis, Paula Alvarez Cartelle, Harry Cliff, Rafael Silva Coutinho, Guido Andreassi, Mick Mulder, Maarten van Veghel, John Smeaton, Vitalii Lisovskyi, Biplab Dey'
@@ -1733,7 +1733,6 @@ class Bu2LLKConf(LineBuilder):
         from StandardParticles import StdLooseMuons as Muons
         # from CommonParticles import StdLooseDetachedTau
         # Taus = DataOnDemand(Location = "Phys/StdLooseDetachedTau3pi/Particles")
-        from CommonParticles import StdTightDetachedTau
         Taus = DataOnDemand(Location="Phys/StdTightDetachedTau3pi/Particles")
 
         _DecayDescriptor = "[J/psi(1S) -> mu+ tau-]cc"
@@ -2080,7 +2079,6 @@ class Bu2LLKConf(LineBuilder):
 #################################################################################################################################
 
     def _storeInputBremPhotons(self, linename, outputlocprefix="Leptonic/Phys/", photonloc="Phys/StdVeryLooseAllPhotons/Particles"):
-        from PhysSelPython.Wrappers import FilterSelection, DataOnDemand, SelectionSequence
         from Configurables import (CopyParticles, ParticleCloner,
                                    ProtoParticleCloner, CaloHypoCloner,
                                    CaloClusterCloner)
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingBu2MajoLep.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingBu2MajoLep.py
index 5a96cdedd562ea723f6b2b20d6b2cf30f98f517f..850c2f87ccfaddc8f68a9b6e087f3f6d41cebbb1 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingBu2MajoLep.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingBu2MajoLep.py
@@ -19,12 +19,10 @@ __version__ = 'V0.9'
 __all__ = ('Bu2MajoLepConf',
            'default_config')
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
+from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from GaudiKernel.SystemOfUnits import *
 
 from StandardParticles import StdLooseMuons as Muons
 from StandardParticles import StdLoosePions as Pions
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingBu2MuNu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingBu2MuNu.py
index 19ce21e90e54ca7bc0f65d55187d37c95520c6d9..4163901dd65f50c70f659de9c335932f2c9649fa 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingBu2MuNu.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingBu2MuNu.py
@@ -25,12 +25,11 @@ __all__ = ('Bu2MuNuConf',
            'default_config')
 
 from Gaudi.Configuration import *
-from PhysSelPython.Wrappers import Selection, DataOnDemand
+from PhysSelPython.Wrappers import DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from StandardParticles import StdTightMuons, StdTightANNMuons
 from CommonParticles.Utils import *
-from Configurables import FilterDesktop, CombineParticles
+from Configurables import FilterDesktop
 from JetAccessories.JetMaker_Config import JetMakerConf
 
 default_name = 'Bu2MuNu'
@@ -72,7 +71,7 @@ def create_stdjets(strobj, line_location, stdjets_name_ban):
         strobj.StdJetsNoJetIDBan = [myconf1]
 
     # configure Data-On-Demand service
-    locations = updateDoD(myconf1)
+    updateDoD(myconf1)
 
 
 relInfoJetsVars = ["JETNOMU1PX", "JETNOMU1PY", "JETNOMU1PZ", "JETNOMU1PT", "JETNOMU1JETWIDTH", "JETNOMU1NNTAG", "JETNOMU1MNF", "JETNOMU2PX", "JETNOMU2PY", "JETNOMU2PZ", "JETNOMU2PT", "JETNOMU2JETWIDTH", "JETNOMU2NNTAG",
@@ -255,7 +254,7 @@ class Bu2MuNuConf(LineBuilder):
                                            JetIDCut=False).algorithms[0]
 
         # configure Data-On-Demand service
-        locations = updateDoD(StdJetsNoJetIDNoBan)
+        updateDoD(StdJetsNoJetIDNoBan)
 
         # add the jets with the specific banning
         create_stdjets(self, self.ControlLine.outputLocation(),
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingD23MuLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingD23MuLines.py
index 9d9153bde02604dd6518511524323b953c58b810..a119c6aadabeb6405ae23f48d28004723f035a3b 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingD23MuLines.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingD23MuLines.py
@@ -51,12 +51,11 @@ __all__ = ("D23MuLinesConf",
 #############################################################################
 
 from Gaudi.Configuration import *
-from Configurables import FilterDesktop, CombineParticles, DaVinci__N3BodyDecays
+from Configurables import DaVinci__N3BodyDecays
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 # from StrippingSelections.Utils import checkConfig
-from GaudiKernel.PhysicalConstants import c_light
 
 #############################################################################
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingDarkBoson.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingDarkBoson.py
index 754d0f38050b7a4694b6c0d51d824b1e808d61c3..e79bed1bf4d9ba4dcb692145cb4e20d25fe0063e 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingDarkBoson.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingDarkBoson.py
@@ -17,23 +17,18 @@ Author: M. Williams, D. Craik
 from Configurables import DiElectronMaker, ProtoParticleCALOFilter
 from GaudiConfUtils.ConfigurableGenerators import DaVinci__N3BodyDecays
 from CommonParticles.Utils import *
-from copy import deepcopy
 from Configurables import SubstitutePID
 from StandardParticles import StdAllLooseGammaLL, StdAllLooseGammaDD, \
     StdAllLooseElectrons, StdLooseAllPhotons  # , StdDiElectronFromTracks
 from Beauty2Charm_LoKiCuts import LoKiCuts
 from StandardParticles import StdAllNoPIDsPions, StdAllNoPIDsKaons, \
-    StdAllNoPIDsProtons, StdNoPIDsUpPions, StdAllLooseMuons, \
-    StdLooseDownMuons
-from Configurables import LoKi__VoidFilter
+    StdAllLooseMuons, StdLooseDownMuons
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import EventSelection
 from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
 from Gaudi.Configuration import *
-import re
 __author__ = ['Mike Williams', 'Dan Craik']
 
 moduleName = 'DarkBoson'
@@ -364,7 +359,7 @@ class DarkBosonConf(LineBuilder):
         mmDDX = makeX(
             'MuMuDD', default_config['XDD'], 'KS0 -> mu+ mu-', [muDX])
         kkX = makeX('KK', default_config['XLL'], 'KS0 -> K+ K-', [kX])
-        kkDDX = makeX('KKDD', default_config['XDD'], 'KS0 -> K+ K-', [kDX])
+        makeX('KKDD', default_config['XDD'], 'KS0 -> K+ K-', [kDX])
         pipiX = makeX(
             'PiPi', default_config['XLLhard'], 'KS0 -> pi+ pi-', [piX])
         pipiDDX = makeX(
@@ -419,7 +414,7 @@ class DarkBosonConf(LineBuilder):
             'PiPiSSDD', default_config['XDD'], '[KS0 -> pi+ pi+]cc', [piDX])
         preSS = default_config['Prescales']['SS']
 
-        preDD = default_config['Prescales']['DD']
+        default_config['Prescales']['DD']
         preKK = default_config['Prescales']['KK']
 
         j = makeJ(default_config['J'], [muJ])
@@ -630,7 +625,7 @@ class DarkBosonConf(LineBuilder):
         kst = filterKst()
         self._makeBLine('B2JKst', ['[B0 -> J/psi(1S) K*(892)0]cc'],
                         [j, kst], default_config['B2KX'])
-        rho = makeRho([piB])
+        makeRho([piB])
         # self._makeBLine('B2RhoX2MuMu',['B0 -> rho(770)0 KS0'],[rho,mmX],
         #                default_config['B2HHX'])
         # self._makeBLine('B2RhoX2MuMuDD',['B0 -> rho(770)0 KS0'],[rho,mmDDX],
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingDoubleSLForRX.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingDoubleSLForRX.py
index f7e5ccc228e7525247584f38f94bf53502f3cdea..3116bd40e9e8d6da906924d79ac8c85fabf37565 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingDoubleSLForRX.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingDoubleSLForRX.py
@@ -19,7 +19,6 @@ from GaudiConfUtils.ConfigurableGenerators import (CombineParticles,
                                                    DaVinci__N3BodyDecays)
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from Gaudi.Configuration import *
 __author__ = 'M. Kreps, T. Blake, D. Loh'
 __date__ = '10/11/2016'
 __version__ = '$Revision: 1.0$'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingHypb2L0HGamma.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingHypb2L0HGamma.py
index 83e2745fd58ace3d154d5c84e17588243850ee63..e33667deb325d3bc47009996d2c37915a3a42fd3 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingHypb2L0HGamma.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingHypb2L0HGamma.py
@@ -16,8 +16,8 @@ __all__ = ('Hypb2L0HGammaConf',
            'default_config', )
 
 from Gaudi.Configuration import *
-from Configurables import FilterDesktop, CombineParticles, TisTosParticleTagger
-from PhysSelPython.Wrappers import Selection, MergedSelection, DataOnDemand
+from Configurables import CombineParticles, FilterDesktop
+from PhysSelPython.Wrappers import DataOnDemand, Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from StandardParticles import StdLooseAllPhotons
@@ -495,7 +495,7 @@ def tisTosSelection(sel, TISTOSdict):
 
 
 def makevelotracks(name):
-    from Configurables import FastVeloTracking, TrackPrepareVelo, DecodeVeloRawBuffer, TrackEventFitter, TrackStateInitAlg,  TrackContainerCopy
+    from Configurables import FastVeloTracking, TrackContainerCopy, TrackStateInitAlg
     from TrackFitter.ConfiguredFitters import ConfiguredEventFitter
 
     MyFastVeloTracking = FastVeloTracking(
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingK0s2XXMuMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingK0s2XXMuMu.py
index 454c44356bf363573cfae8fad85f13e9b83e92ea..dc8a94331712da6fda2d902eeaadf4a4c7f30f0f 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingK0s2XXMuMu.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingK0s2XXMuMu.py
@@ -19,9 +19,7 @@ from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection
 from StandardParticles import StdAllLoosePions, StdAllLooseMuons
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-from GaudiKernel.PhysicalConstants import c_light
-from GaudiKernel.SystemOfUnits import MeV, m, mm, picosecond
-from Gaudi.Configuration import *
+from GaudiKernel.SystemOfUnits import MeV, mm, picosecond
 __author__ = ['Miguel Ramos Pernas']
 __date__ = '10/10/2017'
 __version__ = '$Revision: 0.00 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingKshort2Leptons.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingKshort2Leptons.py
index 83456277a05a2d15a84b3c40618055fab95e052a..d92e0c670b0be9bdf5477406d71070e64f531e88 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingKshort2Leptons.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingKshort2Leptons.py
@@ -11,7 +11,6 @@
 from SelPy.utils import (UniquelyNamedObject,
                          ClonableObject,
                          SelectionBase)
-from itertools import product
 from Configurables import ChargedProtoParticleMaker, NoPIDsParticleMaker, DelegatingTrackSelector, CombineParticles, LoKi__VertexFitter
 from CommonParticles.Utils import *
 from StandardParticles import StdNoPIDsUpElectrons
@@ -23,11 +22,9 @@ from StandardParticles import StdNoPIDsDownPions
 from StandardParticles import StdAllNoPIDsPions
 from StandardParticles import StdLooseDownMuons
 from StandardParticles import StdAllLooseMuons
-from StandardParticles import StdAllNoPIDsMuons
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection
-from GaudiConfUtils.ConfigurableGenerators import DaVinci__N3BodyDecays as Combine3Particles
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
 from Gaudi.Configuration import *
 __author__ = ['Adrian Casais Vidal', 'Carla Marin',
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingKshort2MuMuMuMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingKshort2MuMuMuMu.py
index 86a943e5a6fb41852c6a9f29c92389947b9c890f..81ef82f2043ed504638103a44bd0a0e915d41771 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingKshort2MuMuMuMu.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingKshort2MuMuMuMu.py
@@ -15,15 +15,12 @@ derived, in large measure, from StrippingKshort2PiPiMuMu.py
 '''
 
 from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays
-from GaudiKernel.SystemOfUnits import MeV
-from StandardParticles import StdNoPIDsDownPions, StdLooseDownMuons
-from StandardParticles import StdAllLoosePions, StdAllLooseMuons, StdAllNoPIDsPions
-from StandardParticles import StdLoosePions, StdLooseMuons, StdNoPIDsPions
+from StandardParticles import StdLooseDownMuons
+from StandardParticles import StdAllLooseMuons
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
+from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
 __author__ = ['Mike Sokoloff']
 __date__ = '07 January 2014'
 __version__ = '$Revision: 0.1 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingKshort2PiPiMuMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingKshort2PiPiMuMu.py
index 0955f65fa0e2efdcb575b1c11a7ad439f53a1944..07b134c737342e2921702f4d74fa30eda7121cf9 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingKshort2PiPiMuMu.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingKshort2PiPiMuMu.py
@@ -10,15 +10,12 @@
 ###############################################################################
 
 from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays
-from GaudiKernel.SystemOfUnits import MeV
 from StandardParticles import StdNoPIDsDownPions, StdLooseDownMuons
-from StandardParticles import StdAllLoosePions, StdAllLooseMuons, StdAllNoPIDsPions
-from StandardParticles import StdLoosePions, StdLooseMuons, StdNoPIDsPions
+from StandardParticles import StdAllLooseMuons, StdAllLoosePions
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
+from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
 __author__ = ['Mike Sokoloff']
 __date__ = '25/10/2012'
 __version__ = '$Revision: 0.1 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingKshort2eePiPi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingKshort2eePiPi.py
index 45b59c0fd9ae49240a75a9caff9e2ff006af5fa5..832334778db6e7c5c42f3ac70aab3b7cd6ca4026 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingKshort2eePiPi.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingKshort2eePiPi.py
@@ -16,7 +16,6 @@ from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection
 from GaudiConfUtils.ConfigurableGenerators import DaVinci__N3BodyDecays as Combine3Particles
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
-from Gaudi.Configuration import *
 __author__ = ['Carla Marin']
 __date__ = '23/11/2016'
 __version__ = '$1.1 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingLFVLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingLFVLines.py
index 4a7726e9b33f8cb67d0e0e1c4052c9f7f01e78b5..279eff2f3e813fb4043b2104ebb0bf7955e48339 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingLFVLines.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingLFVLines.py
@@ -23,14 +23,12 @@ __all__ = ('LFVLinesConf',
            'default_config',
            )
 
-from Gaudi.Configuration import *
 # from Configurables import FilterDesktop, CombineParticles
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, DaVinci__N3BodyDecays
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N3BodyDecays
 from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from GaudiKernel.PhysicalConstants import c_light
-from GaudiKernel.SystemOfUnits import GeV, MeV, mm
+from GaudiKernel.SystemOfUnits import MeV, mm
 from copy import deepcopy
 #
 # Configure related info tools
@@ -1284,7 +1282,7 @@ class LFVLinesConf(LineBuilder):
         hemu_name = name+'B2heMu'
         pmu_name = name+'B2hMu'
         bu_name = name+'Bu2KJPsiee'
-        taumu_name = name+'B2TauMu'
+        name+'B2TauMu'
         htaumu_name = name+'B2hTauMu'
         muetap_gamma_name = name+'Tau2MuEtaP2pipig'
         muetap_pi_name = name+'Tau2MuEtaP2pipipi'
@@ -1778,7 +1776,6 @@ def makeB2TauMu(name):
         "& (BPVVDCHI2> 225)"\
         "& (BPVIPCHI2()< 25) "
 
-    from CommonParticles import StdLooseDetachedTau, StdLooseDipion
     _stdLooseMuons = DataOnDemand(Location="Phys/StdLooseMuons/Particles")
     _stdLooseDetachedTaus = DataOnDemand(
         Location="Phys/StdLooseDetachedTau3pi/Particles")
@@ -2418,7 +2415,6 @@ def makeB2hTauMu(name):
                           "& (BPVVDCHI2> 225)"\
                           "& (BPVIPCHI2()< 16) "  # maybe 16
 
-    from CommonParticles import StdLooseDetachedTau, StdLooseDipion
     _stdLooseMuons = DataOnDemand(Location="Phys/StdLooseMuons/Particles")
     _stdLooseDetachedTaus = DataOnDemand(
         Location="Phys/StdLooseDetachedTau3pi/Particles")
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingLb2L0Gamma.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingLb2L0Gamma.py
index 802119884510c53e5cf00d3e4788223b09ab5a71..bfcf8336af14cb0e5ff39ae2da6502181e9066d9 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingLb2L0Gamma.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingLb2L0Gamma.py
@@ -25,9 +25,6 @@ __date__ = "14.11.2016"
 __version__ = "2.0"
 __all__ = ("default_config", "StrippingLb2L0GammaConf")
 
-import os
-
-from Gaudi.Configuration import *
 
 from Configurables import CombineParticles
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
@@ -36,9 +33,7 @@ from PhysSelPython.Wrappers import Selection, MergedSelection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 
-from StandardParticles import StdAllNoPIDsPions, StdAllNoPIDsProtons
 from StandardParticles import StdLooseAllPhotons, StdAllLooseGammaDD, StdAllLooseGammaLL
-from StandardParticles import StdVeryLooseDetachedKst2Kpi
 from StandardParticles import StdLooseJpsi2MuMu
 
 default_config = {'NAME': 'Lb2L0Gamma',
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingLc23MuLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingLc23MuLines.py
index b2244bd7aa9f116d9783ce03a8fc1944cde17b39..3d97e939f7633e3e700dd756976cae1b815955f7 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingLc23MuLines.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingLc23MuLines.py
@@ -68,12 +68,11 @@ __all__ = ("Lc23MuLinesConf",
 ###################################################################################################
 
 from Gaudi.Configuration import *
-from Configurables import FilterDesktop, CombineParticles, DaVinci__N3BodyDecays, DaVinci__N4BodyDecays
+from Configurables import CombineParticles, DaVinci__N3BodyDecays, DaVinci__N4BodyDecays
 # from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from GaudiKernel.PhysicalConstants import c_light
 
 ###################################################################################################
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingMultiLepton.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingMultiLepton.py
index afbfe24d38ca0ad99bb80d52c8473be1c8076e1a..c83aa90e0286b93a0882a2d1617fe54f9de8d006 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingMultiLepton.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingMultiLepton.py
@@ -12,8 +12,8 @@ from CommonParticles.Utils import *
 from GaudiKernel.SystemOfUnits import *
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection, AutomaticData
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, DaVinci__N3BodyDecays, DaVinci__N4BodyDecays, DaVinci__N5BodyDecays, DaVinci__N6BodyDecays
+from PhysSelPython.Wrappers import DataOnDemand, MergedSelection, Selection
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N3BodyDecays, DaVinci__N4BodyDecays, FilterDesktop
 from Gaudi.Configuration import *
 __author__ = 'Vitalii Lisovskyi'
 __date__ = '05/03/2021'
@@ -100,14 +100,11 @@ class MultiLeptonConf(LineBuilder):
         Jpsi2Mu3EDetLine_name = name+'_Jpsi2Mu3EDetached'
         Jpsi2Mu3EPromptLine_name = name+'_Jpsi2Mu3EPrompt'
 
-        from StandardParticles import StdLoosePions as Pions
         from StandardParticles import StdLooseKaons as Kaons
-        from StandardParticles import StdLooseProtons as Protons
         from StandardParticles import StdVeryLooseKsLL as KshortsLL
         from StandardParticles import StdLooseKsDD as KshortsDD
         from StandardParticles import StdVeryLooseLambdaLL as LambdasLL
         from StandardParticles import StdLooseLambdaDD as LambdasDD
-        from StandardParticles import StdLooseLambdaLD as LambdasLD
         from StandardParticles import StdLoosePhi2KK as Phi2KK
         from StandardParticles import StdLooseKstar2Kpi as KstartoKpi
         from StandardParticles import StdLooseLambdastar2pK as Lstar
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingPhiToKSKS.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingPhiToKSKS.py
index ff157859dd3877ab38f9cad234fb49a80418e50d..1a62ef5db16a204dc0a3d66d1fd1d1f75d4a04d4 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingPhiToKSKS.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingPhiToKSKS.py
@@ -23,8 +23,7 @@ from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from StandardParticles import StdAllLooseKaons, StdAllLooseMuons
-from Configurables import FitDecayTrees
-from PhysSelPython.Wrappers import AutomaticData, MergedSelection
+from PhysSelPython.Wrappers import MergedSelection
 
 __all__ = ('PhiToKSKSAllLinesConf',
            'TOSFilter',
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingRareBaryonicMuMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingRareBaryonicMuMu.py
index e3c0eaddce01018392bdba4b396503b925c88a07..51ba747a021efc15c1337eff37065053e6f7babf 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingRareBaryonicMuMu.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingRareBaryonicMuMu.py
@@ -12,11 +12,10 @@ from GaudiKernel.SystemOfUnits import MeV
 from CommonParticles.Utils import updateDoD
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection, AutomaticData
+from PhysSelPython.Wrappers import AutomaticData, MergedSelection, Selection
 from Configurables import (ResolvedPi0Maker, PhotonMaker)
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N3BodyDecays, DaVinci__N4BodyDecays
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop as FilterDesktop_GC
-from Gaudi.Configuration import *
 __author__ = 'Vitalii Lisovskyi'
 __date__ = '26/02/2021'
 __version__ = '$Revision: 0 $'
@@ -343,7 +342,6 @@ class RareBaryonicMuMuConf(LineBuilder):
         # 2 : Make Dileptons
 
         from StandardParticles import StdLooseDiMuon as DiMuons
-        MuonID = "(HASMUON)&(ISMUON)"
         DiMuonID = "(2 == NINTREE((ABSID==13)&(HASMUON)&(ISMUON)))"
         DiElectronID = "(2 == NINTREE((ABSID==11)&(PIDe>0)))"
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingRareNStrange.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingRareNStrange.py
index a24627bc3e07197df367fefe4a22da371088d698..ff85ddd9295400d397f4543aa160622a121c5a9b 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingRareNStrange.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingRareNStrange.py
@@ -10,9 +10,8 @@
 ###############################################################################
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection, AutomaticData
+from PhysSelPython.Wrappers import Selection
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = 'Diego Martinez Santos, Carlos Vazquez, Xabier Cid, Jessica Prisciandaro'
 __date__ = '08/05/2015'
 __version__ = '$Revision: Not sure $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingRareStrange.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingRareStrange.py
index 6f7264e1db8f4045b2b139a11daa3e90056e3c44..bba73d994ee42cf94a9237f00597a4d7be7cc54d 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingRareStrange.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingRareStrange.py
@@ -59,15 +59,11 @@ __all__ = ('RareStrangeLinesConf',
 from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 from GaudiConfUtils.ConfigurableGenerators import DaVinci__N3BodyDecays as Combine3Particles
-from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays as Combine4Particles
-from CommonParticles import StdNoPIDsDownElectrons
 from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from GaudiKernel.PhysicalConstants import c_light
-from StandardParticles import (StdAllNoPIDsPions, StdNoPIDsDownPions,
-                               StdLoosePions, StdLooseDownMuons,
-                               StdLooseMergedPi0, StdLooseResolvedPi0, StdLooseDalitzPi0)
+from StandardParticles import (StdLooseMergedPi0, StdLooseResolvedPi0,
+                               StdLooseDalitzPi0)
 
 # from CommonParticles.StdLooseDalitzPi0 import (StdLoosePi02gee, StdLoosePi024e)
 
@@ -2786,7 +2782,7 @@ def makeLambdaPPiEE(name, config, inputs):
 
 
 def makevelotracks(name):
-    from Configurables import FastVeloTracking, TrackPrepareVelo, DecodeVeloRawBuffer, TrackEventFitter, TrackStateInitAlg,  TrackContainerCopy
+    from Configurables import FastVeloTracking, TrackContainerCopy, TrackStateInitAlg
     from TrackFitter.ConfiguredFitters import ConfiguredEventFitter
 
     MyFastVeloTracking = FastVeloTracking(
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingS2Hyperons.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingS2Hyperons.py
index 4b77564a243f8b801f636bd39f17d13862c59259..cc3f28a66decb2a00ca4d54e588542b898c3d5d5 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingS2Hyperons.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingS2Hyperons.py
@@ -18,13 +18,9 @@ __version__ = '$Revision: 1.0 $'
 __all__ = ('StrippingS2HyperonsConf', 'default_config')
 
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from StandardParticles import StdLoosePions, StdNoPIDsDownPions, StdLooseKaons, StdLooseDownKaons
-from StandardParticles import StdAllLoosePions, StdAllLooseKaons
 
 from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
-from PhysSelPython.Wrappers import MultiSelectionSequence
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from GaudiKernel.SystemOfUnits import MeV, mm, picosecond
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingSb2PKMuXPi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingSb2PKMuXPi.py
index 1a58f8ff04bce6f56de5c4ab5c3629cf15490947..c9a1d99c746dfb072966681ef100532dfcb168de 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingSb2PKMuXPi.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingSb2PKMuXPi.py
@@ -12,9 +12,8 @@
 
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, MergedSelection, AutomaticData
+from PhysSelPython.Wrappers import MergedSelection, Selection
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = "Dan Thompson; based on combination of Bu2LLK lines and Bs2st2KKMuXLine"
 __date__ = "14/06/2021"
 __version__ = "$Revision: 1$"
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingStrangeHadrons.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingStrangeHadrons.py
index 5c16fb7fd63ec1f15df76e17b03a96af7c5a4c61..e2488a937f3c160c5d1dc0bbb81310ee8ff58466 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingStrangeHadrons.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingStrangeHadrons.py
@@ -35,23 +35,12 @@ __all__ = ('default_config',
            'StrangeHadronsConf',
            )
 
-import os
 
-from Gaudi.Configuration import *
-
-from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-
-from GaudiConfUtils.ConfigurableGenerators import DaVinci__N3BodyDecays as Combine3Particles
-from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays as Combine4Particles
-from CommonParticles import StdNoPIDsDownElectrons
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
+from PhysSelPython.Wrappers import DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from GaudiKernel.PhysicalConstants import c_light
 from GaudiKernel.SystemOfUnits import MeV
 
-from StandardParticles import StdAllNoPIDsPions, StdLoosePions, StdLooseProtons, StdAllLoosePions, StdAllLooseMuons
-from StandardParticles import StdLooseAllPhotons
 ##
 from PhysConf.Selections import CombineSelection
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingStrangeSL.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingStrangeSL.py
index 5134ef5434ea3f244733fc6ac26485b868c228fb..26590be4ba73ad6710f007e7e831cea2a4a4b23a 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingStrangeSL.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingStrangeSL.py
@@ -36,23 +36,12 @@ __all__ = ('default_config',
            'StrangeSLConf',
            )
 
-import os
 
-from Gaudi.Configuration import *
-
-from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-
-from GaudiConfUtils.ConfigurableGenerators import DaVinci__N3BodyDecays as Combine3Particles
-from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays as Combine4Particles
-from CommonParticles import StdNoPIDsDownElectrons
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
+from PhysSelPython.Wrappers import DataOnDemand, Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from GaudiKernel.PhysicalConstants import c_light
 from GaudiKernel.SystemOfUnits import MeV
 
-from StandardParticles import StdAllNoPIDsPions, StdLoosePions, StdLooseProtons, StdAllLoosePions, StdAllLooseMuons, StdAllLooseElectrons
-from StandardParticles import StdLooseMergedPi0, StdLooseResolvedPi0, StdLooseDalitzPi0
 from PhysConf.Selections import CombineSelection
 
 default_config = {
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingTau23MuLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingTau23MuLines.py
index d2bc92f6cce7f5bd010c90bfbed1d26ec6298dc4..f76088d68ebb79ec8363df3707e480e3955aa4fe 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingTau23MuLines.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingTau23MuLines.py
@@ -36,7 +36,6 @@ from GaudiConfUtils.ConfigurableGenerators import DaVinci__N5BodyDecays as Combi
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from GaudiKernel.PhysicalConstants import c_light
 
 default_config = {
     'NAME': 'Tau23Mu',
@@ -74,7 +73,7 @@ class Tau23MuLinesConf(LineBuilder):
         tau_name = name+'Tau23Mu'
         tau_name_DST = name+'Tau23Mu_DST'
         tau_name_DST_3mu = name+'Tau23Mu_DST_3mu'
-        ds23PiTIS_name = name+'Ds23PiTIS'
+        name+'Ds23PiTIS'
         ds23Pi_name = name+'Ds23Pi'
         ds2PhiPi_name = name+'Ds2PhiPi'
         ds2PhiPi_name_DST = name+'Ds2PhiPi_DST'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingTau2LambdaMuLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingTau2LambdaMuLines.py
index 6f7caa01d008433cca4a3184d6bdfeb2a9bcd909..2e5401740f914b698345c335bfe29788f1e7ed2e 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingTau2LambdaMuLines.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingTau2LambdaMuLines.py
@@ -16,12 +16,10 @@ Exported symbols (use python help!):
    - 
 '''
 
-from GaudiKernel.PhysicalConstants import c_light
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
-from Configurables import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
+from Configurables import CombineParticles
 __author__ = ['Marcin Chrzaszcz']
 __date__ = '14/12/2012'
 __version__ = '$Revision: 1.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingZVTOP.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingZVTOP.py
index f4ee63f69c4320486335e4fa797004ccb36ecca4..6b5cbfa74e249908ea9e854e9c0f238ebdd2d9cf 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingZVTOP.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingRD/StrippingZVTOP.py
@@ -9,14 +9,12 @@
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
 from Configurables import TopoTauAlg, TopoVertexTool
-from StandardParticles import StdLooseKaons
-from StandardParticles import StdLoosePions, StdTightPions
-from StandardParticles import StdNoPIDsKaons, StdNoPIDsPions
+from StandardParticles import StdLoosePions
+from StandardParticles import StdNoPIDsPions
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, OfflineVertexFitter
-from Gaudi.Configuration import *
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop
 __author__ = ['Giampi Mancinelli', 'Julien Cogan', 'Justine Serrano']
 
 __date__ = '14/01/2014'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingSL/StrippingB23MuNu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingSL/StrippingB23MuNu.py
index 73f06f15243522a9ee6fbe3cdad49e8549ea82f5..b59d48fb8b976f7da0abc2b960db7c139bd1f7d6 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingSL/StrippingB23MuNu.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingSL/StrippingB23MuNu.py
@@ -19,15 +19,12 @@ __all__ = ('B23MuNuConf', 'default_config')
 Stripping selection for B to three muons and a neutrino.
 """
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop
 
-from PhysSelPython.Wrappers import Selection, AutomaticData, MergedSelection
+from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from LHCbKernel.Configuration import *  # check if needed
-from Configurables import SubstitutePID
-from Configurables import SubPIDMMFilter
 
 
 #################
@@ -282,7 +279,6 @@ class B23MuNuConf(LineBuilder):
         )
 
         # specify leptons to identify the muon candidate
-        RelInfoTools_fake_mumue = RelInfoTools_fake
         # RelInfoTools_fake_mumue[0] = { "Type" : "RelInfoMuonIDPlus",
         #                     "Variables" : ["MU_BDT"],
         #                     "DaughterLocations"  : {
@@ -416,15 +412,13 @@ class B23MuNuConf(LineBuilder):
         """
         Creates Jpsi as proxy for dimuon
         """
-        from PhysSelPython.Wrappers import AutomaticData, Selection, SelectionSequence, DataOnDemand, MergedSelection
+        from PhysSelPython.Wrappers import Selection
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         # from Configurables import CombineParticles
 
         CombineJpsi = CombineParticles(DecayDescriptors=["J/psi(1S) -> mu+ mu-", "[J/psi(1S) -> mu+ mu+]cc"],
                                        MotherCut="ALL")
 
-        sel_name = "Jpsi"
-
         from PhysSelPython.Wrappers import Selection
         SelJpsi = Selection("Sel_" + self.name + "_Jpsi", Algorithm=CombineJpsi,
                             RequiredSelections=[self.Muons])
@@ -434,15 +428,13 @@ class B23MuNuConf(LineBuilder):
         """
         Creates Jpsi as proxy for dielectron
         """
-        from PhysSelPython.Wrappers import AutomaticData, Selection, SelectionSequence, DataOnDemand, MergedSelection
+        from PhysSelPython.Wrappers import Selection
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         # from Configurables import CombineParticles
 
         CombineJpsi = CombineParticles(DecayDescriptors=["J/psi(1S) -> e+ e-", "[J/psi(1S) -> e+ e+]cc"],
                                        MotherCut="ALL")
 
-        sel_name = "Jpsi"
-
         from PhysSelPython.Wrappers import Selection
         SelJpsi = Selection("Sel_" + self.name + "_Jpsiee", Algorithm=CombineJpsi,
                             RequiredSelections=[self.Electrons])
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingSL/StrippingB2DMuForTauMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingSL/StrippingB2DMuForTauMu.py
index bbb6591f636c547192b1c9759ebfeedf27b88e2b..8bd9a436ea3d941e0b4ec5b3610d262206579753 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingSL/StrippingB2DMuForTauMu.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingSL/StrippingB2DMuForTauMu.py
@@ -18,12 +18,10 @@ __version__ = '$Revision: 2.0 $'
 
 from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from PhysSelPython.Wrappers import Selection, DataOnDemand
+from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from StandardParticles import StdLoosePions, StdAllLooseMuons, StdLooseKaons, StdLooseProtons, StdAllLoosePions, StdLooseMergedPi0, StdLooseResolvedPi0, StdAllNoPIDsMuons, StdLooseANNUpPions
-from Configurables import ConjugateNeutralPID
-from PhysSelPython.Wrappers import MergedSelection
+from StandardParticles import StdAllLooseMuons, StdAllNoPIDsMuons, StdLooseKaons, StdLoosePions, StdLooseProtons
 
 __all__ = ('B2DMuForTauMuconf',
            # 'makeb2DMuX',
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingSL/StrippingB2DMuNuX.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingSL/StrippingB2DMuNuX.py
index 51c5a39b0e68d79ff13fd973b9049f68df623cb8..3ffd86fc01b71b7801c6bd140f16f695e248450c 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingSL/StrippingB2DMuNuX.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingSL/StrippingB2DMuNuX.py
@@ -13,14 +13,13 @@ __date__ = '23/07/2010'
 __version__ = '$Revision: 5.0 $'
 
 from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
+from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
 from PhysSelPython.Wrappers import Selection
-from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from StandardParticles import StdLoosePions, StdLooseMuons, StdLooseKaons, StdLooseProtons, StdLooseElectrons
 from StandardParticles import StdNoPIDsPions, StdNoPIDsKaons, StdNoPIDsProtons, StdNoPIDsMuons
 from StrippingB2DMuNuXUtils import *
-from GaudiKernel.SystemOfUnits import MeV, GeV, cm, mm
+from GaudiKernel.SystemOfUnits import GeV, MeV, mm
 
 __all__ = ('B2DMuNuXAllLinesConf',
            'default_config')
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingSL/StrippingB2DMuNuXUtils.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingSL/StrippingB2DMuNuXUtils.py
index 34c3af4e61a9d753aa459abad0af31e3fe01da0e..efaa9d2a15bbc424b459896d227733451f06e069 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingSL/StrippingB2DMuNuXUtils.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingSL/StrippingB2DMuNuXUtils.py
@@ -13,11 +13,9 @@ __date__ = '06/03/2015'
 __version__ = '$Revision: 0.0 $'
 
 from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
-from StrippingUtils.Utils import LineBuilder
-from StandardParticles import StdLoosePions, StdLooseMuons, StdLooseKaons, StdLooseProtons, StdNoPIDsPions, StdLooseElectrons, StdNoPIDsMuons
 
 
 def BtoDlnuLine(module_name,
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingSL/StrippingB2Dlnu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingSL/StrippingB2Dlnu.py
index 0c8d00bd94717af821926626f5446a85cb20a902..b05a05c95319c31661cfe61524eca70e234905c3 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingSL/StrippingB2Dlnu.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingSL/StrippingB2Dlnu.py
@@ -17,12 +17,10 @@ __version__ = '$Revision: 1.0 $'
 
 from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from PhysSelPython.Wrappers import Selection, DataOnDemand
+from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from StandardParticles import StdLoosePions, StdLooseMuons, StdLooseKaons, StdLooseProtons, StdAllLoosePions, StdLooseMergedPi0, StdLooseResolvedPi0, StdAllNoPIDsMuons, StdLooseANNUpPions, StdLooseElectrons
-from Configurables import ConjugateNeutralPID
-from PhysSelPython.Wrappers import MergedSelection
+from StandardParticles import StdAllNoPIDsMuons, StdLooseElectrons, StdLooseKaons, StdLooseMuons, StdLoosePions
 
 __all__ = ('B2DMuForLNuconf',
            # 'makeb2DMuX',
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingSL/StrippingB2Dst0MuNu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingSL/StrippingB2Dst0MuNu.py
index 3f6fd96ade4433b51152a37ee46ccbd072892fbe..e98d2b4850975113ec77abeed5a53c59a6ba950c 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingSL/StrippingB2Dst0MuNu.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingSL/StrippingB2Dst0MuNu.py
@@ -12,12 +12,11 @@ __author__ = ['Michel De Cian']
 __date__ = '12/12/2018'
 __version__ = '$Revision: 0.0 $'
 
-from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from PhysSelPython.Wrappers import Selection, DataOnDemand
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
+from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from StandardParticles import StdLoosePions, StdLooseMuons, StdLooseKaons, StdAllLoosePions, StdAllLooseElectrons, StdLooseResolvedPi0, StdLooseMergedPi0, StdLooseDalitzPi0
+from StandardParticles import StdAllLooseElectrons, StdLooseDalitzPi0, StdLooseKaons, StdLooseMergedPi0, StdLooseMuons, StdLoosePions, StdLooseResolvedPi0
 
 __all__ = ('B2Dst0MuNuAllLinesConf',
            'TOSFilter',
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingSL/StrippingB2DstMuNuIncl.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingSL/StrippingB2DstMuNuIncl.py
index 6abd041bf344194b0ad86747d5d5622ae5fdddf9..3a91f70e613b554c2c0d5b7095d89a8eb3c67f3d 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingSL/StrippingB2DstMuNuIncl.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingSL/StrippingB2DstMuNuIncl.py
@@ -12,9 +12,8 @@ __author__ = ['Mika Vesterinen']
 __date__ = '04/04/2015'
 __version__ = '$Revision: 0.0 $'
 
-from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from PhysSelPython.Wrappers import Selection, DataOnDemand
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
+from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from StandardParticles import StdLoosePions, StdLooseMuons, StdLooseKaons, StdAllLoosePions
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingSL/StrippingB2Invis.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingSL/StrippingB2Invis.py
index 59745cf95a2bca024482d13cbd55b7e541adc062..8839d6b97306b18d1dbfbdbbe8f6ad75be31223c 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingSL/StrippingB2Invis.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingSL/StrippingB2Invis.py
@@ -15,12 +15,7 @@ __version__ = '$Revision: 0.0 $'
 These are some lines for measuring the BF of Lc->pKpi and Ds->KKpi
 """
 
-from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from PhysSelPython.Wrappers import Selection, DataOnDemand
-from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from StandardParticles import StdLoosePions, StdLooseMuons, StdLooseKaons, StdAllLoosePions
 
 __all__ = ('B2InvisAllLinesConf',
            'default_config')
@@ -267,7 +262,7 @@ class B2InvisAllLinesConf(LineBuilder):
     ##### B+ Filter #####
     def _BpFilter(self):
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-        from PhysSelPython.Wrappers import Selection, MergedSelection
+        from PhysSelPython.Wrappers import Selection
 
         _XuPi = CombineParticles(
             DecayDescriptors=["[B+ -> Delta++ pi-]cc"], ReFitPVs=True)
@@ -284,7 +279,7 @@ class B2InvisAllLinesConf(LineBuilder):
     ##### B+ same-sign Filter #####
     def _Bp_SSFilter(self):
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-        from PhysSelPython.Wrappers import Selection, MergedSelection
+        from PhysSelPython.Wrappers import Selection
 
         _XuPi = CombineParticles(
             DecayDescriptors=["[B+ -> Delta++ pi+]cc"], ReFitPVs=True)
@@ -301,7 +296,7 @@ class B2InvisAllLinesConf(LineBuilder):
     ##### B+ fake proton Filter #####
     def _Bp_fakeP_Filter(self):
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-        from PhysSelPython.Wrappers import Selection, MergedSelection
+        from PhysSelPython.Wrappers import Selection
 
         _XuPi = CombineParticles(
             DecayDescriptors=["[B+ -> Delta++ pi-]cc"], ReFitPVs=True)
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingSL/StrippingB2PPbarMuForTauMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingSL/StrippingB2PPbarMuForTauMu.py
index ab951b0dfdbe3c2477ad4d89c79ee826f8481641..94a83f33e4ac596cf3fc5d5e11a0581d31138c26 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingSL/StrippingB2PPbarMuForTauMu.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingSL/StrippingB2PPbarMuForTauMu.py
@@ -9,9 +9,7 @@
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
 
-import logging
 from StrippingUtils.Utils import LineBuilder
-from Gaudi.Configuration import *
 __author__ = ['Mark Smith']
 __date__ = '17/10/2016'
 __version__ = '$Revision: 1.0 $'
@@ -107,8 +105,6 @@ class B2PPbarMuForTauMuBuilder(LineBuilder):
     def __init__(self, name, config):
         LineBuilder.__init__(self, name, config)
 
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
-
         self.GECs = {"Code": "( recSummary(LHCb.RecSummary.nSPDhits,'Raw/Spd/Digits') < %(GEC_nSPDHits)s )" % config,
                      "Preambulo": ["from LoKiTracks.decorators import *"]}
 
@@ -448,7 +444,7 @@ class B2PPbarMuForTauMuBuilder(LineBuilder):
     ###### B->ppMuNu Signal ######
     def _bhad2PMuX_B(self):
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-        from PhysSelPython.Wrappers import Selection, MergedSelection
+        from PhysSelPython.Wrappers import Selection
 
         _pMu = CombineParticles(
             DecayDescriptors=self._config["DECAYS"], ReFitPVs=True)
@@ -465,7 +461,7 @@ class B2PPbarMuForTauMuBuilder(LineBuilder):
     ###### B->ppMuNu Signal for Topo Line ######
     def _bhad2PMuX_BTopo(self):
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-        from PhysSelPython.Wrappers import Selection, MergedSelection
+        from PhysSelPython.Wrappers import Selection
 
         _pMu = CombineParticles(
             DecayDescriptors=self._config["DECAYS"], ReFitPVs=True)
@@ -482,7 +478,7 @@ class B2PPbarMuForTauMuBuilder(LineBuilder):
     ###### B->ppMuNu Same-Sign protons ######
     def _bhad2PMuX_B_SS(self):
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-        from PhysSelPython.Wrappers import Selection, MergedSelection
+        from PhysSelPython.Wrappers import Selection
 
         _pMu = CombineParticles(
             DecayDescriptors=self._config["DECAYS"], ReFitPVs=True)
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingSL/StrippingB2XTauNu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingSL/StrippingB2XTauNu.py
index 27a551c0cc74fe90670dcf8b6c0c1e819d4b7bd3..4a7e33c3bb5ed47f37817f68d2d2bf8c8021dda7 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingSL/StrippingB2XTauNu.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingSL/StrippingB2XTauNu.py
@@ -762,7 +762,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         self.__MakeB0d2DdoubleStar2PiDstar02GammaD0TauNuNonPhysTau__()
 
         from StrippingConf.StrippingLine import StrippingLine
-        from PhysSelPython.Wrappers import SelectionSequence
 
         # TisTos filter
         def filterTisTos(name, Input, myTisTosSpecs):
@@ -1633,7 +1632,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
     def __MakeTau23pi__(self):
 
         from PhysSelPython.Wrappers import DataOnDemand
-        from CommonParticles import StdLooseDetachedTauNoPID
 
         self.tau23piSel = DataOnDemand(Location=self.tau_path)
 
@@ -1699,7 +1697,7 @@ class B2XTauNuAllLinesConf(LineBuilder):
     def __FilterD02K3pi__(self):
 
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
+        from PhysSelPython.Wrappers import Selection
         from StandardParticles import StdLoosePions, StdLooseKaons
 
         CombD02K3pi = CombineParticles(
@@ -1720,7 +1718,7 @@ class B2XTauNuAllLinesConf(LineBuilder):
     def __FilterD02K3piForDst__(self):
 
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
+        from PhysSelPython.Wrappers import Selection
         from StandardParticles import StdLoosePions, StdLooseKaons
 
         CombD02K3piForDst = CombineParticles(
@@ -1741,7 +1739,7 @@ class B2XTauNuAllLinesConf(LineBuilder):
     def __FilterDstarD02K3pi__(self):
 
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
+        from PhysSelPython.Wrappers import Selection
         from StandardParticles import StdAllLoosePions
 
         CombDstar2piD02K3pi = CombineParticles(
@@ -1759,7 +1757,7 @@ class B2XTauNuAllLinesConf(LineBuilder):
     def __FilterDstarD02K3piWS__(self):
 
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
+        from PhysSelPython.Wrappers import Selection
         from StandardParticles import StdAllLoosePions
 
         CombDstar2piD02K3piWS = CombineParticles(
@@ -1850,7 +1848,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
 
         from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseJpsi2MuMu
 
         JpsiForBc = FilterDesktop(
             Code=self.totalJpsiCut
@@ -1869,7 +1866,7 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
 
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
+        from PhysSelPython.Wrappers import Selection
         from StandardParticles import StdLoosePions
 
         CombDdoubleStar02DstarPi = CombineParticles(
@@ -1889,8 +1886,7 @@ class B2XTauNuAllLinesConf(LineBuilder):
         [B0 -> D*- tau+]cc
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
+        from PhysSelPython.Wrappers import Selection
 
         # MyStdLooseDetachedTau = DataOnDemand(Location = 'Phys/StdLooseDetachedTau3pi/Particles')
         # MyStdLooseDetachedTau = DataOnDemand(Location = self.tau_path)
@@ -1914,8 +1910,7 @@ class B2XTauNuAllLinesConf(LineBuilder):
         [B0 -> D*- tau+ with wrong sign pion in the D*]cc
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
+        from PhysSelPython.Wrappers import Selection
 
         # MyStdLooseDetachedTau = DataOnDemand(Location = 'Phys/StdLooseDetachedTau3pi/Particles')
         # MyStdLooseDetachedTau = DataOnDemand(Location = self.tau_path)
@@ -1941,8 +1936,7 @@ class B2XTauNuAllLinesConf(LineBuilder):
         use of wrong charge combination is useful for background subtraction
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
+        from PhysSelPython.Wrappers import Selection
 
         # MyStdLooseDetachedTau = DataOnDemand(Location = 'Phys/StdLooseDetachedTau3pi/Particles')
         # MyStdLooseDetachedTau = DataOnDemand(Location = self.tau_path)
@@ -1968,7 +1962,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTauNonPhys
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3piNonPhys/Particles')
@@ -1992,8 +1985,7 @@ class B2XTauNuAllLinesConf(LineBuilder):
         [B0 -> D*- tau+ with wrong sign pion in the D*]cc
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
+        from PhysSelPython.Wrappers import Selection
 
         # MyStdLooseDetachedTau = DataOnDemand(Location = 'Phys/StdLooseDetachedTau3pi/Particles')
         # MyStdLooseDetachedTau = DataOnDemand(Location = self.tau_path)
@@ -2018,8 +2010,7 @@ class B2XTauNuAllLinesConf(LineBuilder):
         [B0 -> D*-(->D0(->K3pi) pi-) tau+]cc
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
+        from PhysSelPython.Wrappers import Selection
 
         # MyStdLooseDetachedTau = DataOnDemand(Location = 'Phys/StdLooseDetachedTau3pi/Particles')
         # MyStdLooseDetachedTau = DataOnDemand(Location = self.tau_path)
@@ -2045,8 +2036,7 @@ class B2XTauNuAllLinesConf(LineBuilder):
         [B0 -> D*-(->D0(->K3pi) pi-) tau+ with wrong sign pion in the D*]cc
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
+        from PhysSelPython.Wrappers import Selection
 
         # MyStdLooseDetachedTau = DataOnDemand(Location = 'Phys/StdLooseDetachedTau3pi/Particles')
         # MyStdLooseDetachedTau = DataOnDemand(Location = self.tau_path)
@@ -2072,8 +2062,7 @@ class B2XTauNuAllLinesConf(LineBuilder):
         [B0 -> D*-(->D0(->K3pi) pi-) tau+ with wrong sign pion in the D*]cc
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
+        from PhysSelPython.Wrappers import Selection
 
         # MyStdLooseDetachedTau = DataOnDemand(Location = 'Phys/StdLooseDetachedTau3pi/Particles')
         # MyStdLooseDetachedTau = DataOnDemand(Location = self.tau_path)
@@ -2100,8 +2089,7 @@ class B2XTauNuAllLinesConf(LineBuilder):
         use of wrong charge combination is useful for background subtraction
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
+        from PhysSelPython.Wrappers import Selection
 
         # MyStdLooseDetachedTau = DataOnDemand(Location = 'Phys/StdLooseDetachedTau3pi/Particles')
         # MyStdLooseDetachedTau = DataOnDemand(Location = self.tau_path)
@@ -2129,7 +2117,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTauNonPhys
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3piNonPhys/Particles')
@@ -2155,8 +2142,7 @@ class B2XTauNuAllLinesConf(LineBuilder):
         [B- -> D0(->K3pi) tau-]cc
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
+        from PhysSelPython.Wrappers import Selection
 
         # MyStdLooseDetachedTau = DataOnDemand(Location = 'Phys/StdLooseDetachedTau3pi/Particles')
         # MyStdLooseDetachedTau = DataOnDemand(Location = self.tau_path)
@@ -2183,8 +2169,7 @@ class B2XTauNuAllLinesConf(LineBuilder):
         use of wrong charge combination is useful for background subtraction
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
+        from PhysSelPython.Wrappers import Selection
 
         # MyStdLooseDetachedTau = DataOnDemand(Location = 'Phys/StdLooseDetachedTau3pi/Particles')
         # MyStdLooseDetachedTau = DataOnDemand(Location = self.tau_path)
@@ -2213,7 +2198,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTauNonPhys
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3piNonPhys/Particles')
@@ -2241,8 +2225,7 @@ class B2XTauNuAllLinesConf(LineBuilder):
         [B0 -> D- tau+]cc
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
+        from PhysSelPython.Wrappers import Selection
 
         # MyStdLooseDetachedTau = DataOnDemand(Location = 'Phys/StdLooseDetachedTau3pi/Particles')
         # MyStdLooseDetachedTau = DataOnDemand(Location = self.tau_path)
@@ -2268,8 +2251,7 @@ class B2XTauNuAllLinesConf(LineBuilder):
         use of wrong charge combination is useful for background subtraction
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
+        from PhysSelPython.Wrappers import Selection
 
         # MyStdLooseDetachedTau = DataOnDemand(Location = 'Phys/StdLooseDetachedTau3pi/Particles')
         # MyStdLooseDetachedTau = DataOnDemand(Location = self.tau_path)
@@ -2296,7 +2278,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTauNonPhys
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3piNonPhys/Particles')
@@ -2320,8 +2301,7 @@ class B2XTauNuAllLinesConf(LineBuilder):
         [B- -> D0 tau-]cc
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
+        from PhysSelPython.Wrappers import Selection
 
         # MyStdLooseDetachedTau = DataOnDemand(Location = 'Phys/StdLooseDetachedTau3pi/Particles')
         # MyStdLooseDetachedTau = DataOnDemand(Location = self.tau_path)
@@ -2347,8 +2327,7 @@ class B2XTauNuAllLinesConf(LineBuilder):
         use of wrong charge combination is useful for background subtraction
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
+        from PhysSelPython.Wrappers import Selection
 
         # MyStdLooseDetachedTau = DataOnDemand(Location = 'Phys/StdLooseDetachedTau3pi/Particles')
         # MyStdLooseDetachedTau = DataOnDemand(Location = self.tau_path)
@@ -2376,7 +2355,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTauNonPhys
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3piNonPhys/Particles')
@@ -2401,8 +2379,7 @@ class B2XTauNuAllLinesConf(LineBuilder):
         [B_c+ -> J/psi(1S) tau+]cc
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
+        from PhysSelPython.Wrappers import Selection
 
         # MyStdLooseDetachedTau = DataOnDemand(Location = 'Phys/StdLooseDetachedTau3pi/Particles')
         # MyStdLooseDetachedTau = DataOnDemand(Location = self.tau_path)
@@ -2428,7 +2405,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTauNonPhys
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3piNonPhys/Particles')
@@ -2452,8 +2428,7 @@ class B2XTauNuAllLinesConf(LineBuilder):
         [B_s0 -> D_s- tau+]cc
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
+        from PhysSelPython.Wrappers import Selection
 
         # MyStdLooseDetachedTau = DataOnDemand(Location = 'Phys/StdLooseDetachedTau3pi/Particles')
         # MyStdLooseDetachedTau = DataOnDemand(Location = self.tau_path)
@@ -2479,8 +2454,7 @@ class B2XTauNuAllLinesConf(LineBuilder):
         use of wrong charge combination is useful for background subtraction
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
+        from PhysSelPython.Wrappers import Selection
 
         # MyStdLooseDetachedTau = DataOnDemand(Location = 'Phys/StdLooseDetachedTau3pi/Particles')
         # MyStdLooseDetachedTau = DataOnDemand(Location = self.tau_path)
@@ -2507,7 +2481,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTauNonPhys
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3piNonPhys/Particles')
@@ -2532,8 +2505,7 @@ class B2XTauNuAllLinesConf(LineBuilder):
         [Lambda_b0 -> Lambda_c+ tau-]cc
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
+        from PhysSelPython.Wrappers import Selection
 
         # MyStdLooseDetachedTau = DataOnDemand(Location = 'Phys/StdLooseDetachedTau3pi/Particles')
         # MyStdLooseDetachedTau = DataOnDemand(Location = self.tau_path)
@@ -2561,8 +2533,7 @@ class B2XTauNuAllLinesConf(LineBuilder):
         use of wrong charge combination is useful for background subtraction
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
+        from PhysSelPython.Wrappers import Selection
 
         # MyStdLooseDetachedTau = DataOnDemand(Location = 'Phys/StdLooseDetachedTau3pi/Particles')
         # MyStdLooseDetachedTau = DataOnDemand(Location = self.tau_path)
@@ -2588,8 +2559,7 @@ class B2XTauNuAllLinesConf(LineBuilder):
         [Lambda_b0 -> p+ tau-]cc
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
+        from PhysSelPython.Wrappers import Selection
 
         # MyStdLooseDetachedTau = DataOnDemand(Location = 'Phys/StdLooseDetachedTau3pi/Particles')
         # MyStdLooseDetachedTau = DataOnDemand(Location = self.tau_path)
@@ -2614,8 +2584,7 @@ class B2XTauNuAllLinesConf(LineBuilder):
         use of wrong charge combination is useful for background subtraction
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
+        from PhysSelPython.Wrappers import Selection
 
         # MyStdLooseDetachedTau = DataOnDemand(Location = 'Phys/StdLooseDetachedTau3pi/Particles')
         # MyStdLooseDetachedTau = DataOnDemand(Location = self.tau_path)
@@ -2641,7 +2610,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTauNonPhys
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3piNonPhys/Particles')
@@ -2668,8 +2636,7 @@ class B2XTauNuAllLinesConf(LineBuilder):
         use of inverted vertex cut only first, should boost the overall efficiency
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
+        from PhysSelPython.Wrappers import Selection
 
         # MyStdLooseDetachedTau = DataOnDemand(Location = 'Phys/StdLooseDetachedTau3pi/Particles')
         # MyStdLooseDetachedTau = DataOnDemand(Location = self.tau_path)
@@ -2695,8 +2662,7 @@ class B2XTauNuAllLinesConf(LineBuilder):
         use of inverted vertex cut only first, should boost the overall efficiency
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
+        from PhysSelPython.Wrappers import Selection
 
         # MyStdLooseDetachedTau = DataOnDemand(Location = 'Phys/StdLooseDetachedTau3pi/Particles')
         # MyStdLooseDetachedTau = DataOnDemand(Location = self.tau_path)
@@ -2720,8 +2686,7 @@ class B2XTauNuAllLinesConf(LineBuilder):
         Also useful for studying background in B0 -> D* tau nu when pi- from D** decay is missed
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
+        from PhysSelPython.Wrappers import Selection
 
         # MyStdLooseDetachedTau = DataOnDemand(Location = 'Phys/StdLooseDetachedTau3pi/Particles')
         # MyStdLooseDetachedTau = DataOnDemand(Location = self.tau_path)
@@ -2746,8 +2711,7 @@ class B2XTauNuAllLinesConf(LineBuilder):
         Also useful for studying WS background in B0 -> D* tau nu when pi+ from D** decay is missed
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
+        from PhysSelPython.Wrappers import Selection
 
         # MyStdLooseDetachedTau = DataOnDemand(Location = 'Phys/StdLooseDetachedTau3pi/Particles')
         # MyStdLooseDetachedTau = DataOnDemand(Location = self.tau_path)
@@ -2773,7 +2737,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTauNonPhys
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3piNonPhys/Particles')
@@ -2798,7 +2761,7 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
 
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
+        from PhysSelPython.Wrappers import Selection
         from StandardParticles import StdLooseResolvedPi0
 
         CombDStar02Pi0D0 = CombineParticles(
@@ -2817,8 +2780,7 @@ class B2XTauNuAllLinesConf(LineBuilder):
         [B- -> D*0 tau-]cc
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
+        from PhysSelPython.Wrappers import Selection
 
         # MyStdLooseDetachedTau = DataOnDemand(Location = 'Phys/StdLooseDetachedTau3pi/Particles')
         # MyStdLooseDetachedTau = DataOnDemand(Location = self.tau_path)
@@ -2842,8 +2804,7 @@ class B2XTauNuAllLinesConf(LineBuilder):
         use of wrong charge combination is useful for background subtraction
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
+        from PhysSelPython.Wrappers import Selection
 
         # MyStdLooseDetachedTau = DataOnDemand(Location = 'Phys/StdLooseDetachedTau3pi/Particles')
         # MyStdLooseDetachedTau = DataOnDemand(Location = self.tau_path)
@@ -2868,7 +2829,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3piNonPhys/Particles')
@@ -2892,7 +2852,7 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
 
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
+        from PhysSelPython.Wrappers import Selection
         from StandardParticles import StdLooseAllPhotons
 
         CombDStar02GammaD0 = CombineParticles(
@@ -2911,8 +2871,7 @@ class B2XTauNuAllLinesConf(LineBuilder):
         [B- -> D*0 tau-]cc
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
+        from PhysSelPython.Wrappers import Selection
 
         # MyStdLooseDetachedTau = DataOnDemand(Location = 'Phys/StdLooseDetachedTau3pi/Particles')
         # MyStdLooseDetachedTau = DataOnDemand(Location = self.tau_path)
@@ -2936,8 +2895,7 @@ class B2XTauNuAllLinesConf(LineBuilder):
         use of wrong charge combination is useful for background subtraction
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
+        from PhysSelPython.Wrappers import Selection
 
         # MyStdLooseDetachedTau = DataOnDemand(Location = 'Phys/StdLooseDetachedTau3pi/Particles')
         # MyStdLooseDetachedTau = DataOnDemand(Location = self.tau_path)
@@ -2962,7 +2920,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3piNonPhys/Particles')
@@ -2985,7 +2942,7 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
 
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
+        from PhysSelPython.Wrappers import Selection
         from StandardParticles import StdLoosePions
 
         CombDdoubleStar2PiDstar02Pi0D0 = CombineParticles(
@@ -3004,8 +2961,7 @@ class B2XTauNuAllLinesConf(LineBuilder):
         [B0 -> (D_1(2420)- -> D*0 pi-) tau+]cc
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
+        from PhysSelPython.Wrappers import Selection
 
         # MyStdLooseDetachedTau = DataOnDemand(Location = 'Phys/StdLooseDetachedTau3pi/Particles')
         # MyStdLooseDetachedTau = DataOnDemand(Location = self.tau_path)
@@ -3029,8 +2985,7 @@ class B2XTauNuAllLinesConf(LineBuilder):
         use of wrong charge combination is useful for background subtraction
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
+        from PhysSelPython.Wrappers import Selection
 
         # MyStdLooseDetachedTau = DataOnDemand(Location = 'Phys/StdLooseDetachedTau3pi/Particles')
         # MyStdLooseDetachedTau = DataOnDemand(Location = self.tau_path)
@@ -3055,7 +3010,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3piNonPhys/Particles')
@@ -3078,7 +3032,7 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
 
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
+        from PhysSelPython.Wrappers import Selection
         from StandardParticles import StdLoosePions
 
         CombDdoubleStar2PiDstar02GammaD0 = CombineParticles(
@@ -3097,8 +3051,7 @@ class B2XTauNuAllLinesConf(LineBuilder):
         [B0 -> (D_1(2420)- -> D*0 pi-) tau+]cc
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
+        from PhysSelPython.Wrappers import Selection
 
         # MyStdLooseDetachedTau = DataOnDemand(Location = 'Phys/StdLooseDetachedTau3pi/Particles')
         # MyStdLooseDetachedTau = DataOnDemand(Location = self.tau_path)
@@ -3122,8 +3075,7 @@ class B2XTauNuAllLinesConf(LineBuilder):
         use of wrong charge combination is useful for background subtraction
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
+        from PhysSelPython.Wrappers import Selection
 
         # MyStdLooseDetachedTau = DataOnDemand(Location = 'Phys/StdLooseDetachedTau3pi/Particles')
         # MyStdLooseDetachedTau = DataOnDemand(Location = self.tau_path)
@@ -3148,7 +3100,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3piNonPhys/Particles')
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingSL/StrippingB2XuENu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingSL/StrippingB2XuENu.py
index 73ab1a2a4e2c0a0a1016fb4040cc2e6b7b36c884..b59084d7969d22b0c34cc4c7c11b62ae657ce530 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingSL/StrippingB2XuENu.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingSL/StrippingB2XuENu.py
@@ -9,9 +9,7 @@
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
 
-import logging
 from StrippingUtils.Utils import LineBuilder
-from Gaudi.Configuration import *
 __author__ = ['Phillip Urquijo, Alessandra Borgia', 'Michel De Cian']
 __date__ = '11/01/2019'
 __version__ = '$Revision: 1.6 $'
@@ -243,7 +241,7 @@ class B2XuENuBuilder(LineBuilder):
     def __init__(self, name, config):
         LineBuilder.__init__(self, name, config)
         self.config = config
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
+        from PhysSelPython.Wrappers import DataOnDemand
         self._stdVeryLooseKsLL = DataOnDemand(
             "Phys/StdVeryLooseKsLL/Particles")
         self._stdLooseKsLD = DataOnDemand("Phys/StdLooseKsLD/Particles")
@@ -734,7 +732,7 @@ class B2XuENuBuilder(LineBuilder):
 
     # Bs -> K*/Kspi e nu lines
     def _Kstar_line(self):
-        NoPS = self.config['NoPrescales']
+        self.config['NoPrescales']
         from StrippingConf.StrippingLine import StrippingLine
         return StrippingLine(self._name+'Bs2Kstar_Line', prescale=1.0,
                              FILTER=self.GECs,
@@ -1055,8 +1053,8 @@ class B2XuENuBuilder(LineBuilder):
         if self._KSSel is not None:
             return self._KSSel
 
-        from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
+        from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
+        from PhysSelPython.Wrappers import Selection
 
         _code = FilterDesktop(Code=self._NominalKsSelection() % self._config)
 
@@ -1141,7 +1139,6 @@ class B2XuENuBuilder(LineBuilder):
 
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection
-        from StandardParticles import StdLoosePions
 
         _rho770 = CombineParticles(
             DecayDescriptors=["rho(770)0 -> pi- pi+"],
@@ -1171,7 +1168,6 @@ class B2XuENuBuilder(LineBuilder):
 
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection
-        from StandardParticles import StdLoosePions
 
         _rho770NoPID = CombineParticles(
             DecayDescriptors=["rho(770)0 -> pi- pi+"],
@@ -1201,7 +1197,6 @@ class B2XuENuBuilder(LineBuilder):
 
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection
-        from StandardParticles import StdLoosePions
 
         _rho770WS = CombineParticles(
             DecayDescriptors=["[rho(770)0 -> pi+ pi+]cc"],
@@ -1229,7 +1224,6 @@ class B2XuENuBuilder(LineBuilder):
 
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection
-        from StandardParticles import StdLoosePions
 
         _rho770SB = CombineParticles(
             DecayDescriptors=["rho(770)0 -> pi+ pi-"],
@@ -1341,7 +1335,7 @@ class B2XuENuBuilder(LineBuilder):
 
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection
-        from StandardParticles import StdLoosePions, StdLooseElectrons
+        from StandardParticles import StdLoosePions
 
         _Ksh = CombineParticles(
             DecayDescriptor="KS0 -> e- pi+",
@@ -1369,7 +1363,7 @@ class B2XuENuBuilder(LineBuilder):
 
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection
-        from StandardParticles import StdLoosePions, StdLooseElectrons
+        from StandardParticles import StdLoosePions
 
         _Ksh = CombineParticles(
             DecayDescriptor="KS0 -> e+ pi-",
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingSL/StrippingB2XuMuNu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingSL/StrippingB2XuMuNu.py
index e990a0f5fca381288d278a31edfe8c4be451c2d9..7dbf8f670c004436033f2172b635cf83469f0692 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingSL/StrippingB2XuMuNu.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingSL/StrippingB2XuMuNu.py
@@ -9,9 +9,7 @@
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
 
-import logging
 from StrippingUtils.Utils import LineBuilder
-from Gaudi.Configuration import *
 __author__ = ['Phillip Urquijo, Alessandra Borgia', 'Michel De Cian']
 __date__ = '11/01/2019'
 __version__ = '$Revision: 1.6 $'
@@ -238,7 +236,7 @@ class B2XuMuNuBuilder(LineBuilder):
     def __init__(self, name, config):
         LineBuilder.__init__(self, name, config)
         self.config = config
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
+        from PhysSelPython.Wrappers import DataOnDemand
         self._stdVeryLooseKsLL = DataOnDemand(
             "Phys/StdVeryLooseKsLL/Particles")
         self._stdLooseKsLD = DataOnDemand("Phys/StdLooseKsLD/Particles")
@@ -733,7 +731,7 @@ class B2XuMuNuBuilder(LineBuilder):
 
     # Bs -> K*/Kspi mu nu lines
     def _Kstar_line(self):
-        NoPS = self.config['NoPrescales']
+        self.config['NoPrescales']
         from StrippingConf.StrippingLine import StrippingLine
         return StrippingLine(self._name+'Bs2Kstar_Line', prescale=1.0,
                              FILTER=self.GECs,
@@ -1052,8 +1050,8 @@ class B2XuMuNuBuilder(LineBuilder):
         if self._KSSel is not None:
             return self._KSSel
 
-        from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
+        from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
+        from PhysSelPython.Wrappers import Selection
 
         _code = FilterDesktop(Code=self._NominalKsSelection() % self._config)
 
@@ -1138,7 +1136,6 @@ class B2XuMuNuBuilder(LineBuilder):
 
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection
-        from StandardParticles import StdLoosePions
 
         _rho770 = CombineParticles(
             DecayDescriptors=["rho(770)0 -> pi- pi+"],
@@ -1168,7 +1165,6 @@ class B2XuMuNuBuilder(LineBuilder):
 
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection
-        from StandardParticles import StdLoosePions
 
         _rho770NoPID = CombineParticles(
             DecayDescriptors=["rho(770)0 -> pi- pi+"],
@@ -1198,7 +1194,6 @@ class B2XuMuNuBuilder(LineBuilder):
 
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection
-        from StandardParticles import StdLoosePions
 
         _rho770WS = CombineParticles(
             DecayDescriptors=["[rho(770)0 -> pi+ pi+]cc"],
@@ -1226,7 +1221,6 @@ class B2XuMuNuBuilder(LineBuilder):
 
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection
-        from StandardParticles import StdLoosePions
 
         _rho770SB = CombineParticles(
             DecayDescriptors=["rho(770)0 -> pi+ pi-"],
@@ -1338,7 +1332,7 @@ class B2XuMuNuBuilder(LineBuilder):
 
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection
-        from StandardParticles import StdLoosePions, StdLooseMuons
+        from StandardParticles import StdLoosePions
 
         _Ksh = CombineParticles(
             DecayDescriptor="KS0 -> mu- pi+",
@@ -1366,7 +1360,7 @@ class B2XuMuNuBuilder(LineBuilder):
 
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection
-        from StandardParticles import StdLoosePions, StdLooseMuons
+        from StandardParticles import StdLoosePions
 
         _Ksh = CombineParticles(
             DecayDescriptor="KS0 -> mu+ pi-",
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingSL/StrippingBc2Bs.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingSL/StrippingBc2Bs.py
index 599af631e5a48c5d8dddb043536ff0c3b5437f7b..dd86fee48fdfdc2ccf98c400e81825f4b3a016f8 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingSL/StrippingBc2Bs.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingSL/StrippingBc2Bs.py
@@ -11,9 +11,7 @@
 __author__ = ['Adam Davis']
 __date__ = '12/03/2021'
 __version__ = '$Revision: 1.0 $'
-from Gaudi.Configuration import *
 from StrippingUtils.Utils import LineBuilder
-import logging
 
 """
 Selections for Bc -> Bs X
@@ -173,7 +171,6 @@ class Bc2BsBuilder(LineBuilder):
     def __init__(self, name, config):
         LineBuilder.__init__(self, name, config)
         self.config = config
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
         # GECs for # long tracks
         self.GECs = {"Code": "( recSummaryTrack(LHCb.RecSummary.nLongTracks, TrLONG) < %(GEC_nLongTrk)s )" % config,
                      "Preambulo": ["from LoKiTracks.decorators import *"]}
@@ -492,7 +489,6 @@ class Bc2BsBuilder(LineBuilder):
             return self._Ds2KKpiSel
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection
-        from StandardParticles import StdAllLoosePions, StdAllLooseKaons
 
         _Ds2KKpi = CombineParticles(
             DecayDescriptors=["[D_s+ -> K+ K- pi+]cc"],
@@ -515,7 +511,6 @@ class Bc2BsBuilder(LineBuilder):
 
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection
-        from StandardParticles import StdAllLoosePions, StdAllLooseKaons
 
         _Phi2KK = CombineParticles(
             DecayDescriptors=["phi(1020) -> K+ K-"],
@@ -537,7 +532,6 @@ class Bc2BsBuilder(LineBuilder):
 
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection
-        from StandardParticles import StdAllLooseMuons
 
         _Jpsi2mumu = CombineParticles(
             DecayDescriptors=["J/psi(1S) -> mu+ mu-"],
@@ -582,7 +576,6 @@ class Bc2BsBuilder(LineBuilder):
 
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection
-        from StandardParticles import StdAllLoosePions
 
         _Bs2DsPi = CombineParticles(
             DecayDescriptors=["[ B_s0 -> D_s- pi+ ]cc",
@@ -605,7 +598,6 @@ class Bc2BsBuilder(LineBuilder):
 
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection
-        from StandardParticles import StdAllLooseKaons
 
         _Bs2DsK = CombineParticles(
             DecayDescriptors=["[ B_s0 -> D_s- K+ ]cc", "[B_s0 -> D_s+ K+]cc"],
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingSL/StrippingCharmFromBSemiForHadronAsy.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingSL/StrippingCharmFromBSemiForHadronAsy.py
index a80fcb301fa6917bd97160506a3b0a679ff40777..ddaec2925512363daba54947938f97bdafffeb41 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingSL/StrippingCharmFromBSemiForHadronAsy.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingSL/StrippingCharmFromBSemiForHadronAsy.py
@@ -25,8 +25,7 @@ from Configurables import FilterDesktop, CombineParticles
 from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from StandardParticles import StdAllLoosePions, StdLoosePions, StdLooseMuons, StdLooseKaons, StdLooseProtons
-from Configurables import TisTosParticleTagger
+from StandardParticles import StdLooseKaons, StdLooseMuons, StdLoosePions
 
 __all__ = ('CharmFromBSemiForHadronAsyAllLinesConf',
            'TOSFilter',
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingSL/StrippingLb2LcMuNuX_Lc2L0Pi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingSL/StrippingLb2LcMuNuX_Lc2L0Pi.py
index 827fcbc76e3e951b79048e280c55f4b9d1a24165..230adf6c801b1d0b8445131c844c55c702a3469f 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingSL/StrippingLb2LcMuNuX_Lc2L0Pi.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingSL/StrippingLb2LcMuNuX_Lc2L0Pi.py
@@ -16,14 +16,13 @@ __author__ = ['Scott Ely']
 __date__ = '23/01/2019'
 __version__ = '$Revision: 1.0 $'
 
-from Gaudi.Configuration import *
 from Configurables import FilterDesktop, CombineParticles
-from PhysSelPython.Wrappers import Selection, DataOnDemand
+from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from StandardParticles import StdLoosePions, StdLooseMuons, StdLooseKaons, StdLooseProtons, StdLooseElectrons, StdVeryLooseLambdaLL, StdLooseLambdaLL, StdLooseLambdaDD
-from StandardParticles import StdNoPIDsPions, StdNoPIDsKaons, StdNoPIDsProtons, StdNoPIDsMuons
-from GaudiKernel.SystemOfUnits import MeV, GeV, cm, mm
+from StandardParticles import StdLooseLambdaDD, StdLooseMuons, StdLoosePions, StdVeryLooseLambdaLL
+from StandardParticles import StdNoPIDsMuons
+from GaudiKernel.SystemOfUnits import GeV, MeV, mm
 
 __all__ = ('Lb2LcMuNuX_Lc2L0PiConf', 'default_config')
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingSL/StrippingLb2pMuNuVub.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingSL/StrippingLb2pMuNuVub.py
index cd969d689449a9dc069bd745b4acbc62f683dfda..e74c7de20e90982142bcf10f66be4a6cb90689e6 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingSL/StrippingLb2pMuNuVub.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingSL/StrippingLb2pMuNuVub.py
@@ -9,9 +9,7 @@
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
 
-import logging
 from StrippingUtils.Utils import LineBuilder
-from Gaudi.Configuration import *
 __author__ = ['William Sutcliffe']
 __date__ = '19/01/2014'
 __version__ = '$Revision: 1.0 $'
@@ -137,8 +135,6 @@ class Lb2pMuNuVubBuilder(LineBuilder):
     def __init__(self, name, config):
         LineBuilder.__init__(self, name, config)
 
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
-
         self.GECs = {"Code": "( recSummaryTrack(LHCb.RecSummary.nLongTracks, TrLONG) < %(GEC_nLongTrk)s )" % config,
                      "Preambulo": ["from LoKiTracks.decorators import *"]}
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingSL/StrippingSemilepISR.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingSL/StrippingSemilepISR.py
index 9003d470acd7115962091a7193ffb0bd6a6fa9c8..9d2d80fb96c93bb8fdbd3557b03ab8a7cc70090c 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingSL/StrippingSemilepISR.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingSL/StrippingSemilepISR.py
@@ -26,7 +26,7 @@ from StrippingUtils.Utils import LineBuilder
 from StandardParticles import StdLoosePions, StdLooseMuons, StdLooseKaons, StdLooseProtons, StdLooseElectrons
 from StandardParticles import StdNoPIDsPions, StdNoPIDsKaons, StdNoPIDsProtons, StdNoPIDsMuons
 # from StrippingSemilepISRUtils import *
-from GaudiKernel.SystemOfUnits import MeV, GeV, cm, mm
+from GaudiKernel.SystemOfUnits import GeV, MeV, mm
 from CommonParticles.Utils import *
 
 __all__ = ('SemilepISRAllLinesConf',
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingSL/Strippingbhad2PMuX.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingSL/Strippingbhad2PMuX.py
index e89305332152e8ebc4ee1e72a7f10cd8d9d2dfae..f46738721f8dbfce869e840a1aa8cbb13c6fdd2f 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingSL/Strippingbhad2PMuX.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping28r2p1/StrippingSL/Strippingbhad2PMuX.py
@@ -9,9 +9,7 @@
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
 
-import logging
 from StrippingUtils.Utils import LineBuilder
-from Gaudi.Configuration import *
 __author__ = ['William Sutcliffe', 'Patrick Owen']
 __date__ = '02/12/2015'
 __version__ = '$Revision: 2.0 $'
@@ -132,8 +130,6 @@ class bhad2PMuXBuilder(LineBuilder):
     def __init__(self, name, config):
         LineBuilder.__init__(self, name, config)
 
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
-
         self.GECs = {"Code": "( recSummaryTrack(LHCb.RecSummary.nLongTracks, TrLONG) < %(GEC_nLongTrk)s )" % config,
                      "Preambulo": ["from LoKiTracks.decorators import *"]}
 
@@ -455,7 +451,7 @@ class bhad2PMuXBuilder(LineBuilder):
     ###### Lb->pMuNu High M_corr Opposite Sign ######
     def _bhad2PMuX_Lb(self):
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-        from PhysSelPython.Wrappers import Selection, MergedSelection
+        from PhysSelPython.Wrappers import Selection
 
         _pMu = CombineParticles(
             DecayDescriptors=self._config["DECAYS"], ReFitPVs=True)
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingB2CC/StrippingB2JpsiHH.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingB2CC/StrippingB2JpsiHH.py
index 6ff1488617634fd007d8a12547b6a594ae4d4936..9661c75a75522aa8815ff60794ec74f220936c52 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingB2CC/StrippingB2JpsiHH.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingB2CC/StrippingB2JpsiHH.py
@@ -20,18 +20,10 @@ __date__ = '10/11/2016'
 
 __all__ = ('B2JpsiHHConf', 'default_config')
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from CommonParticles.Utils import updateDoD
-from StandardParticles import StdLoosePions
-from StandardParticles import StdLooseKaons
-from StandardParticles import StdLooseProtons
-from StandardParticles import StdAllLooseKaons
-from StandardParticles import StdAllLooseProtons
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
+from PhysSelPython.Wrappers import DataOnDemand, Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from GaudiKernel.SystemOfUnits import MeV
 
 default_config = {
     'NAME': 'B2JpsiHH',
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingB2CC/StrippingB2JpsiPi0.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingB2CC/StrippingB2JpsiPi0.py
index d101d6736bd6fbc066c9d3a41641c3443833d8e3..07e3c0f585f807e2d4aca22d4bdb1025c417bb2f 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingB2CC/StrippingB2JpsiPi0.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingB2CC/StrippingB2JpsiPi0.py
@@ -14,15 +14,10 @@ __version__ = '$Revision: 1.1$'
 
 __all__ = ('B2JpsiPi0Conf', 'default_config')
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from CommonParticles.Utils import updateDoD
-from StandardParticles import StdLooseResolvedPi0
-from StandardParticles import StdLooseMergedPi0
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
+from PhysSelPython.Wrappers import DataOnDemand, Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from GaudiKernel.SystemOfUnits import MeV
 
 default_config = {
     # The real name of the lines is BetaS, this is a reference this for the Settings.
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingB2CC/StrippingB2JpsiPi0_Run1.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingB2CC/StrippingB2JpsiPi0_Run1.py
index 98d9454e367d35177c8710e0664fbec2eaefeea4..ca1071c4660938aa4aa6560a2e1bfd3c18313a12 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingB2CC/StrippingB2JpsiPi0_Run1.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingB2CC/StrippingB2JpsiPi0_Run1.py
@@ -14,15 +14,10 @@ __version__ = '$Revision: 1.2$'
 
 __all__ = ('B2JpsiPi0Conf_RI', 'default_config')
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from CommonParticles.Utils import updateDoD
-from StandardParticles import StdLooseResolvedPi0
-from StandardParticles import StdLooseMergedPi0
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
+from PhysSelPython.Wrappers import DataOnDemand, Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from GaudiKernel.SystemOfUnits import MeV
 
 default_config = {
     # The real name of the lines is BetaS, this is a reference this for the Settings.
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingB2CC/StrippingB2JpsiXforBeta_s.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingB2CC/StrippingB2JpsiXforBeta_s.py
index 098bb6abdfaea54665c8b9d58093c40360f73805..45db0c074b99c56d0ecc2b01c7a78d41221789c0 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingB2CC/StrippingB2JpsiXforBeta_s.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingB2CC/StrippingB2JpsiXforBeta_s.py
@@ -26,16 +26,12 @@ __version__ = '$Revision: 4.0$'
 
 __all__ = ('B2JpsiXforBeta_sConf', 'default_config')
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from CommonParticles.Utils import updateDoD
 from StandardParticles import StdLoosePions
 from StandardParticles import StdLooseKaons
-from StandardParticles import StdAllLooseKaons
 from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from GaudiKernel.SystemOfUnits import MeV
 
 default_config = {
     'NAME': 'BetaS',
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingB2CC/StrippingBd2JpsieeKS.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingB2CC/StrippingBd2JpsieeKS.py
index 07219a0d2951c613809802dd40aa568790631ead..09096eb19abdb19a36493251300e6cba80b16e90 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingB2CC/StrippingBd2JpsieeKS.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingB2CC/StrippingBd2JpsieeKS.py
@@ -8,16 +8,10 @@
 # granted to it by virtue of its status as an Intergovernmental Organization  #
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
-from GaudiKernel.SystemOfUnits import MeV
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
-from StandardParticles import StdAllLooseKaons
-from StandardParticles import StdLooseKaons
-from StandardParticles import StdLoosePions
-from CommonParticles.Utils import updateDoD
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = 'Ramon Niet'
 __date__ = '2014/10/23'
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingB2CC/StrippingBs2EtacPhiBDT.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingB2CC/StrippingBs2EtacPhiBDT.py
index d69562e93974639a7ed7d97c104f670f03ca44a0..51b7aaa9cd5881166fe14986d4e116af3a69992c 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingB2CC/StrippingBs2EtacPhiBDT.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingB2CC/StrippingBs2EtacPhiBDT.py
@@ -17,7 +17,6 @@ from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
-from Gaudi.Configuration import *
 __author__ = ['Morgan Martin, Jibo He']
 __date__ = '20/08/2014'
 __version__ = '$Revision: 1.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingB2CC/StrippingBs2JpsieePhi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingB2CC/StrippingBs2JpsieePhi.py
index e348ef543ce16847b7f3e983e4dd1dada22c6425..7ddeef2463dfe7bcc313536aa70f0533707bd4d9 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingB2CC/StrippingBs2JpsieePhi.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingB2CC/StrippingBs2JpsieePhi.py
@@ -12,7 +12,6 @@ from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from Configurables import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = 'Artur Ukleja, Jibo He, Konrad Klimaszewski'
 __date__ = '2011/03/01'
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingB2OC/Beauty2Charm_B2DXBuilder.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingB2OC/Beauty2Charm_B2DXBuilder.py
index 541ddeee2f42ea3e80fcfb74eb36f3a8aa993a29..78bf5b5654648fe05ca072dbfc6398e44abf39eb 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingB2OC/Beauty2Charm_B2DXBuilder.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingB2OC/Beauty2Charm_B2DXBuilder.py
@@ -12,11 +12,7 @@
 
 from copy import deepcopy
 from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-from PhysSelPython.Wrappers import Selection
-from Beauty2Charm_LoKiCuts import LoKiCuts
 from Beauty2Charm_Utils import *
-from Configurables import SubstitutePID
 
 # \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\#
 
@@ -1014,7 +1010,7 @@ class B2DXBuilder(object):
                                     "B- -> D*_2(2460)0 D0 K-"],
                   'B2D0st2460D0Pi': ["B+ -> D*_2(2460)0 D0 pi+",
                                      "B- -> D*_2(2460)0 D0 pi-"]}
-        input = self.dst.dpi_2460_pid+self.d.kpi_pid+self.topoKaons_PID
+        self.dst.dpi_2460_pid+self.d.kpi_pid+self.topoKaons_PID
         inputs = {'B2D0st2460D0K': self.dst.dpi_2460_pid+self.d.kpi_pid+self.topoKaons_PID,
                   'B2D0st2460D0Pi': self.dst.dpi_2460_pid+self.d.kpi_pid+self.topoPions_PID}
         rs = makeB2XSels(decays, '', inputs, self.config)
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingB2OC/Beauty2Charm_Bc2BXBuilder.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingB2OC/Beauty2Charm_Bc2BXBuilder.py
index b6f87b17a91e7aee89aaf7e40919f477b8952426..ee3e5514565abe4c20d0ea41b02a6dca09bb3d3e 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingB2OC/Beauty2Charm_Bc2BXBuilder.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingB2OC/Beauty2Charm_Bc2BXBuilder.py
@@ -8,11 +8,9 @@
 # granted to it by virtue of its status as an Intergovernmental Organization  #
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
-from copy import deepcopy
 from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 from PhysSelPython.Wrappers import Selection, MergedSelection
-from Beauty2Charm_LoKiCuts import LoKiCuts
 from Beauty2Charm_Utils import *
 
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingB2OC/Beauty2Charm_Bc2DDBuilder.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingB2OC/Beauty2Charm_Bc2DDBuilder.py
index 97d0925f7065d9aa9c1983797ddf4689b27c2c7a..5d9ad7c3081eed161b72e98fd8d9f52289a48fd8 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingB2OC/Beauty2Charm_Bc2DDBuilder.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingB2OC/Beauty2Charm_Bc2DDBuilder.py
@@ -11,10 +11,8 @@
 
 # \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\#
 
-from copy import deepcopy
 from Gaudi.Configuration import *
-from PhysSelPython.Wrappers import Selection, MergedSelection
-from Beauty2Charm_LoKiCuts import LoKiCuts
+from PhysSelPython.Wrappers import MergedSelection
 from Beauty2Charm_Utils import *
 # from Configurables import SubstitutePID
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingB2OC/Beauty2Charm_Bc2DXBuilder.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingB2OC/Beauty2Charm_Bc2DXBuilder.py
index 9296ddf6f105f560d6bf5a96234f7288575c8738..d9598e8c1d88a6f4cfd526cb1e806023c0818ee5 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingB2OC/Beauty2Charm_Bc2DXBuilder.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingB2OC/Beauty2Charm_Bc2DXBuilder.py
@@ -10,9 +10,6 @@
 ###############################################################################
 from copy import deepcopy
 from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-from PhysSelPython.Wrappers import Selection, MergedSelection
-from Beauty2Charm_LoKiCuts import LoKiCuts
 from Beauty2Charm_Utils import *
 
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingB2OC/Beauty2Charm_DBuilder.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingB2OC/Beauty2Charm_DBuilder.py
index fd77399ae9ceb43dc7fefb37b7d4eee03ff07872..789ce80dedcda4d50c3002b94f85f1f49f3f0ba2 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingB2OC/Beauty2Charm_DBuilder.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingB2OC/Beauty2Charm_DBuilder.py
@@ -315,7 +315,6 @@ class DBuilder(object):
         # self.k3pi_ddx_pid = [filterSelection('D2k3pi_for_DDX',LoKiCuts(['VCHI2DOF','BPVVDCHI2'],config_for_ddx).code(),self.k3pi_pid)]
 
         # use this below
-        d_cf_noMassWin = d_cf
         d_cf = LoKiCuts.combine([d_cf, "in_range(%s,MM,%s)" % (d_min, d_max)])
         ds_cf = LoKiCuts.combine(
             [ds_cf, "in_range(%s,MM,%s)" % (ds_min, ds_max)])
@@ -1800,9 +1799,6 @@ class DBuilder(object):
 
     def _makeD2PhiMuNu(self, up=False):
         '''makes Ds->phi mu nu'''
-        decays = [['phi(1020)', 'mu+']]
-        min = '1125.13*MeV'
-        max = '2168.49*MeV'
         cpkk = CombineParticles(CombinationCut="ADAMASS('phi(1020)') < 150*MeV",  # ( hasTopoChild() )
                                 MotherCut='(VFASPF(VCHI2/VDOF) < 10)',
                                 DaughtersCuts={'K+': '(PIDK>-10)'},
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingB2OC/Beauty2Charm_HHBuilder.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingB2OC/Beauty2Charm_HHBuilder.py
index f91cef3b54256d316e6b93d3473acaa77f5e751a..a5f7f08c862bb76c6184b30c38e9347a02ddb3f2 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingB2OC/Beauty2Charm_HHBuilder.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingB2OC/Beauty2Charm_HHBuilder.py
@@ -10,7 +10,6 @@
 ###############################################################################
 # \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\#
 
-from copy import deepcopy
 from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 from PhysSelPython.Wrappers import Selection
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingB2OC/Beauty2Charm_HHHBuilder.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingB2OC/Beauty2Charm_HHHBuilder.py
index 73bdd42ab2d419c0060f6e52c520cd6457336577..148169c3681a9a8c2655d407509db953311ff55d 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingB2OC/Beauty2Charm_HHHBuilder.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingB2OC/Beauty2Charm_HHHBuilder.py
@@ -10,9 +10,8 @@
 ###############################################################################
 # \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\#
 
-from copy import deepcopy
 from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N3BodyDecays
+from GaudiConfUtils.ConfigurableGenerators import DaVinci__N3BodyDecays
 from PhysSelPython.Wrappers import Selection
 from Beauty2Charm_LoKiCuts import LoKiCuts
 from Beauty2Charm_Utils import *
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingB2OC/Beauty2Charm_Lb2XBuilder.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingB2OC/Beauty2Charm_Lb2XBuilder.py
index 3650ed5d9b23de714524d04abfa82d0c9b06df53..38d85b42af6ee313d1b390a6890db6768a914ccb 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingB2OC/Beauty2Charm_Lb2XBuilder.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingB2OC/Beauty2Charm_Lb2XBuilder.py
@@ -1155,7 +1155,7 @@ class Lb2XBuilder(object):
 
     def _makeX2LcKPiPiPi(self):
         '''Makes RS + WS Xib -> Lc HH + c.c.'''
-        pions = self.pions
+        self.pions
         kaons = self.kaons
         pipipi = self.hhh.pipipi
         config = deepcopy(self.config)
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingB2OC/Beauty2Charm_LoKiCuts.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingB2OC/Beauty2Charm_LoKiCuts.py
index da5ba556db6406c1de78f96f4fe4e84ea4811d7f..b376cda82c538e3b997c3fc99c2e51c5e2c66663 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingB2OC/Beauty2Charm_LoKiCuts.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingB2OC/Beauty2Charm_LoKiCuts.py
@@ -10,11 +10,6 @@
 ###############################################################################
 # \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\#
 
-from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
-from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-from PhysSelPython.Wrappers import Selection, MergedSelection
-from StandardParticles import StdNoPIDsPions, StdNoPIDsKaons
 
 # \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\#
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingB2OC/Beauty2Charm_Utils.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingB2OC/Beauty2Charm_Utils.py
index 53e1e9516368913bfc8ab783a50057c32b708278..5aa6a17bb0175186102c8a7e04a3b83bf601af65 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingB2OC/Beauty2Charm_Utils.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingB2OC/Beauty2Charm_Utils.py
@@ -10,13 +10,11 @@
 ###############################################################################
 # \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\#
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-from PhysSelPython.Wrappers import DataOnDemand, Selection, MergedSelection, VoidEventSelection
+from PhysSelPython.Wrappers import DataOnDemand, Selection, VoidEventSelection
 from Beauty2Charm_LoKiCuts import LoKiCuts
 from Configurables import SubstitutePID
-from Configurables import ConeJetProxyFilter
 
 # \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\#
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingB2OC/StrippingB2DDphi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingB2OC/StrippingB2DDphi.py
index fc49b483ca68045c51c0273d61218eead2284ac3..649ee42b6509a2f9cec56b73be76880c9fb180dc 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingB2OC/StrippingB2DDphi.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingB2OC/StrippingB2DDphi.py
@@ -15,8 +15,7 @@ Author: M. Martinelli
 Notes: Excited states are included by placing the line in FULL.DST
 '''
 from PhysSelPython.Wrappers import Selection, DataOnDemand
-from Configurables import FilterDesktop, CombineParticles, DaVinci__N4BodyDecays
-from GaudiConfUtils.ConfigurableGenerators import CombineParticles
+from Configurables import DaVinci__N4BodyDecays, FilterDesktop
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 __author__ = ['Maurizio Martinelli']
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingB2OC/StrippingB2DXD2HMuNu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingB2OC/StrippingB2DXD2HMuNu.py
index e31b819ffef4b0ca065196961a68d156446a0000..da52d1d716806d5a347dd1e2f33834589c781fb6 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingB2OC/StrippingB2DXD2HMuNu.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingB2OC/StrippingB2DXD2HMuNu.py
@@ -12,13 +12,11 @@ __author__ = ['Wenbin Qian']
 __date__ = '09/11/2015'
 __version__ = '$Revision: 0.01 $'
 
-from Gaudi.Configuration import *
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, DaVinci__N4BodyDecays, DaVinci__N3BodyDecays
-from PhysSelPython.Wrappers import Selection, DataOnDemand
+from PhysSelPython.Wrappers import Selection
 from StandardParticles import StdLooseMuons, StdLoosePions, StdLooseKaons
-from GaudiKernel.SystemOfUnits import MeV, GeV, cm, mm
 
 __all__ = ('B2DXD2HMuNuBuilder',
            'default_config')
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingB2OC/StrippingB2DhhhLTUB.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingB2OC/StrippingB2DhhhLTUB.py
index fffd8e491bba10bbf0f31e72f2c296ec758af5e9..f3dd308be8affa5995e434730f4b7cb064117856 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingB2OC/StrippingB2DhhhLTUB.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingB2OC/StrippingB2DhhhLTUB.py
@@ -30,7 +30,6 @@ from StandardParticles import (StdAllNoPIDsPions, StdAllNoPIDsKaons,
 from Beauty2Charm_LoKiCuts import LoKiCuts
 from Beauty2Charm_Utils import *
 from GaudiConfUtils.ConfigurableGenerators import DaVinci__N3BodyDecays
-from Configurables import SubPIDMMFilter
 
 # Default configuration dictionary
 default_config = {
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingB2OC/StrippingB2nbody.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingB2OC/StrippingB2nbody.py
index 9084c61c074c73f98bf558b297ff5c69772ebf9a..2e6227101d962626e6855be64335539fb7fa9376 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingB2OC/StrippingB2nbody.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingB2OC/StrippingB2nbody.py
@@ -16,7 +16,6 @@ from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, MergedSelection, DataOnDemand, VoidEventSelection
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = ['Rudolf Oldeman']
 __date__ = '08/02/2011'
 __version__ = '$Revision: 1.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingB2OC/StrippingBeauty2Charm.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingB2OC/StrippingBeauty2Charm.py
index 13669f766511f7336026d2ff63a228c655334931..07fcaee5ff0263ab31305c5558eb7ad1c44b5882 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingB2OC/StrippingBeauty2Charm.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingB2OC/StrippingBeauty2Charm.py
@@ -28,11 +28,9 @@ from Beauty2Charm_HHHBuilder import *
 from Beauty2Charm_HHBuilder import *
 from Beauty2Charm_DBuilder import *
 from StandardParticles import StdLooseAllPhotons, StdVeryLooseAllPhotons
-from Configurables import LoKi__VoidFilter
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import EventSelection
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
+from PhysSelPython.Wrappers import MergedSelection, Selection
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
 from Gaudi.Configuration import *
 import re
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingB2OC/StrippingDstarD02Kpipi0.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingB2OC/StrippingDstarD02Kpipi0.py
index 5ff751290de17bf77f93b252ea943ad9fde4ab6f..94ae3fe820bfc97cbf14546bcf54af26c9eb5e7b 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingB2OC/StrippingDstarD02Kpipi0.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingB2OC/StrippingDstarD02Kpipi0.py
@@ -22,10 +22,10 @@ from StandardParticles import (StdAllNoPIDsPions,
                                StdAllNoPIDsKaons,
                                StdLooseMergedPi0,
                                StdLooseResolvedPi0)
-from StrippingUtils.Utils import LineBuilder, checkConfig
+from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, ConjugateNeutralPID
+from PhysSelPython.Wrappers import MergedSelection, Selection
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles, ConjugateNeutralPID
 __author__ = 'Andrea Contu'
 __date__ = '04/10/2010'
 __version__ = '$Revision: 1.5 $'
@@ -85,7 +85,6 @@ def makeD02kpipi0(name):
     str_D0_CombCuts = "(ADAMASS('D0')<200*MeV) & (ADOCA(1,2) < 1.5) & (AHASCHILD(((ABSID == 'K+') | (ABSID == 'pi+')) & (MIPCHI2DV(PRIMARY)>40)))"
     str_D0_MotherCuts = "(BPVDIRA>0.9) & (PT>2.5*GeV) & (VFASPF(VCHI2/VDOF)<10) & (BPVVDCHI2>36)"
     str_D0_DecayDescriptor_RS = "[D0 -> K- pi+ pi0]cc"
-    str_D0_Sidebands = "200*MeV"
 
     d0 = CombineParticles()
     d0.DecayDescriptor = str_D0_DecayDescriptor_RS
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingB2OC/StrippingLb2Lcpi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingB2OC/StrippingLb2Lcpi.py
index 0b22157303eb41ca14c2a78e4c6266ef085aa405..ad295973223de82f6f6d12eee5f86169e7f2563d 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingB2OC/StrippingLb2Lcpi.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingB2OC/StrippingLb2Lcpi.py
@@ -12,19 +12,12 @@
 Module for selecting Lb->Lambda_c+ pi
 '''
 
-from StandardParticles import (StdAllNoPIDsPions, StdAllNoPIDsKaons,
-                               StdAllNoPIDsProtons, StdNoPIDsUpPions,
-                               StdLooseMuons, StdNoPIDsUpKaons,
-                               StdLooseResolvedPi0, StdLooseMergedPi0)
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from StandardParticles import StdLooseAllPhotons, StdVeryLooseAllPhotons
-from Configurables import LoKi__VoidFilter
 from PhysSelPython.Wrappers import MergedSelection
 from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
-from Gaudi.Configuration import *
 __author__ = ['Jiesheng Yu', 'Yuehong Xie']
 __date__ = '28/11/2016'
 __version__ = '$Revision: 2.0$'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBandQ/StrippingB2JpsiXforEM_s.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBandQ/StrippingB2JpsiXforEM_s.py
index bc246c589889244c88c690d5538697934211a86c..42cf65a760892339a2d0e813f799d123ac3e1dee 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBandQ/StrippingB2JpsiXforEM_s.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBandQ/StrippingB2JpsiXforEM_s.py
@@ -20,21 +20,11 @@ __version__ = '$Revision: 0.0 $'
 
 __all__ = ('B2JpsiXforEM_sConf', 'default_config')
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
 from Configurables import LoKi__PVReFitter, CombineParticles
-from CommonParticles.Utils import updateDoD
-from StandardParticles import StdLoosePions
-from StandardParticles import StdLooseKaons
-from StandardParticles import StdAllLooseKaons
-from StandardParticles import StdLooseResolvedPi0
-from StandardParticles import StdLooseMergedPi0
-from StandardParticles import StdNoPIDsPions
-from StandardParticles import StdLooseProtons
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
+from PhysSelPython.Wrappers import DataOnDemand, Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from GaudiKernel.SystemOfUnits import MeV
 
 default_config = {
     'NAME': 'B2JpsiXforEM',
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBandQ/StrippingBbbar2PhiPhi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBandQ/StrippingBbbar2PhiPhi.py
index 68d2ae631f967ead0fd39b8d78a4f7850226577b..99d49369aa31255be87f60d200a2ca96c9e5513c 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBandQ/StrippingBbbar2PhiPhi.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBandQ/StrippingBbbar2PhiPhi.py
@@ -21,12 +21,10 @@ confBbbar2PhiPhi = Bbbar2PhiPhiConf( name = 'Bbbar2PhiPhi', config = config_Bbba
 stream.appendLines( confBbbar2PhiPhi.lines() )
 '''
 
-from StandardParticles import StdNoPIDsProtons, StdNoPIDsPions, StdNoPIDsDownPions
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
+from PhysSelPython.Wrappers import DataOnDemand, Selection
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = ['Simone Stracka']
 __date__ = '10/03/2015'
 __all__ = (
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBandQ/StrippingBc2JpsiHBDT.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBandQ/StrippingBc2JpsiHBDT.py
index 9fff4e97511b05b78e9a0f69f8190a87a6e94427..0f2af87a6076525ab1b0cdac932cd4254a9efa35 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBandQ/StrippingBc2JpsiHBDT.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBandQ/StrippingBc2JpsiHBDT.py
@@ -18,7 +18,6 @@ from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = ['Jibo He']
 __date__ = '02/11/2013'
 __version__ = '$Revision: 2.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBandQ/StrippingBc2JpsiMuXNew.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBandQ/StrippingBc2JpsiMuXNew.py
index 187d4d70008c6cb4acaae0c988ab23ab721428d3..422fa39bf0c88c53879fe511ad3ddeca3c23a8a5 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBandQ/StrippingBc2JpsiMuXNew.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBandQ/StrippingBc2JpsiMuXNew.py
@@ -18,7 +18,6 @@ from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = ['Jibo He']
 __date__ = '02/09/2010'
 __version__ = '$Revision: 2.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBandQ/StrippingCC2DD.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBandQ/StrippingCC2DD.py
index 56531b5bc3b8fdc4481e313939be1de765f199f4..1598c1f9f6758d00f48ef8bf734fa3a0c8aff035 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBandQ/StrippingCC2DD.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBandQ/StrippingCC2DD.py
@@ -22,8 +22,7 @@ Module for construction of CC->D D, where CC is a particle decaying to D D
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 __author__ = ['Lucio Anderlini', 'Andrea Bizzeti']
 __date__ = '2015-12-01'
 __version__ = '$Revision: 0.4 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBandQ/StrippingCcbar2Baryons.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBandQ/StrippingCcbar2Baryons.py
index db1a8e674f1380c30d293b155b447db888789b0c..db554d3a6a13854cfb39cfac28c9ae01af445eb9 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBandQ/StrippingCcbar2Baryons.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBandQ/StrippingCcbar2Baryons.py
@@ -20,7 +20,6 @@ stream.appendLines( [
 ])
 '''
 
-from StandardParticles import StdNoPIDsProtons, StdNoPIDsPions, StdNoPIDsDownPions
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBandQ/StrippingCcbar2LstLst.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBandQ/StrippingCcbar2LstLst.py
index 6515f84ca12e36c6d06a892e69e95360c9e2f3f4..ad9039b46d5a61c5253f7122661786c7e8731fe8 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBandQ/StrippingCcbar2LstLst.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBandQ/StrippingCcbar2LstLst.py
@@ -21,12 +21,10 @@ confCcbar2LstLst = Ccbar2LstLstConf( name = 'Ccbar2LstLst', config = config_Ccba
 stream.appendLines( confCcbar2LstLst.lines() )
 '''
 
-from StandardParticles import StdNoPIDsProtons, StdNoPIDsKaons
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
+from PhysSelPython.Wrappers import DataOnDemand, Selection
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = ['Andrii Usachov']
 __date__ = '12/01/2017'
 
@@ -70,22 +68,22 @@ class Ccbar2LstLstConf(LineBuilder):
         self.name = name
         self.config = config
 
-        TRCHI2DOF = config['TRCHI2DOF']
-        CcbarPT = config['CcbarPT']
-        KaonProbNNk = config['KaonProbNNk']
-        KaonPT = config['KaonPT']
-        KaonPTSec = config['KaonPTSec']
-        ProtonProbNNp = config['ProtonProbNNp']
-        ProtonPT = config['ProtonPT']
-        ProtonPTSec = config['ProtonPTSec']
-        LstVtxChi2 = config['LstVtxChi2']
-        LstMinMass = config['LstMinMass']
-        LstMaxMass = config['LstMaxMass']
-        CombMaxMass = config['CombMaxMass']
-        CombMinMass = config['CombMinMass']
-        MaxMass = config['MaxMass']
-        MinMass = config['MinMass']
-        Lst_TisTosSpecs = config['Lst_TisTosSpecs']
+        config['TRCHI2DOF']
+        config['CcbarPT']
+        config['KaonProbNNk']
+        config['KaonPT']
+        config['KaonPTSec']
+        config['ProtonProbNNp']
+        config['ProtonPT']
+        config['ProtonPTSec']
+        config['LstVtxChi2']
+        config['LstMinMass']
+        config['LstMaxMass']
+        config['CombMaxMass']
+        config['CombMinMass']
+        config['MaxMass']
+        config['MinMass']
+        config['Lst_TisTosSpecs']
 
         """
         Unbiased, require Hlt Tis
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBandQ/StrippingCcbar2PPPiPi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBandQ/StrippingCcbar2PPPiPi.py
index 1baf5793c54d1cf7c0db705b5b635116d72951ee..98fdb7f110d844cb8f222f2e0825cfc55a7129da 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBandQ/StrippingCcbar2PPPiPi.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBandQ/StrippingCcbar2PPPiPi.py
@@ -12,12 +12,11 @@
 Module for selecting charmonium -> p pbar pi pi 
 '''
 
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
+from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
 from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
-from Gaudi.Configuration import *
 __author__ = ['Jibo He']
 __date__ = '12/11/2015'
 __version__ = '$Revision: 1.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBandQ/StrippingCcbar2PhiPhi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBandQ/StrippingCcbar2PhiPhi.py
index 699437c3bc06d6f9ef8d71ef25d59e5854abaa77..28e46f5fd73a17d752f06d7afb1020754dfa86ea 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBandQ/StrippingCcbar2PhiPhi.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBandQ/StrippingCcbar2PhiPhi.py
@@ -21,12 +21,10 @@ confCcbar2PhiPhi = Ccbar2PhiPhiConf( name = 'Ccbar2PhiPhi', config = config_Ccba
 stream.appendLines( confCcbar2PhiPhi.lines() )
 '''
 
-from StandardParticles import StdNoPIDsProtons, StdNoPIDsPions, StdNoPIDsDownPions
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
+from PhysSelPython.Wrappers import DataOnDemand, Selection
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = ['Jibo He']
 __date__ = '20/01/2012'
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBandQ/StrippingCcbar2PhiPhiDetached.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBandQ/StrippingCcbar2PhiPhiDetached.py
index e6a23c416236ec260cbde0f7e27ef419c26d8b63..2efa73daa63445c07e6f9422398282c433d6429a 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBandQ/StrippingCcbar2PhiPhiDetached.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBandQ/StrippingCcbar2PhiPhiDetached.py
@@ -15,12 +15,10 @@ Inherited from StrippingCcbar2PhiPhi.py; moved To FullDST
 
 '''
 
-from StandardParticles import StdNoPIDsProtons, StdNoPIDsPions, StdNoPIDsDownPions
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
+from PhysSelPython.Wrappers import DataOnDemand, Selection
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = ['Jibo He, Liupan An']
 __date__ = '11/01/2017'
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBandQ/StrippingCcbar2PhiPhiPiPi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBandQ/StrippingCcbar2PhiPhiPiPi.py
index ddb88e1954def91543a3f0a59a00716f5bd235d7..9090289120899103df433cf45001623eeaf79cdd 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBandQ/StrippingCcbar2PhiPhiPiPi.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBandQ/StrippingCcbar2PhiPhiPiPi.py
@@ -12,12 +12,11 @@
 Module for selecting charmonium -> phi phi pi pi 
 '''
 
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
+from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
 from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
-from Gaudi.Configuration import *
 __author__ = ['Andrii Usachov']
 __date__ = '10/04/2017'
 __version__ = '$Revision: 1.1 $'
@@ -61,12 +60,12 @@ class Ccbar2PhiPhiPiPiConf(LineBuilder):
         self.name = name
         self.config = config
 
-        PhiVtxChi2 = config['PhiVtxChi2']
-        PhiMassW = config['PhiMassW']
-        KaonPT = config['KaonPT']
-        TRCHI2DOF = config['TRCHI2DOF']
-        KaonProbNNk = config['KaonProbNNk']
-        KaonIPCHI2 = config['KaonIPCHI2']
+        config['PhiVtxChi2']
+        config['PhiMassW']
+        config['KaonPT']
+        config['TRCHI2DOF']
+        config['KaonProbNNk']
+        config['KaonIPCHI2']
 
         self.SelPions = self.createSubSel(OutputList=self.name + "SelPions",
                                           InputList=DataOnDemand(
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBandQ/StrippingCcbar2PpbarNew.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBandQ/StrippingCcbar2PpbarNew.py
index 516985c59ccaf3e62e2b0cd6e7854be4d026b219..9d41a780f5f17e24bf58cf91f33a808d5da77441 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBandQ/StrippingCcbar2PpbarNew.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBandQ/StrippingCcbar2PpbarNew.py
@@ -18,9 +18,8 @@ Module for Charmonium->p pbar, including three lines
 
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
+from PhysSelPython.Wrappers import Selection
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 __author__ = ['Jibo He']
 __date__ = '03/10/2010'
 __version__ = '$Revision: 1.2 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBandQ/StrippingChiCJPsiGammaConv.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBandQ/StrippingChiCJPsiGammaConv.py
index 39414a2916b0f53397182e29fb2a9b81b1302a97..b17f83d5302ed3c59a1e107d4f81d3c06f495239 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBandQ/StrippingChiCJPsiGammaConv.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBandQ/StrippingChiCJPsiGammaConv.py
@@ -11,8 +11,7 @@
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
-from Configurables import FilterDesktop, CombineParticles, OfflineVertexFitter
-from Gaudi.Configuration import *
+from Configurables import CombineParticles, FilterDesktop
 __author__ = 'Edwige Tournefier'
 __date__ = '08/06/2012'
 __version__ = '$ 1.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBandQ/StrippingDiMuonForXsection.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBandQ/StrippingDiMuonForXsection.py
index 21f73ebac0f9dc811485e0f2194e3dbe6c8f586e..ce4daa1211b88144135f0f2588520bea0acef116 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBandQ/StrippingDiMuonForXsection.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBandQ/StrippingDiMuonForXsection.py
@@ -16,7 +16,6 @@ from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
-from Gaudi.Configuration import *
 __author__ = ['Jibo He']
 __date__ = '28/03/2012'
 __version__ = '$Revision: 1.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBandQ/StrippingDiMuonNew.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBandQ/StrippingDiMuonNew.py
index 8a272ad23d094d840fc6955b2c67f3976834c915..f0e46c0b4d08131b87ba289d29dd2ab04d08ee3b 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBandQ/StrippingDiMuonNew.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBandQ/StrippingDiMuonNew.py
@@ -60,7 +60,6 @@ from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand, EventSelection
 from Configurables import LoKi__VoidFilter
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
-from Gaudi.Configuration import *
 __author__ = ['Jibo He']
 __date__ = '30/09/2010'
 __version__ = '$Revision: 1.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBandQ/StrippingHeavyBaryons.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBandQ/StrippingHeavyBaryons.py
index eb64c175072af830020f5799a7c17fc8dfcb6121..fa0dcf9a66313c735015d48754857948cd7efd09 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBandQ/StrippingHeavyBaryons.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBandQ/StrippingHeavyBaryons.py
@@ -12,14 +12,10 @@
 Stripping line for HeavyBaryons studies : Xi_b-, Xi_b0 and Omega_b-
 Author: Yasmine Amhis
 '''
-from GaudiKernel.SystemOfUnits import MeV
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
-from StandardParticles import StdAllLoosePions, StdAllLooseKaons
-from StandardParticles import StdLoosePions, StdNoPIDsDownPions, StdLooseKaons, StdLooseDownKaons
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = ['Yasmine Amhis']
 __date__ = '19/05/2011'
 __version__ = '$Revision: 1.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBandQ/StrippingLb2EtacKp.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBandQ/StrippingLb2EtacKp.py
index 0c836118d6ad2de1e6aa2c2dedac2917dacca810..63e11ca5d4abca4914b64c29f42f7397f5565146 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBandQ/StrippingLb2EtacKp.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBandQ/StrippingLb2EtacKp.py
@@ -17,7 +17,6 @@ from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
-from Gaudi.Configuration import *
 __author__ = ['Liming Zhang', 'Xuesong Liu']
 __date__ = '23/11/2016'
 __version__ = '$Revision: 2.0$'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBandQ/StrippingOmegab2XicKpi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBandQ/StrippingOmegab2XicKpi.py
index 3e2d953e5c68e5184050887ee4d64c459de21acd..8d75e01e9198aae28302595b73bca42da91b8059 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBandQ/StrippingOmegab2XicKpi.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBandQ/StrippingOmegab2XicKpi.py
@@ -25,8 +25,7 @@ __all__ = ('Omegab2XicKpiConf',
            'makeOmegab2XicKpi',
            'default_config')
 
-from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBandQ/StrippingPPMuMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBandQ/StrippingPPMuMu.py
index 1df5d93b87bbdb9dae5bf3778b297ca01759bc14..fcea01500647f725d298f5a17513a6a9ec45cd4d 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBandQ/StrippingPPMuMu.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBandQ/StrippingPPMuMu.py
@@ -12,12 +12,11 @@
 Module for selecting Hc -> p pbar mu mu
 '''
 
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
+from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
 from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
-from Gaudi.Configuration import *
 __author__ = ['Liupan An']
 __date__ = '18/05/2017'
 __version__ = '$Revision: 1.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBandQ/StrippingXibc.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBandQ/StrippingXibc.py
index 09c274076ab77b1ffa445d4027da57cc7c71076c..73028a237e89513bcf5c298f108bcad2a1ff9f07 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBandQ/StrippingXibc.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBandQ/StrippingXibc.py
@@ -47,17 +47,11 @@ __all__ = ('XibcBuilder'  # LineBuilder class specialization
            )
 
 
-from Gaudi.Configuration import *
-
 from Configurables import FilterDesktop, CombineParticles
 from PhysSelPython.Wrappers import Selection, AutomaticData, MergedSelection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 
-from CommonParticles.StdLooseLambda import StdLooseLambdaLL, StdLooseLambdaDD
-from GaudiKernel.SystemOfUnits import MeV, GeV, mm
-from Configurables import TisTosParticleTagger
-
 
 default_name = "Xibc"
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBandQ/StrippingXibcBDT.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBandQ/StrippingXibcBDT.py
index fbb6cc13c3ac13de0c21873fee47d7b215a1fd13..c4c8bfdaa9f3eda289dc29405819cbcec755f3ab 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBandQ/StrippingXibcBDT.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBandQ/StrippingXibcBDT.py
@@ -33,8 +33,6 @@ from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticle
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, MergedSelection, DataOnDemand
-from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays
-from Gaudi.Configuration import *
 __author__ = ['Jibo He']
 __date__ = '20/11/2016'
 __version__ = '$Revision: 1.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBandQ/StrippingXic2HHHOld.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBandQ/StrippingXic2HHHOld.py
index 2b6300f560c23ceddc6c67fa4d6def48eb6cb5f9..578167c7681a568ba96718c7d1cb251d66778ff5 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBandQ/StrippingXic2HHHOld.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBandQ/StrippingXic2HHHOld.py
@@ -8,17 +8,15 @@
 # granted to it by virtue of its status as an Intergovernmental Organization  #
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
-from StandardParticles import StdNoPIDsPions, StdTightPions, StdNoPIDsKaons, StdAllNoPIDsProtons
-from Configurables import TisTosParticleTagger
+from StandardParticles import StdAllNoPIDsProtons, StdNoPIDsKaons, StdNoPIDsPions
 from StrippingUtils.Utils import LineBuilder
-from PhysSelPython.Wrappers import Selection, DataOnDemand, AutomaticData, MergedSelection
+from PhysSelPython.Wrappers import DataOnDemand, Selection
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
 from Configurables import FilterDesktop, CombineParticles
 from LHCbKernel.Configuration import *
 from GaudiKernel.SystemOfUnits import MeV, mm, ns
 from StrippingConf.StrippingLine import StrippingLine
 from Gaudi.Configuration import *
-import re
 all
 ''' Xic+ and Theta+ lines Designed by Yury Shcheglov, Alexey Dzyuba, Nelya Sagidova to study Xic+ and Theta+ particles '''
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBandQ/StrippingXiccBDT.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBandQ/StrippingXiccBDT.py
index cd4fb8c12ea0ad6a04988289df6f51c07a333a64..c47838a8934fb09a8fb5f516a09dd4c1fde9e069 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBandQ/StrippingXiccBDT.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBandQ/StrippingXiccBDT.py
@@ -30,9 +30,7 @@ Xicc+  -> D+ p+ K-
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, MergedSelection, DataOnDemand
-from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays
-from Gaudi.Configuration import *
+from PhysSelPython.Wrappers import DataOnDemand, Selection
 __author__ = ['Jibo He']
 __date__ = '20/11/2016'
 __version__ = '$Revision: 1.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBnoC/StrippingB24pLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBnoC/StrippingB24pLines.py
index 6a1293248e466cc67c4e7096a59950a675f613ad..d0ef68a9df8f43bd44f73227ae276cbb19015738 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBnoC/StrippingB24pLines.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBnoC/StrippingB24pLines.py
@@ -54,12 +54,10 @@ Exported symbols (use python help!):
    - 
 """
 
-from GaudiKernel.PhysicalConstants import c_light
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
-from Configurables import FilterDesktop, CombineParticles, DaVinci__N4BodyDecays
-from Gaudi.Configuration import *
+from Configurables import DaVinci__N4BodyDecays
 __author__ = ["Pietro Marino", "Oliver Gruenberg"]
 __date__ = "13.10.2017"
 __version__ = "$Revision: 3.0 $"
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBnoC/StrippingB2CharmlessInclusive.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBnoC/StrippingB2CharmlessInclusive.py
index cd9fc514663d296477d068a8eec81536e9237830..84e599e9d48ebeea579e8528cafbeae6f8f8ac8c 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBnoC/StrippingB2CharmlessInclusive.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBnoC/StrippingB2CharmlessInclusive.py
@@ -16,9 +16,8 @@ from StandardParticles import StdLooseKsDD, StdLooseKsLL
 from StandardParticles import StdNoPIDsPions, StdLooseAllPhotons, StdLooseMergedPi0, StdLooseResolvedPi0
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand, SimpleSelection
+from PhysSelPython.Wrappers import Selection, SimpleSelection
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = ['Fred Blanc', 'Luca Pescatore']
 __date__ = '30/11/2016'
 __version__ = '$Revision: 3.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBnoC/StrippingB2CharmlessQuasi2Body.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBnoC/StrippingB2CharmlessQuasi2Body.py
index 718d39a23d00335bf8f1dcbcc45b7eefac60df7c..722215da6a98e8cb098731d1b08547d32728e4c3 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBnoC/StrippingB2CharmlessQuasi2Body.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBnoC/StrippingB2CharmlessQuasi2Body.py
@@ -15,9 +15,8 @@ B->charmless quasi 2-body selection
 from StandardParticles import StdNoPIDsPions
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand
+from PhysSelPython.Wrappers import Selection
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = ['Fred Blanc']
 __date__ = '25/07/2014'
 __version__ = '$Revision: 2.8 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBnoC/StrippingB2HHBDT.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBnoC/StrippingB2HHBDT.py
index 373482252891dafc2ebd794bee38e3c31665f7d5..87ef9edbab077d9500e2cb0ecdd4587476dededd 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBnoC/StrippingB2HHBDT.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBnoC/StrippingB2HHBDT.py
@@ -24,16 +24,13 @@ __all__ = ('B2HHBDTLines',
            'applyBDT',
            'default_config')
 
-from Gaudi.Configuration import *
 
-from GaudiKernel.SystemOfUnits import *
-
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 from StandardParticles import StdNoPIDsPions
 
 from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
-from StrippingUtils.Utils import LineBuilder, checkConfig
+from StrippingUtils.Utils import LineBuilder
 
 
 default_config = {
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBnoC/StrippingB2HHPi0.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBnoC/StrippingB2HHPi0.py
index 7f0781e48280454c550a19cc42c39585db39a8db..37ddfd7720d7364819cb7952fb6e6c0bb7e2da3d 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBnoC/StrippingB2HHPi0.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBnoC/StrippingB2HHPi0.py
@@ -26,9 +26,8 @@ __all__ = ('StrippingB2HHPi0Conf',
            'makeB2HHPi0M',
            'default_config')
 
-from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from PhysSelPython.Wrappers import Selection, DataOnDemand
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
+from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from StandardParticles import StdNoPIDsPions, StdLooseMergedPi0, StdLooseResolvedPi0
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBnoC/StrippingB2KShh.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBnoC/StrippingB2KShh.py
index b6ed5f7d633af57ed6f8b1a89d7dd2ee9323b11e..213f6377bb60d399cc798f1fb8a9e6aa0513e6ae 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBnoC/StrippingB2KShh.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBnoC/StrippingB2KShh.py
@@ -25,7 +25,6 @@ __version__ = 'Stripping24r1/Stripping26r1'
 __all__ = {'B2KShhConf',
            'default_config'}
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, DaVinci__N3BodyDecays
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBnoC/StrippingB2KShhh.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBnoC/StrippingB2KShhh.py
index a35d44f01b8e80ef2a95c24cc8c95dbc14879bed..19e01960a41605b77b968788e4fbd7fa7704664a 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBnoC/StrippingB2KShhh.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBnoC/StrippingB2KShhh.py
@@ -27,13 +27,13 @@ __all__ = ('B2KShhhConf',
 
 from Gaudi.Configuration import *
 
-from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N4BodyDecays
+from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays
 from StandardParticles import StdNoPIDsPions, StdNoPIDsKaons  # ipchi2 cut
 from StandardParticles import StdLooseKsDD, StdLooseKsLL
 
-from PhysSelPython.Wrappers import Selection, MergedSelection
+from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
-from StrippingUtils.Utils import LineBuilder, checkConfig
+from StrippingUtils.Utils import LineBuilder
 
 from Configurables import FilterDesktop
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBnoC/StrippingB2Ksthh.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBnoC/StrippingB2Ksthh.py
index e878d03046af779ac332df6b113e19552f52d4db..1bfb413fe01485a34aaaeb592f39f482172a42ad 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBnoC/StrippingB2Ksthh.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBnoC/StrippingB2Ksthh.py
@@ -22,7 +22,6 @@ __version__ = 'Stripping26'
 __all__ = {'B2KsthhConf',
            'default_config'}
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
@@ -176,7 +175,7 @@ class B2KsthhConf(LineBuilder):
         _massCutHigh = "(AM<(5279+%s)*MeV)" % config['B_Mhigh']
         _aptCut = "(APT>%s*MeV)" % config['B_APTmin']
         _daugMedPtCut = "(ANUM(PT>%s*MeV)>=2)" % config['BDaug_MedPT_PT']
-        _daugMaxPtIPCut = "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['BDaug_MaxPT_IP']
+        "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['BDaug_MaxPT_IP']
         _daugPtSumCut = "((APT1+APT2+APT3)>%s*MeV)" % config['BDaug_PTsum']
 
         _combCuts = _aptCut
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBnoC/StrippingB2TwoBaryons.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBnoC/StrippingB2TwoBaryons.py
index be5394ee6af7729db44cf59ecfeedb504d8b1b27..26bb8d6f679d13ed169bc510a1472696a873ae14 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBnoC/StrippingB2TwoBaryons.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBnoC/StrippingB2TwoBaryons.py
@@ -31,11 +31,10 @@ from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
 from StandardParticles import StdLooseProtons
 from StandardParticles import StdNoPIDsPions as Pions
-from CommonParticles.StdLooseLambda import StdLooseLambdaLL, StdLooseLambdaDD
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
-from StrippingUtils.Utils import LineBuilder, checkConfig
-from GaudiKernel.SystemOfUnits import MeV, GeV, mm, ns
+from StrippingUtils.Utils import LineBuilder
+from GaudiKernel.SystemOfUnits import GeV, MeV, mm
 
 default_config = {'NAME': 'B2TwoBaryons',
                   'WGs': ['BnoC'],
@@ -157,7 +156,7 @@ class B2TwoBaryonLines(LineBuilder):
 
         B2PPbarName = name + "B2PPbar"
 
-        B2PPSameSignName = name + "B2PPSameSign"
+        name + "B2PPSameSign"
 
         B2Lp_dd_name = name+'B2PLambdabarDD'
         B2Lp_ll_name = name+'B2PLambdabarLL'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBnoC/StrippingB2XEta.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBnoC/StrippingB2XEta.py
index ed24e9afa098a704c220dc1576bebc7f4b618dc8..a85b63d0f6c48630471d87c4ec99d3ff00e14140 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBnoC/StrippingB2XEta.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBnoC/StrippingB2XEta.py
@@ -25,9 +25,7 @@ from StandardParticles import StdLoosePions as Pions
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, DaVinci__N3BodyDecays
-from PhysSelPython.Wrappers import DataOnDemand, Selection, SelectionSequence, MergedSelection
-from GaudiKernel import SystemOfUnits as Units
-from Gaudi.Configuration import *
+from PhysSelPython.Wrappers import DataOnDemand, MergedSelection, Selection
 __author__ = ['Timothy Williams']
 __date__ = '1/12/2016'
 __version__ = 'Stripping26r1'
@@ -564,7 +562,7 @@ class B2XEtaConf(LineBuilder):
         _trackCuts = _track_PT+'&'+_track_Chi2+'&'+_track_GPCut+'&'+_track_PIDCut
         _combCuts = _massCut+'&'+_docaCut
         _combCut12Doca = "ACHI2DOCA(1,2)<%s" % config['eta_DOCA']
-        _combCut12Vtx = "(VFASPF(VCHI2/VDOF)<%s)" % config['eta_vtxChi2']
+        "(VFASPF(VCHI2/VDOF)<%s)" % config['eta_vtxChi2']
         _combCut12 = _combCut12Doca
 
         # _eta3Pi=CombineParticles("eta3Pi",
@@ -592,7 +590,7 @@ class B2XEtaConf(LineBuilder):
         _trackCuts = _track_PT+'&'+_track_Chi2+'&'+_track_GPCut+'&'+_track_PIDCut
         _combCuts = _massCut+'&'+_docaCut
         _combCut12Doca = "ACHI2DOCA(1,2)<%s" % config['eta_prime_DOCA']
-        _combCut12Vtx = "(VFASPF(VCHI2/VDOF)<%s)" % config['eta_prime_vtxChi2']
+        "(VFASPF(VCHI2/VDOF)<%s)" % config['eta_prime_vtxChi2']
         _combCut12 = _combCut12Doca
 
         # _etap=CombineParticles("etap",
@@ -883,7 +881,7 @@ class B2XEtaConf(LineBuilder):
         _combCuts = _massCut+'&'+_docaCut
         _allCuts = _PTCut+'&'+_vtxCut+'&'+_diraCut+'&'+_IPChi2Cut
         _combCut12Doca = "ACHI2DOCA(1,2)<%s" % config['LbDaug_LL_maxDocaChi2']
-        _combCut12Vtx = "(VFASPF(VCHI2/VDOF)<%s)" % config['Lb_VtxChi2']
+        "(VFASPF(VCHI2/VDOF)<%s)" % config['Lb_VtxChi2']
         _combCut12 = _combCut12Doca
 
         _Lb2pKetap = DaVinci__N3BodyDecays(DecayDescriptor="[Lambda_b0 -> p+ K- eta_prime]cc",
@@ -921,7 +919,7 @@ class B2XEtaConf(LineBuilder):
         _combCuts = _massCut
         _allCuts = _PTCut+'&'+_IPChi2Cut+'&'+_vtxCut+'&'+_diraCut
         _combCut12Doca = "ACHI2DOCA(1,2)<%s" % config['LbDaug_LL_maxDocaChi2']
-        _combCut12Vtx = "(VFASPF(VCHI2/VDOF)<%s)" % config['Lb_VtxChi2']
+        "(VFASPF(VCHI2/VDOF)<%s)" % config['Lb_VtxChi2']
         _combCut12 = _combCut12Doca
 
         _Lb2pKeta3Pi = DaVinci__N3BodyDecays(DecayDescriptor="[Lambda_b0 -> p+ K- eta]cc",
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBnoC/StrippingB2a1Pi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBnoC/StrippingB2a1Pi.py
index 7122ae867e7e6cb1bde58f2cfdfd30aa0d240f52..db0bacbfa565ae7b8150163fc8c4c7c5352aa931 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBnoC/StrippingB2a1Pi.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBnoC/StrippingB2a1Pi.py
@@ -17,7 +17,6 @@ from Configurables import DaVinci__N4BodyDecays
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
-from Gaudi.Configuration import *
 __author__ = ['Daniel Vieira, Jibo He']
 __date__ = '01/12/2016'
 __version__ = '$Revision: 1.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBnoC/StrippingB2pphh.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBnoC/StrippingB2pphh.py
old mode 100755
new mode 100644
index 98e460d757a794b2d939f602b94d4d3711f5533b..193ff53fe70d045102b03995d531bb12320411a7
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBnoC/StrippingB2pphh.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBnoC/StrippingB2pphh.py
@@ -25,16 +25,13 @@ __all__ = ('B2pphhConf',
            )
 
 
-from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop
+from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
 # from Configurables import DaVinci__N4BodyDecays
 from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays
 
-from StandardParticles import StdAllNoPIDsKaons, StdAllNoPIDsPions, StdAllNoPIDsProtons
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from Configurables import LoKi__VoidFilter as VoidFilter
 
 default_config = {
     'NAME': 'B2pphh',
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBnoC/StrippingBc2hhh_BnoC.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBnoC/StrippingBc2hhh_BnoC.py
index 36ea85af4db7abafbbe99eee0a7538f4826c1b68..7f9a438ee86d830276cf2cf989aed20166beaece 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBnoC/StrippingBc2hhh_BnoC.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBnoC/StrippingBc2hhh_BnoC.py
@@ -23,13 +23,11 @@ Exported symbols (use python help!):
    - makeppK_excl  
 '''
 
-from Configurables import LoKi__VoidFilter as VoidFilter
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection
 import StandardParticles
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 __author__ = ['Alvaro Gomes', 'Adlene Hicheur']
 __date__ = '31/08/2014'
 __version__ = '$Revision: 1.5 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBnoC/StrippingBs2KKhh.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBnoC/StrippingBs2KKhh.py
index dde55525b06f816fc6920690629b551e37b69fcd..f12ace21ab9ca71d0ce07d7e6f00c9dd259533d1 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBnoC/StrippingBs2KKhh.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBnoC/StrippingBs2KKhh.py
@@ -27,7 +27,6 @@ from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop
-from Gaudi.Configuration import *
 __author__ = ['Sean Benson', 'Adam Morris', 'Laurence Carson']
 __date__ = '22/11/2016'
 __version__ = '3.2'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBnoC/StrippingBs2KSKS_Run2.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBnoC/StrippingBs2KSKS_Run2.py
index 4580afecf4c01f9e41baf8c5acbcf0d2a19381ab..9b3c212035d7adeee4c570b05c5ed9d7e786e124 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBnoC/StrippingBs2KSKS_Run2.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBnoC/StrippingBs2KSKS_Run2.py
@@ -22,15 +22,11 @@ __date__ = '13/09/2016'
 __version__ = 'Run2'
 __all__ = {'Bs2KSKSConf', 'default_config'}
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
+from PhysSelPython.Wrappers import DataOnDemand, Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 
-from StandardParticles import StdNoPIDsPions as Pions
-from StandardParticles import StdNoPIDsDownPions as DownPions
-
 
 default_config = {
     'NAME': 'Bs2KSKS',
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBnoC/StrippingBs2Kst_0Kst_0.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBnoC/StrippingBs2Kst_0Kst_0.py
index b53f616c921d0b54652c488e0c38cac1f5ce4524..7a979a9eaf956b50a902298fa49f660dce2481fd 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBnoC/StrippingBs2Kst_0Kst_0.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBnoC/StrippingBs2Kst_0Kst_0.py
@@ -19,11 +19,8 @@ Exported symbols (use python help!):
 
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, SelectionSequence, DataOnDemand
+from PhysSelPython.Wrappers import DataOnDemand, Selection
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-from CommonParticles.Utils import *
-from LHCbKernel.Configuration import *
-from Gaudi.Configuration import *
 __author__ = ['Brais Sanmartin Sedes']
 __date__ = '12/11/2015'
 __version__ = '5.1'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBnoC/StrippingBs2PhiKst0.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBnoC/StrippingBs2PhiKst0.py
index aef03c61961f38f6f068ef062a0becf2559328ff..760de6aa13d7b0a722662b7dd528b6f1674d806c 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBnoC/StrippingBs2PhiKst0.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBnoC/StrippingBs2PhiKst0.py
@@ -20,11 +20,8 @@ Exported symbols (use python help!):
 
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, SelectionSequence, DataOnDemand
+from PhysSelPython.Wrappers import DataOnDemand, Selection
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-from CommonParticles.Utils import *
-from LHCbKernel.Configuration import *
-from Gaudi.Configuration import *
 __author__ = ['Brais Sanmartin Sedes']
 __date__ = '01/12/2015'
 __version__ = '5.0'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBnoC/StrippingBs2PhiPhi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBnoC/StrippingBs2PhiPhi.py
index 58996ef52a66510db5fb60dbf44832780557590c..611bd2bca00562eb1a482bbb1419ddd2a0c0f97f 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBnoC/StrippingBs2PhiPhi.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBnoC/StrippingBs2PhiPhi.py
@@ -24,12 +24,10 @@ Exports the following stripping lines as instance data members:
 
 from StandardParticles import StdAllLooseANNKaons as MyLooseKaons
 from StandardParticles import StdLooseANNUpKaons as MyLooseUpKaons
-import StandardParticles
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
+from PhysSelPython.Wrappers import Selection
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 __author__ = ['Sean Benson']
 __date__ = '2013/08/15'
 __version__ = '3.0'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBnoC/StrippingBu2Ksthh.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBnoC/StrippingBu2Ksthh.py
index 1fd6ba79106d4c72d1f5378548dde305d33378e6..4f9c1afdf1ca56cd839fd46540b523d1043c3014 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBnoC/StrippingBu2Ksthh.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBnoC/StrippingBu2Ksthh.py
@@ -23,7 +23,6 @@ __version__ = 'Stripping26'
 __all__ = {'Bu2KsthhConf',
            'default_config'}
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
@@ -302,7 +301,7 @@ class Bu2KsthhConf(LineBuilder):
         _massCutHigh = "(AM<(5279+%s)*MeV)" % config['B_Mhigh']
         _aptCut = "(APT>%s*MeV)" % config['B_APTmin']
         _daugMedPtCut = "(ANUM(PT>%s*MeV)>=2)" % config['BDaug_MedPT_PT']
-        _daugMaxPtIPCut = "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['BDaug_MaxPT_IP']
+        "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['BDaug_MaxPT_IP']
         _maxDocaChi2Cut = "(ACUTDOCACHI2(%s,''))" % config['BDaug_DD_maxDocaChi2']
         _daugPtSumCut = "((APT1+APT2+APT3)>%s*MeV)" % config['BDaug_DD_PTsum']
 
@@ -359,7 +358,7 @@ class Bu2KsthhConf(LineBuilder):
         _massCutHigh = "(AM<(5279+%s)*MeV)" % config['B_Mhigh']
         _aptCut = "(APT>%s*MeV)" % config['B_APTmin']
         _daugMedPtCut = "(ANUM(PT>%s*MeV)>=2)" % config['BDaug_MedPT_PT']
-        _daugMaxPtIPCut = "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['BDaug_MaxPT_IP']
+        "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['BDaug_MaxPT_IP']
         _maxDocaChi2Cut = "(ACUTDOCACHI2(%s,''))" % config['BDaug_LL_maxDocaChi2']
         _daugPtSumCut = "((APT1+APT2+APT3)>%s*MeV)" % config['BDaug_LL_PTsum']
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBnoC/StrippingBu2hhh.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBnoC/StrippingBu2hhh.py
index b0e05de78958b36146c5a12809f45d4740bb2fa6..a56f353bf291873105ec54cba5728f3b553b07bd 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBnoC/StrippingBu2hhh.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBnoC/StrippingBu2hhh.py
@@ -22,13 +22,11 @@ Exported symbols (use python help!):
    - makepph_incl
 '''
 
-from Configurables import LoKi__VoidFilter as VoidFilter
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection
 import StandardParticles
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 __author__ = ['Irina Nasteva', 'Jussara Miranda', 'Alvaro Gomes']
 __date__ = '19/05/2017'
 __version__ = 'Stripping29'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBnoC/StrippingBu2rho0rhoPlus.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBnoC/StrippingBu2rho0rhoPlus.py
index b3c5e6c8c3f30a98e89149776396db914e3521a7..f8977b65f3b942bc77dcabdcef4e8eaafc84d344 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBnoC/StrippingBu2rho0rhoPlus.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBnoC/StrippingBu2rho0rhoPlus.py
@@ -21,7 +21,6 @@ from StrippingUtils.Utils import LineBuilder, checkConfig
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = "Jason E Andrews"
 __date__ = "26/11/2016"
 __version__ = "4.0"
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBnoC/StrippingButo5h.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBnoC/StrippingButo5h.py
index f513b2eb8e791c982132575a578c37ea43972bc1..86d97904e5f34fc79cf9ebc9ad39fa87262f2f8e 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBnoC/StrippingButo5h.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBnoC/StrippingButo5h.py
@@ -23,13 +23,11 @@ Exported symbols (use python help!):
    - makeppKpipi_excl
 '''
 
-from Configurables import LoKi__VoidFilter as VoidFilter
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection
 import StandardParticles
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 __author__ = ['Luiz Gustavo de Oliveira',
               'Alvaro Gomes', 'Bruno Souza de Paula']
 __date__ = '22/Aug/2014'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBnoC/StrippingD2HHBDT.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBnoC/StrippingD2HHBDT.py
index 0dfb222d2ab5dafe519ef756d69dd2b74431bea4..91e98da0d8961d715e47786f01a3c51a0d58cbec 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBnoC/StrippingD2HHBDT.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBnoC/StrippingD2HHBDT.py
@@ -23,14 +23,13 @@ __all__ = ('D2HHBDTLines',
            'makeD2HHBDT',
            'default_config')
 
-from Gaudi.Configuration import *
 
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
 from StandardParticles import StdNoPIDsKaons, StdAllNoPIDsPions
 
 from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
-from StrippingUtils.Utils import LineBuilder, checkConfig
+from StrippingUtils.Utils import LineBuilder
 
 
 default_config = {
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBnoC/StrippingHb2Charged2Body.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBnoC/StrippingHb2Charged2Body.py
index 5892ee9c6a978ec163161067545b8241aff5219a..213bb72f76914d8e9fde9fce72f99f9a8376da9d 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBnoC/StrippingHb2Charged2Body.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBnoC/StrippingHb2Charged2Body.py
@@ -23,14 +23,13 @@ __all__ = ('Hb2Charged2BodyLines',
            'makeB2Charged2Body',
            'default_config')
 
-from Gaudi.Configuration import *
 
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-from StandardParticles import StdNoPIDsPions, StdLooseProtons, StdLooseKaons
+from StandardParticles import StdNoPIDsPions
 
 from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
-from StrippingUtils.Utils import LineBuilder, checkConfig
+from StrippingUtils.Utils import LineBuilder
 
 
 default_config = {
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBnoC/StrippingHb2V0V0h.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBnoC/StrippingHb2V0V0h.py
index f6702785b326d61efc44578825e2016852c82b2c..52ebfc4bea96f799009c3fb522ae04cb32319278 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBnoC/StrippingHb2V0V0h.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBnoC/StrippingHb2V0V0h.py
@@ -22,7 +22,6 @@ __date__ = '10/02/2017'
 __version__ = 'Stripping28'
 __all__ = 'Hb2V0V0hConf'
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBnoC/StrippingLb2V0hh.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBnoC/StrippingLb2V0hh.py
index 2641bd9d0ee5387a26e5a643e9ad1450e372db4e..afba240ffc7f72f48dd0ad804fb20c88e61b20f2 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBnoC/StrippingLb2V0hh.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBnoC/StrippingLb2V0hh.py
@@ -25,7 +25,6 @@ __date__ = '21/05/2015'
 __version__ = 'Stripping23'
 __all__ = 'Lb2V0hhConf'
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
@@ -392,7 +391,7 @@ class Lb2V0hhConf(LineBuilder):
         _vtxChi2Cut = "(VFASPF(VCHI2)<%s)" % config['Lb_VtxChi2']
         _diraCut = "(BPVDIRA>%s)" % config['Lb_DD_Dira']
         _ipChi2Cut = "(MIPCHI2DV(PRIMARY)<%s)" % config['Lb_DD_IPCHI2wrtPV']
-        _fdCut = "(VFASPF(VMINVDDV(PRIMARY))>%s)" % config['Lb_FDwrtPV']
+        "(VFASPF(VMINVDDV(PRIMARY))>%s)" % config['Lb_FDwrtPV']
         _fdChi2Cut = "(BPVVDCHI2>%s)" % config['Lb_DD_FDChi2']
 
         _motherCuts = _ptCut+'&'+_vtxChi2Cut+'&'+_diraCut+'&'+_ipChi2Cut+'&'+_fdChi2Cut
@@ -597,7 +596,7 @@ class Lb2V0hhConf(LineBuilder):
         _vtxChi2Cut = "(VFASPF(VCHI2)<%s)" % config['Lb_VtxChi2']
         _diraCut = "(BPVDIRA>%s)" % config['Lb_LD_Dira']
         _ipChi2Cut = "(MIPCHI2DV(PRIMARY)<%s)" % config['Lb_LD_IPCHI2wrtPV']
-        _fdCut = "(VFASPF(VMINVDDV(PRIMARY))>%s)" % config['Lb_FDwrtPV']
+        "(VFASPF(VMINVDDV(PRIMARY))>%s)" % config['Lb_FDwrtPV']
         _fdChi2Cut = "(BPVVDCHI2>%s)" % config['Lb_LD_FDChi2']
 
         _motherCuts = _ptCut+'&'+_vtxChi2Cut+'&'+_diraCut+'&'+_ipChi2Cut+'&'+_fdChi2Cut
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBnoC/StrippingXb23ph.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBnoC/StrippingXb23ph.py
index 8067c7a6d01c2b569906174d551aad6998b32877..f09fc331bb17fe13ce14781f527fb8055987ec83 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBnoC/StrippingXb23ph.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBnoC/StrippingXb23ph.py
@@ -22,7 +22,6 @@ from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, DaVinci__N4Body
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection
-from Gaudi.Configuration import *
 __author__ = ['Jinlin Fu', 'Maurizio Martinelli', 'Andrea Merli']
 __date__ = '12/11/2015'
 __version__ = 'v1r0'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBnoC/StrippingXb2p3h.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBnoC/StrippingXb2p3h.py
index b2c3ad4b4899c94b787cce91c7fcdb640b88197d..19d8a03d1836fbec11592ab3c6a8c98aef3be41a 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBnoC/StrippingXb2p3h.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBnoC/StrippingXb2p3h.py
@@ -22,7 +22,6 @@ from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, DaVinci__N4Body
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection
-from Gaudi.Configuration import *
 __author__ = ['Jan Mickelle V. Maratas', 'Stephane Monteil', 'Andrea Merli']
 __date__ = '01/04/2016'
 __version__ = 'v1r0'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBnoC/StrippingXb2phh.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBnoC/StrippingXb2phh.py
index b19f47e926fd172852930b68a68b191c324a6bc5..8ab8cbe05188bf8bdb14e4a0f4f9d9e03b129e9a 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBnoC/StrippingXb2phh.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingBnoC/StrippingXb2phh.py
@@ -22,7 +22,6 @@ from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, DaVinci__N3Body
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection
-from Gaudi.Configuration import *
 __author__ = ['Jan Mickelle V. Maratas', 'Stephane Monteil', 'Thomas Latham']
 __date__ = '24/11/2016'
 __version__ = 'v1r0'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCalib/StrippingCharmFromBSemiForHadronAsy.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCalib/StrippingCharmFromBSemiForHadronAsy.py
index 7b207e6c145457c2c1cabcdea0c84d473e0a9929..f1542028672636e33782cbbc8d9c498b46dc82de 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCalib/StrippingCharmFromBSemiForHadronAsy.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCalib/StrippingCharmFromBSemiForHadronAsy.py
@@ -19,14 +19,12 @@ __author__ = ['Mika Vesterinen']
 __date__ = '10/03/2013'
 __version__ = '$Revision: 0.0 $'
 
-from Gaudi.Configuration import *
 
 from Configurables import FilterDesktop, CombineParticles
 from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from StandardParticles import StdAllLoosePions, StdLoosePions, StdLooseMuons, StdLooseKaons, StdLooseProtons
-from Configurables import TisTosParticleTagger
+from StandardParticles import StdLooseKaons, StdLooseMuons, StdLoosePions
 
 __all__ = ('CharmFromBSemiForHadronAsyAllLinesConf',
            'TOSFilter',
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCalib/StrippingCharmFromBSemiForProtonPID.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCalib/StrippingCharmFromBSemiForProtonPID.py
index 92af0a7a1eee98722cedfcfba8308f8eec1d876b..81115d7fe35ae7d0e1c7fb77acbfafb29da9fb93 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCalib/StrippingCharmFromBSemiForProtonPID.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCalib/StrippingCharmFromBSemiForProtonPID.py
@@ -18,12 +18,11 @@ __author__ = ['Mika Vesterinen']
 __date__ = '19/03/2013'
 __version__ = '$Revision: 0.0 $'
 
-from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from StandardParticles import StdLoosePions, StdLooseMuons, StdLooseKaons, StdLooseProtons, StdNoPIDsProtons
+from StandardParticles import StdLooseKaons, StdLooseMuons, StdLoosePions, StdNoPIDsProtons
 
 __all__ = ('CharmFromBSemiForProtonPIDAllLinesConf',
            'default_config')
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCalib/StrippingD02KPiPi0.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCalib/StrippingD02KPiPi0.py
index 162aeb0dd27f065b18aa50e6a38d07b76d96d0de..115a1c5c4bc1b7c5361bf0f30a9b9e21504af64d 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCalib/StrippingD02KPiPi0.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCalib/StrippingD02KPiPi0.py
@@ -25,9 +25,8 @@ __all__ = ('StrippingD02KPiPi0Conf',
            'makeD02KPiPi0M',
            'default_config')
 
-from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from PhysSelPython.Wrappers import Selection, DataOnDemand
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
+from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from StandardParticles import StdTightPions, StdTightKaons, StdLooseMergedPi0, StdLooseResolvedPi0
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCalib/StrippingD02KPiPi0DalitzPartReco.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCalib/StrippingD02KPiPi0DalitzPartReco.py
index 329adac1d867595f4a4003d27412fbb641ed7903..66aa89c6a3615c55878a174ff92567271c8c9ee8 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCalib/StrippingD02KPiPi0DalitzPartReco.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCalib/StrippingD02KPiPi0DalitzPartReco.py
@@ -8,9 +8,7 @@
 # granted to it by virtue of its status as an Intergovernmental Organization  #
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
-import logging
 from StrippingUtils.Utils import LineBuilder
-from Gaudi.Configuration import *
 __author__ = ['Greg Ciezarek', 'Liang Sun', 'Adam Davis']
 __date__ = '18/05/2017'
 __version__ = '$Revision: 0.01 $'
@@ -75,7 +73,6 @@ class D2KPiPi0_PartRecoBuilder(LineBuilder):
     def __init__(self, name, config):
         LineBuilder.__init__(self, name, config)
         self._config = config
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
 
         # self.GECs = { "Code":"( recSummaryTrack(LHCb.RecSummary.nLongTracks, TrLONG) < %(GEC_nLongTrk)s )" % config,
         #              "Preambulo": ["from LoKiTracks.decorators import *"]}
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCalib/StrippingD0ForBXX.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCalib/StrippingD0ForBXX.py
index 769c83ae0334fff286071b114aebff90455a172d..f24af2698a14718a337e2e7bc878ea42c6ec8be6 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCalib/StrippingD0ForBXX.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCalib/StrippingD0ForBXX.py
@@ -20,7 +20,7 @@ from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from StandardParticles import StdLoosePions, StdLooseKaons, StdLooseProtons, StdAllLoosePions
+from StandardParticles import StdAllLoosePions, StdLooseKaons, StdLoosePions
 
 
 name = 'confD0forBXX'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCalib/StrippingElectronID.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCalib/StrippingElectronID.py
index b9dfbf8674035ebbfe76393fcd267f95404e8221..c7400e8e63bf2c304fe5bc3da358064626dfb9c3 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCalib/StrippingElectronID.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCalib/StrippingElectronID.py
@@ -23,9 +23,8 @@ stream.appendLines( [
 
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand
+from PhysSelPython.Wrappers import Selection
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = ['Jibo He']
 __date__ = '03/10/2010'
 __version__ = '$Revision: 1.2 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCalib/StrippingJPsiForSL.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCalib/StrippingJPsiForSL.py
index 0901cc37bb50e4481e53abf0adae10028ec19d3b..8290b32fde2ed55d4087a0b25c4c5a16e3c4e373 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCalib/StrippingJPsiForSL.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCalib/StrippingJPsiForSL.py
@@ -20,11 +20,10 @@ __version__ = '$Revision: 0.1 $'
 
 from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from PhysSelPython.Wrappers import Selection, DataOnDemand
+from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from StandardParticles import StdLoosePions, StdLooseMuons, StdLooseKaons, StdLooseProtons, StdNoPIDsPions, StdNoPIDsMuons, StdLooseMergedPi0, StdLooseResolvedPi0, StdLooseElectrons, StdNoPIDsKaons
-from Configurables import TisTosParticleTagger
+from StandardParticles import StdNoPIDsKaons, StdNoPIDsMuons
 
 __all__ = ('JPsiForSLAllLinesConf',
            'confdict')
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCalib/StrippingLowPtMuID.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCalib/StrippingLowPtMuID.py
index 2c8d1c88b056a88fce019885c14c847b2dad2f35..b1034d405ac3978291097c410171c439e4a6b7af 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCalib/StrippingLowPtMuID.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCalib/StrippingLowPtMuID.py
@@ -19,12 +19,9 @@ largely cloned from line written by 'S.Furcas', 'G.Lanfranchi', 'M.Palutan', 'A.
 
 from StandardParticles import StdAllNoPIDsMuons
 from StrippingUtils.Utils import LineBuilder
-from Configurables import LoKi__Hybrid__CoreFactory as CoreFactory
-from Configurables import LoKi__VoidFilter as VoidFilter
-from PhysSelPython.Wrappers import DataOnDemand, Selection, SelectionSequence, MergedSelection
+from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 __author__ = ['G.Ciezarek', ]
 __date__ = '03/12/2015'
 __version__ = '$Revision: 1.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCalib/StrippingMuIDCalib.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCalib/StrippingMuIDCalib.py
index bc111971fba45936693ba7c559a0079e36daa071..e70ca9d5698c0590500879b3b9b7a2c886aaeebf 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCalib/StrippingMuIDCalib.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCalib/StrippingMuIDCalib.py
@@ -22,15 +22,12 @@ lb = builder( 'MuIDCalib', config_params )
 
 '''
 
-from StandardParticles import StdAllNoPIDsKaons, StdAllNoPIDsMuons, StdAllNoPIDsPions, StdAllNoPIDsProtons
+from StandardParticles import StdAllNoPIDsMuons
 from StandardParticles import StdNoPIDsKaons, StdNoPIDsMuons, StdNoPIDsPions, StdNoPIDsProtons
 from StrippingUtils.Utils import LineBuilder
-from Configurables import LoKi__Hybrid__CoreFactory as CoreFactory
-from Configurables import LoKi__VoidFilter as VoidFilter
-from PhysSelPython.Wrappers import DataOnDemand, Selection, SelectionSequence, MergedSelection
+from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 __author__ = ['S.Furcas', 'G.Lanfranchi',
               'M.Palutan', 'A.Sarti', 'D.Milanes', 'MuID Team']
 __date__ = '23/08/2011'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCalib/StrippingNoPIDDstarWithD02RSKPi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCalib/StrippingNoPIDDstarWithD02RSKPi.py
index 0c80077a3ee046c7f4e2450c335aa758b3e4a2eb..5b545751189fdfbd02d713c93bdbedcdd01a325a 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCalib/StrippingNoPIDDstarWithD02RSKPi.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCalib/StrippingNoPIDDstarWithD02RSKPi.py
@@ -13,10 +13,8 @@
 from StandardParticles import StdAllNoPIDsKaons, StdAllNoPIDsPions
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from LHCbKernel.Configuration import *
-from Gaudi.Configuration import *
+from PhysSelPython.Wrappers import Selection
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 __author__ = ['Philip Xing', 'Andrew Powell']
 __date__ = '23rd August 2012'
 __version__ = '$Revision: 7.0 $'
@@ -42,7 +40,7 @@ StrippingReport                                                INFO Event 100000
 __all__ = ('NoPIDDstarWithD02RSKPiConf', 'default_config')
 
 
-from GaudiKernel.SystemOfUnits import mm, cm, MeV, GeV
+from GaudiKernel.SystemOfUnits import GeV, MeV
 # from Configurables import FilterDesktop, CombineParticles
 
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCalib/StrippingPIDCalib.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCalib/StrippingPIDCalib.py
index 9fd00b35156af86a3c21a2b4c0fb4c11589535d9..ff38d7bcf8580fc0e5f6990b2151fc54c2e340f8 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCalib/StrippingPIDCalib.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCalib/StrippingPIDCalib.py
@@ -35,9 +35,7 @@ from Configurables import DaVinci__N3BodyDecays
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
 from Configurables import CombineParticles
-from Gaudi.Configuration import *
 __author__ = ['Lucio Anderlini']
 __date__ = '25/02/2015'
 __version__ = '$Revision: 1.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCalib/StrippingTrackEffD0ToKPi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCalib/StrippingTrackEffD0ToKPi.py
index 96a8666b55c13f9afe210c83a363c4c7302b3498..5afe8fb6611cf5f9d0ce219c46a4b418f0d70286 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCalib/StrippingTrackEffD0ToKPi.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCalib/StrippingTrackEffD0ToKPi.py
@@ -17,7 +17,7 @@ from Configurables import FilterDesktop, CombineParticles
 from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from StandardParticles import StdLooseKaons, StdLoosePions, StdAllLoosePions, StdAllNoPIDsPions
+from StandardParticles import StdAllLoosePions, StdLooseKaons, StdLoosePions
 from SelPy.utils import (UniquelyNamedObject,
                          ClonableObject,
                          SelectionBase)
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCalib/StrippingTrackEffDownMuon.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCalib/StrippingTrackEffDownMuon.py
old mode 100755
new mode 100644
index ff7ca8fc3482bfc030ade360db660d3bb3e5ae86..f0e488bfb1905fd6a46beef2ce82e133e8b836cb
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCalib/StrippingTrackEffDownMuon.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCalib/StrippingTrackEffDownMuon.py
@@ -43,34 +43,26 @@ __all__ = ('StrippingTrackEffDownMuonConf',
 # FIXME Write includes in a cleaner way
 from Gaudi.Configuration import *
 from LHCbKernel.Configuration import *
-from DAQSys.DecoderClass import Decoder
 from Configurables import GaudiSequencer
 from Configurables import UnpackTrack, ChargedProtoParticleMaker, DelegatingTrackSelector, TrackSelector, BestPIDParticleMaker
-from TrackFitter.ConfiguredFitters import ConfiguredFit
 from Configurables import TrackStateInitAlg
 from StrippingConf.StrippingLine import StrippingLine
-from Configurables import ChargedProtoParticleAddMuonInfo, MuonIDAlgLite
+from Configurables import ChargedProtoParticleAddMuonInfo
 from MuonID import ConfiguredMuonIDs
 from Configurables import ChargedProtoCombineDLLsAlg, ProtoParticleMUONFilter
-from PhysSelPython.Wrappers import Selection, DataOnDemand
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
+from PhysSelPython.Wrappers import Selection
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 
 from StrippingUtils.Utils import LineBuilder
-from Configurables import LoKi__VoidFilter
-from os import environ
 from Gaudi.Configuration import *
-import GaudiKernel.ProcessJobOptions
-from GaudiKernel.SystemOfUnits import mm
 
 from GaudiConfUtils.ConfigurableGenerators import TisTosParticleTagger
 from StandardParticles import StdAllLooseMuons
 from Configurables import GaudiSequencer
 from Configurables import TrackToDST
-from Configurables import TrackSys
 from Configurables import PatSeeding, PatSeedingTool, PatLongLivedTracking
-from PhysSelPython.Wrappers import AutomaticData
 # Get the fitters
-from TrackFitter.ConfiguredFitters import ConfiguredFit, ConfiguredFitSeed, ConfiguredFitDownstream
+from TrackFitter.ConfiguredFitters import ConfiguredFitDownstream
 from PatAlgorithms import PatAlgConf
 
 from SelPy.utils import (UniquelyNamedObject,
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCalib/StrippingTrackEffMuonTT.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCalib/StrippingTrackEffMuonTT.py
index 641201574c8f09bca329978057c4acc7969dd736..f27b71e4d680425be1de988e64d75b2686a0c282 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCalib/StrippingTrackEffMuonTT.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCalib/StrippingTrackEffMuonTT.py
@@ -62,11 +62,10 @@ __all__ = ('StrippingTrackEffMuonTTConf',
            'makeBJpsiKTrackEff',
            'filterHLT2ForBJpsiK')
 
-from Gaudi.Configuration import *
-from PhysSelPython.Wrappers import Selection, DataOnDemand, ChargedProtoParticleSelection
+from PhysSelPython.Wrappers import ChargedProtoParticleSelection, Selection
 from StrippingConf.StrippingLine import StrippingLine
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from StrippingUtils.Utils import LineBuilder, checkConfig
+from StrippingUtils.Utils import LineBuilder
 from StandardParticles import StdLooseKaons, StdLooseMuons, StdAllLooseMuons
 
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCalib/StrippingTrackEffVeloMuon.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCalib/StrippingTrackEffVeloMuon.py
old mode 100755
new mode 100644
index 9a14b8675059438ed88c4a5294e9f1bd31c001a1..10dd862824db4aa233d749f14173d33947ea2f17
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCalib/StrippingTrackEffVeloMuon.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCalib/StrippingTrackEffVeloMuon.py
@@ -40,30 +40,22 @@ __all__ = ('StrippingTrackEffVeloMuonConf',
            )
 
 
-from Gaudi.Configuration import *
-from LHCbKernel.Configuration import *
 from Configurables import CombineParticles
-from PhysSelPython.Wrappers import Selection, SelectionSequence, DataOnDemand
-from Configurables import ChargedProtoParticleMaker, NoPIDsParticleMaker, DataOnDemandSvc, DelegatingTrackSelector, TrackSelector, CombinedParticleMaker, BestPIDParticleMaker
+from PhysSelPython.Wrappers import Selection
+from Configurables import ChargedProtoParticleMaker, DataOnDemandSvc, DelegatingTrackSelector, NoPIDsParticleMaker, TrackSelector
 from Configurables import FastVeloTracking
 
 from StrippingConf.StrippingLine import StrippingLine
-from Configurables import TrackStateInitAlg, TrackEventFitter, TrackPrepareVelo, TrackContainerCopy, Tf__PatVeloSpaceTool, StandaloneMuonRec
-from Configurables import TrackCloneFinder
+from Configurables import StandaloneMuonRec, TrackPrepareVelo
 from StrippingUtils.Utils import LineBuilder
 from StandardParticles import StdLooseMuons
 
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, TisTosParticleTagger
 
 from Configurables import GaudiSequencer
-from Configurables import TrackSys
-from PhysSelPython.Wrappers import AutomaticData
 # Get the fitters
-from TrackFitter.ConfiguredFitters import ConfiguredFit
 
-from Configurables import TrackEventCloneKiller, VeloMuonBuilder
-from Configurables import TrackEventFitter, TrackMasterFitter
-from Configurables import TrackKalmanFilter, TrackMasterExtrapolator
+from Configurables import VeloMuonBuilder
 # from TrackFitter.ConfiguredFitters import ConfiguredFastFitter
 # from Configurables import TrackCloneFinder
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCharm/StrippingB2ppipiSigmacmm_Lcpi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCharm/StrippingB2ppipiSigmacmm_Lcpi.py
index 83239c94ced3a8a9d0eb6984bb527b872ec43a1c..6e136b7bac83e851400df8c22e3c067c7ec38db2 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCharm/StrippingB2ppipiSigmacmm_Lcpi.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCharm/StrippingB2ppipiSigmacmm_Lcpi.py
@@ -31,12 +31,11 @@ __all__ = ('StrippingB2ppipiSigmacmm_Lcpi_Conf', 'makepifromSigmacmm', 'makeThre
            )
 
 from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, ConjugateNeutralPID, DaVinci__N3BodyDecays
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N3BodyDecays, FilterDesktop
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
-from StrippingUtils.Utils import checkConfig, LineBuilder
+from StrippingUtils.Utils import LineBuilder
 from GaudiKernel.SystemOfUnits import MeV, GeV, mm
-from copy import copy
 
 name = 'StrippingB2ppipiSigmacmm_Lcpi'
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCharm/StrippingChargedHyperons.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCharm/StrippingChargedHyperons.py
index 5607b756d06c80cb7dfb1a025b910cad33bbee0b..6a46e95972bceac9d25ddf9b615334fb36577533 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCharm/StrippingChargedHyperons.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCharm/StrippingChargedHyperons.py
@@ -21,13 +21,9 @@ __version__ = '$Revision: 1.0 $'
 __all__ = ('StrippingChargedHyperonsConf', 'default_config')
 
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from StandardParticles import StdLoosePions, StdNoPIDsDownPions, StdLooseKaons, StdLooseDownKaons
-from StandardParticles import StdAllLoosePions, StdAllLooseKaons
 
 from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
-from PhysSelPython.Wrappers import MultiSelectionSequence
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from GaudiKernel.SystemOfUnits import MeV, mm, picosecond
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCharm/StrippingCharm2PPX.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCharm/StrippingCharm2PPX.py
index fefe1d3422c22f4f00fb68d64a79d8356a02d31b..802e8316c7219207b7d0df5943ad07eff3520be7 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCharm/StrippingCharm2PPX.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCharm/StrippingCharm2PPX.py
@@ -26,7 +26,7 @@ __all__ = (
     'StrippingCharm2PPXConf'  # ???
 )
 
-from GaudiKernel.SystemOfUnits import MeV, GeV, mm, mrad
+from GaudiKernel.SystemOfUnits import GeV, MeV, mm
 from Configurables import CombineParticles, FilterDesktop
 # from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop, DaVinci__N3BodyDecays
 from StandardParticles import (
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCharm/StrippingCharmForVub.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCharm/StrippingCharmForVub.py
index 96f3dd5c148c592b2c4d56028233c34a4d02b5fa..89ec6575ae96f2e1ea3add0e4f542acb5fc081cb 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCharm/StrippingCharmForVub.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCharm/StrippingCharmForVub.py
@@ -31,9 +31,8 @@ __all__ = ('CharmForVubConf',
            'makeDstarD02HMuNu')
 
 from Gaudi.Configuration import *
-from Configurables import SubstitutePID
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
+from PhysSelPython.Wrappers import MergedSelection, Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from StandardParticles import StdLooseMuons, StdLooseKaons, StdAllLoosePions, StdLoosePions
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCharm/StrippingD02KSKS.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCharm/StrippingD02KSKS.py
index cd0f357900e2fdf26f21aaf1aed7029b8265b59a..5c0183ffd6fe19db8a1cde097f2ca90273537cbe 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCharm/StrippingD02KSKS.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCharm/StrippingD02KSKS.py
@@ -25,9 +25,8 @@ __date__ = '15/05/2014'
 __version__ = 'Stripping23'
 __all__ = 'D02KSKSConf'
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
+from PhysSelPython.Wrappers import DataOnDemand, Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 
@@ -611,7 +610,7 @@ class D02KSKSConf(LineBuilder):
         _daughterCuts = "(TRGHOSTPROB <=%s )" % config['slowPi_LLL_TRGHOSTPROB']
 
         # 40
-        _vertexChi2_cut = "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_LL']
+        "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_LL']
 
         # 200
         _combCuts = "(ADAMASS('D*(2010)+') < %s*MeV)" % config['Dst_mass_LL']
@@ -648,7 +647,7 @@ class D02KSKSConf(LineBuilder):
         _daughterCuts = "(TRGHOSTPROB <=%s )" % config['slowPi_LLU_TRGHOSTPROB']
 
         # 40
-        _vertexChi2_cut = "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_LL']
+        "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_LL']
 
         # 200
         _combCuts = "(ADAMASS('D*(2010)+') < %s*MeV)" % config['Dst_mass_LL']
@@ -685,7 +684,7 @@ class D02KSKSConf(LineBuilder):
         _daughterCuts = "(TRGHOSTPROB <=%s )" % config['slowPi_LDL_TRGHOSTPROB']
 
         # 40
-        _vertexChi2_cut = "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_LD']
+        "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_LD']
 
         # 200
         _combCuts = "(ADAMASS('D*(2010)+') < %s*MeV)" % config['Dst_mass_LD']
@@ -722,7 +721,7 @@ class D02KSKSConf(LineBuilder):
         _daughterCuts = "(TRGHOSTPROB <=%s )" % config['slowPi_LDU_TRGHOSTPROB']
 
         # 40
-        _vertexChi2_cut = "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_LD']
+        "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_LD']
 
         # 200
         _combCuts = "(ADAMASS('D*(2010)+') < %s*MeV)" % config['Dst_mass_LD']
@@ -759,7 +758,7 @@ class D02KSKSConf(LineBuilder):
         _daughterCuts = "(TRGHOSTPROB <=%s )" % config['slowPi_DDL_TRGHOSTPROB']
 
         # 40
-        _vertexChi2_cut = "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_DD']
+        "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_DD']
 
         # 200
         _combCuts = "(ADAMASS('D*(2010)+') < %s*MeV)" % config['Dst_mass_DD']
@@ -796,7 +795,7 @@ class D02KSKSConf(LineBuilder):
         _daughterCuts = "(TRGHOSTPROB <=%s )" % config['slowPi_DDU_TRGHOSTPROB']
 
         # 40
-        _vertexChi2_cut = "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_DD']
+        "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_DD']
 
         # 200
         _combCuts = "(ADAMASS('D*(2010)+') < %s*MeV)" % config['Dst_mass_DD']
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCharm/StrippingD2HHHKs.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCharm/StrippingD2HHHKs.py
index 9a861cb097ab87e3083a67ea9248943b3612da2c..b60a33fa55c9b6da278721f3014e7d306e05d771 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCharm/StrippingD2HHHKs.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCharm/StrippingD2HHHKs.py
@@ -22,19 +22,18 @@ __version__ = '$Revision: 0.1 $'
 __all__ = ('D2HHHKsLines',
            'default_config')
 
-from Gaudi.Configuration import *
 
-from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N4BodyDecays
+from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays
 from StandardParticles import StdNoPIDsPions, StdNoPIDsKaons
 from StandardParticles import StdLooseKsDD, StdLooseKsLL
 
 from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
-from StrippingUtils.Utils import LineBuilder, checkConfig
+from StrippingUtils.Utils import LineBuilder
 
 from Configurables import FilterDesktop
 
-from GaudiKernel.SystemOfUnits import GeV, MeV, picosecond, mm
+from GaudiKernel.SystemOfUnits import MeV, mm, picosecond
 
 
 default_config = {
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCharm/StrippingD2HHHPi0.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCharm/StrippingD2HHHPi0.py
index ed8648686363780edfce58bff954cdeb421f24b8..f006ce35a79955f71a0723f3ae1a483b3b33069a 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCharm/StrippingD2HHHPi0.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCharm/StrippingD2HHHPi0.py
@@ -22,19 +22,18 @@ __version__ = '$Revision: 0.1 $'
 __all__ = ('D2HHHPi0Lines',
            'default_config')
 
-from Gaudi.Configuration import *
 
-from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N4BodyDecays
+from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays
 from StandardParticles import StdNoPIDsPions, StdNoPIDsKaons
 from StandardParticles import StdLooseResolvedPi0, StdLooseMergedPi0
 
 from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
-from StrippingUtils.Utils import LineBuilder, checkConfig
+from StrippingUtils.Utils import LineBuilder
 
 from Configurables import FilterDesktop
 
-from GaudiKernel.SystemOfUnits import GeV, MeV, picosecond, mm
+from GaudiKernel.SystemOfUnits import GeV, MeV, picosecond
 
 
 default_config = {
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCharm/StrippingD2HMuNu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCharm/StrippingD2HMuNu.py
index 5f50a64468770bc59fdc136644a3e2419eded047..b7803b39122404b43cceb17df7e5b251913c3ff6 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCharm/StrippingD2HMuNu.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCharm/StrippingD2HMuNu.py
@@ -9,9 +9,7 @@
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
 
-import logging
 from StrippingUtils.Utils import LineBuilder
-from Gaudi.Configuration import *
 __author__ = ['Liang Sun', 'Adam Davis']
 __date__ = '09/11/2015'
 __version__ = '$Revision: 0.01 $'
@@ -98,7 +96,6 @@ class D2HLepNuBuilder(LineBuilder):
     def __init__(self, name, config):
         LineBuilder.__init__(self, name, config)
         self._config = config
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
 
         self.GECs = {"Code": "( recSummaryTrack(LHCb.RecSummary.nLongTracks, TrLONG) < %(GEC_nLongTrk)s )" % config,
                      "Preambulo": ["from LoKiTracks.decorators import *"]}
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCharm/StrippingD2KS0H_conf.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCharm/StrippingD2KS0H_conf.py
index 61aa4a7c39883854dbb03015f117de36e9d8489b..99e1b1032f2a671266146c036cade2c5eea7d4b8 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCharm/StrippingD2KS0H_conf.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCharm/StrippingD2KS0H_conf.py
@@ -44,9 +44,9 @@ from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticle
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StandardParticles import StdLoosePions, StdLooseKaons
 from StrippingConf.StrippingLine import StrippingLine
-from StrippingUtils.Utils import LineBuilder, checkConfig
+from StrippingUtils.Utils import LineBuilder
 from Configurables import TisTosParticleTagger
-from GaudiKernel.SystemOfUnits import GeV, MeV, picosecond, mm
+from GaudiKernel.SystemOfUnits import MeV, mm, picosecond
 
 default_name = 'D2KS0H'
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCharm/StrippingD2PiPi0.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCharm/StrippingD2PiPi0.py
index 3b0409acbbfd03b6273526bd0fcdb67d1c80616c..0b95d641540e601a41a5bbdcaefb88ee6985f3a3 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCharm/StrippingD2PiPi0.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCharm/StrippingD2PiPi0.py
@@ -33,7 +33,7 @@ __all__ = (
 
 )
 
-from GaudiKernel.SystemOfUnits import MeV, GeV, mrad, picosecond
+from GaudiKernel.SystemOfUnits import MeV, picosecond
 
 from StandardParticles import (
     StdAllNoPIDsKaons,
@@ -51,7 +51,7 @@ from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 
 # from Configurables import CombineParticles, FilterDesktop
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, ConjugateNeutralPID, DaVinci__N3BodyDecays
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N3BodyDecays
 
 default_config = {
     'D2Pi0H': {
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCharm/StrippingD2XMuMuSS.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCharm/StrippingD2XMuMuSS.py
index 63052973a0d26de1b430874492a8932ac9f35ca5..d25cc78a559d20061372c19afc0a60d1d662980a 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCharm/StrippingD2XMuMuSS.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCharm/StrippingD2XMuMuSS.py
@@ -9,14 +9,13 @@
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
 
-from StandardParticles import StdAllLooseElectrons, StdAllNoPIDsElectrons
+from StandardParticles import StdAllLooseElectrons
 from StandardParticles import StdAllLooseKaons, StdAllLoosePions, StdAllLooseMuons, StdAllNoPIDsPions, StdAllNoPIDsKaons
-from StandardParticles import StdLooseKaons, StdLoosePions, StdLooseMuons, StdNoPIDsPions, StdNoPIDsKaons, StdLooseProtons, StdAllNoPIDsProtons
+from StandardParticles import StdAllNoPIDsProtons, StdLooseKaons, StdLooseMuons, StdLoosePions, StdLooseProtons
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, OfflineVertexFitter
-from Gaudi.Configuration import *
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop
 import copy
 __author__ = ['Malcolm John', 'B. Viaud', 'O. Kochebina']
 __date__ = '25/6/2012'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCharm/StrippingD2hh.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCharm/StrippingD2hh.py
index 04f7a2eaa894bfd8dee3118acc2d9051ddc23f06..132e325c858cd552d79410e5e81d7f9a35dee470 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCharm/StrippingD2hh.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCharm/StrippingD2hh.py
@@ -24,7 +24,6 @@ __all__ = ('D2hhBuilder',
 '''
 This file contains stripping lines for time-dependent two-body charm analyses of mixing, yCP, and A_Gamma
 '''
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
@@ -185,7 +184,7 @@ class D2hhBuilder(LineBuilder):
         stdNoPIDsPions = StdAllNoPIDsPions
 
         d2kpi_name = name+'PromptD2KPi'
-        d0RS_name = name+'PromptD0RS'
+        name+'PromptD0RS'
         d0WS_name = name+'PromptD0WS'
         d2kk_name = name+'PromptD2KK'
         d2pipi_name = name+'PromptD2PiPi'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCharm/StrippingD2hhh_FTcalib.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCharm/StrippingD2hhh_FTcalib.py
index ca556fcd061283943c85050142dc1fed957ecac9..92b63ab8b8227f8c599d9d0f7cb9e45c01f9045d 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCharm/StrippingD2hhh_FTcalib.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCharm/StrippingD2hhh_FTcalib.py
@@ -29,13 +29,10 @@ __version__ = '$Revision: 0.0 $'
 __all__ = ('D2hhhFTCalibConf',
            'makeStdD2hhhFT')
 
-from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
+from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from StandardParticles import (StdNoPIDsPions,
-                               StdTightKaons)
 
 name = "D2hhhFTCalib"
 # Cuts to be implemented vy the Stripping team in Stripping Settings
@@ -267,7 +264,6 @@ def globalEventCutFilter(name,
     if MaxTrSIZE == None:
         return None
 
-    from Configurables import LoKi__VoidFilter as VoidFilter
     from Configurables import LoKi__Hybrid__CoreFactory as CoreFactory
     modules = CoreFactory('CoreFactory').Modules
     for i in ['LoKiTracks.decorators']:
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCharm/StrippingD2hhh_conf.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCharm/StrippingD2hhh_conf.py
index 4edfcbbf716005d89bb67e23f49675568d265d87..2b5bbdd7a698b23b875296f72fd7238fedbf32cf 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCharm/StrippingD2hhh_conf.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCharm/StrippingD2hhh_conf.py
@@ -38,8 +38,7 @@ from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticle
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from StandardParticles import (StdNoPIDsPions,
-                               StdTightKaons)
+from StandardParticles import StdNoPIDsPions
 
 name = "D2hhh"
 # Cuts to be implemented vy the Stripping team in Stripping Settings
@@ -755,7 +754,6 @@ def globalEventCutFilter(name,
     if MaxTrSIZE == None:
         return None
 
-    from Configurables import LoKi__VoidFilter as VoidFilter
     from Configurables import LoKi__Hybrid__CoreFactory as CoreFactory
     modules = CoreFactory('CoreFactory').Modules
     for i in ['LoKiTracks.decorators']:
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCharm/StrippingDstarD02xx.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCharm/StrippingDstarD02xx.py
index d6432a15ead58ad1d9a1a2025b9183e69ba4b5c5..31c1f92b10774f78337efc200c2dd331c386037b 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCharm/StrippingDstarD02xx.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCharm/StrippingDstarD02xx.py
@@ -22,8 +22,7 @@ __all__ = ('StrippingDstarD02xxConf', 'combinetwobody', 'combineDstar', 'default
             where xx = {mu mu, pi pi, pi mu, k mu, ... }
             
 '''
-from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCharm/StrippingDstarD0ToHHPi0.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCharm/StrippingDstarD0ToHHPi0.py
index bf75d26a702888468823abf0528c496c6fdb49d4..0fc805cafbcf5b5c715add7f71c675ce9f033aef 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCharm/StrippingDstarD0ToHHPi0.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCharm/StrippingDstarD0ToHHPi0.py
@@ -17,13 +17,11 @@ Module for D* tagged D0 -> hhpi0.
 Supersedes StrippingDstarD2hhpi0
 """
 
-from Gaudi.Configuration import *
 from Configurables import FilterDesktop, CombineParticles, OfflineVertexFitter
 from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from StandardParticles import StdAllLoosePions, StdLoosePions, StdLooseKaons, StdLooseResolvedPi0, StdLooseMergedPi0
-from Configurables import TisTosParticleTagger
 
 __all__ = ('DstarD0ToHHPi0AllLinesBuilder',
            'DstarMaker',
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCharm/StrippingDstarD2HHHH.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCharm/StrippingDstarD2HHHH.py
index 6ca6b394d1c16026937764f0eafb79c38aeb20a7..b1010c3cddbd19de46d0a5cb069929253effde94 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCharm/StrippingDstarD2HHHH.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCharm/StrippingDstarD2HHHH.py
@@ -22,16 +22,15 @@ __version__ = '$Revision: 1.0 $'
 __all__ = ('DstarD2HHHHLines',
            'default_config')
 
-from Gaudi.Configuration import *
 
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N4BodyDecays
 from StandardParticles import StdAllNoPIDsPions, StdNoPIDsPions, StdNoPIDsKaons
 
 from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
-from StrippingUtils.Utils import LineBuilder, checkConfig
+from StrippingUtils.Utils import LineBuilder
 
-from GaudiKernel.SystemOfUnits import GeV, MeV, picosecond, mm
+from GaudiKernel.SystemOfUnits import MeV, picosecond
 
 
 default_config = {
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCharm/StrippingDstarD2KSHHPi0.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCharm/StrippingDstarD2KSHHPi0.py
index 8004878d3118c47bcc681e5d6833f67148ea14fd..d717afb5cf44dedfbb8910ab49da26f35af6e033 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCharm/StrippingDstarD2KSHHPi0.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCharm/StrippingDstarD2KSHHPi0.py
@@ -22,18 +22,17 @@ __version__ = '$Revision: 1.0 $'
 __all__ = ('DstarD2KSHHPi0Lines',
            'default_config')
 
-from Gaudi.Configuration import *
 
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N4BodyDecays
 from StandardParticles import StdAllNoPIDsPions, StdNoPIDsPions, StdNoPIDsKaons, StdLooseResolvedPi0, StdLooseMergedPi0, StdLooseKsDD, StdLooseKsLL
 
 from PhysSelPython.Wrappers import Selection, MergedSelection
 from StrippingConf.StrippingLine import StrippingLine
-from StrippingUtils.Utils import LineBuilder, checkConfig
+from StrippingUtils.Utils import LineBuilder
 
 from Configurables import FilterDesktop
 
-from GaudiKernel.SystemOfUnits import GeV, MeV, picosecond, mm
+from GaudiKernel.SystemOfUnits import MeV, mm, picosecond
 
 
 default_config = {
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCharm/StrippingDstarD2KShh.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCharm/StrippingDstarD2KShh.py
index 930ba6dd1a176d45dd81cb76e4d7d90061657804..5c17fdff8e562e58b20339beef4f7dde0bf73e6d 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCharm/StrippingDstarD2KShh.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCharm/StrippingDstarD2KShh.py
@@ -34,7 +34,6 @@ __all__ = ('DstarD2KShhBuilder',
            'makeD2KShh',
            'makeDstar')
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCharm/StrippingDstarD2XGamma.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCharm/StrippingDstarD2XGamma.py
index 0b8f07c8e92fd36f253c008c58709f4b5a775f55..a162a42f57ebc8bd021e3048ba2760b0fac3ceba 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCharm/StrippingDstarD2XGamma.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCharm/StrippingDstarD2XGamma.py
@@ -24,7 +24,6 @@ __version__ = '$Revision: 0.1 $'
 __all__ = ('DstarD2XGammaLines',
            'default_config')
 
-from Gaudi.Configuration import *
 
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 from StandardParticles import StdAllNoPIDsPions, StdNoPIDsPions, StdNoPIDsKaons
@@ -32,11 +31,11 @@ from StandardParticles import StdLooseAllPhotons, StdAllLooseGammaLL, StdAllLoos
 
 from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
-from StrippingUtils.Utils import LineBuilder, checkConfig
+from StrippingUtils.Utils import LineBuilder
 
 from Configurables import FilterDesktop
 
-from GaudiKernel.SystemOfUnits import GeV, MeV, picosecond, mm
+from GaudiKernel.SystemOfUnits import GeV, MeV, picosecond
 
 default_config = {
     'NAME': 'DstarD2XGamma',
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCharm/StrippingDstarPromptWithD02HHHH.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCharm/StrippingDstarPromptWithD02HHHH.py
index ee13ea7feaf67160f5cd257bb530e6362de4b20a..5e817ce46cbfcdae8fed23c2c49713bf361e45aa 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCharm/StrippingDstarPromptWithD02HHHH.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCharm/StrippingDstarPromptWithD02HHHH.py
@@ -36,11 +36,10 @@ __version__ = '$Revision: 1.2 $'
 __all__ = ('DstarPromptWithD02HHHHConf', 'makeD02hhhh',
            'makePromptDstar', 'default_config')
 
-from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, ConjugateNeutralPID
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles, ConjugateNeutralPID
 from PhysSelPython.Wrappers import Selection, MergedSelection
 from StrippingConf.StrippingLine import StrippingLine
-from StrippingUtils.Utils import checkConfig, LineBuilder
+from StrippingUtils.Utils import LineBuilder
 from GaudiKernel.SystemOfUnits import MeV, GeV, mm
 from copy import copy
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCharm/StrippingDstarPromptWithD02HHMuMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCharm/StrippingDstarPromptWithD02HHMuMu.py
index a131e40e3acb189497c6e36da19841fbfbb4c7b1..7a1541f08f9d8fb4eec57f34b0aa5aea862483cc 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCharm/StrippingDstarPromptWithD02HHMuMu.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCharm/StrippingDstarPromptWithD02HHMuMu.py
@@ -29,11 +29,10 @@ __version__ = '$Revision: 2.0 $'
 __all__ = ('DstarPromptWithD02HHLLConf', 'makeD02hhll',
            'makePromptDstar', 'default_config')
 
-from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, ConjugateNeutralPID
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles, ConjugateNeutralPID
 from PhysSelPython.Wrappers import Selection, MergedSelection
 from StrippingConf.StrippingLine import StrippingLine
-from StrippingUtils.Utils import checkConfig, LineBuilder
+from StrippingUtils.Utils import LineBuilder
 from GaudiKernel.SystemOfUnits import MeV, GeV, mm
 from copy import copy
 
@@ -224,7 +223,6 @@ def makeD02hhll(
         _pionCuts = _pionCutsOLD + " & " + _ghostCut
         _eleCuts = _eleCutsOLD + " & " + _ghostCut
 
-    from StandardParticles import StdAllNoPIDsPions, StdAllNoPIDsKaons
     from StandardParticles import StdAllLoosePions, StdAllLooseKaons, StdAllLooseMuons
     from StandardParticles import StdAllLooseElectrons
     from StandardParticles import StdAllLooseMuPion
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCharm/StrippingExcitedDsSpectroscopy.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCharm/StrippingExcitedDsSpectroscopy.py
index 71165c716e1550d38801bcd5e537a3bbd27bac81..e210c6918c5485d5d7207bd970781eae8cce82f3 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCharm/StrippingExcitedDsSpectroscopy.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCharm/StrippingExcitedDsSpectroscopy.py
@@ -347,7 +347,6 @@ def globalEventCutFilter(name,
     if MaxTrSIZE == None:
         return None
 
-    from Configurables import LoKi__VoidFilter as VoidFilter
     from Configurables import LoKi__Hybrid__CoreFactory as CoreFactory
     modules = CoreFactory('CoreFactory').Modules
     for i in ['LoKiTracks.decorators']:
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCharm/StrippingLambdac2V03H.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCharm/StrippingLambdac2V03H.py
index d82de0a68b56a1830913cbe7af0afa398aea8f89..30b54539913afb80a16ee9630ae6091f7bc0971f 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCharm/StrippingLambdac2V03H.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCharm/StrippingLambdac2V03H.py
@@ -27,7 +27,7 @@ __all__ = (
 )
 
 from GaudiKernel.SystemOfUnits import MeV, GeV, mm, mrad
-from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop, DaVinci__N4BodyDecays
+from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays, FilterDesktop
 from StandardParticles import StdNoPIDsPions as InputPions
 from StandardParticles import StdNoPIDsKaons as InputKaons
 from StandardParticles import StdLooseLambdaLL as InputLambdasLL
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCharm/StrippingLc2L0LLpi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCharm/StrippingLc2L0LLpi.py
index 857d348c56722f0dadec5fba5036030325eb54dc..ec6a5705483856be3073dbe9b17c2c7d86bc6019 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCharm/StrippingLc2L0LLpi.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCharm/StrippingLc2L0LLpi.py
@@ -12,17 +12,10 @@
 Module for selecting Lambda_c+->Lambda pi+
 '''
 
-from StandardParticles import (StdAllLoosePions, StdLooseProtons,
-                               StdLoosePions, StdNoPIDsUpPions)
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from StandardParticles import StdLooseAllPhotons, StdVeryLooseAllPhotons
-from Configurables import LoKi__VoidFilter
-from PhysSelPython.Wrappers import MergedSelection
-from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
-from Gaudi.Configuration import *
 __author__ = ['Guiyun Ding', 'Jiesheng Yu', 'Yuehong Xie']
 __date__ = '28/11/2016'
 __version__ = '$Revision: 2.0$'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCharm/StrippingNeutralCBaryons.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCharm/StrippingNeutralCBaryons.py
index fa3250a83bd48196f87981d9d429c63cbcb63404..327a500122ff512fe20087317ec9bf1b9e3b7d5c 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCharm/StrippingNeutralCBaryons.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCharm/StrippingNeutralCBaryons.py
@@ -23,13 +23,9 @@ __version__ = '$Revision: 1.0 $'
 __all__ = ('StrippingNeutralCBaryonsConf', 'default_config')
 
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from StandardParticles import StdLoosePions, StdNoPIDsDownPions, StdLooseKaons, StdLooseDownKaons
-from StandardParticles import StdAllLoosePions, StdAllLooseKaons
 
 from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
-from PhysSelPython.Wrappers import MultiSelectionSequence
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from GaudiKernel.SystemOfUnits import MeV, mm, picosecond
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCharm/StrippingXic2HHH.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCharm/StrippingXic2HHH.py
index 4c7a528734f03b3247c265b29afbb06249a8e8df..ec6e744b6d3279f53da71850a50e53835d882fb2 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCharm/StrippingXic2HHH.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCharm/StrippingXic2HHH.py
@@ -8,18 +8,15 @@
 # granted to it by virtue of its status as an Intergovernmental Organization  #
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
-from StandardParticles import StdNoPIDsPions, StdNoPIDsKaons, StdNoPIDsProtons, StdAllNoPIDsProtons
-from Configurables import TisTosParticleTagger
+from StandardParticles import StdNoPIDsKaons, StdNoPIDsPions, StdNoPIDsProtons
 from StrippingUtils.Utils import LineBuilder
-from PhysSelPython.Wrappers import MultiSelectionSequence
-from PhysSelPython.Wrappers import Selection, DataOnDemand, AutomaticData, MergedSelection
+from PhysSelPython.Wrappers import DataOnDemand, MergedSelection, Selection
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
 from Configurables import FilterDesktop, CombineParticles
 from LHCbKernel.Configuration import *
-from GaudiKernel.SystemOfUnits import MeV, mm, ns
+from GaudiKernel.SystemOfUnits import MeV, mm
 from StrippingConf.StrippingLine import StrippingLine
 from Gaudi.Configuration import *
-import re
 all
 ''' Xic+ and Theta+ lines Designed by Yury Shcheglov, Alexey Dzyuba, Nelya Sagidova to study Xic+ and Theta+ particles '''
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCharm/StrippingXicc.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCharm/StrippingXicc.py
index 5d7a3369f392194d8c7a89132a8949ced1fbb74c..b7f50de193148881a67e0e6e9149cb5806d7efdf 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCharm/StrippingXicc.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingCharm/StrippingXicc.py
@@ -52,9 +52,6 @@ from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticle
 from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from StandardParticles import StdAllLoosePions, StdAllLooseKaons, StdAllLooseProtons
-from StandardParticles import StdLoosePions
-from CommonParticles.StdLooseLambda import StdLooseLambdaLL, StdLooseLambdaDD
 from GaudiKernel.SystemOfUnits import MeV, GeV, mm
 from Configurables import TisTosParticleTagger
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingIFT/StrippingHeavyIonD02KPiPi0.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingIFT/StrippingHeavyIonD02KPiPi0.py
index f59616873d32a3880ffa9c3cddc8ffdf12e8c49c..38d1f1cf011fb226ff77746240f5265193af1874 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingIFT/StrippingHeavyIonD02KPiPi0.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingIFT/StrippingHeavyIonD02KPiPi0.py
@@ -25,9 +25,8 @@ __all__ = ('StrippingHeavyIonD02KPiPi0Conf',
            'makeD02KPiPi0M',
            'default_config')
 
-from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from PhysSelPython.Wrappers import Selection, DataOnDemand
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
+from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from StandardParticles import StdTightPions, StdTightKaons, StdLooseMergedPi0, StdLooseResolvedPi0
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingIFT/StrippingHeavyIonDiMuon.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingIFT/StrippingHeavyIonDiMuon.py
index 1f1fb6fd6434ffe5daa3a047c002516420db3900..c05fa9e4e82d82da609577669b8d83dd3a521ae6 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingIFT/StrippingHeavyIonDiMuon.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingIFT/StrippingHeavyIonDiMuon.py
@@ -17,8 +17,7 @@ from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 from StandardParticles import StdAllLooseMuons
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand
-from Gaudi.Configuration import *
+from PhysSelPython.Wrappers import Selection
 __author__ = ['Emilie MAURICE']
 __date__ = ''
 __version__ = '$Revision: 2.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingIFT/StrippingHeavyIonDst2D0KPiForPID.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingIFT/StrippingHeavyIonDst2D0KPiForPID.py
index f65a077827fa72aa474ee1992539974419ddc652..2a6ac3e4930d2f3b5e6f9750ace051db2604f1f7 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingIFT/StrippingHeavyIonDst2D0KPiForPID.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingIFT/StrippingHeavyIonDst2D0KPiForPID.py
@@ -13,10 +13,8 @@
 from StandardParticles import StdAllNoPIDsKaons, StdAllNoPIDsPions
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from LHCbKernel.Configuration import *
-from Gaudi.Configuration import *
+from PhysSelPython.Wrappers import Selection
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 __author__ = ['Philip Xing', 'Andrew Powell']
 __date__ = '23rd August 2012'
 __version__ = '$Revision: 7.0 $'
@@ -36,7 +34,7 @@ Usage:
 __all__ = ('HeavyIonDst2D0KPiForPIDConf', 'default_config', "D0", "Dstar")
 
 
-from GaudiKernel.SystemOfUnits import mm, cm, MeV, GeV
+from GaudiKernel.SystemOfUnits import GeV, MeV
 # from Configurables import FilterDesktop, CombineParticles
 
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingIFT/StrippingHeavyIonIncLcForProtonPID.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingIFT/StrippingHeavyIonIncLcForProtonPID.py
index ccee2be91073ad9f8062287c8a6388f4b94f8132..1f6d52b84c74a1fb2023a42365076518eaf746dc 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingIFT/StrippingHeavyIonIncLcForProtonPID.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingIFT/StrippingHeavyIonIncLcForProtonPID.py
@@ -17,12 +17,11 @@ __author__ = ['IFT']
 __date__ = '29/03/2018'
 __version__ = '$Revision: 0.0 $'
 
-from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from StandardParticles import StdLoosePions, StdLooseMuons, StdLooseKaons, StdLooseProtons, StdNoPIDsProtons
+from StandardParticles import StdLooseKaons, StdLoosePions, StdNoPIDsProtons
 
 __all__ = ('HeavyIonIncLcForProtonPIDConf',
            'default_config')
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingIFT/StrippingHeavyIonOthercc.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingIFT/StrippingHeavyIonOthercc.py
index a915f213306583c9349e52ae26fdfb5bcbfb2cb7..64496a63a9e2dbb8187a1999a7546349858ef1cb 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingIFT/StrippingHeavyIonOthercc.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingIFT/StrippingHeavyIonOthercc.py
@@ -17,8 +17,7 @@ from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 from StandardParticles import StdNoPIDsElectrons, StdLooseProtons, StdLooseMuons
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand
-from Gaudi.Configuration import *
+from PhysSelPython.Wrappers import Selection
 __author__ = ['Emilie MAURICE']
 __date__ = ''
 __version__ = '$Revision: 1.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingIFT/StrippingHeavyIonPIDCalib.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingIFT/StrippingHeavyIonPIDCalib.py
index 16e2016d65284b12a6b6bbf80b59e400b0f28026..376c9f63f6ebba144c1c1a520bb2b065b591f9ac 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingIFT/StrippingHeavyIonPIDCalib.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingIFT/StrippingHeavyIonPIDCalib.py
@@ -37,7 +37,6 @@ from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
 from Gaudi.Configuration import *
 __author__ = ['Yanxi ZHANG']
 __date__ = '25/02/2015'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingIFT/StrippingHeavyIonTopology.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingIFT/StrippingHeavyIonTopology.py
index f5989cd6be1fbda62bff5415d738e4993238598e..6f1af3c6923dfc0f2b71c35d24fbdc172f1caf5b 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingIFT/StrippingHeavyIonTopology.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingIFT/StrippingHeavyIonTopology.py
@@ -12,14 +12,9 @@
 Module for selecting specific topology
 '''
 
-from Configurables import FilterDesktop, CombineParticles
-from LoKiPhys.functions import SOURCE
-from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-from StandardParticles import StdAllLooseMuons, StdAllLoosePions, StdAllNoPIDsPions, StdLoosePhotons
+from Configurables import FilterDesktop
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand
-from Gaudi.Configuration import *
 __author__ = ['Emilie MAURICE']
 __date__ = ''
 __version__ = '$Revision: 1.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingIFT/StrippingHeavyIonTrackEffDownMuon.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingIFT/StrippingHeavyIonTrackEffDownMuon.py
index 53e68cac2e822ee2debe76f91a7290e21e4f85f7..d5239b2b5d8bb994246901606f79d163101061c5 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingIFT/StrippingHeavyIonTrackEffDownMuon.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingIFT/StrippingHeavyIonTrackEffDownMuon.py
@@ -43,34 +43,26 @@ __all__ = ('StrippingHeavyIonTrackEffDownMuonConf',
 # FIXME Write includes in a cleaner way
 from Gaudi.Configuration import *
 from LHCbKernel.Configuration import *
-from DAQSys.DecoderClass import Decoder
 from Configurables import GaudiSequencer
 from Configurables import UnpackTrack, ChargedProtoParticleMaker, DelegatingTrackSelector, TrackSelector, BestPIDParticleMaker
-from TrackFitter.ConfiguredFitters import ConfiguredFit
 from Configurables import TrackStateInitAlg
 from StrippingConf.StrippingLine import StrippingLine
-from Configurables import ChargedProtoParticleAddMuonInfo, MuonIDAlgLite
+from Configurables import ChargedProtoParticleAddMuonInfo
 from MuonID import ConfiguredMuonIDs
 from Configurables import ChargedProtoCombineDLLsAlg, ProtoParticleMUONFilter
-from PhysSelPython.Wrappers import Selection, DataOnDemand
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
+from PhysSelPython.Wrappers import Selection
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 
 from StrippingUtils.Utils import LineBuilder
-from Configurables import LoKi__VoidFilter
-from os import environ
 from Gaudi.Configuration import *
-import GaudiKernel.ProcessJobOptions
-from GaudiKernel.SystemOfUnits import mm
 
 from GaudiConfUtils.ConfigurableGenerators import TisTosParticleTagger
 from StandardParticles import StdAllLooseMuons
 from Configurables import GaudiSequencer
 from Configurables import TrackToDST
-from Configurables import TrackSys
 from Configurables import PatSeeding, PatSeedingTool, PatLongLivedTracking
-from PhysSelPython.Wrappers import AutomaticData
 # Get the fitters
-from TrackFitter.ConfiguredFitters import ConfiguredFit, ConfiguredFitSeed, ConfiguredFitDownstream
+from TrackFitter.ConfiguredFitters import ConfiguredFitDownstream
 from PatAlgorithms import PatAlgConf
 
 from SelPy.utils import (UniquelyNamedObject,
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingIFT/StrippingHeavyIonTrackEffMuonTT.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingIFT/StrippingHeavyIonTrackEffMuonTT.py
index c0dfb7ba8d57b4326ea6b8420fabff3518f3a6bc..250433bd8394b3321b2f6a02de678cd0eb3fdd18 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingIFT/StrippingHeavyIonTrackEffMuonTT.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingIFT/StrippingHeavyIonTrackEffMuonTT.py
@@ -63,10 +63,10 @@ __all__ = ('StrippingHeavyionTrackEffMuonTTConf',
            'filterHLT2ForBJpsiK')
 
 from Gaudi.Configuration import *
-from PhysSelPython.Wrappers import Selection, DataOnDemand, ChargedProtoParticleSelection
+from PhysSelPython.Wrappers import ChargedProtoParticleSelection, Selection
 from StrippingConf.StrippingLine import StrippingLine
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from StrippingUtils.Utils import LineBuilder, checkConfig
+from StrippingUtils.Utils import LineBuilder
 from StandardParticles import StdLooseKaons, StdLooseMuons, StdAllLooseMuons
 
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingIFT/StrippingHeavyIonTrackEffVeloMuon.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingIFT/StrippingHeavyIonTrackEffVeloMuon.py
index 1a80cc9576021cda493765e0b79d92240270118f..c633585164030668df014f73204e61d2b9ef83e5 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingIFT/StrippingHeavyIonTrackEffVeloMuon.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingIFT/StrippingHeavyIonTrackEffVeloMuon.py
@@ -40,17 +40,14 @@ __all__ = ('HeavyIonTrackEffVeloMuonConf',
            )
 
 
-from Gaudi.Configuration import *
-from LHCbKernel.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 # from Configurables import CombineParticles
-from PhysSelPython.Wrappers import Selection, SelectionSequence, DataOnDemand
-from Configurables import ChargedProtoParticleMaker, NoPIDsParticleMaker, DataOnDemandSvc, DelegatingTrackSelector, TrackSelector, CombinedParticleMaker, BestPIDParticleMaker
+from PhysSelPython.Wrappers import Selection
+from Configurables import ChargedProtoParticleMaker, DataOnDemandSvc, DelegatingTrackSelector, NoPIDsParticleMaker, TrackSelector
 from Configurables import FastVeloTracking
 
 from StrippingConf.StrippingLine import StrippingLine
-from Configurables import TrackStateInitAlg, TrackEventFitter, TrackPrepareVelo, TrackContainerCopy, Tf__PatVeloSpaceTool, StandaloneMuonRec
-from Configurables import TrackCloneFinder
+from Configurables import StandaloneMuonRec, TrackPrepareVelo
 from StrippingUtils.Utils import LineBuilder
 # changed from StdLooseMuons, yanxi
 from StandardParticles import StdAllLooseMuons
@@ -59,14 +56,9 @@ from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, TisTosParticleT
 # from Configurables import TisTosParticleTagger
 
 from Configurables import GaudiSequencer
-from Configurables import TrackSys
-from PhysSelPython.Wrappers import AutomaticData
 # Get the fitters
-from TrackFitter.ConfiguredFitters import ConfiguredFit
 
-from Configurables import TrackEventCloneKiller, VeloMuonBuilder
-from Configurables import TrackEventFitter, TrackMasterFitter
-from Configurables import TrackKalmanFilter, TrackMasterExtrapolator
+from Configurables import VeloMuonBuilder
 # from TrackFitter.ConfiguredFitters import ConfiguredFastFitter
 # from Configurables import TrackCloneFinder
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingIFT/__init__.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingIFT/__init__.py
index fdfc79a58a2fc556007dcee6375f2fc9251cb0b9..ed393ad5206e05472519a2b3f9c1d20119008450 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingIFT/__init__.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingIFT/__init__.py
@@ -17,17 +17,6 @@ from StrippingUtils.Utils import getBuilderConfFromModule as _getcon
 from StrippingUtils.Utils import getLineBuildersFromModule as _getter
 __author__ = 'Juan Palacios palacios@physik.uzh.ch'
 
-import StrippingHeavyIonOpenCharm
-import StrippingHeavyIonWMuNu
-import StrippingHeavyIonConvertedPhoton
-import StrippingHeavyIonDiMuon
-import StrippingHeavyIonOthercc
-import StrippingHeavyIonTopology
-import StrippingHeavyIonGammaHadron
-import StrippingHeavyIonTrackEffMuonTT
-import StrippingHeavyIonTrackEffDownMuon
-import StrippingHeavyIonD02KPiPi0
-import StrippingHeavyIonIncLcForProtonPID
 
 from sys import modules as _modules
 _this = _modules[__name__]
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingMiniBias/StrippingBadEvents.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingMiniBias/StrippingBadEvents.py
index 1c381f645303eb85fa59a276c4ffa62fa7082584..b6bfb5f29e6eaf5bcf70492429be21413809a429 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingMiniBias/StrippingBadEvents.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingMiniBias/StrippingBadEvents.py
@@ -8,7 +8,6 @@
 # granted to it by virtue of its status as an Intergovernmental Organization  #
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
-from PhysSelPython.Wrappers import Selection
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 __author__ = 'Andrea Contu'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingMiniBias/StrippingMiniBias.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingMiniBias/StrippingMiniBias.py
index da1ac5dd5328262185dd50d32ad0ff94f012315f..986b1718c7f61a525a67a5d92b3c08e9acae884f 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingMiniBias/StrippingMiniBias.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingMiniBias/StrippingMiniBias.py
@@ -8,7 +8,6 @@
 # granted to it by virtue of its status as an Intergovernmental Organization  #
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
-from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 __author__ = 'Patrick Koppenburg'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingQEE/DisplVertices_Utils.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingQEE/DisplVertices_Utils.py
index 75fad1a93b39f6a186f370b531405d43f844f563..f7ae00ee0d50e8cc1fb39c32ca1104645bf95838 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingQEE/DisplVertices_Utils.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingQEE/DisplVertices_Utils.py
@@ -14,12 +14,11 @@ Utilities for displaced vertex stripping: wrapper class around PatPV3D
 
 __all__ = ("SelectionFromAlgorithmWithTools", "SelectionPatPV3DWrapper")
 
-from GaudiConfUtils import isConfigurable
 
 from SelPy.utils import (UniquelyNamedObject, ClonableObject, SelectionBase, compatibleSequences,
-                         IncompatibleInputLocations, CloneCallable, makeOutputLocation, setOutputLocation)
+                         IncompatibleInputLocations, makeOutputLocation, setOutputLocation)
 
-from PhysSelPython.Wrappers import checkConfigurable, checkName
+from PhysSelPython.Wrappers import checkName
 
 
 def connectToRequiredSelections(selection, inputSetter):
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingQEE/StrippingA1MuMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingQEE/StrippingA1MuMu.py
old mode 100755
new mode 100644
index 2fbd096e0a2c433fdbcf8f46f10702ed72c791bd..999ae0e27f3391f4d69443ebc1dc14e9d5ab32c7
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingQEE/StrippingA1MuMu.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingQEE/StrippingA1MuMu.py
@@ -23,11 +23,9 @@ A_1 -> mu+ mu-, based on functionality from StrippingDiMuonNew by Jibo He.
 
 """
 
-from Gaudi.Configuration import *
-from LHCbKernel.Configuration import *
 
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
-from PhysSelPython.Wrappers import Selection, DataOnDemand, SimpleSelection
+from PhysSelPython.Wrappers import SimpleSelection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from GaudiKernel.SystemOfUnits import MeV
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingQEE/StrippingA2MuMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingQEE/StrippingA2MuMu.py
index 7f662d87e37979ff2018a9d0c45902b758e372c6..75edb9aa52b5263aac4a9198306b6b7532f9879b 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingQEE/StrippingA2MuMu.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingQEE/StrippingA2MuMu.py
@@ -22,7 +22,7 @@ from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from StandardParticles import StdAllLooseMuons, StdAllNoPIDsMuons
+from StandardParticles import StdAllLooseMuons
 from GaudiKernel.SystemOfUnits import GeV
 
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingQEE/StrippingA2MuMuSameSign.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingQEE/StrippingA2MuMuSameSign.py
index 1cd5ccbaad25a23eb91271e03be5627dc096b786..432c22256be7fed285ab9ea113e4cb54859226e9 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingQEE/StrippingA2MuMuSameSign.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingQEE/StrippingA2MuMuSameSign.py
@@ -22,7 +22,7 @@ from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from StandardParticles import StdAllLooseMuons, StdAllNoPIDsMuons
+from StandardParticles import StdAllLooseMuons
 from GaudiKernel.SystemOfUnits import GeV
 
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingQEE/StrippingDY2MuMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingQEE/StrippingDY2MuMu.py
index 514a5dde899eacc84ffabbe96801327228cefe0a..03356ebe07088ef87fdabc55949a790c9ee1454e 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingQEE/StrippingDY2MuMu.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingQEE/StrippingDY2MuMu.py
@@ -24,9 +24,8 @@ DY2MuMu4    (20-40GeV): StdAllLooseMuons & TrkPChi2>0.1% & P>10GeV & pT>3GeV
 
 __all__ = 'DY2MuMuConf', 'default_config'
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-from PhysSelPython.Wrappers import Selection, SimpleSelection
+from PhysSelPython.Wrappers import SimpleSelection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from StandardParticles import StdAllLooseMuons
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingQEE/StrippingDY2ee.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingQEE/StrippingDY2ee.py
index 5a03684346d4d9037fd6a54aa3ec6c86b73e5d96..fdc374106c720f9072ee7a85c8905722f8b5d819 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingQEE/StrippingDY2ee.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingQEE/StrippingDY2ee.py
@@ -18,9 +18,8 @@
 
 __all__ = ('DY2eeConf', 'default_config')
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-from PhysSelPython.Wrappers import Selection, DataOnDemand
+from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from StandardParticles import StdAllNoPIDsElectrons
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingQEE/StrippingDisplVertices.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingQEE/StrippingDisplVertices.py
index 67725bbba29c2754711a77628e07d242cdc35fe6..6ff23d235cafe02fa3652a518b05623c84ae0b5f 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingQEE/StrippingDisplVertices.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingQEE/StrippingDisplVertices.py
@@ -40,7 +40,6 @@ __all__ = ('DisplVerticesConf', 'default_config')
 
 from Gaudi.Configuration import *
 from GaudiKernel import SystemOfUnits as units
-from LHCbKernel.Configuration import DEBUG, VERBOSE
 
 import logging
 logger = logging.getLogger(__name__)
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingQEE/StrippingDitau.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingQEE/StrippingDitau.py
old mode 100755
new mode 100644
index 0ad441ea83d4a9fd162a98f97cce9d9f3820d4ca..0472121f4530889bbf3fd69d7b81817e6301682f
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingQEE/StrippingDitau.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingQEE/StrippingDitau.py
@@ -155,8 +155,7 @@ Derived from works of S.Farry & P. Ilten
 
 """
 
-import os
-from GaudiKernel.SystemOfUnits import MeV, GeV, micrometer
+from GaudiKernel.SystemOfUnits import GeV, MeV
 from PhysSelPython.Wrappers import Selection, SimpleSelection, PassThroughSelection, MergedSelection, AutomaticData
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
@@ -894,7 +893,7 @@ def Tuples():
 
     """
     import re
-    from DecayTreeTuple.Configuration import DecayTreeTuple, EventTuple
+    from DecayTreeTuple.Configuration import DecayTreeTuple
 
     seq = GaudiSequencer('TupleSeq')
     seq.ModeOR = True
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingQEE/StrippingExotica.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingQEE/StrippingExotica.py
old mode 100755
new mode 100644
index c02471267810d88c2ce0182c4548f40e6bab690d..9d041d4174b66d314fb68bf3b8336a489585f7e7
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingQEE/StrippingExotica.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingQEE/StrippingExotica.py
@@ -30,7 +30,7 @@ Hlt2ExoticaPrmptDiMuonHighMass
 from GaudiKernel.SystemOfUnits import MeV, GeV, mm, picosecond
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-from PhysSelPython.Wrappers import Selection, SimpleSelection, MergedSelection, AutomaticData
+from PhysSelPython.Wrappers import AutomaticData, SimpleSelection
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingQEE/StrippingFullDiJets.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingQEE/StrippingFullDiJets.py
index 2981965bb27d3ebfea2e058a0380a802bd3f5d1b..9d0f27dcf84c5776ada54ce0932ff9933de66595 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingQEE/StrippingFullDiJets.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingQEE/StrippingFullDiJets.py
@@ -9,14 +9,10 @@
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
 
-from Gaudi.Configuration import *
-from Configurables import FilterDesktop, CombineParticles, LoKi__VertexFitter
+from Configurables import CombineParticles, LoKi__VertexFitter
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from StandardParticles import StdJets
-from CommonParticles.Utils import *
-from Configurables import FilterJet
 from GaudiKernel.SystemOfUnits import GeV
 
 __author__ = "Xabier Cid Vidal", "Cedric Potterat", "William Barter"
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingQEE/StrippingHighPtTau.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingQEE/StrippingHighPtTau.py
index ac4b3b9c5906f1ef795681c1df8cdad05c052f9a..54239d73e2759d0101b16eabf78bd434bba79e74 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingQEE/StrippingHighPtTau.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingQEE/StrippingHighPtTau.py
@@ -24,7 +24,7 @@ from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from StandardParticles import StdAllNoPIDsPions, StdAllLoosePions, StdLooseResolvedPi0, StdLooseMergedPi0
+from StandardParticles import StdAllLoosePions, StdLooseMergedPi0, StdLooseResolvedPi0
 from GaudiKernel.SystemOfUnits import GeV
 from Configurables import FilterDesktop
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingQEE/StrippingLFVExotica.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingQEE/StrippingLFVExotica.py
old mode 100755
new mode 100644
index 59d45b25c3081e3680db2f10e9e0d1ad1ed8f0bb..1a886e3801e0322239b8183c5b0e8fe140db6ba2
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingQEE/StrippingLFVExotica.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingQEE/StrippingLFVExotica.py
@@ -106,7 +106,7 @@ def create_stdjets(strob, line_location, stdjets_name_ban):
         strob.StdJetsNoJetIDBan = [myconf1]
 
     # configure Data-On-Demand service
-    locations = updateDoD(myconf1)
+    updateDoD(myconf1)
 
 
 relInfoJetsVars = ["JETNOMU1PX", "JETNOMU1PY", "JETNOMU1PZ", "JETNOMU1PT", "JETNOMU1JETWIDTH", "JETNOMU1NNTAG", "JETNOMU1MNF", "JETNOMU2PX", "JETNOMU2PY", "JETNOMU2PZ", "JETNOMU2PT", "JETNOMU2JETWIDTH", "JETNOMU2NNTAG", "JETNOMU2MNF", "JETNOMU3PX", "JETNOMU3PY",
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingQEE/StrippingLLP2MuX.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingQEE/StrippingLLP2MuX.py
index d58edd68465d3b66d3c11cab0bbbed15edf12ed2..fe88689a415b694a3f182eeea3924fe2df393eff 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingQEE/StrippingLLP2MuX.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingQEE/StrippingLLP2MuX.py
@@ -16,7 +16,6 @@ from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import AutomaticData, Selection
 from GaudiKernel import SystemOfUnits as units
-from LHCbKernel.Configuration import *
 __author__ = "Pieter David"
 __date__ = "2014-08-28"
 __all__ = ("LLP2MuXConf", "default_config")
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingQEE/StrippingLb2dp.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingQEE/StrippingLb2dp.py
old mode 100755
new mode 100644
index 6fd0fdcc5c19ca68dd6eaf7b42ea46412da9f432..7d202e58f915b4e8cbabd5e3d94da1f41b631330
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingQEE/StrippingLb2dp.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingQEE/StrippingLb2dp.py
@@ -23,15 +23,11 @@ __all__ = ('Lb2dpConf',
            )
 
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop
-from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays
 
-from StandardParticles import StdAllNoPIDsPions, StdAllNoPIDsProtons,  StdAllNoPIDsKaons
 from PhysSelPython.Wrappers import Selection, DataOnDemand, SimpleSelection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from Configurables import LoKi__VoidFilter as VoidFilter
 
 default_config = {
     'NAME': 'Lb2dp',
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingQEE/StrippingMicroDiJets.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingQEE/StrippingMicroDiJets.py
index 111d837cba0b6e3109043e85911ad651a9771cca..01e67268d1ad2a18b20e6bec03474a5d626c5b48 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingQEE/StrippingMicroDiJets.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingQEE/StrippingMicroDiJets.py
@@ -10,13 +10,12 @@
 ###############################################################################
 
 from Gaudi.Configuration import *
-from Configurables import FilterDesktop, CombineParticles, LoKi__VertexFitter
+from Configurables import CombineParticles
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from StandardParticles import StdJets
 from CommonParticles.Utils import *
-from Configurables import FilterJet, ClearDaughters
+from Configurables import ClearDaughters
 from GaudiKernel.SystemOfUnits import GeV
 
 __author__ = "Xabier Cid Vidal", "Cedric Potterat", "William Barter"
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingQEE/StrippingMuMuSS.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingQEE/StrippingMuMuSS.py
index 1d7798298fd46ec3a7437632e49e3e77ed0f5b3d..43046078d280e4b8afa0cafd3eab5c50e3168868 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingQEE/StrippingMuMuSS.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingQEE/StrippingMuMuSS.py
@@ -26,7 +26,7 @@ __author__ = (
 )
 
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-from PhysSelPython.Wrappers import Selection, SimpleSelection
+from PhysSelPython.Wrappers import SimpleSelection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from StandardParticles import StdAllLooseMuons
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingQEE/StrippingSbarSCorrelations.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingQEE/StrippingSbarSCorrelations.py
index 249c3f9ab979883ed8a9d91337d77cefb449f848..69b3d42731dbc9ca8b3c05f7c37baecc626941f6 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingQEE/StrippingSbarSCorrelations.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingQEE/StrippingSbarSCorrelations.py
@@ -21,10 +21,8 @@ Long tracks only
 from GaudiKernel.SystemOfUnits import MeV, GeV
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
-from StandardParticles import StdAllNoPIDsPions, StdTightKaons, StdAllNoPIDsProtons
+from PhysSelPython.Wrappers import DataOnDemand, Selection
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = ['Florin MACIUC']
 __date__ = '24/08/2013'
 __version__ = '$Revision: 1.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingQEE/StrippingStrangeBaryons.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingQEE/StrippingStrangeBaryons.py
index 0b5d595c501f5f05a6cf290f848f882391e42df9..ae8735231a28354a5bc271d76afb516f034dce59 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingQEE/StrippingStrangeBaryons.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingQEE/StrippingStrangeBaryons.py
@@ -18,14 +18,10 @@ Xi -> Lambda pi,   Omega -> Lambda K
 LLL DDL DDD
 '''
 
-from GaudiKernel.SystemOfUnits import MeV
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
-from CommonParticles import StdLooseLambda
-from StandardParticles import StdLoosePions, StdNoPIDsDownPions, StdLooseKaons, StdLooseDownKaons, StdLooseProtons, StdNoPIDsDownProtons
+from PhysSelPython.Wrappers import DataOnDemand, Selection
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = ['Mihai Straticiuc', 'Florin Maciuc', 'Nguyen Thi Dung']
 __date__ = '26/06/2012'
 __version__ = '$Revision: 0.3 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingQEE/StrippingStrangeBaryonsNoPID.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingQEE/StrippingStrangeBaryonsNoPID.py
index 11d394ddb819c05116043ca7af67ee25121e7053..df33cc7953709a81da22f213b036048ee27aaa61 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingQEE/StrippingStrangeBaryonsNoPID.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingQEE/StrippingStrangeBaryonsNoPID.py
@@ -18,12 +18,10 @@ Xi -> Lambda pi,   Omega -> Lambda K
 LLL
 '''
 
-from GaudiKernel.SystemOfUnits import MeV
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
+from PhysSelPython.Wrappers import DataOnDemand, Selection
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = ['Florin Maciuc']
 __date__ = '13/01/2014'
 __version__ = '$Revision: 0.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingQEE/StrippingTaggedJets.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingQEE/StrippingTaggedJets.py
old mode 100755
new mode 100644
index aa10ffcef11e3b67c222795b627dce36ab58d9e2..421ef28a33474ba4a598a2b27634f087159d46b7
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingQEE/StrippingTaggedJets.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingQEE/StrippingTaggedJets.py
@@ -10,11 +10,10 @@
 ###############################################################################
 
 from Gaudi.Configuration import *
-from Configurables import FilterDesktop, CombineParticles, LoKi__VertexFitter
+from Configurables import CombineParticles, LoKi__VertexFitter
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from StandardParticles import StdJets
 from CommonParticles.Utils import *
 from Configurables import FilterJet
 from GaudiKernel.SystemOfUnits import GeV
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingQEE/StrippingW2nH.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingQEE/StrippingW2nH.py
index 3fbf48b1fca05211e68a169fa40c1dd93686300d..f16a508b980ce094474a1bb71301a5e339201600 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingQEE/StrippingW2nH.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingQEE/StrippingW2nH.py
@@ -26,7 +26,6 @@ from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from StandardParticles import StdAllNoPIDsPions
 from GaudiKernel.SystemOfUnits import GeV
-from GaudiKernel.SystemOfUnits import MeV
 
 
 default_config = {
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingQEE/StrippingWJets.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingQEE/StrippingWJets.py
old mode 100755
new mode 100644
index d522b8b500a9a2d429f8c8ad864cfb9783ed5b3e..3da8ccba4608ab608547abdaef921ddb169677f1
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingQEE/StrippingWJets.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingQEE/StrippingWJets.py
@@ -22,14 +22,12 @@ They are then cover a phasespace complementarily on each other.
 
 """
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
 from Configurables import CombineParticles, LoKi__VertexFitter
 from PhysSelPython.Wrappers import Selection, SimpleSelection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from StandardParticles import StdAllLooseMuons, StdAllNoPIDsElectrons, StdJets
-from CommonParticles.Utils import *
 from GaudiKernel.SystemOfUnits import GeV, MeV
 
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingQEE/StrippingWRareDecay.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingQEE/StrippingWRareDecay.py
index 7ef7290f438bd2cedb0a512af1341a965e77c38a..d3358d5224e36ab08dfa8e27b04d29642ac39da9 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingQEE/StrippingWRareDecay.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingQEE/StrippingWRareDecay.py
@@ -21,8 +21,7 @@ from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from GaudiKernel.SystemOfUnits import MeV, GeV, mm, picosecond
-from Gaudi.Configuration import *
+from GaudiKernel.SystemOfUnits import MeV, picosecond
 __author__ = ['Hang Yin', 'Qundong Han']
 __date__ = '11/29/2016'
 __version__ = '$Revision: 2.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingQEE/StrippingWe.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingQEE/StrippingWe.py
index 7cdca666d96cb142580b9b9457521d8d661ca1ba..dae887a639bb7304617d72237d4ec047fdbc41a6 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingQEE/StrippingWe.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingQEE/StrippingWe.py
@@ -21,7 +21,6 @@ We control: StdAllNoPIDsElectrons, PRS>50Mev & E_ECal/P>0.1 & E_HCal/P<0.05 & pT
 __all__ = 'WeConf', 'default_config'
 __author__ = 'S. Bifani', 'D. Ward'
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
 from PhysSelPython.Wrappers import SimpleSelection
 from StrippingConf.StrippingLine import StrippingLine
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingQEE/StrippingZ02ee.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingQEE/StrippingZ02ee.py
index 0bb2cccfd2da3efa094fe5808011f303566a0cc9..03ee6a325270a212b2b8f00000c396f090b245db 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingQEE/StrippingZ02ee.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingQEE/StrippingZ02ee.py
@@ -21,7 +21,6 @@ __all__ = (
     'default_config',
 )
 
-from Gaudi.Configuration import *
 from GaudiKernel.SystemOfUnits import GeV, MeV
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 from PhysSelPython.Wrappers import SimpleSelection
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingQEE/StrippingZ02nH.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingQEE/StrippingZ02nH.py
index f262f43a0d676efec05bdedfc744b49c71c0f89b..82fb2760e954d0f52d5f0b14942694fdecccf31f 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingQEE/StrippingZ02nH.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingQEE/StrippingZ02nH.py
@@ -26,7 +26,6 @@ from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from StandardParticles import StdAllNoPIDsPions
 from GaudiKernel.SystemOfUnits import GeV
-from GaudiKernel.SystemOfUnits import MeV
 
 
 default_config = {
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingQEE/StrippingZ0RareDecay.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingQEE/StrippingZ0RareDecay.py
index ed5c2136acfad79ba252530f3d5969c14168f261..e1a140f9359f6c1935faf0cbc0436c9110ca551b 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingQEE/StrippingZ0RareDecay.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingQEE/StrippingZ0RareDecay.py
@@ -22,8 +22,7 @@ __version__ = '$Revision: 2.0 $'
 
 __all__ = 'default_config', 'Z0RareDecayConf'
 
-from Gaudi.Configuration import *
-from GaudiKernel.SystemOfUnits import MeV, GeV, mm
+from GaudiKernel.SystemOfUnits import MeV
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
 from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
 from StrippingConf.StrippingLine import StrippingLine
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingQEE/depreciated/StrippingDijets.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingQEE/depreciated/StrippingDijets.py
index 719ab092d3f62f10ba80f27bf444a29031235662..1bd1ad77120b402bfb1c1b69dccbf62347990ae5 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingQEE/depreciated/StrippingDijets.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingQEE/depreciated/StrippingDijets.py
@@ -15,8 +15,7 @@
 __all__ = ('DijetsConf',
            'default_config')
 
-from Gaudi.Configuration import *
-from GaudiKernel.SystemOfUnits import MeV, GeV, mm
+from GaudiKernel.SystemOfUnits import GeV, MeV
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingQEE/depreciated/StrippingHighPtTopoJets.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingQEE/depreciated/StrippingHighPtTopoJets.py
index f62f8db8c1eaba8b5842b9c7345ce93002d621f2..da12c39fb111ca80169e104ec46a2a20533c7b7f 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingQEE/depreciated/StrippingHighPtTopoJets.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingQEE/depreciated/StrippingHighPtTopoJets.py
@@ -21,8 +21,6 @@ __all__ = ('default_config', 'HighPtTopoJetsConf')
 # \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\#
 
 
-from Gaudi.Configuration import *
-from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from PhysSelPython.Wrappers import EventSelection
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingQEE/depreciated/StrippingJets.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingQEE/depreciated/StrippingJets.py
index 0a37d40f9ddfcdf82460897dddfb064edca95d21..75e825eb86e2a06d3cf2de890a8a87180c3674a6 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingQEE/depreciated/StrippingJets.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingQEE/depreciated/StrippingJets.py
@@ -15,13 +15,11 @@
 __all__ = ('JetsConf',
            'default_config')
 
-from Gaudi.Configuration import *
-from GaudiKernel.SystemOfUnits import MeV, GeV, mm
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
+from GaudiKernel.SystemOfUnits import GeV, MeV
+from PhysSelPython.Wrappers import MergedSelection, Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
-from JetAccessories.JetMaker_Config import JetMakerConf
 from StandardParticles import StdJets, StdAllNoPIDsPions
 from Configurables import CombineParticles
 from Configurables import TopologicalTagging
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingRD/Beauty2Charm_LoKiCuts.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingRD/Beauty2Charm_LoKiCuts.py
index 2250a080d80f6bdda41324365b8fe5b561d1a8ac..7ed3e8ea2280ee752d6db80ce6b0241fb170b158 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingRD/Beauty2Charm_LoKiCuts.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingRD/Beauty2Charm_LoKiCuts.py
@@ -10,11 +10,6 @@
 ###############################################################################
 # \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\#
 
-from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
-from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-from PhysSelPython.Wrappers import Selection, MergedSelection
-from StandardParticles import StdNoPIDsPions, StdNoPIDsKaons
 
 # \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\#
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingRD/StrippingB02Lcmu_pKpi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingRD/StrippingB02Lcmu_pKpi.py
index c0209e4a81f00f2e5c7ad0093273ce61ffa558f3..aedb7955e9db5ad1ccdba5cded8149e794cdd800 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingRD/StrippingB02Lcmu_pKpi.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingRD/StrippingB02Lcmu_pKpi.py
@@ -14,7 +14,6 @@ from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = ['Nikita Beliy', 'Jibo He']
 __date__ = '28/11/2016'
 __version__ = '$Revision: 1.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingRD/StrippingB23MuLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingRD/StrippingB23MuLines.py
index 4d5da6cdc6121f1a926af78c8a45c7b5ebae76ad..e11f8912eb05ffba312e196ee43556ce4f70e2bb 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingRD/StrippingB23MuLines.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingRD/StrippingB23MuLines.py
@@ -55,13 +55,11 @@ __all__ = ("B23MuLinesConf",
 
 #############################################################################
 
-from Gaudi.Configuration import *
-from Configurables import FilterDesktop, CombineParticles, DaVinci__N3BodyDecays
+from Configurables import DaVinci__N3BodyDecays
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 # from StrippingSelections.Utils import checkConfig
-from GaudiKernel.PhysicalConstants import c_light
 
 #############################################################################
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingRD/StrippingB2KLLXInclusive.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingRD/StrippingB2KLLXInclusive.py
index 427dc4aa1b251d677f2db5fba16348f609968c42..695822b35f87d53f70965e5dd4f2f55a1640df7f 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingRD/StrippingB2KLLXInclusive.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingRD/StrippingB2KLLXInclusive.py
@@ -19,15 +19,12 @@ __all__ = ('B2KLLXInclusiveConf', 'default_config')
 Stripping selection for inclusively selected B->KmumuX decays.
 """
 
-from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop
+from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
 
 from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from LHCbKernel.Configuration import *  # check if needed
-from Configurables import SubstitutePID
-from Configurables import SubPIDMMFilter
 
 
 #################
@@ -373,7 +370,6 @@ class B2KLLXInclusiveConf(LineBuilder):
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         CombineDiMuon = CombineParticles()
         CombineDiMuon.DecayDescriptors = ["[B+ -> J/psi(1S) K+]cc"]
-        sel_name = "InclKLL"
         CombineDiMuon.MotherCut = self.InclKLLCut
         # choose
         leptons = self.InclLeptons
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingRD/StrippingB2KstTauTau.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingRD/StrippingB2KstTauTau.py
index b7765b8844dff9af2f3f192aafad7298a77a86ae..2ca7e7f98d5b35b857a8b5c36bc873a38ee87647 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingRD/StrippingB2KstTauTau.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingRD/StrippingB2KstTauTau.py
@@ -15,8 +15,7 @@ from StandardParticles import StdTightMuons
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, OfflineVertexFitter, DaVinci__N3BodyDecays
-from Gaudi.Configuration import *
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N3BodyDecays, FilterDesktop
 __author__ = [' G. Mancinelli, J. Serrano']
 __date__ = '15/08/2014'
 __version__ = '$Revision: 0.1 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingRD/StrippingB2LLXBDT.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingRD/StrippingB2LLXBDT.py
index 509cd9d83c968f16af46210ba7db650c5ded765e..1c05c402370ebc7d110492fb2fdb8dbde369ff8e 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingRD/StrippingB2LLXBDT.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingRD/StrippingB2LLXBDT.py
@@ -20,8 +20,6 @@ from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticle
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, MergedSelection
-from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays
-from Gaudi.Configuration import *
 __author__ = ['Jibo He']
 __date__ = '20/11/2015'
 __version__ = '$Revision: 1.0 $'
@@ -295,7 +293,7 @@ class B2LLXBDTConf(LineBuilder):
         """
         Kshort, both LL and DD
         """
-        from StandardParticles import StdLooseKsDD, StdLooseKsLL
+        from StandardParticles import StdLooseKsDD
 
         self.SelKsDD = self.createSubSel(OutputList=self.name + "SelKsDD",
                                          InputList=StdLooseKsDD,
@@ -331,7 +329,7 @@ class B2LLXBDTConf(LineBuilder):
         """
         Lambda, both LL and DD
         """
-        from StandardParticles import StdLooseLambdaDD, StdLooseLambdaLL
+        from StandardParticles import StdLooseLambdaDD
 
         self.SelLambdaDD = self.createSubSel(OutputList=self.name + "SelLambdaDD",
                                              InputList=StdLooseLambdaDD,
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingRD/StrippingB2Lambda0MuLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingRD/StrippingB2Lambda0MuLines.py
index 465f34ce3f2af7a7b564860b40d26eb58a2da883..9a6ac1b5824fb2cb3142b7af4c6b531581243697 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingRD/StrippingB2Lambda0MuLines.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingRD/StrippingB2Lambda0MuLines.py
@@ -21,7 +21,6 @@ __all__ = ('B2Lambda0MuLines',
            'default_config')
 
 from StandardParticles import StdLoosePions, StdLooseMuons, StdLooseDownMuons, StdNoPIDsDownPions
-from Configurables import TisTosParticleTagger
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingRD/StrippingB2MuMuMuMuLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingRD/StrippingB2MuMuMuMuLines.py
index 9c92c11a08153c13ae64cf1aefd911c790442d25..6e1b98b4e6982df1ef8268e5a50d76ae51f2dea4 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingRD/StrippingB2MuMuMuMuLines.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingRD/StrippingB2MuMuMuMuLines.py
@@ -19,7 +19,7 @@ from Beauty2Charm_LoKiCuts import LoKiCuts
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
-from Configurables import FilterDesktop, CombineParticles
+from Configurables import CombineParticles
 from Gaudi.Configuration import *
 __author__ = ['Diego Martinez Santos', 'Johannes Albrecht',
               'Konstantinos A. Petridis', 'Alexander Baranov']
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingRD/StrippingB2XLL.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingRD/StrippingB2XLL.py
old mode 100755
new mode 100644
index 0ec2577787f72a6ff7c13be0980a02980a6736ee..17e34358470655f02fbdd0734114189686d7c13d
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingRD/StrippingB2XLL.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingRD/StrippingB2XLL.py
@@ -10,9 +10,8 @@
 ###############################################################################
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection, AutomaticData
+from PhysSelPython.Wrappers import MergedSelection, Selection
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = 'Raja Nandakumar, Fergus Wilson, Stefania Ricciardi'
 __date__ = '04/11/2015'
 __version__ = '$Revision: 0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingRD/StrippingB2XMuMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingRD/StrippingB2XMuMu.py
index bf8f80ead17879bb5263b3f52c017408ee8bde89..5ee37324415b186663430224441bd317cb059fe2 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingRD/StrippingB2XMuMu.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingRD/StrippingB2XMuMu.py
@@ -19,7 +19,6 @@ __version__ = '$Revision: 1.2 $'
 __all__ = ('B2XMuMuConf', 'default_config')
 
 
-from Gaudi.Configuration import *
 from LHCbKernel.Configuration import *  # check if needed
 
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingRD/StrippingB2XTau.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingRD/StrippingB2XTau.py
index 8f3f40d4d2fa42fe2952d91be7ce7ed045dacd24..d2cb8108d382812e609aba7c2edc6887a533565e 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingRD/StrippingB2XTau.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingRD/StrippingB2XTau.py
@@ -9,15 +9,12 @@
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
 from StandardParticles import StdLooseKaons
-from StandardParticles import StdAllLoosePions, StdAllNoPIDsPions
-from copy import deepcopy
-from StandardParticles import StdLoosePions, StdTightPions
-from StandardParticles import StdNoPIDsKaons, StdNoPIDsPions, StdTightMuons
+from StandardParticles import StdLoosePions
+from StandardParticles import StdTightMuons
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, OfflineVertexFitter, DaVinci__N3BodyDecays
-from Gaudi.Configuration import *
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N3BodyDecays, FilterDesktop
 __author__ = ['G. Mancinelli, J. Serrano']
 __date__ = '24/05/2010,15/01/2014'
 __version__ = '$Revision: 1.2 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingRD/StrippingB2XTauMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingRD/StrippingB2XTauMu.py
index ae80a64870a0162a82b78dd1e8516c6c496ef88b..810e9a208ac175d3b476a03bf34a1a05e74c1b07 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingRD/StrippingB2XTauMu.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingRD/StrippingB2XTauMu.py
@@ -25,8 +25,6 @@ __all__ = ('B2XTauMuConf',
            'default_config')
 
 
-from Gaudi.Configuration import *
-
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
 from PhysSelPython.Wrappers import Selection, MergedSelection
 from StrippingConf.StrippingLine import StrippingLine
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingRD/StrippingBLVLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingRD/StrippingBLVLines.py
index 6dc1f3c32133491d8eb768c09eb61fd804d97848..20e7e7d7a7d5e588a64fd707c52fa17e94306ce3 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingRD/StrippingBLVLines.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingRD/StrippingBLVLines.py
@@ -95,8 +95,7 @@ __all__ = ("BLVLinesConf",
 
 ###################################################################################################
 
-from Gaudi.Configuration import *
-from Configurables import FilterDesktop, CombineParticles, DaVinci__N3BodyDecays
+from Configurables import CombineParticles, DaVinci__N3BodyDecays
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingRD/StrippingBd2eeKstarBDT.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingRD/StrippingBd2eeKstarBDT.py
index 33f47f29ceaa85059794a0f7e9de85412021f226..f56a4e55e7f7a52d2447dcf0f983f77b7f685cf6 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingRD/StrippingBd2eeKstarBDT.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingRD/StrippingBd2eeKstarBDT.py
@@ -18,7 +18,6 @@ from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = ['Marie-Helene Schune', 'Jibo He']
 __date__ = '20/01/2012'
 __version__ = '$Revision: 1.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingRD/StrippingBeauty2XGamma.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingRD/StrippingBeauty2XGamma.py
index b876ae5d9b3e6d22750998716beee8e8e96b4a18..f15067d279ab9c6a8c877716265e623bdf8d4bbd 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingRD/StrippingBeauty2XGamma.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingRD/StrippingBeauty2XGamma.py
@@ -12,7 +12,7 @@
 B-> X Gamma selections
 """
 
-from StandardParticles import StdAllNoPIDsKaons, StdAllNoPIDsPions, StdLooseAllPhotons, StdLooseMergedPi0, StdLooseResolvedPi0, StdAllLooseGammaDD, StdAllLooseGammaLL, StdAllNoPIDsProtons
+from StandardParticles import StdAllLooseGammaDD, StdAllLooseGammaLL, StdAllNoPIDsPions, StdLooseAllPhotons, StdLooseMergedPi0, StdLooseResolvedPi0
 from Configurables import TisTosParticleTagger
 from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays as Combine4Particles
 from GaudiConfUtils.ConfigurableGenerators import DaVinci__N3BodyDecays as Combine3Particles
@@ -20,7 +20,6 @@ from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = ['Violaine Bellee', 'Albert Puig']
 __date__ = '08/04/2016'
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingRD/StrippingBs2MuMuLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingRD/StrippingBs2MuMuLines.py
index 6ed0f1ff2d94fe2aa3b66f0525cb5f231048f1b0..f471cc532b70a5e28fd0828ca74b985e254c074b 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingRD/StrippingBs2MuMuLines.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingRD/StrippingBs2MuMuLines.py
@@ -25,7 +25,7 @@ Exported symbols (use python help!):
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
-from Configurables import FilterDesktop, CombineParticles
+from Configurables import CombineParticles
 from Gaudi.Configuration import *
 from JetAccessories.JetMaker_Config import JetMakerConf
 from CommonParticles.Utils import *
@@ -159,7 +159,7 @@ def create_stdjets(strob, line_location, stdjets_name_ban, stdjets_name_addb):
         strob.StdJetsNoJetIDBan = [myconf1]
 
     # configure Data-On-Demand service
-    locations = updateDoD(myconf1)
+    updateDoD(myconf1)
 
     myconf2 = JetMakerConf(stdjets_name_addb,
                            Inputs=['Phys/PFParticles/Particles', line_location],
@@ -173,7 +173,7 @@ def create_stdjets(strob, line_location, stdjets_name_ban, stdjets_name_addb):
         strob.StdJetsNoJetIDAddB = [myconf2]
 
     # configure Data-On-Demand service
-    locations = updateDoD(myconf2)
+    updateDoD(myconf2)
 
 
 ##########################################
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingRD/StrippingBs2gammagamma.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingRD/StrippingBs2gammagamma.py
index 158db5f4c8ca7edbfdce8faccbacecedb0256e3a..30dd3664829a9606d3488e160a1ff92230465960 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingRD/StrippingBs2gammagamma.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingRD/StrippingBs2gammagamma.py
@@ -21,16 +21,11 @@ Exports the following stripping lines as instance data members:
 - Bs2gammagamma_NoConvWideLine  : wide line with 0 conversions
 '''
 
-from Configurables import (DiElectronMaker, ProtoParticleCALOFilter,
-                           ParticleTransporter, BremAdder)
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop  # , CombineParticles
-from CommonParticles import StdLooseAllPhotons
-from CommonParticles import StdAllLooseGammaConversion
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
 from Configurables import CombineParticles
-from Gaudi.Configuration import *
 __author__ = ['Sean Benson']
 __date__ = '2016/04/08'
 __version__ = '1.1'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingRD/StrippingBs2st2KKMuX.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingRD/StrippingBs2st2KKMuX.py
index 53f4155191d8afc755034ab6c642404b7f75bacc..f105ed628117302c196d81973d7e945d4b5bbb1e 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingRD/StrippingBs2st2KKMuX.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingRD/StrippingBs2st2KKMuX.py
@@ -22,9 +22,8 @@ Stripping lines:
 from StandardParticles import StdLooseMuons, StdLooseKaons, StdAllLooseKaons, StdMassConstrainedJpsi2MuMu
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand
+from PhysSelPython.Wrappers import Selection
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = ['Jianchun Wang']
 __date__ = '03/22/2015'
 __version__ = '$Revision: 0.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingRD/StrippingBu2LLK.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingRD/StrippingBu2LLK.py
index 81d36d68547a4f6d3fdab29e77b03b88bffd056f..8bd9c599bc1fa5345db3bff7ac707b8ba9ce6204 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingRD/StrippingBu2LLK.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingRD/StrippingBu2LLK.py
@@ -10,9 +10,8 @@
 ###############################################################################
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection, AutomaticData
+from PhysSelPython.Wrappers import DataOnDemand, MergedSelection, Selection
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, DaVinci__N3BodyDecays
-from Gaudi.Configuration import *
 __author__ = 'Patrick Koppenburg, Alex Shires, Thomas Blake, Luca Pescatore, Simone Bifani, Yasmine Amhis, Paula Alvarez Cartelle, Harry Cliff, Rafael Silva Coutinho'
 __date__ = '16/06/2014'
 __version__ = '$Revision: 3 $'
@@ -768,7 +767,6 @@ class Bu2LLKConf(LineBuilder):
         from StandardParticles import StdLooseMuons as Muons
         # from CommonParticles import StdLooseDetachedTau
         # Taus = DataOnDemand(Location = "Phys/StdLooseDetachedTau3pi/Particles")
-        from CommonParticles import StdTightDetachedTau
         Taus = DataOnDemand(Location="Phys/StdTightDetachedTau3pi/Particles")
 
         _DecayDescriptor = "[J/psi(1S) -> mu+ tau-]cc"
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingRD/StrippingBu2MajoLep.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingRD/StrippingBu2MajoLep.py
index 961fe2a146eaab148d7183186a1be049ae53675f..c3380097f8416a348b98e69fbc89bab18848428b 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingRD/StrippingBu2MajoLep.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingRD/StrippingBu2MajoLep.py
@@ -19,12 +19,10 @@ __version__ = 'V0.9'
 __all__ = ('Bu2MajoLepConf',
            'default_config')
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
+from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from GaudiKernel.SystemOfUnits import *
 
 from StandardParticles import StdLooseMuons as Muons
 from StandardParticles import StdLoosePions as Pions
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingRD/StrippingBu2MuNu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingRD/StrippingBu2MuNu.py
index 093b37f68ae083d7fcea980f498b8d601b1e28cb..53ebfe877490fa2db9f95fcace9e4f27c1030829 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingRD/StrippingBu2MuNu.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingRD/StrippingBu2MuNu.py
@@ -25,12 +25,11 @@ __all__ = ('Bu2MuNuConf',
            'default_config')
 
 from Gaudi.Configuration import *
-from PhysSelPython.Wrappers import Selection, DataOnDemand
+from PhysSelPython.Wrappers import DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from StandardParticles import StdTightMuons, StdTightANNMuons
 from CommonParticles.Utils import *
-from Configurables import FilterDesktop, CombineParticles
+from Configurables import FilterDesktop
 from JetAccessories.JetMaker_Config import JetMakerConf
 
 default_name = 'Bu2MuNu'
@@ -72,7 +71,7 @@ def create_stdjets(strobj, line_location, stdjets_name_ban):
         strobj.StdJetsNoJetIDBan = [myconf1]
 
     # configure Data-On-Demand service
-    locations = updateDoD(myconf1)
+    updateDoD(myconf1)
 
 
 relInfoJetsVars = ["JETNOMU1PX", "JETNOMU1PY", "JETNOMU1PZ", "JETNOMU1PT", "JETNOMU1JETWIDTH", "JETNOMU1NNTAG", "JETNOMU1MNF", "JETNOMU2PX", "JETNOMU2PY", "JETNOMU2PZ", "JETNOMU2PT", "JETNOMU2JETWIDTH", "JETNOMU2NNTAG",
@@ -268,7 +267,7 @@ class Bu2MuNuConf(LineBuilder):
                                            JetIDCut=False).algorithms[0]
 
         # configure Data-On-Demand service
-        locations = updateDoD(StdJetsNoJetIDNoBan)
+        updateDoD(StdJetsNoJetIDNoBan)
 
         # add the jets with the specific banning
         create_stdjets(self, self.ControlLine.outputLocation(),
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingRD/StrippingD23MuLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingRD/StrippingD23MuLines.py
index 0725ecd798e0099828ec0b644ba1f5d6119f0551..9cac5b811b4fe683ae8ab1818ebbc34986a48f2a 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingRD/StrippingD23MuLines.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingRD/StrippingD23MuLines.py
@@ -51,12 +51,11 @@ __all__ = ("D23MuLinesConf",
 #############################################################################
 
 from Gaudi.Configuration import *
-from Configurables import FilterDesktop, CombineParticles, DaVinci__N3BodyDecays
+from Configurables import DaVinci__N3BodyDecays
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 # from StrippingSelections.Utils import checkConfig
-from GaudiKernel.PhysicalConstants import c_light
 
 #############################################################################
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingRD/StrippingDarkBoson.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingRD/StrippingDarkBoson.py
index 1e573360994477ff49301aa3b3a323f18798cf49..e42cad2ffa26db0015272fe3a37258e312b6be6a 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingRD/StrippingDarkBoson.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingRD/StrippingDarkBoson.py
@@ -17,23 +17,18 @@ Author: M. Williams
 from Configurables import DiElectronMaker, ProtoParticleCALOFilter
 from GaudiConfUtils.ConfigurableGenerators import DaVinci__N3BodyDecays
 from CommonParticles.Utils import *
-from copy import deepcopy
 from Configurables import SubstitutePID
 from StandardParticles import StdAllLooseGammaLL, StdAllLooseGammaDD, \
     StdAllLooseElectrons, StdLooseAllPhotons  # , StdDiElectronFromTracks
 from Beauty2Charm_LoKiCuts import LoKiCuts
 from StandardParticles import StdAllNoPIDsPions, StdAllNoPIDsKaons, \
-    StdAllNoPIDsProtons, StdNoPIDsUpPions, StdAllLooseMuons, \
-    StdLooseDownMuons
-from Configurables import LoKi__VoidFilter
+    StdAllLooseMuons, StdLooseDownMuons
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import EventSelection
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
+from PhysSelPython.Wrappers import DataOnDemand, Selection
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
 from Gaudi.Configuration import *
-import re
 __author__ = ['Mike Williams']
 
 moduleName = 'DarkBoson'
@@ -252,7 +247,7 @@ class DarkBosonConf(LineBuilder):
         mmDDX = makeX(
             'MuMuDD', default_config['XDD'], 'KS0 -> mu+ mu-', [muDX])
         kkX = makeX('KK', default_config['XLL'], 'KS0 -> K+ K-', [kX])
-        kkDDX = makeX('KKDD', default_config['XDD'], 'KS0 -> K+ K-', [kDX])
+        makeX('KKDD', default_config['XDD'], 'KS0 -> K+ K-', [kDX])
         pipiX = makeX(
             'PiPi', default_config['XLLhard'], 'KS0 -> pi+ pi-', [piX])
         pipiDDX = makeX(
@@ -274,7 +269,7 @@ class DarkBosonConf(LineBuilder):
             'PiPiSSDD', default_config['XDD'], '[KS0 -> pi+ pi+]cc', [piDX])
         preSS = default_config['Prescales']['SS']
 
-        preDD = default_config['Prescales']['DD']
+        default_config['Prescales']['DD']
         preKK = default_config['Prescales']['KK']
 
         j = makeJ(default_config['J'], [muJ])
@@ -391,7 +386,7 @@ class DarkBosonConf(LineBuilder):
         kst = filterKst()
         self._makeBLine('B2JKst', ['[B0 -> J/psi(1S) K*(892)0]cc'],
                         [j, kst], default_config['B2KX'])
-        rho = makeRho([piB])
+        makeRho([piB])
         # self._makeBLine('B2RhoX2MuMu',['B0 -> rho(770)0 KS0'],[rho,mmX],
         #                default_config['B2HHX'])
         # self._makeBLine('B2RhoX2MuMuDD',['B0 -> rho(770)0 KS0'],[rho,mmDDX],
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingRD/StrippingDoubleSLForRX.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingRD/StrippingDoubleSLForRX.py
index c04d6c7bc25ac04102a5ecd3d2e30878506825a4..703ec457e7bfec5cc75b90127f8b3ae580a8eb65 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingRD/StrippingDoubleSLForRX.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingRD/StrippingDoubleSLForRX.py
@@ -19,7 +19,6 @@ from GaudiConfUtils.ConfigurableGenerators import (CombineParticles,
                                                    DaVinci__N3BodyDecays)
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from Gaudi.Configuration import *
 __author__ = 'M. Kreps, T. Blake, D. Loh'
 __date__ = '10/11/2016'
 __version__ = '$Revision: 1.0$'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingRD/StrippingHypb2L0HGamma.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingRD/StrippingHypb2L0HGamma.py
index fb11a22899308c69c98379bf3153a7465645ce7e..ecbacfd2c6b212eb8f365e777f9a9448bf0d6bc9 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingRD/StrippingHypb2L0HGamma.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingRD/StrippingHypb2L0HGamma.py
@@ -16,8 +16,8 @@ __all__ = ('Hypb2L0HGammaConf',
            'default_config', )
 
 from Gaudi.Configuration import *
-from Configurables import FilterDesktop, CombineParticles, TisTosParticleTagger
-from PhysSelPython.Wrappers import Selection, MergedSelection, DataOnDemand
+from Configurables import CombineParticles, FilterDesktop
+from PhysSelPython.Wrappers import DataOnDemand, Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from StandardParticles import StdLooseAllPhotons
@@ -408,7 +408,7 @@ def tisTosSelection(sel, TISTOSdict):
 
 
 def makevelotracks(name):
-    from Configurables import FastVeloTracking, TrackPrepareVelo, DecodeVeloRawBuffer, TrackEventFitter, TrackStateInitAlg,  TrackContainerCopy
+    from Configurables import FastVeloTracking, TrackContainerCopy, TrackStateInitAlg
     from TrackFitter.ConfiguredFitters import ConfiguredEventFitter
 
     MyFastVeloTracking = FastVeloTracking(
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingRD/StrippingKshort2MuMuMuMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingRD/StrippingKshort2MuMuMuMu.py
index 0eb02eba089e401f5b8d05f25aa574d3d0998143..af71823927f8d50ad7b3bb851a6a0a0605e974ab 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingRD/StrippingKshort2MuMuMuMu.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingRD/StrippingKshort2MuMuMuMu.py
@@ -15,15 +15,12 @@ derived, in large measure, from StrippingKshort2PiPiMuMu.py
 '''
 
 from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays
-from GaudiKernel.SystemOfUnits import MeV
-from StandardParticles import StdNoPIDsDownPions, StdLooseDownMuons
-from StandardParticles import StdAllLoosePions, StdAllLooseMuons, StdAllNoPIDsPions
-from StandardParticles import StdLoosePions, StdLooseMuons, StdNoPIDsPions
+from StandardParticles import StdLooseDownMuons
+from StandardParticles import StdAllLooseMuons
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
+from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
 __author__ = ['Mike Sokoloff']
 __date__ = '07 January 2014'
 __version__ = '$Revision: 0.1 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingRD/StrippingKshort2PiPiMuMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingRD/StrippingKshort2PiPiMuMu.py
index df7f615d006d7f8b2d9e4f2b4fb21c0a63c956f2..2077734097791267b6f75fb46e6e51b2ea45444d 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingRD/StrippingKshort2PiPiMuMu.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingRD/StrippingKshort2PiPiMuMu.py
@@ -10,15 +10,12 @@
 ###############################################################################
 
 from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays
-from GaudiKernel.SystemOfUnits import MeV
 from StandardParticles import StdNoPIDsDownPions, StdLooseDownMuons
-from StandardParticles import StdAllLoosePions, StdAllLooseMuons, StdAllNoPIDsPions
-from StandardParticles import StdLoosePions, StdLooseMuons, StdNoPIDsPions
+from StandardParticles import StdAllLooseMuons, StdAllLoosePions
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
+from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
 __author__ = ['Mike Sokoloff']
 __date__ = '25/10/2012'
 __version__ = '$Revision: 0.1 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingRD/StrippingKshort2eePiPi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingRD/StrippingKshort2eePiPi.py
index da78ba561a995d50ca08f28c7180c2d376edc373..f1c66b71d8bca485a8da728e91f430b40a8f727d 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingRD/StrippingKshort2eePiPi.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingRD/StrippingKshort2eePiPi.py
@@ -16,7 +16,6 @@ from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection
 from GaudiConfUtils.ConfigurableGenerators import DaVinci__N3BodyDecays as Combine3Particles
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
-from Gaudi.Configuration import *
 __author__ = ['Carla Marin']
 __date__ = '23/11/2016'
 __version__ = '$1.1 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingRD/StrippingLFVLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingRD/StrippingLFVLines.py
index dff1703008dbd91cf449348ac2dbb57ad32ca23e..1a3aa2f9456cc88f392c0cc4d3a794052cc263ee 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingRD/StrippingLFVLines.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingRD/StrippingLFVLines.py
@@ -23,14 +23,12 @@ __all__ = ('LFVLinesConf',
            'default_config',
            )
 
-from Gaudi.Configuration import *
 # from Configurables import FilterDesktop, CombineParticles
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, DaVinci__N3BodyDecays
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N3BodyDecays
 from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from GaudiKernel.PhysicalConstants import c_light
-from GaudiKernel.SystemOfUnits import GeV, MeV, mm
+from GaudiKernel.SystemOfUnits import MeV, mm
 from copy import deepcopy
 #
 # Configure related info tools
@@ -1181,7 +1179,7 @@ class LFVLinesConf(LineBuilder):
         hemu_name = name+'B2heMu'
         pmu_name = name+'B2hMu'
         bu_name = name+'Bu2KJPsiee'
-        taumu_name = name+'B2TauMu'
+        name+'B2TauMu'
         htaumu_name = name+'B2hTauMu'
         muetap_gamma_name = name+'Tau2MuEtaP2pipig'
         muetap_pi_name = name+'Tau2MuEtaP2pipipi'
@@ -1675,7 +1673,6 @@ def makeB2TauMu(name):
         "& (BPVVDCHI2> 225)"\
         "& (BPVIPCHI2()< 25) "
 
-    from CommonParticles import StdLooseDetachedTau, StdLooseDipion
     _stdLooseMuons = DataOnDemand(Location="Phys/StdLooseMuons/Particles")
     _stdLooseDetachedTaus = DataOnDemand(
         Location="Phys/StdLooseDetachedTau3pi/Particles")
@@ -2314,7 +2311,6 @@ def makeB2hTauMu(name):
                           "& (BPVVDCHI2> 225)"\
                           "& (BPVIPCHI2()< 16) "  # maybe 16
 
-    from CommonParticles import StdLooseDetachedTau, StdLooseDipion
     _stdLooseMuons = DataOnDemand(Location="Phys/StdLooseMuons/Particles")
     _stdLooseDetachedTaus = DataOnDemand(
         Location="Phys/StdLooseDetachedTau3pi/Particles")
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingRD/StrippingLb2L0Gamma.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingRD/StrippingLb2L0Gamma.py
index 048e24b93a02626bd3b5b98e17e081330ef91c75..698e0dbb30bb3876bc5a609bc7b3716a923898e6 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingRD/StrippingLb2L0Gamma.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingRD/StrippingLb2L0Gamma.py
@@ -25,9 +25,6 @@ __date__ = "14.11.2016"
 __version__ = "2.0"
 __all__ = ("default_config", "StrippingLb2L0GammaConf")
 
-import os
-
-from Gaudi.Configuration import *
 
 from Configurables import CombineParticles
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
@@ -36,9 +33,7 @@ from PhysSelPython.Wrappers import Selection, MergedSelection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 
-from StandardParticles import StdAllNoPIDsPions, StdAllNoPIDsProtons
 from StandardParticles import StdLooseAllPhotons, StdAllLooseGammaDD, StdAllLooseGammaLL
-from StandardParticles import StdVeryLooseDetachedKst2Kpi
 from StandardParticles import StdLooseJpsi2MuMu
 
 default_config = {'NAME': 'Lb2L0Gamma',
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingRD/StrippingLc23MuLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingRD/StrippingLc23MuLines.py
index 4d0e65fd68afc24ab3e895df75533234dbff67f7..e57d2f0f1b089113abb2f0b33c8af7186c88f792 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingRD/StrippingLc23MuLines.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingRD/StrippingLc23MuLines.py
@@ -66,11 +66,10 @@ __all__ = ("Lc23MuLinesConf",
 ###################################################################################################
 
 from Gaudi.Configuration import *
-from Configurables import FilterDesktop, CombineParticles, DaVinci__N3BodyDecays
+from Configurables import DaVinci__N3BodyDecays
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from GaudiKernel.PhysicalConstants import c_light
 
 ###################################################################################################
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingRD/StrippingPhiToKSKS.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingRD/StrippingPhiToKSKS.py
index ff5893ed3c6e324c43ffa0d57bf6dafae4304e21..3a3bda0062db28d5b2687378589719ba90ee3660 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingRD/StrippingPhiToKSKS.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingRD/StrippingPhiToKSKS.py
@@ -23,8 +23,7 @@ from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from StandardParticles import StdAllLooseKaons, StdAllLooseMuons
-from Configurables import FitDecayTrees
-from PhysSelPython.Wrappers import AutomaticData, MergedSelection
+from PhysSelPython.Wrappers import MergedSelection
 
 __all__ = ('PhiToKSKSAllLinesConf',
            'TOSFilter',
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingRD/StrippingRareNStrange.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingRD/StrippingRareNStrange.py
index 45ebc9b804dc6280194074ac2c29d7eb2abd3648..96da26c9feb2c65e7046fe94c3d8a2b41e31ef0e 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingRD/StrippingRareNStrange.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingRD/StrippingRareNStrange.py
@@ -10,9 +10,8 @@
 ###############################################################################
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection, AutomaticData
+from PhysSelPython.Wrappers import Selection
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = 'Diego Martinez Santos, Carlos Vazquez, Xabier Cid, Jessica Prisciandaro'
 __date__ = '08/05/2015'
 __version__ = '$Revision: Not sure $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingRD/StrippingRareStrange.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingRD/StrippingRareStrange.py
index 59b26f2a269c2ed4a56fa90aba360dffc5e3432e..5a42379b69a5ff8994442a06480cc3afc7ceb662 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingRD/StrippingRareStrange.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingRD/StrippingRareStrange.py
@@ -51,15 +51,11 @@ __all__ = ('RareStrangeLinesConf',
 from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 from GaudiConfUtils.ConfigurableGenerators import DaVinci__N3BodyDecays as Combine3Particles
-from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays as Combine4Particles
-from CommonParticles import StdNoPIDsDownElectrons
 from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from GaudiKernel.PhysicalConstants import c_light
-from StandardParticles import (StdAllNoPIDsPions, StdNoPIDsDownPions,
-                               StdLoosePions, StdLooseDownMuons,
-                               StdLooseMergedPi0, StdLooseResolvedPi0, StdLooseDalitzPi0)
+from StandardParticles import (StdLooseMergedPi0, StdLooseResolvedPi0,
+                               StdLooseDalitzPi0)
 
 # from CommonParticles.StdLooseDalitzPi0 import (StdLoosePi02gee, StdLoosePi024e)
 
@@ -2150,7 +2146,7 @@ def makeLambdaPPiEE(name, config, inputs):
 
 
 def makevelotracks(name):
-    from Configurables import FastVeloTracking, TrackPrepareVelo, DecodeVeloRawBuffer, TrackEventFitter, TrackStateInitAlg,  TrackContainerCopy
+    from Configurables import FastVeloTracking, TrackContainerCopy, TrackStateInitAlg
     from TrackFitter.ConfiguredFitters import ConfiguredEventFitter
 
     MyFastVeloTracking = FastVeloTracking(
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingRD/StrippingTau23MuLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingRD/StrippingTau23MuLines.py
index d9cca6b4abd4adfc85706bc020d4c9d6bb00bbc1..efcddadd2c0c53eae31d65b7c110a301ad4317fa 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingRD/StrippingTau23MuLines.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingRD/StrippingTau23MuLines.py
@@ -35,7 +35,6 @@ from GaudiConfUtils.ConfigurableGenerators import DaVinci__N5BodyDecays as Combi
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from GaudiKernel.PhysicalConstants import c_light
 
 default_config = {
     'NAME': 'Tau23Mu',
@@ -70,7 +69,7 @@ class Tau23MuLinesConf(LineBuilder):
         # checkConfig(Bs2MuMuLinesConf.__configuration_keys__,config)
 
         tau_name = name+'Tau23Mu'
-        ds23PiTIS_name = name+'Ds23PiTIS'
+        name+'Ds23PiTIS'
         ds23Pi_name = name+'Ds23Pi'
         ds2PhiPi_name = name+'Ds2PhiPi'
         tau25_name = name+'Tau25Mu'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingRD/StrippingTau2LambdaMuLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingRD/StrippingTau2LambdaMuLines.py
index 8cd7c6388ff4ba895478a3cfeed968afa1a66ac5..bf1088a9316ebde507658a198795658fff5e954b 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingRD/StrippingTau2LambdaMuLines.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingRD/StrippingTau2LambdaMuLines.py
@@ -16,12 +16,10 @@ Exported symbols (use python help!):
    - 
 '''
 
-from GaudiKernel.PhysicalConstants import c_light
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
-from Configurables import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
+from Configurables import CombineParticles
 __author__ = ['Marcin Chrzaszcz']
 __date__ = '14/12/2012'
 __version__ = '$Revision: 1.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingRD/StrippingZVTOP.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingRD/StrippingZVTOP.py
index ea1f9b6208c57e34dfbe76c664ccab3384f31986..307ea9bc346fb872b84790dd9d88d1116d33d9ad 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingRD/StrippingZVTOP.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingRD/StrippingZVTOP.py
@@ -9,14 +9,12 @@
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
 from Configurables import TopoTauAlg, TopoVertexTool
-from StandardParticles import StdLooseKaons
-from StandardParticles import StdLoosePions, StdTightPions
-from StandardParticles import StdNoPIDsKaons, StdNoPIDsPions
+from StandardParticles import StdLoosePions
+from StandardParticles import StdNoPIDsPions
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, OfflineVertexFitter
-from Gaudi.Configuration import *
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop
 old__author__ = ['G. Mancinelli, J Cogan']
 __date__ = '14/01/2014'
 __version__ = '$Revision: 1.2 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingSL/StrippingB23MuNu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingSL/StrippingB23MuNu.py
index 5f1edbaaaac7ff2b810161a6accc4d35fe5b2590..cb73631db49326f0330f231f9d0bbcbe9652a3b2 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingSL/StrippingB23MuNu.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingSL/StrippingB23MuNu.py
@@ -19,15 +19,12 @@ __all__ = ('B23MuNuConf')
 Stripping selection for B to three muons and a neutrino.
 """
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop
 
-from PhysSelPython.Wrappers import Selection, AutomaticData, MergedSelection
+from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from LHCbKernel.Configuration import *  # check if needed
-from Configurables import SubstitutePID
-from Configurables import SubPIDMMFilter
 
 
 #################
@@ -189,15 +186,13 @@ class B23MuNuConf(LineBuilder):
         """
         Creates Jpsi as proxy for dimuon
         """
-        from PhysSelPython.Wrappers import AutomaticData, Selection, SelectionSequence, DataOnDemand, MergedSelection
+        from PhysSelPython.Wrappers import Selection
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         # from Configurables import CombineParticles
 
         CombineJpsi = CombineParticles(DecayDescriptors=["J/psi(1S) -> mu+ mu-", "[J/psi(1S) -> mu+ mu+]cc"],
                                        MotherCut="ALL")
 
-        sel_name = "Jpsi"
-
         from PhysSelPython.Wrappers import Selection
         SelJpsi = Selection("Sel_" + self.name + "_Jpsi", Algorithm=CombineJpsi,
                             RequiredSelections=[self.Muons])
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingSL/StrippingB2DMuForTauMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingSL/StrippingB2DMuForTauMu.py
index 24bd5252aa63ad2bd7e72f001e4bf7d92164b192..12dee166b3de78360c21d960e89150de48cebd46 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingSL/StrippingB2DMuForTauMu.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingSL/StrippingB2DMuForTauMu.py
@@ -18,12 +18,10 @@ __version__ = '$Revision: 2.0 $'
 
 from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from PhysSelPython.Wrappers import Selection, DataOnDemand
+from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from StandardParticles import StdLoosePions, StdAllLooseMuons, StdLooseKaons, StdLooseProtons, StdAllLoosePions, StdLooseMergedPi0, StdLooseResolvedPi0, StdAllNoPIDsMuons, StdLooseANNUpPions
-from Configurables import ConjugateNeutralPID
-from PhysSelPython.Wrappers import MergedSelection
+from StandardParticles import StdAllLooseMuons, StdAllNoPIDsMuons, StdLooseKaons, StdLoosePions, StdLooseProtons
 
 __all__ = ('B2DMuForTauMuconf',
            # 'makeb2DMuX',
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingSL/StrippingB2DMuNuX.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingSL/StrippingB2DMuNuX.py
index 17cd5b71dd5db077b2c2fbed4adfe216fa2128e8..be298e6b623e98c491c6fb9e112f98311749074e 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingSL/StrippingB2DMuNuX.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingSL/StrippingB2DMuNuX.py
@@ -13,14 +13,13 @@ __date__ = '23/07/2010'
 __version__ = '$Revision: 5.0 $'
 
 from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
+from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
 from PhysSelPython.Wrappers import Selection
-from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from StandardParticles import StdLoosePions, StdLooseMuons, StdLooseKaons, StdLooseProtons, StdLooseElectrons
 from StandardParticles import StdNoPIDsPions, StdNoPIDsKaons, StdNoPIDsProtons, StdNoPIDsMuons
 from StrippingB2DMuNuXUtils import *
-from GaudiKernel.SystemOfUnits import MeV, GeV, cm, mm
+from GaudiKernel.SystemOfUnits import GeV, MeV, mm
 
 __all__ = ('B2DMuNuXAllLinesConf',
            'default_config')
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingSL/StrippingB2DMuNuXUtils.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingSL/StrippingB2DMuNuXUtils.py
index 4c6dd348fed7388392b98366954d2b1dc0fbbe27..7bce3fa7f24650a21814814917551403af57f85c 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingSL/StrippingB2DMuNuXUtils.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingSL/StrippingB2DMuNuXUtils.py
@@ -13,11 +13,9 @@ __date__ = '06/03/2015'
 __version__ = '$Revision: 0.0 $'
 
 from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
-from StrippingUtils.Utils import LineBuilder
-from StandardParticles import StdLoosePions, StdLooseMuons, StdLooseKaons, StdLooseProtons, StdNoPIDsPions, StdLooseElectrons, StdNoPIDsMuons
 
 
 def BtoDlnuLine(module_name,
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingSL/StrippingB2Dlnu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingSL/StrippingB2Dlnu.py
index 314d6e309550b6649edc4e0deda1b41a781ac788..d9b1a081f6ec6651b558b666e7576c54a2581b3e 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingSL/StrippingB2Dlnu.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingSL/StrippingB2Dlnu.py
@@ -17,12 +17,10 @@ __version__ = '$Revision: 1.0 $'
 
 from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from PhysSelPython.Wrappers import Selection, DataOnDemand
+from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from StandardParticles import StdLoosePions, StdLooseMuons, StdLooseKaons, StdLooseProtons, StdAllLoosePions, StdLooseMergedPi0, StdLooseResolvedPi0, StdAllNoPIDsMuons, StdLooseANNUpPions, StdLooseElectrons
-from Configurables import ConjugateNeutralPID
-from PhysSelPython.Wrappers import MergedSelection
+from StandardParticles import StdAllNoPIDsMuons, StdLooseElectrons, StdLooseKaons, StdLooseMuons, StdLoosePions
 
 __all__ = ('B2DMuForLNuconf',
            # 'makeb2DMuX',
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingSL/StrippingB2DstMuNuIncl.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingSL/StrippingB2DstMuNuIncl.py
index 2deca338b3c3e54fbefa7fd0858949d287ad4315..1cc8f434534b20edd10910569fb0c5884c783bad 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingSL/StrippingB2DstMuNuIncl.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingSL/StrippingB2DstMuNuIncl.py
@@ -12,9 +12,8 @@ __author__ = ['Mika Vesterinen']
 __date__ = '04/04/2015'
 __version__ = '$Revision: 0.0 $'
 
-from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from PhysSelPython.Wrappers import Selection, DataOnDemand
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
+from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from StandardParticles import StdLoosePions, StdLooseMuons, StdLooseKaons, StdAllLoosePions
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingSL/StrippingB2PPbarMuForTauMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingSL/StrippingB2PPbarMuForTauMu.py
index bbf2f30af50a4d032dcbc3d8bd45d439db3c1f39..04dfcfdefa47c1de292fecc8a0d346b598e38f79 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingSL/StrippingB2PPbarMuForTauMu.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingSL/StrippingB2PPbarMuForTauMu.py
@@ -9,9 +9,7 @@
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
 
-import logging
 from StrippingUtils.Utils import LineBuilder
-from Gaudi.Configuration import *
 __author__ = ['Mark Smith']
 __date__ = '17/10/2016'
 __version__ = '$Revision: 1.0 $'
@@ -110,8 +108,6 @@ class B2PPbarMuForTauMuBuilder(LineBuilder):
     def __init__(self, name, config):
         LineBuilder.__init__(self, name, config)
 
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
-
         self.GECs = {"Code": "( recSummary(LHCb.RecSummary.nSPDhits,'Raw/Spd/Digits') < %(GEC_nSPDHits)s )" % config,
                      "Preambulo": ["from LoKiTracks.decorators import *"]}
 
@@ -420,7 +416,7 @@ class B2PPbarMuForTauMuBuilder(LineBuilder):
     ###### B->ppMuNu Signal ######
     def _bhad2PMuX_B(self):
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-        from PhysSelPython.Wrappers import Selection, MergedSelection
+        from PhysSelPython.Wrappers import Selection
 
         _pMu = CombineParticles(
             DecayDescriptors=self._config["DECAYS"], ReFitPVs=True)
@@ -437,7 +433,7 @@ class B2PPbarMuForTauMuBuilder(LineBuilder):
     ###### B->ppMuNu Signal for Topo Line ######
     def _bhad2PMuX_BTopo(self):
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-        from PhysSelPython.Wrappers import Selection, MergedSelection
+        from PhysSelPython.Wrappers import Selection
 
         _pMu = CombineParticles(
             DecayDescriptors=self._config["DECAYS"], ReFitPVs=True)
@@ -454,7 +450,7 @@ class B2PPbarMuForTauMuBuilder(LineBuilder):
     ###### B->ppMuNu Same-Sign protons ######
     def _bhad2PMuX_B_SS(self):
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-        from PhysSelPython.Wrappers import Selection, MergedSelection
+        from PhysSelPython.Wrappers import Selection
 
         _pMu = CombineParticles(
             DecayDescriptors=self._config["SSDECAYS"], ReFitPVs=True)
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingSL/StrippingB2XTauNu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingSL/StrippingB2XTauNu.py
index 8efb67709ccc4939a7afd4730bb973234c008b74..fcbc8d4cc08bc4620c7d772cbeb082e28c89109d 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingSL/StrippingB2XTauNu.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingSL/StrippingB2XTauNu.py
@@ -608,7 +608,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         self.__MakeB0d2DdoubleStarTauNuNonPhysTau__()
 
         from StrippingConf.StrippingLine import StrippingLine
-        from PhysSelPython.Wrappers import SelectionSequence
 
         # TisTos filter
         def filterTisTos(name, Input, myTisTosSpecs):
@@ -1126,7 +1125,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
 
         from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseJpsi2MuMu
 
         JpsiForBc = FilterDesktop(
             Code=self.totalJpsiCut
@@ -1145,7 +1143,7 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
 
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
+        from PhysSelPython.Wrappers import Selection
         from StandardParticles import StdLoosePions
 
         CombDdoubleStar2DstarPi = CombineParticles(
@@ -1167,7 +1165,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3pi/Particles')
@@ -1191,7 +1188,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3pi/Particles')
@@ -1215,7 +1211,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTauNonPhys
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3piNonPhys/Particles')
@@ -1239,7 +1234,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3pi/Particles')
@@ -1264,7 +1258,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3pi/Particles')
@@ -1289,7 +1282,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTauNonPhys
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3piNonPhys/Particles')
@@ -1313,7 +1305,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3pi/Particles')
@@ -1338,7 +1329,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3pi/Particles')
@@ -1363,7 +1353,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTauNonPhys
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3piNonPhys/Particles')
@@ -1388,7 +1377,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3pi/Particles')
@@ -1412,7 +1400,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTauNonPhys
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3piNonPhys/Particles')
@@ -1436,7 +1423,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3pi/Particles')
@@ -1461,7 +1447,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3pi/Particles')
@@ -1486,7 +1471,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTauNonPhys
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3piNonPhys/Particles')
@@ -1511,7 +1495,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3pi/Particles')
@@ -1537,7 +1520,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3pi/Particles')
@@ -1561,7 +1543,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3pi/Particles')
@@ -1587,7 +1568,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3pi/Particles')
@@ -1612,7 +1592,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTauNonPhys
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3piNonPhys/Particles')
@@ -1638,7 +1617,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3pi/Particles')
@@ -1662,7 +1640,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3pi/Particles')
@@ -1686,7 +1663,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3pi/Particles')
@@ -1711,7 +1687,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3pi/Particles')
@@ -1737,7 +1712,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTauNonPhys
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3piNonPhys/Particles')
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingSL/StrippingB2XuMuNu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingSL/StrippingB2XuMuNu.py
index 200bd7771aa4cf41977bcd119043ca3b1f036a1e..26632da6719ba79a45f0ca97230622d6e21c2285 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingSL/StrippingB2XuMuNu.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingSL/StrippingB2XuMuNu.py
@@ -9,9 +9,7 @@
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
 
-import logging
 from StrippingUtils.Utils import LineBuilder
-from Gaudi.Configuration import *
 __author__ = ['Phillip Urquijo, Alessandra Borgia']
 __date__ = '08/05/2010'
 __version__ = '$Revision: 1.6 $'
@@ -227,7 +225,7 @@ class B2XuMuNuBuilder(LineBuilder):
     def __init__(self, name, config):
         LineBuilder.__init__(self, name, config)
         self.config = config
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
+        from PhysSelPython.Wrappers import DataOnDemand
         self._stdLooseKsLL = DataOnDemand("Phys/StdLooseKsLL/Particles")
         self._stdLooseKsLD = DataOnDemand("Phys/StdLooseKsLD/Particles")
         self._stdLooseKsDD = DataOnDemand("Phys/StdLooseKsDD/Particles")
@@ -633,8 +631,8 @@ class B2XuMuNuBuilder(LineBuilder):
         if self._KSSel is not None:
             return self._KSSel
 
-        from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
+        from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
+        from PhysSelPython.Wrappers import Selection
 
         _code = FilterDesktop(Code=self._NominalKsSelection() % self._config)
 
@@ -754,7 +752,7 @@ class B2XuMuNuBuilder(LineBuilder):
 
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection
-        from StandardParticles import StdLoosePions, StdLooseMuons
+        from StandardParticles import StdLoosePions
 
         _Ksh = CombineParticles(
             DecayDescriptor="KS0 -> mu- pi+",
@@ -782,7 +780,7 @@ class B2XuMuNuBuilder(LineBuilder):
 
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection
-        from StandardParticles import StdLoosePions, StdLooseMuons
+        from StandardParticles import StdLoosePions
 
         _Ksh = CombineParticles(
             DecayDescriptor="KS0 -> mu+ pi-",
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingSL/StrippingCharmFromBSemiForHadronAsy.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingSL/StrippingCharmFromBSemiForHadronAsy.py
index ae6916ee10975107d80bf873fb0cf514d0ae100d..50c775a9989778091e07c14a177f345664ef901d 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingSL/StrippingCharmFromBSemiForHadronAsy.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingSL/StrippingCharmFromBSemiForHadronAsy.py
@@ -25,8 +25,7 @@ from Configurables import FilterDesktop, CombineParticles
 from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from StandardParticles import StdAllLoosePions, StdLoosePions, StdLooseMuons, StdLooseKaons, StdLooseProtons
-from Configurables import TisTosParticleTagger
+from StandardParticles import StdLooseKaons, StdLooseMuons, StdLoosePions
 
 __all__ = ('CharmFromBSemiForHadronAsyAllLinesConf',
            'TOSFilter',
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingSL/StrippingLb2pMuNuVub.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingSL/StrippingLb2pMuNuVub.py
index e10913eb9590d30fc0624576ebbc5a089ebecfc9..233c320a48e2e1db5dcc41254759cc48a4896b7b 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingSL/StrippingLb2pMuNuVub.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingSL/StrippingLb2pMuNuVub.py
@@ -9,9 +9,7 @@
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
 
-import logging
 from StrippingUtils.Utils import LineBuilder
-from Gaudi.Configuration import *
 __author__ = ['William Sutcliffe']
 __date__ = '19/01/2014'
 __version__ = '$Revision: 1.0 $'
@@ -137,8 +135,6 @@ class Lb2pMuNuVubBuilder(LineBuilder):
     def __init__(self, name, config):
         LineBuilder.__init__(self, name, config)
 
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
-
         self.GECs = {"Code": "( recSummaryTrack(LHCb.RecSummary.nLongTracks, TrLONG) < %(GEC_nLongTrk)s )" % config,
                      "Preambulo": ["from LoKiTracks.decorators import *"]}
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingSL/Strippingbhad2PMuX.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingSL/Strippingbhad2PMuX.py
index 3ba91114e26c7abd9eedb69152926b96d6fc5064..00920929d0c157380e67827dd082ac96b04c48e2 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingSL/Strippingbhad2PMuX.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r2/StrippingSL/Strippingbhad2PMuX.py
@@ -9,9 +9,7 @@
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
 
-import logging
 from StrippingUtils.Utils import LineBuilder
-from Gaudi.Configuration import *
 __author__ = ['William Sutcliffe', 'Patrick Owen']
 __date__ = '02/12/2015'
 __version__ = '$Revision: 2.0 $'
@@ -135,8 +133,6 @@ class bhad2PMuXBuilder(LineBuilder):
     def __init__(self, name, config):
         LineBuilder.__init__(self, name, config)
 
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
-
         self.GECs = {"Code": "( recSummaryTrack(LHCb.RecSummary.nLongTracks, TrLONG) < %(GEC_nLongTrk)s )" % config,
                      "Preambulo": ["from LoKiTracks.decorators import *"]}
 
@@ -458,7 +454,7 @@ class bhad2PMuXBuilder(LineBuilder):
     ###### Lb->pMuNu High M_corr Opposite Sign ######
     def _bhad2PMuX_Lb(self):
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-        from PhysSelPython.Wrappers import Selection, MergedSelection
+        from PhysSelPython.Wrappers import Selection
 
         _pMu = CombineParticles(
             DecayDescriptors=self._config["DECAYS"], ReFitPVs=True)
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingB2CC/StrippingB2JpsiHH.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingB2CC/StrippingB2JpsiHH.py
index 6ff1488617634fd007d8a12547b6a594ae4d4936..9661c75a75522aa8815ff60794ec74f220936c52 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingB2CC/StrippingB2JpsiHH.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingB2CC/StrippingB2JpsiHH.py
@@ -20,18 +20,10 @@ __date__ = '10/11/2016'
 
 __all__ = ('B2JpsiHHConf', 'default_config')
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from CommonParticles.Utils import updateDoD
-from StandardParticles import StdLoosePions
-from StandardParticles import StdLooseKaons
-from StandardParticles import StdLooseProtons
-from StandardParticles import StdAllLooseKaons
-from StandardParticles import StdAllLooseProtons
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
+from PhysSelPython.Wrappers import DataOnDemand, Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from GaudiKernel.SystemOfUnits import MeV
 
 default_config = {
     'NAME': 'B2JpsiHH',
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingB2CC/StrippingB2JpsiPi0.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingB2CC/StrippingB2JpsiPi0.py
index d101d6736bd6fbc066c9d3a41641c3443833d8e3..07e3c0f585f807e2d4aca22d4bdb1025c417bb2f 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingB2CC/StrippingB2JpsiPi0.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingB2CC/StrippingB2JpsiPi0.py
@@ -14,15 +14,10 @@ __version__ = '$Revision: 1.1$'
 
 __all__ = ('B2JpsiPi0Conf', 'default_config')
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from CommonParticles.Utils import updateDoD
-from StandardParticles import StdLooseResolvedPi0
-from StandardParticles import StdLooseMergedPi0
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
+from PhysSelPython.Wrappers import DataOnDemand, Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from GaudiKernel.SystemOfUnits import MeV
 
 default_config = {
     # The real name of the lines is BetaS, this is a reference this for the Settings.
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingB2CC/StrippingB2JpsiPi0_Run1.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingB2CC/StrippingB2JpsiPi0_Run1.py
index 98d9454e367d35177c8710e0664fbec2eaefeea4..ca1071c4660938aa4aa6560a2e1bfd3c18313a12 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingB2CC/StrippingB2JpsiPi0_Run1.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingB2CC/StrippingB2JpsiPi0_Run1.py
@@ -14,15 +14,10 @@ __version__ = '$Revision: 1.2$'
 
 __all__ = ('B2JpsiPi0Conf_RI', 'default_config')
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from CommonParticles.Utils import updateDoD
-from StandardParticles import StdLooseResolvedPi0
-from StandardParticles import StdLooseMergedPi0
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
+from PhysSelPython.Wrappers import DataOnDemand, Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from GaudiKernel.SystemOfUnits import MeV
 
 default_config = {
     # The real name of the lines is BetaS, this is a reference this for the Settings.
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingB2CC/StrippingB2JpsiXforBeta_s.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingB2CC/StrippingB2JpsiXforBeta_s.py
index 098bb6abdfaea54665c8b9d58093c40360f73805..45db0c074b99c56d0ecc2b01c7a78d41221789c0 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingB2CC/StrippingB2JpsiXforBeta_s.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingB2CC/StrippingB2JpsiXforBeta_s.py
@@ -26,16 +26,12 @@ __version__ = '$Revision: 4.0$'
 
 __all__ = ('B2JpsiXforBeta_sConf', 'default_config')
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from CommonParticles.Utils import updateDoD
 from StandardParticles import StdLoosePions
 from StandardParticles import StdLooseKaons
-from StandardParticles import StdAllLooseKaons
 from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from GaudiKernel.SystemOfUnits import MeV
 
 default_config = {
     'NAME': 'BetaS',
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingB2CC/StrippingBd2JpsieeKS.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingB2CC/StrippingBd2JpsieeKS.py
index 07219a0d2951c613809802dd40aa568790631ead..09096eb19abdb19a36493251300e6cba80b16e90 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingB2CC/StrippingBd2JpsieeKS.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingB2CC/StrippingBd2JpsieeKS.py
@@ -8,16 +8,10 @@
 # granted to it by virtue of its status as an Intergovernmental Organization  #
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
-from GaudiKernel.SystemOfUnits import MeV
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
-from StandardParticles import StdAllLooseKaons
-from StandardParticles import StdLooseKaons
-from StandardParticles import StdLoosePions
-from CommonParticles.Utils import updateDoD
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = 'Ramon Niet'
 __date__ = '2014/10/23'
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingB2CC/StrippingBs2EtacPhiBDT.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingB2CC/StrippingBs2EtacPhiBDT.py
index d69562e93974639a7ed7d97c104f670f03ca44a0..51b7aaa9cd5881166fe14986d4e116af3a69992c 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingB2CC/StrippingBs2EtacPhiBDT.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingB2CC/StrippingBs2EtacPhiBDT.py
@@ -17,7 +17,6 @@ from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
-from Gaudi.Configuration import *
 __author__ = ['Morgan Martin, Jibo He']
 __date__ = '20/08/2014'
 __version__ = '$Revision: 1.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingB2CC/StrippingBs2JpsieePhi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingB2CC/StrippingBs2JpsieePhi.py
index e348ef543ce16847b7f3e983e4dd1dada22c6425..7ddeef2463dfe7bcc313536aa70f0533707bd4d9 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingB2CC/StrippingBs2JpsieePhi.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingB2CC/StrippingBs2JpsieePhi.py
@@ -12,7 +12,6 @@ from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from Configurables import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = 'Artur Ukleja, Jibo He, Konrad Klimaszewski'
 __date__ = '2011/03/01'
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingB2OC/Beauty2Charm_B2DXBuilder.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingB2OC/Beauty2Charm_B2DXBuilder.py
index 541ddeee2f42ea3e80fcfb74eb36f3a8aa993a29..78bf5b5654648fe05ca072dbfc6398e44abf39eb 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingB2OC/Beauty2Charm_B2DXBuilder.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingB2OC/Beauty2Charm_B2DXBuilder.py
@@ -12,11 +12,7 @@
 
 from copy import deepcopy
 from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-from PhysSelPython.Wrappers import Selection
-from Beauty2Charm_LoKiCuts import LoKiCuts
 from Beauty2Charm_Utils import *
-from Configurables import SubstitutePID
 
 # \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\#
 
@@ -1014,7 +1010,7 @@ class B2DXBuilder(object):
                                     "B- -> D*_2(2460)0 D0 K-"],
                   'B2D0st2460D0Pi': ["B+ -> D*_2(2460)0 D0 pi+",
                                      "B- -> D*_2(2460)0 D0 pi-"]}
-        input = self.dst.dpi_2460_pid+self.d.kpi_pid+self.topoKaons_PID
+        self.dst.dpi_2460_pid+self.d.kpi_pid+self.topoKaons_PID
         inputs = {'B2D0st2460D0K': self.dst.dpi_2460_pid+self.d.kpi_pid+self.topoKaons_PID,
                   'B2D0st2460D0Pi': self.dst.dpi_2460_pid+self.d.kpi_pid+self.topoPions_PID}
         rs = makeB2XSels(decays, '', inputs, self.config)
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingB2OC/Beauty2Charm_Bc2BXBuilder.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingB2OC/Beauty2Charm_Bc2BXBuilder.py
index b6f87b17a91e7aee89aaf7e40919f477b8952426..ee3e5514565abe4c20d0ea41b02a6dca09bb3d3e 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingB2OC/Beauty2Charm_Bc2BXBuilder.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingB2OC/Beauty2Charm_Bc2BXBuilder.py
@@ -8,11 +8,9 @@
 # granted to it by virtue of its status as an Intergovernmental Organization  #
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
-from copy import deepcopy
 from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 from PhysSelPython.Wrappers import Selection, MergedSelection
-from Beauty2Charm_LoKiCuts import LoKiCuts
 from Beauty2Charm_Utils import *
 
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingB2OC/Beauty2Charm_Bc2DDBuilder.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingB2OC/Beauty2Charm_Bc2DDBuilder.py
index 97d0925f7065d9aa9c1983797ddf4689b27c2c7a..5d9ad7c3081eed161b72e98fd8d9f52289a48fd8 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingB2OC/Beauty2Charm_Bc2DDBuilder.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingB2OC/Beauty2Charm_Bc2DDBuilder.py
@@ -11,10 +11,8 @@
 
 # \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\#
 
-from copy import deepcopy
 from Gaudi.Configuration import *
-from PhysSelPython.Wrappers import Selection, MergedSelection
-from Beauty2Charm_LoKiCuts import LoKiCuts
+from PhysSelPython.Wrappers import MergedSelection
 from Beauty2Charm_Utils import *
 # from Configurables import SubstitutePID
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingB2OC/Beauty2Charm_Bc2DXBuilder.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingB2OC/Beauty2Charm_Bc2DXBuilder.py
index 9296ddf6f105f560d6bf5a96234f7288575c8738..d9598e8c1d88a6f4cfd526cb1e806023c0818ee5 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingB2OC/Beauty2Charm_Bc2DXBuilder.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingB2OC/Beauty2Charm_Bc2DXBuilder.py
@@ -10,9 +10,6 @@
 ###############################################################################
 from copy import deepcopy
 from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-from PhysSelPython.Wrappers import Selection, MergedSelection
-from Beauty2Charm_LoKiCuts import LoKiCuts
 from Beauty2Charm_Utils import *
 
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingB2OC/Beauty2Charm_DBuilder.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingB2OC/Beauty2Charm_DBuilder.py
index fd77399ae9ceb43dc7fefb37b7d4eee03ff07872..789ce80dedcda4d50c3002b94f85f1f49f3f0ba2 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingB2OC/Beauty2Charm_DBuilder.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingB2OC/Beauty2Charm_DBuilder.py
@@ -315,7 +315,6 @@ class DBuilder(object):
         # self.k3pi_ddx_pid = [filterSelection('D2k3pi_for_DDX',LoKiCuts(['VCHI2DOF','BPVVDCHI2'],config_for_ddx).code(),self.k3pi_pid)]
 
         # use this below
-        d_cf_noMassWin = d_cf
         d_cf = LoKiCuts.combine([d_cf, "in_range(%s,MM,%s)" % (d_min, d_max)])
         ds_cf = LoKiCuts.combine(
             [ds_cf, "in_range(%s,MM,%s)" % (ds_min, ds_max)])
@@ -1800,9 +1799,6 @@ class DBuilder(object):
 
     def _makeD2PhiMuNu(self, up=False):
         '''makes Ds->phi mu nu'''
-        decays = [['phi(1020)', 'mu+']]
-        min = '1125.13*MeV'
-        max = '2168.49*MeV'
         cpkk = CombineParticles(CombinationCut="ADAMASS('phi(1020)') < 150*MeV",  # ( hasTopoChild() )
                                 MotherCut='(VFASPF(VCHI2/VDOF) < 10)',
                                 DaughtersCuts={'K+': '(PIDK>-10)'},
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingB2OC/Beauty2Charm_HHBuilder.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingB2OC/Beauty2Charm_HHBuilder.py
index f91cef3b54256d316e6b93d3473acaa77f5e751a..a5f7f08c862bb76c6184b30c38e9347a02ddb3f2 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingB2OC/Beauty2Charm_HHBuilder.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingB2OC/Beauty2Charm_HHBuilder.py
@@ -10,7 +10,6 @@
 ###############################################################################
 # \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\#
 
-from copy import deepcopy
 from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 from PhysSelPython.Wrappers import Selection
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingB2OC/Beauty2Charm_HHHBuilder.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingB2OC/Beauty2Charm_HHHBuilder.py
index 73bdd42ab2d419c0060f6e52c520cd6457336577..148169c3681a9a8c2655d407509db953311ff55d 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingB2OC/Beauty2Charm_HHHBuilder.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingB2OC/Beauty2Charm_HHHBuilder.py
@@ -10,9 +10,8 @@
 ###############################################################################
 # \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\#
 
-from copy import deepcopy
 from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N3BodyDecays
+from GaudiConfUtils.ConfigurableGenerators import DaVinci__N3BodyDecays
 from PhysSelPython.Wrappers import Selection
 from Beauty2Charm_LoKiCuts import LoKiCuts
 from Beauty2Charm_Utils import *
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingB2OC/Beauty2Charm_Lb2XBuilder.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingB2OC/Beauty2Charm_Lb2XBuilder.py
index 3650ed5d9b23de714524d04abfa82d0c9b06df53..38d85b42af6ee313d1b390a6890db6768a914ccb 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingB2OC/Beauty2Charm_Lb2XBuilder.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingB2OC/Beauty2Charm_Lb2XBuilder.py
@@ -1155,7 +1155,7 @@ class Lb2XBuilder(object):
 
     def _makeX2LcKPiPiPi(self):
         '''Makes RS + WS Xib -> Lc HH + c.c.'''
-        pions = self.pions
+        self.pions
         kaons = self.kaons
         pipipi = self.hhh.pipipi
         config = deepcopy(self.config)
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingB2OC/Beauty2Charm_LoKiCuts.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingB2OC/Beauty2Charm_LoKiCuts.py
index da5ba556db6406c1de78f96f4fe4e84ea4811d7f..b376cda82c538e3b997c3fc99c2e51c5e2c66663 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingB2OC/Beauty2Charm_LoKiCuts.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingB2OC/Beauty2Charm_LoKiCuts.py
@@ -10,11 +10,6 @@
 ###############################################################################
 # \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\#
 
-from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
-from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-from PhysSelPython.Wrappers import Selection, MergedSelection
-from StandardParticles import StdNoPIDsPions, StdNoPIDsKaons
 
 # \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\#
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingB2OC/Beauty2Charm_Utils.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingB2OC/Beauty2Charm_Utils.py
index 53e1e9516368913bfc8ab783a50057c32b708278..5aa6a17bb0175186102c8a7e04a3b83bf601af65 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingB2OC/Beauty2Charm_Utils.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingB2OC/Beauty2Charm_Utils.py
@@ -10,13 +10,11 @@
 ###############################################################################
 # \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\#
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-from PhysSelPython.Wrappers import DataOnDemand, Selection, MergedSelection, VoidEventSelection
+from PhysSelPython.Wrappers import DataOnDemand, Selection, VoidEventSelection
 from Beauty2Charm_LoKiCuts import LoKiCuts
 from Configurables import SubstitutePID
-from Configurables import ConeJetProxyFilter
 
 # \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\#
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingB2OC/StrippingB2DDphi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingB2OC/StrippingB2DDphi.py
index fc49b483ca68045c51c0273d61218eead2284ac3..649ee42b6509a2f9cec56b73be76880c9fb180dc 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingB2OC/StrippingB2DDphi.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingB2OC/StrippingB2DDphi.py
@@ -15,8 +15,7 @@ Author: M. Martinelli
 Notes: Excited states are included by placing the line in FULL.DST
 '''
 from PhysSelPython.Wrappers import Selection, DataOnDemand
-from Configurables import FilterDesktop, CombineParticles, DaVinci__N4BodyDecays
-from GaudiConfUtils.ConfigurableGenerators import CombineParticles
+from Configurables import DaVinci__N4BodyDecays, FilterDesktop
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 __author__ = ['Maurizio Martinelli']
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingB2OC/StrippingB2DXD2HMuNu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingB2OC/StrippingB2DXD2HMuNu.py
index e31b819ffef4b0ca065196961a68d156446a0000..da52d1d716806d5a347dd1e2f33834589c781fb6 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingB2OC/StrippingB2DXD2HMuNu.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingB2OC/StrippingB2DXD2HMuNu.py
@@ -12,13 +12,11 @@ __author__ = ['Wenbin Qian']
 __date__ = '09/11/2015'
 __version__ = '$Revision: 0.01 $'
 
-from Gaudi.Configuration import *
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, DaVinci__N4BodyDecays, DaVinci__N3BodyDecays
-from PhysSelPython.Wrappers import Selection, DataOnDemand
+from PhysSelPython.Wrappers import Selection
 from StandardParticles import StdLooseMuons, StdLoosePions, StdLooseKaons
-from GaudiKernel.SystemOfUnits import MeV, GeV, cm, mm
 
 __all__ = ('B2DXD2HMuNuBuilder',
            'default_config')
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingB2OC/StrippingB2DhhhLTUB.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingB2OC/StrippingB2DhhhLTUB.py
index fffd8e491bba10bbf0f31e72f2c296ec758af5e9..f3dd308be8affa5995e434730f4b7cb064117856 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingB2OC/StrippingB2DhhhLTUB.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingB2OC/StrippingB2DhhhLTUB.py
@@ -30,7 +30,6 @@ from StandardParticles import (StdAllNoPIDsPions, StdAllNoPIDsKaons,
 from Beauty2Charm_LoKiCuts import LoKiCuts
 from Beauty2Charm_Utils import *
 from GaudiConfUtils.ConfigurableGenerators import DaVinci__N3BodyDecays
-from Configurables import SubPIDMMFilter
 
 # Default configuration dictionary
 default_config = {
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingB2OC/StrippingB2nbody.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingB2OC/StrippingB2nbody.py
index 9084c61c074c73f98bf558b297ff5c69772ebf9a..2e6227101d962626e6855be64335539fb7fa9376 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingB2OC/StrippingB2nbody.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingB2OC/StrippingB2nbody.py
@@ -16,7 +16,6 @@ from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, MergedSelection, DataOnDemand, VoidEventSelection
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = ['Rudolf Oldeman']
 __date__ = '08/02/2011'
 __version__ = '$Revision: 1.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingB2OC/StrippingBeauty2Charm.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingB2OC/StrippingBeauty2Charm.py
index 13669f766511f7336026d2ff63a228c655334931..07fcaee5ff0263ab31305c5558eb7ad1c44b5882 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingB2OC/StrippingBeauty2Charm.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingB2OC/StrippingBeauty2Charm.py
@@ -28,11 +28,9 @@ from Beauty2Charm_HHHBuilder import *
 from Beauty2Charm_HHBuilder import *
 from Beauty2Charm_DBuilder import *
 from StandardParticles import StdLooseAllPhotons, StdVeryLooseAllPhotons
-from Configurables import LoKi__VoidFilter
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import EventSelection
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
+from PhysSelPython.Wrappers import MergedSelection, Selection
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
 from Gaudi.Configuration import *
 import re
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingB2OC/StrippingDstarD02Kpipi0.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingB2OC/StrippingDstarD02Kpipi0.py
index 5ff751290de17bf77f93b252ea943ad9fde4ab6f..94ae3fe820bfc97cbf14546bcf54af26c9eb5e7b 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingB2OC/StrippingDstarD02Kpipi0.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingB2OC/StrippingDstarD02Kpipi0.py
@@ -22,10 +22,10 @@ from StandardParticles import (StdAllNoPIDsPions,
                                StdAllNoPIDsKaons,
                                StdLooseMergedPi0,
                                StdLooseResolvedPi0)
-from StrippingUtils.Utils import LineBuilder, checkConfig
+from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, ConjugateNeutralPID
+from PhysSelPython.Wrappers import MergedSelection, Selection
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles, ConjugateNeutralPID
 __author__ = 'Andrea Contu'
 __date__ = '04/10/2010'
 __version__ = '$Revision: 1.5 $'
@@ -85,7 +85,6 @@ def makeD02kpipi0(name):
     str_D0_CombCuts = "(ADAMASS('D0')<200*MeV) & (ADOCA(1,2) < 1.5) & (AHASCHILD(((ABSID == 'K+') | (ABSID == 'pi+')) & (MIPCHI2DV(PRIMARY)>40)))"
     str_D0_MotherCuts = "(BPVDIRA>0.9) & (PT>2.5*GeV) & (VFASPF(VCHI2/VDOF)<10) & (BPVVDCHI2>36)"
     str_D0_DecayDescriptor_RS = "[D0 -> K- pi+ pi0]cc"
-    str_D0_Sidebands = "200*MeV"
 
     d0 = CombineParticles()
     d0.DecayDescriptor = str_D0_DecayDescriptor_RS
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingB2OC/StrippingLb2Lcpi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingB2OC/StrippingLb2Lcpi.py
index 0b22157303eb41ca14c2a78e4c6266ef085aa405..ad295973223de82f6f6d12eee5f86169e7f2563d 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingB2OC/StrippingLb2Lcpi.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingB2OC/StrippingLb2Lcpi.py
@@ -12,19 +12,12 @@
 Module for selecting Lb->Lambda_c+ pi
 '''
 
-from StandardParticles import (StdAllNoPIDsPions, StdAllNoPIDsKaons,
-                               StdAllNoPIDsProtons, StdNoPIDsUpPions,
-                               StdLooseMuons, StdNoPIDsUpKaons,
-                               StdLooseResolvedPi0, StdLooseMergedPi0)
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from StandardParticles import StdLooseAllPhotons, StdVeryLooseAllPhotons
-from Configurables import LoKi__VoidFilter
 from PhysSelPython.Wrappers import MergedSelection
 from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
-from Gaudi.Configuration import *
 __author__ = ['Jiesheng Yu', 'Yuehong Xie']
 __date__ = '28/11/2016'
 __version__ = '$Revision: 2.0$'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBandQ/StrippingB2JpsiXforEM_s.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBandQ/StrippingB2JpsiXforEM_s.py
index bc246c589889244c88c690d5538697934211a86c..42cf65a760892339a2d0e813f799d123ac3e1dee 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBandQ/StrippingB2JpsiXforEM_s.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBandQ/StrippingB2JpsiXforEM_s.py
@@ -20,21 +20,11 @@ __version__ = '$Revision: 0.0 $'
 
 __all__ = ('B2JpsiXforEM_sConf', 'default_config')
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
 from Configurables import LoKi__PVReFitter, CombineParticles
-from CommonParticles.Utils import updateDoD
-from StandardParticles import StdLoosePions
-from StandardParticles import StdLooseKaons
-from StandardParticles import StdAllLooseKaons
-from StandardParticles import StdLooseResolvedPi0
-from StandardParticles import StdLooseMergedPi0
-from StandardParticles import StdNoPIDsPions
-from StandardParticles import StdLooseProtons
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
+from PhysSelPython.Wrappers import DataOnDemand, Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from GaudiKernel.SystemOfUnits import MeV
 
 default_config = {
     'NAME': 'B2JpsiXforEM',
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBandQ/StrippingBbbar2PhiPhi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBandQ/StrippingBbbar2PhiPhi.py
index 68d2ae631f967ead0fd39b8d78a4f7850226577b..99d49369aa31255be87f60d200a2ca96c9e5513c 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBandQ/StrippingBbbar2PhiPhi.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBandQ/StrippingBbbar2PhiPhi.py
@@ -21,12 +21,10 @@ confBbbar2PhiPhi = Bbbar2PhiPhiConf( name = 'Bbbar2PhiPhi', config = config_Bbba
 stream.appendLines( confBbbar2PhiPhi.lines() )
 '''
 
-from StandardParticles import StdNoPIDsProtons, StdNoPIDsPions, StdNoPIDsDownPions
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
+from PhysSelPython.Wrappers import DataOnDemand, Selection
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = ['Simone Stracka']
 __date__ = '10/03/2015'
 __all__ = (
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBandQ/StrippingBc2JpsiHBDT.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBandQ/StrippingBc2JpsiHBDT.py
index 9fff4e97511b05b78e9a0f69f8190a87a6e94427..0f2af87a6076525ab1b0cdac932cd4254a9efa35 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBandQ/StrippingBc2JpsiHBDT.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBandQ/StrippingBc2JpsiHBDT.py
@@ -18,7 +18,6 @@ from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = ['Jibo He']
 __date__ = '02/11/2013'
 __version__ = '$Revision: 2.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBandQ/StrippingBc2JpsiMuXNew.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBandQ/StrippingBc2JpsiMuXNew.py
index 187d4d70008c6cb4acaae0c988ab23ab721428d3..422fa39bf0c88c53879fe511ad3ddeca3c23a8a5 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBandQ/StrippingBc2JpsiMuXNew.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBandQ/StrippingBc2JpsiMuXNew.py
@@ -18,7 +18,6 @@ from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = ['Jibo He']
 __date__ = '02/09/2010'
 __version__ = '$Revision: 2.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBandQ/StrippingCC2DD.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBandQ/StrippingCC2DD.py
index 56531b5bc3b8fdc4481e313939be1de765f199f4..1598c1f9f6758d00f48ef8bf734fa3a0c8aff035 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBandQ/StrippingCC2DD.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBandQ/StrippingCC2DD.py
@@ -22,8 +22,7 @@ Module for construction of CC->D D, where CC is a particle decaying to D D
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 __author__ = ['Lucio Anderlini', 'Andrea Bizzeti']
 __date__ = '2015-12-01'
 __version__ = '$Revision: 0.4 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBandQ/StrippingCcbar2Baryons.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBandQ/StrippingCcbar2Baryons.py
index db1a8e674f1380c30d293b155b447db888789b0c..db554d3a6a13854cfb39cfac28c9ae01af445eb9 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBandQ/StrippingCcbar2Baryons.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBandQ/StrippingCcbar2Baryons.py
@@ -20,7 +20,6 @@ stream.appendLines( [
 ])
 '''
 
-from StandardParticles import StdNoPIDsProtons, StdNoPIDsPions, StdNoPIDsDownPions
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBandQ/StrippingCcbar2LstLst.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBandQ/StrippingCcbar2LstLst.py
index 6515f84ca12e36c6d06a892e69e95360c9e2f3f4..ad9039b46d5a61c5253f7122661786c7e8731fe8 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBandQ/StrippingCcbar2LstLst.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBandQ/StrippingCcbar2LstLst.py
@@ -21,12 +21,10 @@ confCcbar2LstLst = Ccbar2LstLstConf( name = 'Ccbar2LstLst', config = config_Ccba
 stream.appendLines( confCcbar2LstLst.lines() )
 '''
 
-from StandardParticles import StdNoPIDsProtons, StdNoPIDsKaons
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
+from PhysSelPython.Wrappers import DataOnDemand, Selection
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = ['Andrii Usachov']
 __date__ = '12/01/2017'
 
@@ -70,22 +68,22 @@ class Ccbar2LstLstConf(LineBuilder):
         self.name = name
         self.config = config
 
-        TRCHI2DOF = config['TRCHI2DOF']
-        CcbarPT = config['CcbarPT']
-        KaonProbNNk = config['KaonProbNNk']
-        KaonPT = config['KaonPT']
-        KaonPTSec = config['KaonPTSec']
-        ProtonProbNNp = config['ProtonProbNNp']
-        ProtonPT = config['ProtonPT']
-        ProtonPTSec = config['ProtonPTSec']
-        LstVtxChi2 = config['LstVtxChi2']
-        LstMinMass = config['LstMinMass']
-        LstMaxMass = config['LstMaxMass']
-        CombMaxMass = config['CombMaxMass']
-        CombMinMass = config['CombMinMass']
-        MaxMass = config['MaxMass']
-        MinMass = config['MinMass']
-        Lst_TisTosSpecs = config['Lst_TisTosSpecs']
+        config['TRCHI2DOF']
+        config['CcbarPT']
+        config['KaonProbNNk']
+        config['KaonPT']
+        config['KaonPTSec']
+        config['ProtonProbNNp']
+        config['ProtonPT']
+        config['ProtonPTSec']
+        config['LstVtxChi2']
+        config['LstMinMass']
+        config['LstMaxMass']
+        config['CombMaxMass']
+        config['CombMinMass']
+        config['MaxMass']
+        config['MinMass']
+        config['Lst_TisTosSpecs']
 
         """
         Unbiased, require Hlt Tis
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBandQ/StrippingCcbar2PPPiPi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBandQ/StrippingCcbar2PPPiPi.py
index 1baf5793c54d1cf7c0db705b5b635116d72951ee..98fdb7f110d844cb8f222f2e0825cfc55a7129da 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBandQ/StrippingCcbar2PPPiPi.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBandQ/StrippingCcbar2PPPiPi.py
@@ -12,12 +12,11 @@
 Module for selecting charmonium -> p pbar pi pi 
 '''
 
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
+from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
 from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
-from Gaudi.Configuration import *
 __author__ = ['Jibo He']
 __date__ = '12/11/2015'
 __version__ = '$Revision: 1.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBandQ/StrippingCcbar2PhiPhi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBandQ/StrippingCcbar2PhiPhi.py
index 699437c3bc06d6f9ef8d71ef25d59e5854abaa77..28e46f5fd73a17d752f06d7afb1020754dfa86ea 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBandQ/StrippingCcbar2PhiPhi.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBandQ/StrippingCcbar2PhiPhi.py
@@ -21,12 +21,10 @@ confCcbar2PhiPhi = Ccbar2PhiPhiConf( name = 'Ccbar2PhiPhi', config = config_Ccba
 stream.appendLines( confCcbar2PhiPhi.lines() )
 '''
 
-from StandardParticles import StdNoPIDsProtons, StdNoPIDsPions, StdNoPIDsDownPions
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
+from PhysSelPython.Wrappers import DataOnDemand, Selection
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = ['Jibo He']
 __date__ = '20/01/2012'
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBandQ/StrippingCcbar2PhiPhiDetached.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBandQ/StrippingCcbar2PhiPhiDetached.py
index e6a23c416236ec260cbde0f7e27ef419c26d8b63..2efa73daa63445c07e6f9422398282c433d6429a 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBandQ/StrippingCcbar2PhiPhiDetached.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBandQ/StrippingCcbar2PhiPhiDetached.py
@@ -15,12 +15,10 @@ Inherited from StrippingCcbar2PhiPhi.py; moved To FullDST
 
 '''
 
-from StandardParticles import StdNoPIDsProtons, StdNoPIDsPions, StdNoPIDsDownPions
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
+from PhysSelPython.Wrappers import DataOnDemand, Selection
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = ['Jibo He, Liupan An']
 __date__ = '11/01/2017'
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBandQ/StrippingCcbar2PhiPhiPiPi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBandQ/StrippingCcbar2PhiPhiPiPi.py
index ddb88e1954def91543a3f0a59a00716f5bd235d7..9090289120899103df433cf45001623eeaf79cdd 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBandQ/StrippingCcbar2PhiPhiPiPi.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBandQ/StrippingCcbar2PhiPhiPiPi.py
@@ -12,12 +12,11 @@
 Module for selecting charmonium -> phi phi pi pi 
 '''
 
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
+from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
 from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
-from Gaudi.Configuration import *
 __author__ = ['Andrii Usachov']
 __date__ = '10/04/2017'
 __version__ = '$Revision: 1.1 $'
@@ -61,12 +60,12 @@ class Ccbar2PhiPhiPiPiConf(LineBuilder):
         self.name = name
         self.config = config
 
-        PhiVtxChi2 = config['PhiVtxChi2']
-        PhiMassW = config['PhiMassW']
-        KaonPT = config['KaonPT']
-        TRCHI2DOF = config['TRCHI2DOF']
-        KaonProbNNk = config['KaonProbNNk']
-        KaonIPCHI2 = config['KaonIPCHI2']
+        config['PhiVtxChi2']
+        config['PhiMassW']
+        config['KaonPT']
+        config['TRCHI2DOF']
+        config['KaonProbNNk']
+        config['KaonIPCHI2']
 
         self.SelPions = self.createSubSel(OutputList=self.name + "SelPions",
                                           InputList=DataOnDemand(
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBandQ/StrippingCcbar2PpbarNew.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBandQ/StrippingCcbar2PpbarNew.py
index 516985c59ccaf3e62e2b0cd6e7854be4d026b219..9d41a780f5f17e24bf58cf91f33a808d5da77441 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBandQ/StrippingCcbar2PpbarNew.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBandQ/StrippingCcbar2PpbarNew.py
@@ -18,9 +18,8 @@ Module for Charmonium->p pbar, including three lines
 
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
+from PhysSelPython.Wrappers import Selection
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 __author__ = ['Jibo He']
 __date__ = '03/10/2010'
 __version__ = '$Revision: 1.2 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBandQ/StrippingChiCJPsiGammaConv.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBandQ/StrippingChiCJPsiGammaConv.py
index 39414a2916b0f53397182e29fb2a9b81b1302a97..b17f83d5302ed3c59a1e107d4f81d3c06f495239 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBandQ/StrippingChiCJPsiGammaConv.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBandQ/StrippingChiCJPsiGammaConv.py
@@ -11,8 +11,7 @@
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
-from Configurables import FilterDesktop, CombineParticles, OfflineVertexFitter
-from Gaudi.Configuration import *
+from Configurables import CombineParticles, FilterDesktop
 __author__ = 'Edwige Tournefier'
 __date__ = '08/06/2012'
 __version__ = '$ 1.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBandQ/StrippingDiMuonForXsection.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBandQ/StrippingDiMuonForXsection.py
index 21f73ebac0f9dc811485e0f2194e3dbe6c8f586e..ce4daa1211b88144135f0f2588520bea0acef116 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBandQ/StrippingDiMuonForXsection.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBandQ/StrippingDiMuonForXsection.py
@@ -16,7 +16,6 @@ from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
-from Gaudi.Configuration import *
 __author__ = ['Jibo He']
 __date__ = '28/03/2012'
 __version__ = '$Revision: 1.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBandQ/StrippingDiMuonNew.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBandQ/StrippingDiMuonNew.py
index 8a272ad23d094d840fc6955b2c67f3976834c915..f0e46c0b4d08131b87ba289d29dd2ab04d08ee3b 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBandQ/StrippingDiMuonNew.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBandQ/StrippingDiMuonNew.py
@@ -60,7 +60,6 @@ from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand, EventSelection
 from Configurables import LoKi__VoidFilter
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
-from Gaudi.Configuration import *
 __author__ = ['Jibo He']
 __date__ = '30/09/2010'
 __version__ = '$Revision: 1.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBandQ/StrippingHeavyBaryons.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBandQ/StrippingHeavyBaryons.py
index eb64c175072af830020f5799a7c17fc8dfcb6121..fa0dcf9a66313c735015d48754857948cd7efd09 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBandQ/StrippingHeavyBaryons.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBandQ/StrippingHeavyBaryons.py
@@ -12,14 +12,10 @@
 Stripping line for HeavyBaryons studies : Xi_b-, Xi_b0 and Omega_b-
 Author: Yasmine Amhis
 '''
-from GaudiKernel.SystemOfUnits import MeV
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
-from StandardParticles import StdAllLoosePions, StdAllLooseKaons
-from StandardParticles import StdLoosePions, StdNoPIDsDownPions, StdLooseKaons, StdLooseDownKaons
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = ['Yasmine Amhis']
 __date__ = '19/05/2011'
 __version__ = '$Revision: 1.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBandQ/StrippingLb2EtacKp.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBandQ/StrippingLb2EtacKp.py
index 0c836118d6ad2de1e6aa2c2dedac2917dacca810..63e11ca5d4abca4914b64c29f42f7397f5565146 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBandQ/StrippingLb2EtacKp.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBandQ/StrippingLb2EtacKp.py
@@ -17,7 +17,6 @@ from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
-from Gaudi.Configuration import *
 __author__ = ['Liming Zhang', 'Xuesong Liu']
 __date__ = '23/11/2016'
 __version__ = '$Revision: 2.0$'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBandQ/StrippingOmegab2XicKpi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBandQ/StrippingOmegab2XicKpi.py
index 3e2d953e5c68e5184050887ee4d64c459de21acd..8d75e01e9198aae28302595b73bca42da91b8059 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBandQ/StrippingOmegab2XicKpi.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBandQ/StrippingOmegab2XicKpi.py
@@ -25,8 +25,7 @@ __all__ = ('Omegab2XicKpiConf',
            'makeOmegab2XicKpi',
            'default_config')
 
-from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBandQ/StrippingPPMuMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBandQ/StrippingPPMuMu.py
index 1df5d93b87bbdb9dae5bf3778b297ca01759bc14..fcea01500647f725d298f5a17513a6a9ec45cd4d 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBandQ/StrippingPPMuMu.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBandQ/StrippingPPMuMu.py
@@ -12,12 +12,11 @@
 Module for selecting Hc -> p pbar mu mu
 '''
 
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
+from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
 from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
-from Gaudi.Configuration import *
 __author__ = ['Liupan An']
 __date__ = '18/05/2017'
 __version__ = '$Revision: 1.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBandQ/StrippingXibc.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBandQ/StrippingXibc.py
index 09c274076ab77b1ffa445d4027da57cc7c71076c..73028a237e89513bcf5c298f108bcad2a1ff9f07 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBandQ/StrippingXibc.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBandQ/StrippingXibc.py
@@ -47,17 +47,11 @@ __all__ = ('XibcBuilder'  # LineBuilder class specialization
            )
 
 
-from Gaudi.Configuration import *
-
 from Configurables import FilterDesktop, CombineParticles
 from PhysSelPython.Wrappers import Selection, AutomaticData, MergedSelection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 
-from CommonParticles.StdLooseLambda import StdLooseLambdaLL, StdLooseLambdaDD
-from GaudiKernel.SystemOfUnits import MeV, GeV, mm
-from Configurables import TisTosParticleTagger
-
 
 default_name = "Xibc"
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBandQ/StrippingXibcBDT.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBandQ/StrippingXibcBDT.py
index fbb6cc13c3ac13de0c21873fee47d7b215a1fd13..c4c8bfdaa9f3eda289dc29405819cbcec755f3ab 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBandQ/StrippingXibcBDT.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBandQ/StrippingXibcBDT.py
@@ -33,8 +33,6 @@ from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticle
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, MergedSelection, DataOnDemand
-from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays
-from Gaudi.Configuration import *
 __author__ = ['Jibo He']
 __date__ = '20/11/2016'
 __version__ = '$Revision: 1.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBandQ/StrippingXic2HHHOld.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBandQ/StrippingXic2HHHOld.py
index 2b6300f560c23ceddc6c67fa4d6def48eb6cb5f9..578167c7681a568ba96718c7d1cb251d66778ff5 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBandQ/StrippingXic2HHHOld.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBandQ/StrippingXic2HHHOld.py
@@ -8,17 +8,15 @@
 # granted to it by virtue of its status as an Intergovernmental Organization  #
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
-from StandardParticles import StdNoPIDsPions, StdTightPions, StdNoPIDsKaons, StdAllNoPIDsProtons
-from Configurables import TisTosParticleTagger
+from StandardParticles import StdAllNoPIDsProtons, StdNoPIDsKaons, StdNoPIDsPions
 from StrippingUtils.Utils import LineBuilder
-from PhysSelPython.Wrappers import Selection, DataOnDemand, AutomaticData, MergedSelection
+from PhysSelPython.Wrappers import DataOnDemand, Selection
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
 from Configurables import FilterDesktop, CombineParticles
 from LHCbKernel.Configuration import *
 from GaudiKernel.SystemOfUnits import MeV, mm, ns
 from StrippingConf.StrippingLine import StrippingLine
 from Gaudi.Configuration import *
-import re
 all
 ''' Xic+ and Theta+ lines Designed by Yury Shcheglov, Alexey Dzyuba, Nelya Sagidova to study Xic+ and Theta+ particles '''
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBandQ/StrippingXiccBDT.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBandQ/StrippingXiccBDT.py
index cd4fb8c12ea0ad6a04988289df6f51c07a333a64..c47838a8934fb09a8fb5f516a09dd4c1fde9e069 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBandQ/StrippingXiccBDT.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBandQ/StrippingXiccBDT.py
@@ -30,9 +30,7 @@ Xicc+  -> D+ p+ K-
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, MergedSelection, DataOnDemand
-from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays
-from Gaudi.Configuration import *
+from PhysSelPython.Wrappers import DataOnDemand, Selection
 __author__ = ['Jibo He']
 __date__ = '20/11/2016'
 __version__ = '$Revision: 1.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBnoC/StrippingB24pLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBnoC/StrippingB24pLines.py
index 6a1293248e466cc67c4e7096a59950a675f613ad..d0ef68a9df8f43bd44f73227ae276cbb19015738 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBnoC/StrippingB24pLines.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBnoC/StrippingB24pLines.py
@@ -54,12 +54,10 @@ Exported symbols (use python help!):
    - 
 """
 
-from GaudiKernel.PhysicalConstants import c_light
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
-from Configurables import FilterDesktop, CombineParticles, DaVinci__N4BodyDecays
-from Gaudi.Configuration import *
+from Configurables import DaVinci__N4BodyDecays
 __author__ = ["Pietro Marino", "Oliver Gruenberg"]
 __date__ = "13.10.2017"
 __version__ = "$Revision: 3.0 $"
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBnoC/StrippingB2CharmlessInclusive.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBnoC/StrippingB2CharmlessInclusive.py
index cd9fc514663d296477d068a8eec81536e9237830..84e599e9d48ebeea579e8528cafbeae6f8f8ac8c 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBnoC/StrippingB2CharmlessInclusive.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBnoC/StrippingB2CharmlessInclusive.py
@@ -16,9 +16,8 @@ from StandardParticles import StdLooseKsDD, StdLooseKsLL
 from StandardParticles import StdNoPIDsPions, StdLooseAllPhotons, StdLooseMergedPi0, StdLooseResolvedPi0
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand, SimpleSelection
+from PhysSelPython.Wrappers import Selection, SimpleSelection
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = ['Fred Blanc', 'Luca Pescatore']
 __date__ = '30/11/2016'
 __version__ = '$Revision: 3.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBnoC/StrippingB2CharmlessQuasi2Body.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBnoC/StrippingB2CharmlessQuasi2Body.py
index 718d39a23d00335bf8f1dcbcc45b7eefac60df7c..722215da6a98e8cb098731d1b08547d32728e4c3 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBnoC/StrippingB2CharmlessQuasi2Body.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBnoC/StrippingB2CharmlessQuasi2Body.py
@@ -15,9 +15,8 @@ B->charmless quasi 2-body selection
 from StandardParticles import StdNoPIDsPions
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand
+from PhysSelPython.Wrappers import Selection
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = ['Fred Blanc']
 __date__ = '25/07/2014'
 __version__ = '$Revision: 2.8 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBnoC/StrippingB2HHBDT.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBnoC/StrippingB2HHBDT.py
index 373482252891dafc2ebd794bee38e3c31665f7d5..87ef9edbab077d9500e2cb0ecdd4587476dededd 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBnoC/StrippingB2HHBDT.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBnoC/StrippingB2HHBDT.py
@@ -24,16 +24,13 @@ __all__ = ('B2HHBDTLines',
            'applyBDT',
            'default_config')
 
-from Gaudi.Configuration import *
 
-from GaudiKernel.SystemOfUnits import *
-
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 from StandardParticles import StdNoPIDsPions
 
 from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
-from StrippingUtils.Utils import LineBuilder, checkConfig
+from StrippingUtils.Utils import LineBuilder
 
 
 default_config = {
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBnoC/StrippingB2HHPi0.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBnoC/StrippingB2HHPi0.py
index 7f0781e48280454c550a19cc42c39585db39a8db..37ddfd7720d7364819cb7952fb6e6c0bb7e2da3d 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBnoC/StrippingB2HHPi0.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBnoC/StrippingB2HHPi0.py
@@ -26,9 +26,8 @@ __all__ = ('StrippingB2HHPi0Conf',
            'makeB2HHPi0M',
            'default_config')
 
-from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from PhysSelPython.Wrappers import Selection, DataOnDemand
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
+from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from StandardParticles import StdNoPIDsPions, StdLooseMergedPi0, StdLooseResolvedPi0
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBnoC/StrippingB2KShh.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBnoC/StrippingB2KShh.py
index b6ed5f7d633af57ed6f8b1a89d7dd2ee9323b11e..213f6377bb60d399cc798f1fb8a9e6aa0513e6ae 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBnoC/StrippingB2KShh.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBnoC/StrippingB2KShh.py
@@ -25,7 +25,6 @@ __version__ = 'Stripping24r1/Stripping26r1'
 __all__ = {'B2KShhConf',
            'default_config'}
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, DaVinci__N3BodyDecays
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBnoC/StrippingB2KShhh.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBnoC/StrippingB2KShhh.py
index a35d44f01b8e80ef2a95c24cc8c95dbc14879bed..19e01960a41605b77b968788e4fbd7fa7704664a 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBnoC/StrippingB2KShhh.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBnoC/StrippingB2KShhh.py
@@ -27,13 +27,13 @@ __all__ = ('B2KShhhConf',
 
 from Gaudi.Configuration import *
 
-from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N4BodyDecays
+from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays
 from StandardParticles import StdNoPIDsPions, StdNoPIDsKaons  # ipchi2 cut
 from StandardParticles import StdLooseKsDD, StdLooseKsLL
 
-from PhysSelPython.Wrappers import Selection, MergedSelection
+from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
-from StrippingUtils.Utils import LineBuilder, checkConfig
+from StrippingUtils.Utils import LineBuilder
 
 from Configurables import FilterDesktop
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBnoC/StrippingB2Ksthh.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBnoC/StrippingB2Ksthh.py
index e878d03046af779ac332df6b113e19552f52d4db..1bfb413fe01485a34aaaeb592f39f482172a42ad 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBnoC/StrippingB2Ksthh.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBnoC/StrippingB2Ksthh.py
@@ -22,7 +22,6 @@ __version__ = 'Stripping26'
 __all__ = {'B2KsthhConf',
            'default_config'}
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
@@ -176,7 +175,7 @@ class B2KsthhConf(LineBuilder):
         _massCutHigh = "(AM<(5279+%s)*MeV)" % config['B_Mhigh']
         _aptCut = "(APT>%s*MeV)" % config['B_APTmin']
         _daugMedPtCut = "(ANUM(PT>%s*MeV)>=2)" % config['BDaug_MedPT_PT']
-        _daugMaxPtIPCut = "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['BDaug_MaxPT_IP']
+        "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['BDaug_MaxPT_IP']
         _daugPtSumCut = "((APT1+APT2+APT3)>%s*MeV)" % config['BDaug_PTsum']
 
         _combCuts = _aptCut
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBnoC/StrippingB2TwoBaryons.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBnoC/StrippingB2TwoBaryons.py
index be5394ee6af7729db44cf59ecfeedb504d8b1b27..26bb8d6f679d13ed169bc510a1472696a873ae14 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBnoC/StrippingB2TwoBaryons.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBnoC/StrippingB2TwoBaryons.py
@@ -31,11 +31,10 @@ from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
 from StandardParticles import StdLooseProtons
 from StandardParticles import StdNoPIDsPions as Pions
-from CommonParticles.StdLooseLambda import StdLooseLambdaLL, StdLooseLambdaDD
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
-from StrippingUtils.Utils import LineBuilder, checkConfig
-from GaudiKernel.SystemOfUnits import MeV, GeV, mm, ns
+from StrippingUtils.Utils import LineBuilder
+from GaudiKernel.SystemOfUnits import GeV, MeV, mm
 
 default_config = {'NAME': 'B2TwoBaryons',
                   'WGs': ['BnoC'],
@@ -157,7 +156,7 @@ class B2TwoBaryonLines(LineBuilder):
 
         B2PPbarName = name + "B2PPbar"
 
-        B2PPSameSignName = name + "B2PPSameSign"
+        name + "B2PPSameSign"
 
         B2Lp_dd_name = name+'B2PLambdabarDD'
         B2Lp_ll_name = name+'B2PLambdabarLL'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBnoC/StrippingB2XEta.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBnoC/StrippingB2XEta.py
index ed24e9afa098a704c220dc1576bebc7f4b618dc8..a85b63d0f6c48630471d87c4ec99d3ff00e14140 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBnoC/StrippingB2XEta.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBnoC/StrippingB2XEta.py
@@ -25,9 +25,7 @@ from StandardParticles import StdLoosePions as Pions
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, DaVinci__N3BodyDecays
-from PhysSelPython.Wrappers import DataOnDemand, Selection, SelectionSequence, MergedSelection
-from GaudiKernel import SystemOfUnits as Units
-from Gaudi.Configuration import *
+from PhysSelPython.Wrappers import DataOnDemand, MergedSelection, Selection
 __author__ = ['Timothy Williams']
 __date__ = '1/12/2016'
 __version__ = 'Stripping26r1'
@@ -564,7 +562,7 @@ class B2XEtaConf(LineBuilder):
         _trackCuts = _track_PT+'&'+_track_Chi2+'&'+_track_GPCut+'&'+_track_PIDCut
         _combCuts = _massCut+'&'+_docaCut
         _combCut12Doca = "ACHI2DOCA(1,2)<%s" % config['eta_DOCA']
-        _combCut12Vtx = "(VFASPF(VCHI2/VDOF)<%s)" % config['eta_vtxChi2']
+        "(VFASPF(VCHI2/VDOF)<%s)" % config['eta_vtxChi2']
         _combCut12 = _combCut12Doca
 
         # _eta3Pi=CombineParticles("eta3Pi",
@@ -592,7 +590,7 @@ class B2XEtaConf(LineBuilder):
         _trackCuts = _track_PT+'&'+_track_Chi2+'&'+_track_GPCut+'&'+_track_PIDCut
         _combCuts = _massCut+'&'+_docaCut
         _combCut12Doca = "ACHI2DOCA(1,2)<%s" % config['eta_prime_DOCA']
-        _combCut12Vtx = "(VFASPF(VCHI2/VDOF)<%s)" % config['eta_prime_vtxChi2']
+        "(VFASPF(VCHI2/VDOF)<%s)" % config['eta_prime_vtxChi2']
         _combCut12 = _combCut12Doca
 
         # _etap=CombineParticles("etap",
@@ -883,7 +881,7 @@ class B2XEtaConf(LineBuilder):
         _combCuts = _massCut+'&'+_docaCut
         _allCuts = _PTCut+'&'+_vtxCut+'&'+_diraCut+'&'+_IPChi2Cut
         _combCut12Doca = "ACHI2DOCA(1,2)<%s" % config['LbDaug_LL_maxDocaChi2']
-        _combCut12Vtx = "(VFASPF(VCHI2/VDOF)<%s)" % config['Lb_VtxChi2']
+        "(VFASPF(VCHI2/VDOF)<%s)" % config['Lb_VtxChi2']
         _combCut12 = _combCut12Doca
 
         _Lb2pKetap = DaVinci__N3BodyDecays(DecayDescriptor="[Lambda_b0 -> p+ K- eta_prime]cc",
@@ -921,7 +919,7 @@ class B2XEtaConf(LineBuilder):
         _combCuts = _massCut
         _allCuts = _PTCut+'&'+_IPChi2Cut+'&'+_vtxCut+'&'+_diraCut
         _combCut12Doca = "ACHI2DOCA(1,2)<%s" % config['LbDaug_LL_maxDocaChi2']
-        _combCut12Vtx = "(VFASPF(VCHI2/VDOF)<%s)" % config['Lb_VtxChi2']
+        "(VFASPF(VCHI2/VDOF)<%s)" % config['Lb_VtxChi2']
         _combCut12 = _combCut12Doca
 
         _Lb2pKeta3Pi = DaVinci__N3BodyDecays(DecayDescriptor="[Lambda_b0 -> p+ K- eta]cc",
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBnoC/StrippingB2a1Pi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBnoC/StrippingB2a1Pi.py
index 7122ae867e7e6cb1bde58f2cfdfd30aa0d240f52..db0bacbfa565ae7b8150163fc8c4c7c5352aa931 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBnoC/StrippingB2a1Pi.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBnoC/StrippingB2a1Pi.py
@@ -17,7 +17,6 @@ from Configurables import DaVinci__N4BodyDecays
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
-from Gaudi.Configuration import *
 __author__ = ['Daniel Vieira, Jibo He']
 __date__ = '01/12/2016'
 __version__ = '$Revision: 1.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBnoC/StrippingB2pphh.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBnoC/StrippingB2pphh.py
old mode 100755
new mode 100644
index 98e460d757a794b2d939f602b94d4d3711f5533b..193ff53fe70d045102b03995d531bb12320411a7
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBnoC/StrippingB2pphh.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBnoC/StrippingB2pphh.py
@@ -25,16 +25,13 @@ __all__ = ('B2pphhConf',
            )
 
 
-from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop
+from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
 # from Configurables import DaVinci__N4BodyDecays
 from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays
 
-from StandardParticles import StdAllNoPIDsKaons, StdAllNoPIDsPions, StdAllNoPIDsProtons
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from Configurables import LoKi__VoidFilter as VoidFilter
 
 default_config = {
     'NAME': 'B2pphh',
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBnoC/StrippingBc2hhh_BnoC.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBnoC/StrippingBc2hhh_BnoC.py
index 36ea85af4db7abafbbe99eee0a7538f4826c1b68..7f9a438ee86d830276cf2cf989aed20166beaece 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBnoC/StrippingBc2hhh_BnoC.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBnoC/StrippingBc2hhh_BnoC.py
@@ -23,13 +23,11 @@ Exported symbols (use python help!):
    - makeppK_excl  
 '''
 
-from Configurables import LoKi__VoidFilter as VoidFilter
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection
 import StandardParticles
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 __author__ = ['Alvaro Gomes', 'Adlene Hicheur']
 __date__ = '31/08/2014'
 __version__ = '$Revision: 1.5 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBnoC/StrippingBs2KKhh.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBnoC/StrippingBs2KKhh.py
index dde55525b06f816fc6920690629b551e37b69fcd..f12ace21ab9ca71d0ce07d7e6f00c9dd259533d1 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBnoC/StrippingBs2KKhh.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBnoC/StrippingBs2KKhh.py
@@ -27,7 +27,6 @@ from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop
-from Gaudi.Configuration import *
 __author__ = ['Sean Benson', 'Adam Morris', 'Laurence Carson']
 __date__ = '22/11/2016'
 __version__ = '3.2'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBnoC/StrippingBs2KSKS_Run2.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBnoC/StrippingBs2KSKS_Run2.py
index 4580afecf4c01f9e41baf8c5acbcf0d2a19381ab..9b3c212035d7adeee4c570b05c5ed9d7e786e124 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBnoC/StrippingBs2KSKS_Run2.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBnoC/StrippingBs2KSKS_Run2.py
@@ -22,15 +22,11 @@ __date__ = '13/09/2016'
 __version__ = 'Run2'
 __all__ = {'Bs2KSKSConf', 'default_config'}
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
+from PhysSelPython.Wrappers import DataOnDemand, Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 
-from StandardParticles import StdNoPIDsPions as Pions
-from StandardParticles import StdNoPIDsDownPions as DownPions
-
 
 default_config = {
     'NAME': 'Bs2KSKS',
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBnoC/StrippingBs2Kst_0Kst_0.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBnoC/StrippingBs2Kst_0Kst_0.py
index b53f616c921d0b54652c488e0c38cac1f5ce4524..7a979a9eaf956b50a902298fa49f660dce2481fd 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBnoC/StrippingBs2Kst_0Kst_0.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBnoC/StrippingBs2Kst_0Kst_0.py
@@ -19,11 +19,8 @@ Exported symbols (use python help!):
 
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, SelectionSequence, DataOnDemand
+from PhysSelPython.Wrappers import DataOnDemand, Selection
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-from CommonParticles.Utils import *
-from LHCbKernel.Configuration import *
-from Gaudi.Configuration import *
 __author__ = ['Brais Sanmartin Sedes']
 __date__ = '12/11/2015'
 __version__ = '5.1'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBnoC/StrippingBs2PhiKst0.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBnoC/StrippingBs2PhiKst0.py
index aef03c61961f38f6f068ef062a0becf2559328ff..760de6aa13d7b0a722662b7dd528b6f1674d806c 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBnoC/StrippingBs2PhiKst0.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBnoC/StrippingBs2PhiKst0.py
@@ -20,11 +20,8 @@ Exported symbols (use python help!):
 
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, SelectionSequence, DataOnDemand
+from PhysSelPython.Wrappers import DataOnDemand, Selection
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-from CommonParticles.Utils import *
-from LHCbKernel.Configuration import *
-from Gaudi.Configuration import *
 __author__ = ['Brais Sanmartin Sedes']
 __date__ = '01/12/2015'
 __version__ = '5.0'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBnoC/StrippingBs2PhiPhi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBnoC/StrippingBs2PhiPhi.py
index 58996ef52a66510db5fb60dbf44832780557590c..611bd2bca00562eb1a482bbb1419ddd2a0c0f97f 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBnoC/StrippingBs2PhiPhi.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBnoC/StrippingBs2PhiPhi.py
@@ -24,12 +24,10 @@ Exports the following stripping lines as instance data members:
 
 from StandardParticles import StdAllLooseANNKaons as MyLooseKaons
 from StandardParticles import StdLooseANNUpKaons as MyLooseUpKaons
-import StandardParticles
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
+from PhysSelPython.Wrappers import Selection
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 __author__ = ['Sean Benson']
 __date__ = '2013/08/15'
 __version__ = '3.0'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBnoC/StrippingBu2Ksthh.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBnoC/StrippingBu2Ksthh.py
index 1fd6ba79106d4c72d1f5378548dde305d33378e6..4f9c1afdf1ca56cd839fd46540b523d1043c3014 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBnoC/StrippingBu2Ksthh.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBnoC/StrippingBu2Ksthh.py
@@ -23,7 +23,6 @@ __version__ = 'Stripping26'
 __all__ = {'Bu2KsthhConf',
            'default_config'}
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
@@ -302,7 +301,7 @@ class Bu2KsthhConf(LineBuilder):
         _massCutHigh = "(AM<(5279+%s)*MeV)" % config['B_Mhigh']
         _aptCut = "(APT>%s*MeV)" % config['B_APTmin']
         _daugMedPtCut = "(ANUM(PT>%s*MeV)>=2)" % config['BDaug_MedPT_PT']
-        _daugMaxPtIPCut = "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['BDaug_MaxPT_IP']
+        "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['BDaug_MaxPT_IP']
         _maxDocaChi2Cut = "(ACUTDOCACHI2(%s,''))" % config['BDaug_DD_maxDocaChi2']
         _daugPtSumCut = "((APT1+APT2+APT3)>%s*MeV)" % config['BDaug_DD_PTsum']
 
@@ -359,7 +358,7 @@ class Bu2KsthhConf(LineBuilder):
         _massCutHigh = "(AM<(5279+%s)*MeV)" % config['B_Mhigh']
         _aptCut = "(APT>%s*MeV)" % config['B_APTmin']
         _daugMedPtCut = "(ANUM(PT>%s*MeV)>=2)" % config['BDaug_MedPT_PT']
-        _daugMaxPtIPCut = "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['BDaug_MaxPT_IP']
+        "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['BDaug_MaxPT_IP']
         _maxDocaChi2Cut = "(ACUTDOCACHI2(%s,''))" % config['BDaug_LL_maxDocaChi2']
         _daugPtSumCut = "((APT1+APT2+APT3)>%s*MeV)" % config['BDaug_LL_PTsum']
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBnoC/StrippingBu2hhh.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBnoC/StrippingBu2hhh.py
index b0e05de78958b36146c5a12809f45d4740bb2fa6..a56f353bf291873105ec54cba5728f3b553b07bd 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBnoC/StrippingBu2hhh.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBnoC/StrippingBu2hhh.py
@@ -22,13 +22,11 @@ Exported symbols (use python help!):
    - makepph_incl
 '''
 
-from Configurables import LoKi__VoidFilter as VoidFilter
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection
 import StandardParticles
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 __author__ = ['Irina Nasteva', 'Jussara Miranda', 'Alvaro Gomes']
 __date__ = '19/05/2017'
 __version__ = 'Stripping29'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBnoC/StrippingBu2rho0rhoPlus.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBnoC/StrippingBu2rho0rhoPlus.py
index b3c5e6c8c3f30a98e89149776396db914e3521a7..f8977b65f3b942bc77dcabdcef4e8eaafc84d344 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBnoC/StrippingBu2rho0rhoPlus.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBnoC/StrippingBu2rho0rhoPlus.py
@@ -21,7 +21,6 @@ from StrippingUtils.Utils import LineBuilder, checkConfig
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = "Jason E Andrews"
 __date__ = "26/11/2016"
 __version__ = "4.0"
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBnoC/StrippingButo5h.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBnoC/StrippingButo5h.py
index f513b2eb8e791c982132575a578c37ea43972bc1..86d97904e5f34fc79cf9ebc9ad39fa87262f2f8e 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBnoC/StrippingButo5h.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBnoC/StrippingButo5h.py
@@ -23,13 +23,11 @@ Exported symbols (use python help!):
    - makeppKpipi_excl
 '''
 
-from Configurables import LoKi__VoidFilter as VoidFilter
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection
 import StandardParticles
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 __author__ = ['Luiz Gustavo de Oliveira',
               'Alvaro Gomes', 'Bruno Souza de Paula']
 __date__ = '22/Aug/2014'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBnoC/StrippingD2HHBDT.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBnoC/StrippingD2HHBDT.py
index 0dfb222d2ab5dafe519ef756d69dd2b74431bea4..91e98da0d8961d715e47786f01a3c51a0d58cbec 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBnoC/StrippingD2HHBDT.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBnoC/StrippingD2HHBDT.py
@@ -23,14 +23,13 @@ __all__ = ('D2HHBDTLines',
            'makeD2HHBDT',
            'default_config')
 
-from Gaudi.Configuration import *
 
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
 from StandardParticles import StdNoPIDsKaons, StdAllNoPIDsPions
 
 from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
-from StrippingUtils.Utils import LineBuilder, checkConfig
+from StrippingUtils.Utils import LineBuilder
 
 
 default_config = {
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBnoC/StrippingHb2Charged2Body.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBnoC/StrippingHb2Charged2Body.py
index 5892ee9c6a978ec163161067545b8241aff5219a..213bb72f76914d8e9fde9fce72f99f9a8376da9d 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBnoC/StrippingHb2Charged2Body.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBnoC/StrippingHb2Charged2Body.py
@@ -23,14 +23,13 @@ __all__ = ('Hb2Charged2BodyLines',
            'makeB2Charged2Body',
            'default_config')
 
-from Gaudi.Configuration import *
 
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-from StandardParticles import StdNoPIDsPions, StdLooseProtons, StdLooseKaons
+from StandardParticles import StdNoPIDsPions
 
 from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
-from StrippingUtils.Utils import LineBuilder, checkConfig
+from StrippingUtils.Utils import LineBuilder
 
 
 default_config = {
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBnoC/StrippingHb2V0V0h.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBnoC/StrippingHb2V0V0h.py
index f6702785b326d61efc44578825e2016852c82b2c..52ebfc4bea96f799009c3fb522ae04cb32319278 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBnoC/StrippingHb2V0V0h.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBnoC/StrippingHb2V0V0h.py
@@ -22,7 +22,6 @@ __date__ = '10/02/2017'
 __version__ = 'Stripping28'
 __all__ = 'Hb2V0V0hConf'
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBnoC/StrippingLb2V0hh.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBnoC/StrippingLb2V0hh.py
index 2641bd9d0ee5387a26e5a643e9ad1450e372db4e..afba240ffc7f72f48dd0ad804fb20c88e61b20f2 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBnoC/StrippingLb2V0hh.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBnoC/StrippingLb2V0hh.py
@@ -25,7 +25,6 @@ __date__ = '21/05/2015'
 __version__ = 'Stripping23'
 __all__ = 'Lb2V0hhConf'
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
@@ -392,7 +391,7 @@ class Lb2V0hhConf(LineBuilder):
         _vtxChi2Cut = "(VFASPF(VCHI2)<%s)" % config['Lb_VtxChi2']
         _diraCut = "(BPVDIRA>%s)" % config['Lb_DD_Dira']
         _ipChi2Cut = "(MIPCHI2DV(PRIMARY)<%s)" % config['Lb_DD_IPCHI2wrtPV']
-        _fdCut = "(VFASPF(VMINVDDV(PRIMARY))>%s)" % config['Lb_FDwrtPV']
+        "(VFASPF(VMINVDDV(PRIMARY))>%s)" % config['Lb_FDwrtPV']
         _fdChi2Cut = "(BPVVDCHI2>%s)" % config['Lb_DD_FDChi2']
 
         _motherCuts = _ptCut+'&'+_vtxChi2Cut+'&'+_diraCut+'&'+_ipChi2Cut+'&'+_fdChi2Cut
@@ -597,7 +596,7 @@ class Lb2V0hhConf(LineBuilder):
         _vtxChi2Cut = "(VFASPF(VCHI2)<%s)" % config['Lb_VtxChi2']
         _diraCut = "(BPVDIRA>%s)" % config['Lb_LD_Dira']
         _ipChi2Cut = "(MIPCHI2DV(PRIMARY)<%s)" % config['Lb_LD_IPCHI2wrtPV']
-        _fdCut = "(VFASPF(VMINVDDV(PRIMARY))>%s)" % config['Lb_FDwrtPV']
+        "(VFASPF(VMINVDDV(PRIMARY))>%s)" % config['Lb_FDwrtPV']
         _fdChi2Cut = "(BPVVDCHI2>%s)" % config['Lb_LD_FDChi2']
 
         _motherCuts = _ptCut+'&'+_vtxChi2Cut+'&'+_diraCut+'&'+_ipChi2Cut+'&'+_fdChi2Cut
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBnoC/StrippingXb23ph.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBnoC/StrippingXb23ph.py
index 8067c7a6d01c2b569906174d551aad6998b32877..f09fc331bb17fe13ce14781f527fb8055987ec83 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBnoC/StrippingXb23ph.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBnoC/StrippingXb23ph.py
@@ -22,7 +22,6 @@ from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, DaVinci__N4Body
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection
-from Gaudi.Configuration import *
 __author__ = ['Jinlin Fu', 'Maurizio Martinelli', 'Andrea Merli']
 __date__ = '12/11/2015'
 __version__ = 'v1r0'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBnoC/StrippingXb2p3h.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBnoC/StrippingXb2p3h.py
index b2c3ad4b4899c94b787cce91c7fcdb640b88197d..19d8a03d1836fbec11592ab3c6a8c98aef3be41a 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBnoC/StrippingXb2p3h.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBnoC/StrippingXb2p3h.py
@@ -22,7 +22,6 @@ from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, DaVinci__N4Body
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection
-from Gaudi.Configuration import *
 __author__ = ['Jan Mickelle V. Maratas', 'Stephane Monteil', 'Andrea Merli']
 __date__ = '01/04/2016'
 __version__ = 'v1r0'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBnoC/StrippingXb2phh.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBnoC/StrippingXb2phh.py
index b19f47e926fd172852930b68a68b191c324a6bc5..8ab8cbe05188bf8bdb14e4a0f4f9d9e03b129e9a 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBnoC/StrippingXb2phh.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingBnoC/StrippingXb2phh.py
@@ -22,7 +22,6 @@ from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, DaVinci__N3Body
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection
-from Gaudi.Configuration import *
 __author__ = ['Jan Mickelle V. Maratas', 'Stephane Monteil', 'Thomas Latham']
 __date__ = '24/11/2016'
 __version__ = 'v1r0'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCalib/StrippingCharmFromBSemiForHadronAsy.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCalib/StrippingCharmFromBSemiForHadronAsy.py
index 7b207e6c145457c2c1cabcdea0c84d473e0a9929..f1542028672636e33782cbbc8d9c498b46dc82de 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCalib/StrippingCharmFromBSemiForHadronAsy.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCalib/StrippingCharmFromBSemiForHadronAsy.py
@@ -19,14 +19,12 @@ __author__ = ['Mika Vesterinen']
 __date__ = '10/03/2013'
 __version__ = '$Revision: 0.0 $'
 
-from Gaudi.Configuration import *
 
 from Configurables import FilterDesktop, CombineParticles
 from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from StandardParticles import StdAllLoosePions, StdLoosePions, StdLooseMuons, StdLooseKaons, StdLooseProtons
-from Configurables import TisTosParticleTagger
+from StandardParticles import StdLooseKaons, StdLooseMuons, StdLoosePions
 
 __all__ = ('CharmFromBSemiForHadronAsyAllLinesConf',
            'TOSFilter',
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCalib/StrippingCharmFromBSemiForProtonPID.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCalib/StrippingCharmFromBSemiForProtonPID.py
index 92af0a7a1eee98722cedfcfba8308f8eec1d876b..81115d7fe35ae7d0e1c7fb77acbfafb29da9fb93 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCalib/StrippingCharmFromBSemiForProtonPID.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCalib/StrippingCharmFromBSemiForProtonPID.py
@@ -18,12 +18,11 @@ __author__ = ['Mika Vesterinen']
 __date__ = '19/03/2013'
 __version__ = '$Revision: 0.0 $'
 
-from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from StandardParticles import StdLoosePions, StdLooseMuons, StdLooseKaons, StdLooseProtons, StdNoPIDsProtons
+from StandardParticles import StdLooseKaons, StdLooseMuons, StdLoosePions, StdNoPIDsProtons
 
 __all__ = ('CharmFromBSemiForProtonPIDAllLinesConf',
            'default_config')
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCalib/StrippingD02KPiPi0.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCalib/StrippingD02KPiPi0.py
index 162aeb0dd27f065b18aa50e6a38d07b76d96d0de..115a1c5c4bc1b7c5361bf0f30a9b9e21504af64d 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCalib/StrippingD02KPiPi0.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCalib/StrippingD02KPiPi0.py
@@ -25,9 +25,8 @@ __all__ = ('StrippingD02KPiPi0Conf',
            'makeD02KPiPi0M',
            'default_config')
 
-from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from PhysSelPython.Wrappers import Selection, DataOnDemand
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
+from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from StandardParticles import StdTightPions, StdTightKaons, StdLooseMergedPi0, StdLooseResolvedPi0
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCalib/StrippingD02KPiPi0DalitzPartReco.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCalib/StrippingD02KPiPi0DalitzPartReco.py
index 329adac1d867595f4a4003d27412fbb641ed7903..66aa89c6a3615c55878a174ff92567271c8c9ee8 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCalib/StrippingD02KPiPi0DalitzPartReco.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCalib/StrippingD02KPiPi0DalitzPartReco.py
@@ -8,9 +8,7 @@
 # granted to it by virtue of its status as an Intergovernmental Organization  #
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
-import logging
 from StrippingUtils.Utils import LineBuilder
-from Gaudi.Configuration import *
 __author__ = ['Greg Ciezarek', 'Liang Sun', 'Adam Davis']
 __date__ = '18/05/2017'
 __version__ = '$Revision: 0.01 $'
@@ -75,7 +73,6 @@ class D2KPiPi0_PartRecoBuilder(LineBuilder):
     def __init__(self, name, config):
         LineBuilder.__init__(self, name, config)
         self._config = config
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
 
         # self.GECs = { "Code":"( recSummaryTrack(LHCb.RecSummary.nLongTracks, TrLONG) < %(GEC_nLongTrk)s )" % config,
         #              "Preambulo": ["from LoKiTracks.decorators import *"]}
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCalib/StrippingD0ForBXX.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCalib/StrippingD0ForBXX.py
index 769c83ae0334fff286071b114aebff90455a172d..f24af2698a14718a337e2e7bc878ea42c6ec8be6 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCalib/StrippingD0ForBXX.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCalib/StrippingD0ForBXX.py
@@ -20,7 +20,7 @@ from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from StandardParticles import StdLoosePions, StdLooseKaons, StdLooseProtons, StdAllLoosePions
+from StandardParticles import StdAllLoosePions, StdLooseKaons, StdLoosePions
 
 
 name = 'confD0forBXX'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCalib/StrippingElectronID.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCalib/StrippingElectronID.py
index b9dfbf8674035ebbfe76393fcd267f95404e8221..c7400e8e63bf2c304fe5bc3da358064626dfb9c3 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCalib/StrippingElectronID.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCalib/StrippingElectronID.py
@@ -23,9 +23,8 @@ stream.appendLines( [
 
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand
+from PhysSelPython.Wrappers import Selection
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = ['Jibo He']
 __date__ = '03/10/2010'
 __version__ = '$Revision: 1.2 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCalib/StrippingJPsiForSL.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCalib/StrippingJPsiForSL.py
index 0901cc37bb50e4481e53abf0adae10028ec19d3b..8290b32fde2ed55d4087a0b25c4c5a16e3c4e373 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCalib/StrippingJPsiForSL.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCalib/StrippingJPsiForSL.py
@@ -20,11 +20,10 @@ __version__ = '$Revision: 0.1 $'
 
 from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from PhysSelPython.Wrappers import Selection, DataOnDemand
+from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from StandardParticles import StdLoosePions, StdLooseMuons, StdLooseKaons, StdLooseProtons, StdNoPIDsPions, StdNoPIDsMuons, StdLooseMergedPi0, StdLooseResolvedPi0, StdLooseElectrons, StdNoPIDsKaons
-from Configurables import TisTosParticleTagger
+from StandardParticles import StdNoPIDsKaons, StdNoPIDsMuons
 
 __all__ = ('JPsiForSLAllLinesConf',
            'confdict')
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCalib/StrippingLowPtMuID.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCalib/StrippingLowPtMuID.py
index 2c8d1c88b056a88fce019885c14c847b2dad2f35..b1034d405ac3978291097c410171c439e4a6b7af 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCalib/StrippingLowPtMuID.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCalib/StrippingLowPtMuID.py
@@ -19,12 +19,9 @@ largely cloned from line written by 'S.Furcas', 'G.Lanfranchi', 'M.Palutan', 'A.
 
 from StandardParticles import StdAllNoPIDsMuons
 from StrippingUtils.Utils import LineBuilder
-from Configurables import LoKi__Hybrid__CoreFactory as CoreFactory
-from Configurables import LoKi__VoidFilter as VoidFilter
-from PhysSelPython.Wrappers import DataOnDemand, Selection, SelectionSequence, MergedSelection
+from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 __author__ = ['G.Ciezarek', ]
 __date__ = '03/12/2015'
 __version__ = '$Revision: 1.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCalib/StrippingMuIDCalib.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCalib/StrippingMuIDCalib.py
index bc111971fba45936693ba7c559a0079e36daa071..e70ca9d5698c0590500879b3b9b7a2c886aaeebf 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCalib/StrippingMuIDCalib.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCalib/StrippingMuIDCalib.py
@@ -22,15 +22,12 @@ lb = builder( 'MuIDCalib', config_params )
 
 '''
 
-from StandardParticles import StdAllNoPIDsKaons, StdAllNoPIDsMuons, StdAllNoPIDsPions, StdAllNoPIDsProtons
+from StandardParticles import StdAllNoPIDsMuons
 from StandardParticles import StdNoPIDsKaons, StdNoPIDsMuons, StdNoPIDsPions, StdNoPIDsProtons
 from StrippingUtils.Utils import LineBuilder
-from Configurables import LoKi__Hybrid__CoreFactory as CoreFactory
-from Configurables import LoKi__VoidFilter as VoidFilter
-from PhysSelPython.Wrappers import DataOnDemand, Selection, SelectionSequence, MergedSelection
+from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 __author__ = ['S.Furcas', 'G.Lanfranchi',
               'M.Palutan', 'A.Sarti', 'D.Milanes', 'MuID Team']
 __date__ = '23/08/2011'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCalib/StrippingNoPIDDstarWithD02RSKPi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCalib/StrippingNoPIDDstarWithD02RSKPi.py
index 0c80077a3ee046c7f4e2450c335aa758b3e4a2eb..5b545751189fdfbd02d713c93bdbedcdd01a325a 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCalib/StrippingNoPIDDstarWithD02RSKPi.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCalib/StrippingNoPIDDstarWithD02RSKPi.py
@@ -13,10 +13,8 @@
 from StandardParticles import StdAllNoPIDsKaons, StdAllNoPIDsPions
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from LHCbKernel.Configuration import *
-from Gaudi.Configuration import *
+from PhysSelPython.Wrappers import Selection
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 __author__ = ['Philip Xing', 'Andrew Powell']
 __date__ = '23rd August 2012'
 __version__ = '$Revision: 7.0 $'
@@ -42,7 +40,7 @@ StrippingReport                                                INFO Event 100000
 __all__ = ('NoPIDDstarWithD02RSKPiConf', 'default_config')
 
 
-from GaudiKernel.SystemOfUnits import mm, cm, MeV, GeV
+from GaudiKernel.SystemOfUnits import GeV, MeV
 # from Configurables import FilterDesktop, CombineParticles
 
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCalib/StrippingPIDCalib.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCalib/StrippingPIDCalib.py
index 9fd00b35156af86a3c21a2b4c0fb4c11589535d9..ff38d7bcf8580fc0e5f6990b2151fc54c2e340f8 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCalib/StrippingPIDCalib.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCalib/StrippingPIDCalib.py
@@ -35,9 +35,7 @@ from Configurables import DaVinci__N3BodyDecays
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
 from Configurables import CombineParticles
-from Gaudi.Configuration import *
 __author__ = ['Lucio Anderlini']
 __date__ = '25/02/2015'
 __version__ = '$Revision: 1.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCalib/StrippingTrackEffD0ToKPi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCalib/StrippingTrackEffD0ToKPi.py
index 96a8666b55c13f9afe210c83a363c4c7302b3498..5afe8fb6611cf5f9d0ce219c46a4b418f0d70286 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCalib/StrippingTrackEffD0ToKPi.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCalib/StrippingTrackEffD0ToKPi.py
@@ -17,7 +17,7 @@ from Configurables import FilterDesktop, CombineParticles
 from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from StandardParticles import StdLooseKaons, StdLoosePions, StdAllLoosePions, StdAllNoPIDsPions
+from StandardParticles import StdAllLoosePions, StdLooseKaons, StdLoosePions
 from SelPy.utils import (UniquelyNamedObject,
                          ClonableObject,
                          SelectionBase)
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCalib/StrippingTrackEffDownMuon.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCalib/StrippingTrackEffDownMuon.py
old mode 100755
new mode 100644
index ff7ca8fc3482bfc030ade360db660d3bb3e5ae86..f0e488bfb1905fd6a46beef2ce82e133e8b836cb
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCalib/StrippingTrackEffDownMuon.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCalib/StrippingTrackEffDownMuon.py
@@ -43,34 +43,26 @@ __all__ = ('StrippingTrackEffDownMuonConf',
 # FIXME Write includes in a cleaner way
 from Gaudi.Configuration import *
 from LHCbKernel.Configuration import *
-from DAQSys.DecoderClass import Decoder
 from Configurables import GaudiSequencer
 from Configurables import UnpackTrack, ChargedProtoParticleMaker, DelegatingTrackSelector, TrackSelector, BestPIDParticleMaker
-from TrackFitter.ConfiguredFitters import ConfiguredFit
 from Configurables import TrackStateInitAlg
 from StrippingConf.StrippingLine import StrippingLine
-from Configurables import ChargedProtoParticleAddMuonInfo, MuonIDAlgLite
+from Configurables import ChargedProtoParticleAddMuonInfo
 from MuonID import ConfiguredMuonIDs
 from Configurables import ChargedProtoCombineDLLsAlg, ProtoParticleMUONFilter
-from PhysSelPython.Wrappers import Selection, DataOnDemand
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
+from PhysSelPython.Wrappers import Selection
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 
 from StrippingUtils.Utils import LineBuilder
-from Configurables import LoKi__VoidFilter
-from os import environ
 from Gaudi.Configuration import *
-import GaudiKernel.ProcessJobOptions
-from GaudiKernel.SystemOfUnits import mm
 
 from GaudiConfUtils.ConfigurableGenerators import TisTosParticleTagger
 from StandardParticles import StdAllLooseMuons
 from Configurables import GaudiSequencer
 from Configurables import TrackToDST
-from Configurables import TrackSys
 from Configurables import PatSeeding, PatSeedingTool, PatLongLivedTracking
-from PhysSelPython.Wrappers import AutomaticData
 # Get the fitters
-from TrackFitter.ConfiguredFitters import ConfiguredFit, ConfiguredFitSeed, ConfiguredFitDownstream
+from TrackFitter.ConfiguredFitters import ConfiguredFitDownstream
 from PatAlgorithms import PatAlgConf
 
 from SelPy.utils import (UniquelyNamedObject,
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCalib/StrippingTrackEffMuonTT.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCalib/StrippingTrackEffMuonTT.py
index 641201574c8f09bca329978057c4acc7969dd736..f27b71e4d680425be1de988e64d75b2686a0c282 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCalib/StrippingTrackEffMuonTT.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCalib/StrippingTrackEffMuonTT.py
@@ -62,11 +62,10 @@ __all__ = ('StrippingTrackEffMuonTTConf',
            'makeBJpsiKTrackEff',
            'filterHLT2ForBJpsiK')
 
-from Gaudi.Configuration import *
-from PhysSelPython.Wrappers import Selection, DataOnDemand, ChargedProtoParticleSelection
+from PhysSelPython.Wrappers import ChargedProtoParticleSelection, Selection
 from StrippingConf.StrippingLine import StrippingLine
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from StrippingUtils.Utils import LineBuilder, checkConfig
+from StrippingUtils.Utils import LineBuilder
 from StandardParticles import StdLooseKaons, StdLooseMuons, StdAllLooseMuons
 
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCalib/StrippingTrackEffVeloMuon.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCalib/StrippingTrackEffVeloMuon.py
old mode 100755
new mode 100644
index 9a14b8675059438ed88c4a5294e9f1bd31c001a1..10dd862824db4aa233d749f14173d33947ea2f17
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCalib/StrippingTrackEffVeloMuon.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCalib/StrippingTrackEffVeloMuon.py
@@ -40,30 +40,22 @@ __all__ = ('StrippingTrackEffVeloMuonConf',
            )
 
 
-from Gaudi.Configuration import *
-from LHCbKernel.Configuration import *
 from Configurables import CombineParticles
-from PhysSelPython.Wrappers import Selection, SelectionSequence, DataOnDemand
-from Configurables import ChargedProtoParticleMaker, NoPIDsParticleMaker, DataOnDemandSvc, DelegatingTrackSelector, TrackSelector, CombinedParticleMaker, BestPIDParticleMaker
+from PhysSelPython.Wrappers import Selection
+from Configurables import ChargedProtoParticleMaker, DataOnDemandSvc, DelegatingTrackSelector, NoPIDsParticleMaker, TrackSelector
 from Configurables import FastVeloTracking
 
 from StrippingConf.StrippingLine import StrippingLine
-from Configurables import TrackStateInitAlg, TrackEventFitter, TrackPrepareVelo, TrackContainerCopy, Tf__PatVeloSpaceTool, StandaloneMuonRec
-from Configurables import TrackCloneFinder
+from Configurables import StandaloneMuonRec, TrackPrepareVelo
 from StrippingUtils.Utils import LineBuilder
 from StandardParticles import StdLooseMuons
 
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, TisTosParticleTagger
 
 from Configurables import GaudiSequencer
-from Configurables import TrackSys
-from PhysSelPython.Wrappers import AutomaticData
 # Get the fitters
-from TrackFitter.ConfiguredFitters import ConfiguredFit
 
-from Configurables import TrackEventCloneKiller, VeloMuonBuilder
-from Configurables import TrackEventFitter, TrackMasterFitter
-from Configurables import TrackKalmanFilter, TrackMasterExtrapolator
+from Configurables import VeloMuonBuilder
 # from TrackFitter.ConfiguredFitters import ConfiguredFastFitter
 # from Configurables import TrackCloneFinder
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCharm/StrippingB2ppipiSigmacmm_Lcpi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCharm/StrippingB2ppipiSigmacmm_Lcpi.py
index 83239c94ced3a8a9d0eb6984bb527b872ec43a1c..6e136b7bac83e851400df8c22e3c067c7ec38db2 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCharm/StrippingB2ppipiSigmacmm_Lcpi.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCharm/StrippingB2ppipiSigmacmm_Lcpi.py
@@ -31,12 +31,11 @@ __all__ = ('StrippingB2ppipiSigmacmm_Lcpi_Conf', 'makepifromSigmacmm', 'makeThre
            )
 
 from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, ConjugateNeutralPID, DaVinci__N3BodyDecays
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N3BodyDecays, FilterDesktop
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
-from StrippingUtils.Utils import checkConfig, LineBuilder
+from StrippingUtils.Utils import LineBuilder
 from GaudiKernel.SystemOfUnits import MeV, GeV, mm
-from copy import copy
 
 name = 'StrippingB2ppipiSigmacmm_Lcpi'
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCharm/StrippingChargedHyperons.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCharm/StrippingChargedHyperons.py
index 5607b756d06c80cb7dfb1a025b910cad33bbee0b..6a46e95972bceac9d25ddf9b615334fb36577533 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCharm/StrippingChargedHyperons.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCharm/StrippingChargedHyperons.py
@@ -21,13 +21,9 @@ __version__ = '$Revision: 1.0 $'
 __all__ = ('StrippingChargedHyperonsConf', 'default_config')
 
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from StandardParticles import StdLoosePions, StdNoPIDsDownPions, StdLooseKaons, StdLooseDownKaons
-from StandardParticles import StdAllLoosePions, StdAllLooseKaons
 
 from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
-from PhysSelPython.Wrappers import MultiSelectionSequence
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from GaudiKernel.SystemOfUnits import MeV, mm, picosecond
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCharm/StrippingCharm2PPX.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCharm/StrippingCharm2PPX.py
index fefe1d3422c22f4f00fb68d64a79d8356a02d31b..802e8316c7219207b7d0df5943ad07eff3520be7 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCharm/StrippingCharm2PPX.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCharm/StrippingCharm2PPX.py
@@ -26,7 +26,7 @@ __all__ = (
     'StrippingCharm2PPXConf'  # ???
 )
 
-from GaudiKernel.SystemOfUnits import MeV, GeV, mm, mrad
+from GaudiKernel.SystemOfUnits import GeV, MeV, mm
 from Configurables import CombineParticles, FilterDesktop
 # from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop, DaVinci__N3BodyDecays
 from StandardParticles import (
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCharm/StrippingCharmForVub.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCharm/StrippingCharmForVub.py
index 96f3dd5c148c592b2c4d56028233c34a4d02b5fa..89ec6575ae96f2e1ea3add0e4f542acb5fc081cb 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCharm/StrippingCharmForVub.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCharm/StrippingCharmForVub.py
@@ -31,9 +31,8 @@ __all__ = ('CharmForVubConf',
            'makeDstarD02HMuNu')
 
 from Gaudi.Configuration import *
-from Configurables import SubstitutePID
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
+from PhysSelPython.Wrappers import MergedSelection, Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from StandardParticles import StdLooseMuons, StdLooseKaons, StdAllLoosePions, StdLoosePions
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCharm/StrippingD02KSKS.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCharm/StrippingD02KSKS.py
index cd0f357900e2fdf26f21aaf1aed7029b8265b59a..5c0183ffd6fe19db8a1cde097f2ca90273537cbe 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCharm/StrippingD02KSKS.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCharm/StrippingD02KSKS.py
@@ -25,9 +25,8 @@ __date__ = '15/05/2014'
 __version__ = 'Stripping23'
 __all__ = 'D02KSKSConf'
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
+from PhysSelPython.Wrappers import DataOnDemand, Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 
@@ -611,7 +610,7 @@ class D02KSKSConf(LineBuilder):
         _daughterCuts = "(TRGHOSTPROB <=%s )" % config['slowPi_LLL_TRGHOSTPROB']
 
         # 40
-        _vertexChi2_cut = "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_LL']
+        "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_LL']
 
         # 200
         _combCuts = "(ADAMASS('D*(2010)+') < %s*MeV)" % config['Dst_mass_LL']
@@ -648,7 +647,7 @@ class D02KSKSConf(LineBuilder):
         _daughterCuts = "(TRGHOSTPROB <=%s )" % config['slowPi_LLU_TRGHOSTPROB']
 
         # 40
-        _vertexChi2_cut = "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_LL']
+        "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_LL']
 
         # 200
         _combCuts = "(ADAMASS('D*(2010)+') < %s*MeV)" % config['Dst_mass_LL']
@@ -685,7 +684,7 @@ class D02KSKSConf(LineBuilder):
         _daughterCuts = "(TRGHOSTPROB <=%s )" % config['slowPi_LDL_TRGHOSTPROB']
 
         # 40
-        _vertexChi2_cut = "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_LD']
+        "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_LD']
 
         # 200
         _combCuts = "(ADAMASS('D*(2010)+') < %s*MeV)" % config['Dst_mass_LD']
@@ -722,7 +721,7 @@ class D02KSKSConf(LineBuilder):
         _daughterCuts = "(TRGHOSTPROB <=%s )" % config['slowPi_LDU_TRGHOSTPROB']
 
         # 40
-        _vertexChi2_cut = "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_LD']
+        "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_LD']
 
         # 200
         _combCuts = "(ADAMASS('D*(2010)+') < %s*MeV)" % config['Dst_mass_LD']
@@ -759,7 +758,7 @@ class D02KSKSConf(LineBuilder):
         _daughterCuts = "(TRGHOSTPROB <=%s )" % config['slowPi_DDL_TRGHOSTPROB']
 
         # 40
-        _vertexChi2_cut = "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_DD']
+        "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_DD']
 
         # 200
         _combCuts = "(ADAMASS('D*(2010)+') < %s*MeV)" % config['Dst_mass_DD']
@@ -796,7 +795,7 @@ class D02KSKSConf(LineBuilder):
         _daughterCuts = "(TRGHOSTPROB <=%s )" % config['slowPi_DDU_TRGHOSTPROB']
 
         # 40
-        _vertexChi2_cut = "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_DD']
+        "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_DD']
 
         # 200
         _combCuts = "(ADAMASS('D*(2010)+') < %s*MeV)" % config['Dst_mass_DD']
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCharm/StrippingD2HHHKs.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCharm/StrippingD2HHHKs.py
index 9a861cb097ab87e3083a67ea9248943b3612da2c..b60a33fa55c9b6da278721f3014e7d306e05d771 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCharm/StrippingD2HHHKs.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCharm/StrippingD2HHHKs.py
@@ -22,19 +22,18 @@ __version__ = '$Revision: 0.1 $'
 __all__ = ('D2HHHKsLines',
            'default_config')
 
-from Gaudi.Configuration import *
 
-from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N4BodyDecays
+from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays
 from StandardParticles import StdNoPIDsPions, StdNoPIDsKaons
 from StandardParticles import StdLooseKsDD, StdLooseKsLL
 
 from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
-from StrippingUtils.Utils import LineBuilder, checkConfig
+from StrippingUtils.Utils import LineBuilder
 
 from Configurables import FilterDesktop
 
-from GaudiKernel.SystemOfUnits import GeV, MeV, picosecond, mm
+from GaudiKernel.SystemOfUnits import MeV, mm, picosecond
 
 
 default_config = {
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCharm/StrippingD2HHHPi0.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCharm/StrippingD2HHHPi0.py
index ed8648686363780edfce58bff954cdeb421f24b8..f006ce35a79955f71a0723f3ae1a483b3b33069a 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCharm/StrippingD2HHHPi0.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCharm/StrippingD2HHHPi0.py
@@ -22,19 +22,18 @@ __version__ = '$Revision: 0.1 $'
 __all__ = ('D2HHHPi0Lines',
            'default_config')
 
-from Gaudi.Configuration import *
 
-from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N4BodyDecays
+from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays
 from StandardParticles import StdNoPIDsPions, StdNoPIDsKaons
 from StandardParticles import StdLooseResolvedPi0, StdLooseMergedPi0
 
 from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
-from StrippingUtils.Utils import LineBuilder, checkConfig
+from StrippingUtils.Utils import LineBuilder
 
 from Configurables import FilterDesktop
 
-from GaudiKernel.SystemOfUnits import GeV, MeV, picosecond, mm
+from GaudiKernel.SystemOfUnits import GeV, MeV, picosecond
 
 
 default_config = {
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCharm/StrippingD2HMuNu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCharm/StrippingD2HMuNu.py
index 5f50a64468770bc59fdc136644a3e2419eded047..b7803b39122404b43cceb17df7e5b251913c3ff6 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCharm/StrippingD2HMuNu.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCharm/StrippingD2HMuNu.py
@@ -9,9 +9,7 @@
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
 
-import logging
 from StrippingUtils.Utils import LineBuilder
-from Gaudi.Configuration import *
 __author__ = ['Liang Sun', 'Adam Davis']
 __date__ = '09/11/2015'
 __version__ = '$Revision: 0.01 $'
@@ -98,7 +96,6 @@ class D2HLepNuBuilder(LineBuilder):
     def __init__(self, name, config):
         LineBuilder.__init__(self, name, config)
         self._config = config
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
 
         self.GECs = {"Code": "( recSummaryTrack(LHCb.RecSummary.nLongTracks, TrLONG) < %(GEC_nLongTrk)s )" % config,
                      "Preambulo": ["from LoKiTracks.decorators import *"]}
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCharm/StrippingD2KS0H_conf.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCharm/StrippingD2KS0H_conf.py
index 61aa4a7c39883854dbb03015f117de36e9d8489b..99e1b1032f2a671266146c036cade2c5eea7d4b8 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCharm/StrippingD2KS0H_conf.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCharm/StrippingD2KS0H_conf.py
@@ -44,9 +44,9 @@ from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticle
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StandardParticles import StdLoosePions, StdLooseKaons
 from StrippingConf.StrippingLine import StrippingLine
-from StrippingUtils.Utils import LineBuilder, checkConfig
+from StrippingUtils.Utils import LineBuilder
 from Configurables import TisTosParticleTagger
-from GaudiKernel.SystemOfUnits import GeV, MeV, picosecond, mm
+from GaudiKernel.SystemOfUnits import MeV, mm, picosecond
 
 default_name = 'D2KS0H'
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCharm/StrippingD2PiPi0.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCharm/StrippingD2PiPi0.py
index 3b0409acbbfd03b6273526bd0fcdb67d1c80616c..0b95d641540e601a41a5bbdcaefb88ee6985f3a3 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCharm/StrippingD2PiPi0.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCharm/StrippingD2PiPi0.py
@@ -33,7 +33,7 @@ __all__ = (
 
 )
 
-from GaudiKernel.SystemOfUnits import MeV, GeV, mrad, picosecond
+from GaudiKernel.SystemOfUnits import MeV, picosecond
 
 from StandardParticles import (
     StdAllNoPIDsKaons,
@@ -51,7 +51,7 @@ from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 
 # from Configurables import CombineParticles, FilterDesktop
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, ConjugateNeutralPID, DaVinci__N3BodyDecays
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N3BodyDecays
 
 default_config = {
     'D2Pi0H': {
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCharm/StrippingD2XMuMuSS.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCharm/StrippingD2XMuMuSS.py
index 63052973a0d26de1b430874492a8932ac9f35ca5..d25cc78a559d20061372c19afc0a60d1d662980a 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCharm/StrippingD2XMuMuSS.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCharm/StrippingD2XMuMuSS.py
@@ -9,14 +9,13 @@
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
 
-from StandardParticles import StdAllLooseElectrons, StdAllNoPIDsElectrons
+from StandardParticles import StdAllLooseElectrons
 from StandardParticles import StdAllLooseKaons, StdAllLoosePions, StdAllLooseMuons, StdAllNoPIDsPions, StdAllNoPIDsKaons
-from StandardParticles import StdLooseKaons, StdLoosePions, StdLooseMuons, StdNoPIDsPions, StdNoPIDsKaons, StdLooseProtons, StdAllNoPIDsProtons
+from StandardParticles import StdAllNoPIDsProtons, StdLooseKaons, StdLooseMuons, StdLoosePions, StdLooseProtons
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, OfflineVertexFitter
-from Gaudi.Configuration import *
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop
 import copy
 __author__ = ['Malcolm John', 'B. Viaud', 'O. Kochebina']
 __date__ = '25/6/2012'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCharm/StrippingD2hh.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCharm/StrippingD2hh.py
index 04f7a2eaa894bfd8dee3118acc2d9051ddc23f06..132e325c858cd552d79410e5e81d7f9a35dee470 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCharm/StrippingD2hh.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCharm/StrippingD2hh.py
@@ -24,7 +24,6 @@ __all__ = ('D2hhBuilder',
 '''
 This file contains stripping lines for time-dependent two-body charm analyses of mixing, yCP, and A_Gamma
 '''
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
@@ -185,7 +184,7 @@ class D2hhBuilder(LineBuilder):
         stdNoPIDsPions = StdAllNoPIDsPions
 
         d2kpi_name = name+'PromptD2KPi'
-        d0RS_name = name+'PromptD0RS'
+        name+'PromptD0RS'
         d0WS_name = name+'PromptD0WS'
         d2kk_name = name+'PromptD2KK'
         d2pipi_name = name+'PromptD2PiPi'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCharm/StrippingD2hhh_FTcalib.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCharm/StrippingD2hhh_FTcalib.py
index ca556fcd061283943c85050142dc1fed957ecac9..92b63ab8b8227f8c599d9d0f7cb9e45c01f9045d 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCharm/StrippingD2hhh_FTcalib.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCharm/StrippingD2hhh_FTcalib.py
@@ -29,13 +29,10 @@ __version__ = '$Revision: 0.0 $'
 __all__ = ('D2hhhFTCalibConf',
            'makeStdD2hhhFT')
 
-from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
+from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from StandardParticles import (StdNoPIDsPions,
-                               StdTightKaons)
 
 name = "D2hhhFTCalib"
 # Cuts to be implemented vy the Stripping team in Stripping Settings
@@ -267,7 +264,6 @@ def globalEventCutFilter(name,
     if MaxTrSIZE == None:
         return None
 
-    from Configurables import LoKi__VoidFilter as VoidFilter
     from Configurables import LoKi__Hybrid__CoreFactory as CoreFactory
     modules = CoreFactory('CoreFactory').Modules
     for i in ['LoKiTracks.decorators']:
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCharm/StrippingD2hhh_conf.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCharm/StrippingD2hhh_conf.py
index 4edfcbbf716005d89bb67e23f49675568d265d87..2b5bbdd7a698b23b875296f72fd7238fedbf32cf 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCharm/StrippingD2hhh_conf.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCharm/StrippingD2hhh_conf.py
@@ -38,8 +38,7 @@ from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticle
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from StandardParticles import (StdNoPIDsPions,
-                               StdTightKaons)
+from StandardParticles import StdNoPIDsPions
 
 name = "D2hhh"
 # Cuts to be implemented vy the Stripping team in Stripping Settings
@@ -755,7 +754,6 @@ def globalEventCutFilter(name,
     if MaxTrSIZE == None:
         return None
 
-    from Configurables import LoKi__VoidFilter as VoidFilter
     from Configurables import LoKi__Hybrid__CoreFactory as CoreFactory
     modules = CoreFactory('CoreFactory').Modules
     for i in ['LoKiTracks.decorators']:
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCharm/StrippingDstarD02xx.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCharm/StrippingDstarD02xx.py
index d6432a15ead58ad1d9a1a2025b9183e69ba4b5c5..31c1f92b10774f78337efc200c2dd331c386037b 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCharm/StrippingDstarD02xx.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCharm/StrippingDstarD02xx.py
@@ -22,8 +22,7 @@ __all__ = ('StrippingDstarD02xxConf', 'combinetwobody', 'combineDstar', 'default
             where xx = {mu mu, pi pi, pi mu, k mu, ... }
             
 '''
-from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCharm/StrippingDstarD0ToHHPi0.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCharm/StrippingDstarD0ToHHPi0.py
index bf75d26a702888468823abf0528c496c6fdb49d4..0fc805cafbcf5b5c715add7f71c675ce9f033aef 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCharm/StrippingDstarD0ToHHPi0.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCharm/StrippingDstarD0ToHHPi0.py
@@ -17,13 +17,11 @@ Module for D* tagged D0 -> hhpi0.
 Supersedes StrippingDstarD2hhpi0
 """
 
-from Gaudi.Configuration import *
 from Configurables import FilterDesktop, CombineParticles, OfflineVertexFitter
 from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from StandardParticles import StdAllLoosePions, StdLoosePions, StdLooseKaons, StdLooseResolvedPi0, StdLooseMergedPi0
-from Configurables import TisTosParticleTagger
 
 __all__ = ('DstarD0ToHHPi0AllLinesBuilder',
            'DstarMaker',
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCharm/StrippingDstarD2HHHH.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCharm/StrippingDstarD2HHHH.py
index 6ca6b394d1c16026937764f0eafb79c38aeb20a7..b1010c3cddbd19de46d0a5cb069929253effde94 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCharm/StrippingDstarD2HHHH.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCharm/StrippingDstarD2HHHH.py
@@ -22,16 +22,15 @@ __version__ = '$Revision: 1.0 $'
 __all__ = ('DstarD2HHHHLines',
            'default_config')
 
-from Gaudi.Configuration import *
 
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N4BodyDecays
 from StandardParticles import StdAllNoPIDsPions, StdNoPIDsPions, StdNoPIDsKaons
 
 from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
-from StrippingUtils.Utils import LineBuilder, checkConfig
+from StrippingUtils.Utils import LineBuilder
 
-from GaudiKernel.SystemOfUnits import GeV, MeV, picosecond, mm
+from GaudiKernel.SystemOfUnits import MeV, picosecond
 
 
 default_config = {
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCharm/StrippingDstarD2KSHHPi0.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCharm/StrippingDstarD2KSHHPi0.py
index 8004878d3118c47bcc681e5d6833f67148ea14fd..d717afb5cf44dedfbb8910ab49da26f35af6e033 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCharm/StrippingDstarD2KSHHPi0.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCharm/StrippingDstarD2KSHHPi0.py
@@ -22,18 +22,17 @@ __version__ = '$Revision: 1.0 $'
 __all__ = ('DstarD2KSHHPi0Lines',
            'default_config')
 
-from Gaudi.Configuration import *
 
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N4BodyDecays
 from StandardParticles import StdAllNoPIDsPions, StdNoPIDsPions, StdNoPIDsKaons, StdLooseResolvedPi0, StdLooseMergedPi0, StdLooseKsDD, StdLooseKsLL
 
 from PhysSelPython.Wrappers import Selection, MergedSelection
 from StrippingConf.StrippingLine import StrippingLine
-from StrippingUtils.Utils import LineBuilder, checkConfig
+from StrippingUtils.Utils import LineBuilder
 
 from Configurables import FilterDesktop
 
-from GaudiKernel.SystemOfUnits import GeV, MeV, picosecond, mm
+from GaudiKernel.SystemOfUnits import MeV, mm, picosecond
 
 
 default_config = {
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCharm/StrippingDstarD2KShh.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCharm/StrippingDstarD2KShh.py
index 930ba6dd1a176d45dd81cb76e4d7d90061657804..5c17fdff8e562e58b20339beef4f7dde0bf73e6d 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCharm/StrippingDstarD2KShh.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCharm/StrippingDstarD2KShh.py
@@ -34,7 +34,6 @@ __all__ = ('DstarD2KShhBuilder',
            'makeD2KShh',
            'makeDstar')
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCharm/StrippingDstarD2XGamma.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCharm/StrippingDstarD2XGamma.py
index 0b8f07c8e92fd36f253c008c58709f4b5a775f55..a162a42f57ebc8bd021e3048ba2760b0fac3ceba 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCharm/StrippingDstarD2XGamma.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCharm/StrippingDstarD2XGamma.py
@@ -24,7 +24,6 @@ __version__ = '$Revision: 0.1 $'
 __all__ = ('DstarD2XGammaLines',
            'default_config')
 
-from Gaudi.Configuration import *
 
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 from StandardParticles import StdAllNoPIDsPions, StdNoPIDsPions, StdNoPIDsKaons
@@ -32,11 +31,11 @@ from StandardParticles import StdLooseAllPhotons, StdAllLooseGammaLL, StdAllLoos
 
 from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
-from StrippingUtils.Utils import LineBuilder, checkConfig
+from StrippingUtils.Utils import LineBuilder
 
 from Configurables import FilterDesktop
 
-from GaudiKernel.SystemOfUnits import GeV, MeV, picosecond, mm
+from GaudiKernel.SystemOfUnits import GeV, MeV, picosecond
 
 default_config = {
     'NAME': 'DstarD2XGamma',
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCharm/StrippingDstarPromptWithD02HHHH.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCharm/StrippingDstarPromptWithD02HHHH.py
index ee13ea7feaf67160f5cd257bb530e6362de4b20a..5e817ce46cbfcdae8fed23c2c49713bf361e45aa 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCharm/StrippingDstarPromptWithD02HHHH.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCharm/StrippingDstarPromptWithD02HHHH.py
@@ -36,11 +36,10 @@ __version__ = '$Revision: 1.2 $'
 __all__ = ('DstarPromptWithD02HHHHConf', 'makeD02hhhh',
            'makePromptDstar', 'default_config')
 
-from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, ConjugateNeutralPID
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles, ConjugateNeutralPID
 from PhysSelPython.Wrappers import Selection, MergedSelection
 from StrippingConf.StrippingLine import StrippingLine
-from StrippingUtils.Utils import checkConfig, LineBuilder
+from StrippingUtils.Utils import LineBuilder
 from GaudiKernel.SystemOfUnits import MeV, GeV, mm
 from copy import copy
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCharm/StrippingDstarPromptWithD02HHMuMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCharm/StrippingDstarPromptWithD02HHMuMu.py
index a131e40e3acb189497c6e36da19841fbfbb4c7b1..7a1541f08f9d8fb4eec57f34b0aa5aea862483cc 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCharm/StrippingDstarPromptWithD02HHMuMu.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCharm/StrippingDstarPromptWithD02HHMuMu.py
@@ -29,11 +29,10 @@ __version__ = '$Revision: 2.0 $'
 __all__ = ('DstarPromptWithD02HHLLConf', 'makeD02hhll',
            'makePromptDstar', 'default_config')
 
-from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, ConjugateNeutralPID
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles, ConjugateNeutralPID
 from PhysSelPython.Wrappers import Selection, MergedSelection
 from StrippingConf.StrippingLine import StrippingLine
-from StrippingUtils.Utils import checkConfig, LineBuilder
+from StrippingUtils.Utils import LineBuilder
 from GaudiKernel.SystemOfUnits import MeV, GeV, mm
 from copy import copy
 
@@ -224,7 +223,6 @@ def makeD02hhll(
         _pionCuts = _pionCutsOLD + " & " + _ghostCut
         _eleCuts = _eleCutsOLD + " & " + _ghostCut
 
-    from StandardParticles import StdAllNoPIDsPions, StdAllNoPIDsKaons
     from StandardParticles import StdAllLoosePions, StdAllLooseKaons, StdAllLooseMuons
     from StandardParticles import StdAllLooseElectrons
     from StandardParticles import StdAllLooseMuPion
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCharm/StrippingExcitedDsSpectroscopy.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCharm/StrippingExcitedDsSpectroscopy.py
index 71165c716e1550d38801bcd5e537a3bbd27bac81..e210c6918c5485d5d7207bd970781eae8cce82f3 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCharm/StrippingExcitedDsSpectroscopy.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCharm/StrippingExcitedDsSpectroscopy.py
@@ -347,7 +347,6 @@ def globalEventCutFilter(name,
     if MaxTrSIZE == None:
         return None
 
-    from Configurables import LoKi__VoidFilter as VoidFilter
     from Configurables import LoKi__Hybrid__CoreFactory as CoreFactory
     modules = CoreFactory('CoreFactory').Modules
     for i in ['LoKiTracks.decorators']:
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCharm/StrippingLambdac2V03H.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCharm/StrippingLambdac2V03H.py
index d82de0a68b56a1830913cbe7af0afa398aea8f89..30b54539913afb80a16ee9630ae6091f7bc0971f 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCharm/StrippingLambdac2V03H.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCharm/StrippingLambdac2V03H.py
@@ -27,7 +27,7 @@ __all__ = (
 )
 
 from GaudiKernel.SystemOfUnits import MeV, GeV, mm, mrad
-from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop, DaVinci__N4BodyDecays
+from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays, FilterDesktop
 from StandardParticles import StdNoPIDsPions as InputPions
 from StandardParticles import StdNoPIDsKaons as InputKaons
 from StandardParticles import StdLooseLambdaLL as InputLambdasLL
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCharm/StrippingLc2L0LLpi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCharm/StrippingLc2L0LLpi.py
index 857d348c56722f0dadec5fba5036030325eb54dc..ec6a5705483856be3073dbe9b17c2c7d86bc6019 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCharm/StrippingLc2L0LLpi.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCharm/StrippingLc2L0LLpi.py
@@ -12,17 +12,10 @@
 Module for selecting Lambda_c+->Lambda pi+
 '''
 
-from StandardParticles import (StdAllLoosePions, StdLooseProtons,
-                               StdLoosePions, StdNoPIDsUpPions)
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from StandardParticles import StdLooseAllPhotons, StdVeryLooseAllPhotons
-from Configurables import LoKi__VoidFilter
-from PhysSelPython.Wrappers import MergedSelection
-from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
-from Gaudi.Configuration import *
 __author__ = ['Guiyun Ding', 'Jiesheng Yu', 'Yuehong Xie']
 __date__ = '28/11/2016'
 __version__ = '$Revision: 2.0$'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCharm/StrippingNeutralCBaryons.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCharm/StrippingNeutralCBaryons.py
index fa3250a83bd48196f87981d9d429c63cbcb63404..327a500122ff512fe20087317ec9bf1b9e3b7d5c 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCharm/StrippingNeutralCBaryons.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCharm/StrippingNeutralCBaryons.py
@@ -23,13 +23,9 @@ __version__ = '$Revision: 1.0 $'
 __all__ = ('StrippingNeutralCBaryonsConf', 'default_config')
 
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from StandardParticles import StdLoosePions, StdNoPIDsDownPions, StdLooseKaons, StdLooseDownKaons
-from StandardParticles import StdAllLoosePions, StdAllLooseKaons
 
 from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
-from PhysSelPython.Wrappers import MultiSelectionSequence
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from GaudiKernel.SystemOfUnits import MeV, mm, picosecond
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCharm/StrippingXic2HHH.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCharm/StrippingXic2HHH.py
index 4c7a528734f03b3247c265b29afbb06249a8e8df..ec6e744b6d3279f53da71850a50e53835d882fb2 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCharm/StrippingXic2HHH.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCharm/StrippingXic2HHH.py
@@ -8,18 +8,15 @@
 # granted to it by virtue of its status as an Intergovernmental Organization  #
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
-from StandardParticles import StdNoPIDsPions, StdNoPIDsKaons, StdNoPIDsProtons, StdAllNoPIDsProtons
-from Configurables import TisTosParticleTagger
+from StandardParticles import StdNoPIDsKaons, StdNoPIDsPions, StdNoPIDsProtons
 from StrippingUtils.Utils import LineBuilder
-from PhysSelPython.Wrappers import MultiSelectionSequence
-from PhysSelPython.Wrappers import Selection, DataOnDemand, AutomaticData, MergedSelection
+from PhysSelPython.Wrappers import DataOnDemand, MergedSelection, Selection
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
 from Configurables import FilterDesktop, CombineParticles
 from LHCbKernel.Configuration import *
-from GaudiKernel.SystemOfUnits import MeV, mm, ns
+from GaudiKernel.SystemOfUnits import MeV, mm
 from StrippingConf.StrippingLine import StrippingLine
 from Gaudi.Configuration import *
-import re
 all
 ''' Xic+ and Theta+ lines Designed by Yury Shcheglov, Alexey Dzyuba, Nelya Sagidova to study Xic+ and Theta+ particles '''
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCharm/StrippingXicc.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCharm/StrippingXicc.py
index 5d7a3369f392194d8c7a89132a8949ced1fbb74c..b7f50de193148881a67e0e6e9149cb5806d7efdf 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCharm/StrippingXicc.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingCharm/StrippingXicc.py
@@ -52,9 +52,6 @@ from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticle
 from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from StandardParticles import StdAllLoosePions, StdAllLooseKaons, StdAllLooseProtons
-from StandardParticles import StdLoosePions
-from CommonParticles.StdLooseLambda import StdLooseLambdaLL, StdLooseLambdaDD
 from GaudiKernel.SystemOfUnits import MeV, GeV, mm
 from Configurables import TisTosParticleTagger
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingIFT/StrippingHeavyIonD02KPiPi0.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingIFT/StrippingHeavyIonD02KPiPi0.py
index f59616873d32a3880ffa9c3cddc8ffdf12e8c49c..38d1f1cf011fb226ff77746240f5265193af1874 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingIFT/StrippingHeavyIonD02KPiPi0.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingIFT/StrippingHeavyIonD02KPiPi0.py
@@ -25,9 +25,8 @@ __all__ = ('StrippingHeavyIonD02KPiPi0Conf',
            'makeD02KPiPi0M',
            'default_config')
 
-from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from PhysSelPython.Wrappers import Selection, DataOnDemand
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
+from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from StandardParticles import StdTightPions, StdTightKaons, StdLooseMergedPi0, StdLooseResolvedPi0
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingIFT/StrippingHeavyIonDiMuon.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingIFT/StrippingHeavyIonDiMuon.py
index 1f1fb6fd6434ffe5daa3a047c002516420db3900..c05fa9e4e82d82da609577669b8d83dd3a521ae6 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingIFT/StrippingHeavyIonDiMuon.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingIFT/StrippingHeavyIonDiMuon.py
@@ -17,8 +17,7 @@ from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 from StandardParticles import StdAllLooseMuons
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand
-from Gaudi.Configuration import *
+from PhysSelPython.Wrappers import Selection
 __author__ = ['Emilie MAURICE']
 __date__ = ''
 __version__ = '$Revision: 2.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingIFT/StrippingHeavyIonDst2D0KPiForPID.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingIFT/StrippingHeavyIonDst2D0KPiForPID.py
index f65a077827fa72aa474ee1992539974419ddc652..2a6ac3e4930d2f3b5e6f9750ace051db2604f1f7 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingIFT/StrippingHeavyIonDst2D0KPiForPID.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingIFT/StrippingHeavyIonDst2D0KPiForPID.py
@@ -13,10 +13,8 @@
 from StandardParticles import StdAllNoPIDsKaons, StdAllNoPIDsPions
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from LHCbKernel.Configuration import *
-from Gaudi.Configuration import *
+from PhysSelPython.Wrappers import Selection
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 __author__ = ['Philip Xing', 'Andrew Powell']
 __date__ = '23rd August 2012'
 __version__ = '$Revision: 7.0 $'
@@ -36,7 +34,7 @@ Usage:
 __all__ = ('HeavyIonDst2D0KPiForPIDConf', 'default_config', "D0", "Dstar")
 
 
-from GaudiKernel.SystemOfUnits import mm, cm, MeV, GeV
+from GaudiKernel.SystemOfUnits import GeV, MeV
 # from Configurables import FilterDesktop, CombineParticles
 
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingIFT/StrippingHeavyIonIncLcForProtonPID.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingIFT/StrippingHeavyIonIncLcForProtonPID.py
index ccee2be91073ad9f8062287c8a6388f4b94f8132..1f6d52b84c74a1fb2023a42365076518eaf746dc 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingIFT/StrippingHeavyIonIncLcForProtonPID.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingIFT/StrippingHeavyIonIncLcForProtonPID.py
@@ -17,12 +17,11 @@ __author__ = ['IFT']
 __date__ = '29/03/2018'
 __version__ = '$Revision: 0.0 $'
 
-from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from StandardParticles import StdLoosePions, StdLooseMuons, StdLooseKaons, StdLooseProtons, StdNoPIDsProtons
+from StandardParticles import StdLooseKaons, StdLoosePions, StdNoPIDsProtons
 
 __all__ = ('HeavyIonIncLcForProtonPIDConf',
            'default_config')
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingIFT/StrippingHeavyIonOthercc.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingIFT/StrippingHeavyIonOthercc.py
index a915f213306583c9349e52ae26fdfb5bcbfb2cb7..64496a63a9e2dbb8187a1999a7546349858ef1cb 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingIFT/StrippingHeavyIonOthercc.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingIFT/StrippingHeavyIonOthercc.py
@@ -17,8 +17,7 @@ from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 from StandardParticles import StdNoPIDsElectrons, StdLooseProtons, StdLooseMuons
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand
-from Gaudi.Configuration import *
+from PhysSelPython.Wrappers import Selection
 __author__ = ['Emilie MAURICE']
 __date__ = ''
 __version__ = '$Revision: 1.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingIFT/StrippingHeavyIonPIDCalib.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingIFT/StrippingHeavyIonPIDCalib.py
index 16e2016d65284b12a6b6bbf80b59e400b0f28026..376c9f63f6ebba144c1c1a520bb2b065b591f9ac 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingIFT/StrippingHeavyIonPIDCalib.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingIFT/StrippingHeavyIonPIDCalib.py
@@ -37,7 +37,6 @@ from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
 from Gaudi.Configuration import *
 __author__ = ['Yanxi ZHANG']
 __date__ = '25/02/2015'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingIFT/StrippingHeavyIonTopology.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingIFT/StrippingHeavyIonTopology.py
index f5989cd6be1fbda62bff5415d738e4993238598e..6f1af3c6923dfc0f2b71c35d24fbdc172f1caf5b 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingIFT/StrippingHeavyIonTopology.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingIFT/StrippingHeavyIonTopology.py
@@ -12,14 +12,9 @@
 Module for selecting specific topology
 '''
 
-from Configurables import FilterDesktop, CombineParticles
-from LoKiPhys.functions import SOURCE
-from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-from StandardParticles import StdAllLooseMuons, StdAllLoosePions, StdAllNoPIDsPions, StdLoosePhotons
+from Configurables import FilterDesktop
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand
-from Gaudi.Configuration import *
 __author__ = ['Emilie MAURICE']
 __date__ = ''
 __version__ = '$Revision: 1.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingIFT/StrippingHeavyIonTrackEffDownMuon.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingIFT/StrippingHeavyIonTrackEffDownMuon.py
index 53e68cac2e822ee2debe76f91a7290e21e4f85f7..d5239b2b5d8bb994246901606f79d163101061c5 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingIFT/StrippingHeavyIonTrackEffDownMuon.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingIFT/StrippingHeavyIonTrackEffDownMuon.py
@@ -43,34 +43,26 @@ __all__ = ('StrippingHeavyIonTrackEffDownMuonConf',
 # FIXME Write includes in a cleaner way
 from Gaudi.Configuration import *
 from LHCbKernel.Configuration import *
-from DAQSys.DecoderClass import Decoder
 from Configurables import GaudiSequencer
 from Configurables import UnpackTrack, ChargedProtoParticleMaker, DelegatingTrackSelector, TrackSelector, BestPIDParticleMaker
-from TrackFitter.ConfiguredFitters import ConfiguredFit
 from Configurables import TrackStateInitAlg
 from StrippingConf.StrippingLine import StrippingLine
-from Configurables import ChargedProtoParticleAddMuonInfo, MuonIDAlgLite
+from Configurables import ChargedProtoParticleAddMuonInfo
 from MuonID import ConfiguredMuonIDs
 from Configurables import ChargedProtoCombineDLLsAlg, ProtoParticleMUONFilter
-from PhysSelPython.Wrappers import Selection, DataOnDemand
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
+from PhysSelPython.Wrappers import Selection
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 
 from StrippingUtils.Utils import LineBuilder
-from Configurables import LoKi__VoidFilter
-from os import environ
 from Gaudi.Configuration import *
-import GaudiKernel.ProcessJobOptions
-from GaudiKernel.SystemOfUnits import mm
 
 from GaudiConfUtils.ConfigurableGenerators import TisTosParticleTagger
 from StandardParticles import StdAllLooseMuons
 from Configurables import GaudiSequencer
 from Configurables import TrackToDST
-from Configurables import TrackSys
 from Configurables import PatSeeding, PatSeedingTool, PatLongLivedTracking
-from PhysSelPython.Wrappers import AutomaticData
 # Get the fitters
-from TrackFitter.ConfiguredFitters import ConfiguredFit, ConfiguredFitSeed, ConfiguredFitDownstream
+from TrackFitter.ConfiguredFitters import ConfiguredFitDownstream
 from PatAlgorithms import PatAlgConf
 
 from SelPy.utils import (UniquelyNamedObject,
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingIFT/StrippingHeavyIonTrackEffMuonTT.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingIFT/StrippingHeavyIonTrackEffMuonTT.py
index c0dfb7ba8d57b4326ea6b8420fabff3518f3a6bc..250433bd8394b3321b2f6a02de678cd0eb3fdd18 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingIFT/StrippingHeavyIonTrackEffMuonTT.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingIFT/StrippingHeavyIonTrackEffMuonTT.py
@@ -63,10 +63,10 @@ __all__ = ('StrippingHeavyionTrackEffMuonTTConf',
            'filterHLT2ForBJpsiK')
 
 from Gaudi.Configuration import *
-from PhysSelPython.Wrappers import Selection, DataOnDemand, ChargedProtoParticleSelection
+from PhysSelPython.Wrappers import ChargedProtoParticleSelection, Selection
 from StrippingConf.StrippingLine import StrippingLine
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from StrippingUtils.Utils import LineBuilder, checkConfig
+from StrippingUtils.Utils import LineBuilder
 from StandardParticles import StdLooseKaons, StdLooseMuons, StdAllLooseMuons
 
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingIFT/StrippingHeavyIonTrackEffVeloMuon.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingIFT/StrippingHeavyIonTrackEffVeloMuon.py
index 1a80cc9576021cda493765e0b79d92240270118f..c633585164030668df014f73204e61d2b9ef83e5 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingIFT/StrippingHeavyIonTrackEffVeloMuon.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingIFT/StrippingHeavyIonTrackEffVeloMuon.py
@@ -40,17 +40,14 @@ __all__ = ('HeavyIonTrackEffVeloMuonConf',
            )
 
 
-from Gaudi.Configuration import *
-from LHCbKernel.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 # from Configurables import CombineParticles
-from PhysSelPython.Wrappers import Selection, SelectionSequence, DataOnDemand
-from Configurables import ChargedProtoParticleMaker, NoPIDsParticleMaker, DataOnDemandSvc, DelegatingTrackSelector, TrackSelector, CombinedParticleMaker, BestPIDParticleMaker
+from PhysSelPython.Wrappers import Selection
+from Configurables import ChargedProtoParticleMaker, DataOnDemandSvc, DelegatingTrackSelector, NoPIDsParticleMaker, TrackSelector
 from Configurables import FastVeloTracking
 
 from StrippingConf.StrippingLine import StrippingLine
-from Configurables import TrackStateInitAlg, TrackEventFitter, TrackPrepareVelo, TrackContainerCopy, Tf__PatVeloSpaceTool, StandaloneMuonRec
-from Configurables import TrackCloneFinder
+from Configurables import StandaloneMuonRec, TrackPrepareVelo
 from StrippingUtils.Utils import LineBuilder
 # changed from StdLooseMuons, yanxi
 from StandardParticles import StdAllLooseMuons
@@ -59,14 +56,9 @@ from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, TisTosParticleT
 # from Configurables import TisTosParticleTagger
 
 from Configurables import GaudiSequencer
-from Configurables import TrackSys
-from PhysSelPython.Wrappers import AutomaticData
 # Get the fitters
-from TrackFitter.ConfiguredFitters import ConfiguredFit
 
-from Configurables import TrackEventCloneKiller, VeloMuonBuilder
-from Configurables import TrackEventFitter, TrackMasterFitter
-from Configurables import TrackKalmanFilter, TrackMasterExtrapolator
+from Configurables import VeloMuonBuilder
 # from TrackFitter.ConfiguredFitters import ConfiguredFastFitter
 # from Configurables import TrackCloneFinder
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingIFT/__init__.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingIFT/__init__.py
index fdfc79a58a2fc556007dcee6375f2fc9251cb0b9..ed393ad5206e05472519a2b3f9c1d20119008450 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingIFT/__init__.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingIFT/__init__.py
@@ -17,17 +17,6 @@ from StrippingUtils.Utils import getBuilderConfFromModule as _getcon
 from StrippingUtils.Utils import getLineBuildersFromModule as _getter
 __author__ = 'Juan Palacios palacios@physik.uzh.ch'
 
-import StrippingHeavyIonOpenCharm
-import StrippingHeavyIonWMuNu
-import StrippingHeavyIonConvertedPhoton
-import StrippingHeavyIonDiMuon
-import StrippingHeavyIonOthercc
-import StrippingHeavyIonTopology
-import StrippingHeavyIonGammaHadron
-import StrippingHeavyIonTrackEffMuonTT
-import StrippingHeavyIonTrackEffDownMuon
-import StrippingHeavyIonD02KPiPi0
-import StrippingHeavyIonIncLcForProtonPID
 
 from sys import modules as _modules
 _this = _modules[__name__]
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingMiniBias/StrippingBadEvents.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingMiniBias/StrippingBadEvents.py
index 1c381f645303eb85fa59a276c4ffa62fa7082584..b6bfb5f29e6eaf5bcf70492429be21413809a429 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingMiniBias/StrippingBadEvents.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingMiniBias/StrippingBadEvents.py
@@ -8,7 +8,6 @@
 # granted to it by virtue of its status as an Intergovernmental Organization  #
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
-from PhysSelPython.Wrappers import Selection
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 __author__ = 'Andrea Contu'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingMiniBias/StrippingMiniBias.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingMiniBias/StrippingMiniBias.py
index da1ac5dd5328262185dd50d32ad0ff94f012315f..986b1718c7f61a525a67a5d92b3c08e9acae884f 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingMiniBias/StrippingMiniBias.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingMiniBias/StrippingMiniBias.py
@@ -8,7 +8,6 @@
 # granted to it by virtue of its status as an Intergovernmental Organization  #
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
-from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 __author__ = 'Patrick Koppenburg'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingQEE/DisplVertices_Utils.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingQEE/DisplVertices_Utils.py
index 75fad1a93b39f6a186f370b531405d43f844f563..f7ae00ee0d50e8cc1fb39c32ca1104645bf95838 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingQEE/DisplVertices_Utils.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingQEE/DisplVertices_Utils.py
@@ -14,12 +14,11 @@ Utilities for displaced vertex stripping: wrapper class around PatPV3D
 
 __all__ = ("SelectionFromAlgorithmWithTools", "SelectionPatPV3DWrapper")
 
-from GaudiConfUtils import isConfigurable
 
 from SelPy.utils import (UniquelyNamedObject, ClonableObject, SelectionBase, compatibleSequences,
-                         IncompatibleInputLocations, CloneCallable, makeOutputLocation, setOutputLocation)
+                         IncompatibleInputLocations, makeOutputLocation, setOutputLocation)
 
-from PhysSelPython.Wrappers import checkConfigurable, checkName
+from PhysSelPython.Wrappers import checkName
 
 
 def connectToRequiredSelections(selection, inputSetter):
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingQEE/StrippingA1MuMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingQEE/StrippingA1MuMu.py
old mode 100755
new mode 100644
index 2fbd096e0a2c433fdbcf8f46f10702ed72c791bd..999ae0e27f3391f4d69443ebc1dc14e9d5ab32c7
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingQEE/StrippingA1MuMu.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingQEE/StrippingA1MuMu.py
@@ -23,11 +23,9 @@ A_1 -> mu+ mu-, based on functionality from StrippingDiMuonNew by Jibo He.
 
 """
 
-from Gaudi.Configuration import *
-from LHCbKernel.Configuration import *
 
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
-from PhysSelPython.Wrappers import Selection, DataOnDemand, SimpleSelection
+from PhysSelPython.Wrappers import SimpleSelection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from GaudiKernel.SystemOfUnits import MeV
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingQEE/StrippingA2MuMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingQEE/StrippingA2MuMu.py
index 7f662d87e37979ff2018a9d0c45902b758e372c6..75edb9aa52b5263aac4a9198306b6b7532f9879b 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingQEE/StrippingA2MuMu.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingQEE/StrippingA2MuMu.py
@@ -22,7 +22,7 @@ from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from StandardParticles import StdAllLooseMuons, StdAllNoPIDsMuons
+from StandardParticles import StdAllLooseMuons
 from GaudiKernel.SystemOfUnits import GeV
 
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingQEE/StrippingA2MuMuSameSign.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingQEE/StrippingA2MuMuSameSign.py
index 1cd5ccbaad25a23eb91271e03be5627dc096b786..432c22256be7fed285ab9ea113e4cb54859226e9 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingQEE/StrippingA2MuMuSameSign.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingQEE/StrippingA2MuMuSameSign.py
@@ -22,7 +22,7 @@ from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from StandardParticles import StdAllLooseMuons, StdAllNoPIDsMuons
+from StandardParticles import StdAllLooseMuons
 from GaudiKernel.SystemOfUnits import GeV
 
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingQEE/StrippingDY2MuMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingQEE/StrippingDY2MuMu.py
index 514a5dde899eacc84ffabbe96801327228cefe0a..03356ebe07088ef87fdabc55949a790c9ee1454e 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingQEE/StrippingDY2MuMu.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingQEE/StrippingDY2MuMu.py
@@ -24,9 +24,8 @@ DY2MuMu4    (20-40GeV): StdAllLooseMuons & TrkPChi2>0.1% & P>10GeV & pT>3GeV
 
 __all__ = 'DY2MuMuConf', 'default_config'
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-from PhysSelPython.Wrappers import Selection, SimpleSelection
+from PhysSelPython.Wrappers import SimpleSelection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from StandardParticles import StdAllLooseMuons
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingQEE/StrippingDY2ee.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingQEE/StrippingDY2ee.py
index 5a03684346d4d9037fd6a54aa3ec6c86b73e5d96..fdc374106c720f9072ee7a85c8905722f8b5d819 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingQEE/StrippingDY2ee.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingQEE/StrippingDY2ee.py
@@ -18,9 +18,8 @@
 
 __all__ = ('DY2eeConf', 'default_config')
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-from PhysSelPython.Wrappers import Selection, DataOnDemand
+from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from StandardParticles import StdAllNoPIDsElectrons
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingQEE/StrippingDisplVertices.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingQEE/StrippingDisplVertices.py
index 67725bbba29c2754711a77628e07d242cdc35fe6..6ff23d235cafe02fa3652a518b05623c84ae0b5f 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingQEE/StrippingDisplVertices.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingQEE/StrippingDisplVertices.py
@@ -40,7 +40,6 @@ __all__ = ('DisplVerticesConf', 'default_config')
 
 from Gaudi.Configuration import *
 from GaudiKernel import SystemOfUnits as units
-from LHCbKernel.Configuration import DEBUG, VERBOSE
 
 import logging
 logger = logging.getLogger(__name__)
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingQEE/StrippingDitau.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingQEE/StrippingDitau.py
old mode 100755
new mode 100644
index 0ad441ea83d4a9fd162a98f97cce9d9f3820d4ca..0472121f4530889bbf3fd69d7b81817e6301682f
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingQEE/StrippingDitau.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingQEE/StrippingDitau.py
@@ -155,8 +155,7 @@ Derived from works of S.Farry & P. Ilten
 
 """
 
-import os
-from GaudiKernel.SystemOfUnits import MeV, GeV, micrometer
+from GaudiKernel.SystemOfUnits import GeV, MeV
 from PhysSelPython.Wrappers import Selection, SimpleSelection, PassThroughSelection, MergedSelection, AutomaticData
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
@@ -894,7 +893,7 @@ def Tuples():
 
     """
     import re
-    from DecayTreeTuple.Configuration import DecayTreeTuple, EventTuple
+    from DecayTreeTuple.Configuration import DecayTreeTuple
 
     seq = GaudiSequencer('TupleSeq')
     seq.ModeOR = True
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingQEE/StrippingExotica.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingQEE/StrippingExotica.py
old mode 100755
new mode 100644
index c02471267810d88c2ce0182c4548f40e6bab690d..9d041d4174b66d314fb68bf3b8336a489585f7e7
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingQEE/StrippingExotica.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingQEE/StrippingExotica.py
@@ -30,7 +30,7 @@ Hlt2ExoticaPrmptDiMuonHighMass
 from GaudiKernel.SystemOfUnits import MeV, GeV, mm, picosecond
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-from PhysSelPython.Wrappers import Selection, SimpleSelection, MergedSelection, AutomaticData
+from PhysSelPython.Wrappers import AutomaticData, SimpleSelection
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingQEE/StrippingFullDiJets.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingQEE/StrippingFullDiJets.py
index 2981965bb27d3ebfea2e058a0380a802bd3f5d1b..9d0f27dcf84c5776ada54ce0932ff9933de66595 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingQEE/StrippingFullDiJets.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingQEE/StrippingFullDiJets.py
@@ -9,14 +9,10 @@
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
 
-from Gaudi.Configuration import *
-from Configurables import FilterDesktop, CombineParticles, LoKi__VertexFitter
+from Configurables import CombineParticles, LoKi__VertexFitter
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from StandardParticles import StdJets
-from CommonParticles.Utils import *
-from Configurables import FilterJet
 from GaudiKernel.SystemOfUnits import GeV
 
 __author__ = "Xabier Cid Vidal", "Cedric Potterat", "William Barter"
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingQEE/StrippingHighPtTau.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingQEE/StrippingHighPtTau.py
index ac4b3b9c5906f1ef795681c1df8cdad05c052f9a..54239d73e2759d0101b16eabf78bd434bba79e74 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingQEE/StrippingHighPtTau.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingQEE/StrippingHighPtTau.py
@@ -24,7 +24,7 @@ from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from StandardParticles import StdAllNoPIDsPions, StdAllLoosePions, StdLooseResolvedPi0, StdLooseMergedPi0
+from StandardParticles import StdAllLoosePions, StdLooseMergedPi0, StdLooseResolvedPi0
 from GaudiKernel.SystemOfUnits import GeV
 from Configurables import FilterDesktop
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingQEE/StrippingLFVExotica.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingQEE/StrippingLFVExotica.py
old mode 100755
new mode 100644
index 59d45b25c3081e3680db2f10e9e0d1ad1ed8f0bb..1a886e3801e0322239b8183c5b0e8fe140db6ba2
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingQEE/StrippingLFVExotica.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingQEE/StrippingLFVExotica.py
@@ -106,7 +106,7 @@ def create_stdjets(strob, line_location, stdjets_name_ban):
         strob.StdJetsNoJetIDBan = [myconf1]
 
     # configure Data-On-Demand service
-    locations = updateDoD(myconf1)
+    updateDoD(myconf1)
 
 
 relInfoJetsVars = ["JETNOMU1PX", "JETNOMU1PY", "JETNOMU1PZ", "JETNOMU1PT", "JETNOMU1JETWIDTH", "JETNOMU1NNTAG", "JETNOMU1MNF", "JETNOMU2PX", "JETNOMU2PY", "JETNOMU2PZ", "JETNOMU2PT", "JETNOMU2JETWIDTH", "JETNOMU2NNTAG", "JETNOMU2MNF", "JETNOMU3PX", "JETNOMU3PY",
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingQEE/StrippingLLP2MuX.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingQEE/StrippingLLP2MuX.py
index d58edd68465d3b66d3c11cab0bbbed15edf12ed2..fe88689a415b694a3f182eeea3924fe2df393eff 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingQEE/StrippingLLP2MuX.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingQEE/StrippingLLP2MuX.py
@@ -16,7 +16,6 @@ from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import AutomaticData, Selection
 from GaudiKernel import SystemOfUnits as units
-from LHCbKernel.Configuration import *
 __author__ = "Pieter David"
 __date__ = "2014-08-28"
 __all__ = ("LLP2MuXConf", "default_config")
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingQEE/StrippingLb2dp.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingQEE/StrippingLb2dp.py
old mode 100755
new mode 100644
index 6fd0fdcc5c19ca68dd6eaf7b42ea46412da9f432..7d202e58f915b4e8cbabd5e3d94da1f41b631330
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingQEE/StrippingLb2dp.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingQEE/StrippingLb2dp.py
@@ -23,15 +23,11 @@ __all__ = ('Lb2dpConf',
            )
 
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop
-from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays
 
-from StandardParticles import StdAllNoPIDsPions, StdAllNoPIDsProtons,  StdAllNoPIDsKaons
 from PhysSelPython.Wrappers import Selection, DataOnDemand, SimpleSelection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from Configurables import LoKi__VoidFilter as VoidFilter
 
 default_config = {
     'NAME': 'Lb2dp',
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingQEE/StrippingMicroDiJets.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingQEE/StrippingMicroDiJets.py
index 111d837cba0b6e3109043e85911ad651a9771cca..01e67268d1ad2a18b20e6bec03474a5d626c5b48 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingQEE/StrippingMicroDiJets.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingQEE/StrippingMicroDiJets.py
@@ -10,13 +10,12 @@
 ###############################################################################
 
 from Gaudi.Configuration import *
-from Configurables import FilterDesktop, CombineParticles, LoKi__VertexFitter
+from Configurables import CombineParticles
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from StandardParticles import StdJets
 from CommonParticles.Utils import *
-from Configurables import FilterJet, ClearDaughters
+from Configurables import ClearDaughters
 from GaudiKernel.SystemOfUnits import GeV
 
 __author__ = "Xabier Cid Vidal", "Cedric Potterat", "William Barter"
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingQEE/StrippingMuMuSS.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingQEE/StrippingMuMuSS.py
index 1d7798298fd46ec3a7437632e49e3e77ed0f5b3d..43046078d280e4b8afa0cafd3eab5c50e3168868 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingQEE/StrippingMuMuSS.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingQEE/StrippingMuMuSS.py
@@ -26,7 +26,7 @@ __author__ = (
 )
 
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-from PhysSelPython.Wrappers import Selection, SimpleSelection
+from PhysSelPython.Wrappers import SimpleSelection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from StandardParticles import StdAllLooseMuons
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingQEE/StrippingSbarSCorrelations.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingQEE/StrippingSbarSCorrelations.py
index 249c3f9ab979883ed8a9d91337d77cefb449f848..69b3d42731dbc9ca8b3c05f7c37baecc626941f6 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingQEE/StrippingSbarSCorrelations.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingQEE/StrippingSbarSCorrelations.py
@@ -21,10 +21,8 @@ Long tracks only
 from GaudiKernel.SystemOfUnits import MeV, GeV
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
-from StandardParticles import StdAllNoPIDsPions, StdTightKaons, StdAllNoPIDsProtons
+from PhysSelPython.Wrappers import DataOnDemand, Selection
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = ['Florin MACIUC']
 __date__ = '24/08/2013'
 __version__ = '$Revision: 1.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingQEE/StrippingStrangeBaryons.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingQEE/StrippingStrangeBaryons.py
index 0b5d595c501f5f05a6cf290f848f882391e42df9..ae8735231a28354a5bc271d76afb516f034dce59 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingQEE/StrippingStrangeBaryons.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingQEE/StrippingStrangeBaryons.py
@@ -18,14 +18,10 @@ Xi -> Lambda pi,   Omega -> Lambda K
 LLL DDL DDD
 '''
 
-from GaudiKernel.SystemOfUnits import MeV
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
-from CommonParticles import StdLooseLambda
-from StandardParticles import StdLoosePions, StdNoPIDsDownPions, StdLooseKaons, StdLooseDownKaons, StdLooseProtons, StdNoPIDsDownProtons
+from PhysSelPython.Wrappers import DataOnDemand, Selection
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = ['Mihai Straticiuc', 'Florin Maciuc', 'Nguyen Thi Dung']
 __date__ = '26/06/2012'
 __version__ = '$Revision: 0.3 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingQEE/StrippingStrangeBaryonsNoPID.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingQEE/StrippingStrangeBaryonsNoPID.py
index 11d394ddb819c05116043ca7af67ee25121e7053..df33cc7953709a81da22f213b036048ee27aaa61 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingQEE/StrippingStrangeBaryonsNoPID.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingQEE/StrippingStrangeBaryonsNoPID.py
@@ -18,12 +18,10 @@ Xi -> Lambda pi,   Omega -> Lambda K
 LLL
 '''
 
-from GaudiKernel.SystemOfUnits import MeV
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
+from PhysSelPython.Wrappers import DataOnDemand, Selection
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = ['Florin Maciuc']
 __date__ = '13/01/2014'
 __version__ = '$Revision: 0.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingQEE/StrippingTaggedJets.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingQEE/StrippingTaggedJets.py
old mode 100755
new mode 100644
index aa10ffcef11e3b67c222795b627dce36ab58d9e2..421ef28a33474ba4a598a2b27634f087159d46b7
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingQEE/StrippingTaggedJets.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingQEE/StrippingTaggedJets.py
@@ -10,11 +10,10 @@
 ###############################################################################
 
 from Gaudi.Configuration import *
-from Configurables import FilterDesktop, CombineParticles, LoKi__VertexFitter
+from Configurables import CombineParticles, LoKi__VertexFitter
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from StandardParticles import StdJets
 from CommonParticles.Utils import *
 from Configurables import FilterJet
 from GaudiKernel.SystemOfUnits import GeV
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingQEE/StrippingW2nH.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingQEE/StrippingW2nH.py
index 3fbf48b1fca05211e68a169fa40c1dd93686300d..f16a508b980ce094474a1bb71301a5e339201600 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingQEE/StrippingW2nH.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingQEE/StrippingW2nH.py
@@ -26,7 +26,6 @@ from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from StandardParticles import StdAllNoPIDsPions
 from GaudiKernel.SystemOfUnits import GeV
-from GaudiKernel.SystemOfUnits import MeV
 
 
 default_config = {
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingQEE/StrippingWJets.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingQEE/StrippingWJets.py
old mode 100755
new mode 100644
index d522b8b500a9a2d429f8c8ad864cfb9783ed5b3e..3da8ccba4608ab608547abdaef921ddb169677f1
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingQEE/StrippingWJets.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingQEE/StrippingWJets.py
@@ -22,14 +22,12 @@ They are then cover a phasespace complementarily on each other.
 
 """
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
 from Configurables import CombineParticles, LoKi__VertexFitter
 from PhysSelPython.Wrappers import Selection, SimpleSelection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from StandardParticles import StdAllLooseMuons, StdAllNoPIDsElectrons, StdJets
-from CommonParticles.Utils import *
 from GaudiKernel.SystemOfUnits import GeV, MeV
 
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingQEE/StrippingWRareDecay.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingQEE/StrippingWRareDecay.py
index 7ef7290f438bd2cedb0a512af1341a965e77c38a..d3358d5224e36ab08dfa8e27b04d29642ac39da9 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingQEE/StrippingWRareDecay.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingQEE/StrippingWRareDecay.py
@@ -21,8 +21,7 @@ from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from GaudiKernel.SystemOfUnits import MeV, GeV, mm, picosecond
-from Gaudi.Configuration import *
+from GaudiKernel.SystemOfUnits import MeV, picosecond
 __author__ = ['Hang Yin', 'Qundong Han']
 __date__ = '11/29/2016'
 __version__ = '$Revision: 2.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingQEE/StrippingWe.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingQEE/StrippingWe.py
index 7cdca666d96cb142580b9b9457521d8d661ca1ba..dae887a639bb7304617d72237d4ec047fdbc41a6 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingQEE/StrippingWe.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingQEE/StrippingWe.py
@@ -21,7 +21,6 @@ We control: StdAllNoPIDsElectrons, PRS>50Mev & E_ECal/P>0.1 & E_HCal/P<0.05 & pT
 __all__ = 'WeConf', 'default_config'
 __author__ = 'S. Bifani', 'D. Ward'
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
 from PhysSelPython.Wrappers import SimpleSelection
 from StrippingConf.StrippingLine import StrippingLine
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingQEE/StrippingZ02ee.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingQEE/StrippingZ02ee.py
index 0bb2cccfd2da3efa094fe5808011f303566a0cc9..03ee6a325270a212b2b8f00000c396f090b245db 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingQEE/StrippingZ02ee.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingQEE/StrippingZ02ee.py
@@ -21,7 +21,6 @@ __all__ = (
     'default_config',
 )
 
-from Gaudi.Configuration import *
 from GaudiKernel.SystemOfUnits import GeV, MeV
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 from PhysSelPython.Wrappers import SimpleSelection
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingQEE/StrippingZ02nH.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingQEE/StrippingZ02nH.py
index f262f43a0d676efec05bdedfc744b49c71c0f89b..82fb2760e954d0f52d5f0b14942694fdecccf31f 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingQEE/StrippingZ02nH.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingQEE/StrippingZ02nH.py
@@ -26,7 +26,6 @@ from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from StandardParticles import StdAllNoPIDsPions
 from GaudiKernel.SystemOfUnits import GeV
-from GaudiKernel.SystemOfUnits import MeV
 
 
 default_config = {
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingQEE/StrippingZ0RareDecay.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingQEE/StrippingZ0RareDecay.py
index ed5c2136acfad79ba252530f3d5969c14168f261..e1a140f9359f6c1935faf0cbc0436c9110ca551b 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingQEE/StrippingZ0RareDecay.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingQEE/StrippingZ0RareDecay.py
@@ -22,8 +22,7 @@ __version__ = '$Revision: 2.0 $'
 
 __all__ = 'default_config', 'Z0RareDecayConf'
 
-from Gaudi.Configuration import *
-from GaudiKernel.SystemOfUnits import MeV, GeV, mm
+from GaudiKernel.SystemOfUnits import MeV
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
 from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
 from StrippingConf.StrippingLine import StrippingLine
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingQEE/depreciated/StrippingDijets.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingQEE/depreciated/StrippingDijets.py
index 719ab092d3f62f10ba80f27bf444a29031235662..1bd1ad77120b402bfb1c1b69dccbf62347990ae5 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingQEE/depreciated/StrippingDijets.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingQEE/depreciated/StrippingDijets.py
@@ -15,8 +15,7 @@
 __all__ = ('DijetsConf',
            'default_config')
 
-from Gaudi.Configuration import *
-from GaudiKernel.SystemOfUnits import MeV, GeV, mm
+from GaudiKernel.SystemOfUnits import GeV, MeV
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingQEE/depreciated/StrippingHighPtTopoJets.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingQEE/depreciated/StrippingHighPtTopoJets.py
index f62f8db8c1eaba8b5842b9c7345ce93002d621f2..da12c39fb111ca80169e104ec46a2a20533c7b7f 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingQEE/depreciated/StrippingHighPtTopoJets.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingQEE/depreciated/StrippingHighPtTopoJets.py
@@ -21,8 +21,6 @@ __all__ = ('default_config', 'HighPtTopoJetsConf')
 # \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\#
 
 
-from Gaudi.Configuration import *
-from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from PhysSelPython.Wrappers import EventSelection
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingQEE/depreciated/StrippingJets.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingQEE/depreciated/StrippingJets.py
index 0a37d40f9ddfcdf82460897dddfb064edca95d21..75e825eb86e2a06d3cf2de890a8a87180c3674a6 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingQEE/depreciated/StrippingJets.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingQEE/depreciated/StrippingJets.py
@@ -15,13 +15,11 @@
 __all__ = ('JetsConf',
            'default_config')
 
-from Gaudi.Configuration import *
-from GaudiKernel.SystemOfUnits import MeV, GeV, mm
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
+from GaudiKernel.SystemOfUnits import GeV, MeV
+from PhysSelPython.Wrappers import MergedSelection, Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
-from JetAccessories.JetMaker_Config import JetMakerConf
 from StandardParticles import StdJets, StdAllNoPIDsPions
 from Configurables import CombineParticles
 from Configurables import TopologicalTagging
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingRD/Beauty2Charm_LoKiCuts.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingRD/Beauty2Charm_LoKiCuts.py
index 2250a080d80f6bdda41324365b8fe5b561d1a8ac..7ed3e8ea2280ee752d6db80ce6b0241fb170b158 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingRD/Beauty2Charm_LoKiCuts.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingRD/Beauty2Charm_LoKiCuts.py
@@ -10,11 +10,6 @@
 ###############################################################################
 # \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\#
 
-from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
-from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-from PhysSelPython.Wrappers import Selection, MergedSelection
-from StandardParticles import StdNoPIDsPions, StdNoPIDsKaons
 
 # \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\#
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingRD/StrippingB02Lcmu_pKpi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingRD/StrippingB02Lcmu_pKpi.py
index c0209e4a81f00f2e5c7ad0093273ce61ffa558f3..aedb7955e9db5ad1ccdba5cded8149e794cdd800 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingRD/StrippingB02Lcmu_pKpi.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingRD/StrippingB02Lcmu_pKpi.py
@@ -14,7 +14,6 @@ from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = ['Nikita Beliy', 'Jibo He']
 __date__ = '28/11/2016'
 __version__ = '$Revision: 1.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingRD/StrippingB23MuLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingRD/StrippingB23MuLines.py
index 4d5da6cdc6121f1a926af78c8a45c7b5ebae76ad..e11f8912eb05ffba312e196ee43556ce4f70e2bb 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingRD/StrippingB23MuLines.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingRD/StrippingB23MuLines.py
@@ -55,13 +55,11 @@ __all__ = ("B23MuLinesConf",
 
 #############################################################################
 
-from Gaudi.Configuration import *
-from Configurables import FilterDesktop, CombineParticles, DaVinci__N3BodyDecays
+from Configurables import DaVinci__N3BodyDecays
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 # from StrippingSelections.Utils import checkConfig
-from GaudiKernel.PhysicalConstants import c_light
 
 #############################################################################
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingRD/StrippingB2KLLXInclusive.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingRD/StrippingB2KLLXInclusive.py
index 427dc4aa1b251d677f2db5fba16348f609968c42..695822b35f87d53f70965e5dd4f2f55a1640df7f 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingRD/StrippingB2KLLXInclusive.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingRD/StrippingB2KLLXInclusive.py
@@ -19,15 +19,12 @@ __all__ = ('B2KLLXInclusiveConf', 'default_config')
 Stripping selection for inclusively selected B->KmumuX decays.
 """
 
-from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop
+from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
 
 from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from LHCbKernel.Configuration import *  # check if needed
-from Configurables import SubstitutePID
-from Configurables import SubPIDMMFilter
 
 
 #################
@@ -373,7 +370,6 @@ class B2KLLXInclusiveConf(LineBuilder):
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         CombineDiMuon = CombineParticles()
         CombineDiMuon.DecayDescriptors = ["[B+ -> J/psi(1S) K+]cc"]
-        sel_name = "InclKLL"
         CombineDiMuon.MotherCut = self.InclKLLCut
         # choose
         leptons = self.InclLeptons
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingRD/StrippingB2KstTauTau.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingRD/StrippingB2KstTauTau.py
index b7765b8844dff9af2f3f192aafad7298a77a86ae..2ca7e7f98d5b35b857a8b5c36bc873a38ee87647 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingRD/StrippingB2KstTauTau.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingRD/StrippingB2KstTauTau.py
@@ -15,8 +15,7 @@ from StandardParticles import StdTightMuons
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, OfflineVertexFitter, DaVinci__N3BodyDecays
-from Gaudi.Configuration import *
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N3BodyDecays, FilterDesktop
 __author__ = [' G. Mancinelli, J. Serrano']
 __date__ = '15/08/2014'
 __version__ = '$Revision: 0.1 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingRD/StrippingB2LLXBDT.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingRD/StrippingB2LLXBDT.py
index 509cd9d83c968f16af46210ba7db650c5ded765e..1c05c402370ebc7d110492fb2fdb8dbde369ff8e 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingRD/StrippingB2LLXBDT.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingRD/StrippingB2LLXBDT.py
@@ -20,8 +20,6 @@ from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticle
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, MergedSelection
-from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays
-from Gaudi.Configuration import *
 __author__ = ['Jibo He']
 __date__ = '20/11/2015'
 __version__ = '$Revision: 1.0 $'
@@ -295,7 +293,7 @@ class B2LLXBDTConf(LineBuilder):
         """
         Kshort, both LL and DD
         """
-        from StandardParticles import StdLooseKsDD, StdLooseKsLL
+        from StandardParticles import StdLooseKsDD
 
         self.SelKsDD = self.createSubSel(OutputList=self.name + "SelKsDD",
                                          InputList=StdLooseKsDD,
@@ -331,7 +329,7 @@ class B2LLXBDTConf(LineBuilder):
         """
         Lambda, both LL and DD
         """
-        from StandardParticles import StdLooseLambdaDD, StdLooseLambdaLL
+        from StandardParticles import StdLooseLambdaDD
 
         self.SelLambdaDD = self.createSubSel(OutputList=self.name + "SelLambdaDD",
                                              InputList=StdLooseLambdaDD,
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingRD/StrippingB2Lambda0MuLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingRD/StrippingB2Lambda0MuLines.py
index 465f34ce3f2af7a7b564860b40d26eb58a2da883..9a6ac1b5824fb2cb3142b7af4c6b531581243697 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingRD/StrippingB2Lambda0MuLines.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingRD/StrippingB2Lambda0MuLines.py
@@ -21,7 +21,6 @@ __all__ = ('B2Lambda0MuLines',
            'default_config')
 
 from StandardParticles import StdLoosePions, StdLooseMuons, StdLooseDownMuons, StdNoPIDsDownPions
-from Configurables import TisTosParticleTagger
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingRD/StrippingB2MuMuMuMuLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingRD/StrippingB2MuMuMuMuLines.py
index 9c92c11a08153c13ae64cf1aefd911c790442d25..6e1b98b4e6982df1ef8268e5a50d76ae51f2dea4 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingRD/StrippingB2MuMuMuMuLines.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingRD/StrippingB2MuMuMuMuLines.py
@@ -19,7 +19,7 @@ from Beauty2Charm_LoKiCuts import LoKiCuts
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
-from Configurables import FilterDesktop, CombineParticles
+from Configurables import CombineParticles
 from Gaudi.Configuration import *
 __author__ = ['Diego Martinez Santos', 'Johannes Albrecht',
               'Konstantinos A. Petridis', 'Alexander Baranov']
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingRD/StrippingB2XLL.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingRD/StrippingB2XLL.py
old mode 100755
new mode 100644
index 0ec2577787f72a6ff7c13be0980a02980a6736ee..17e34358470655f02fbdd0734114189686d7c13d
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingRD/StrippingB2XLL.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingRD/StrippingB2XLL.py
@@ -10,9 +10,8 @@
 ###############################################################################
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection, AutomaticData
+from PhysSelPython.Wrappers import MergedSelection, Selection
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = 'Raja Nandakumar, Fergus Wilson, Stefania Ricciardi'
 __date__ = '04/11/2015'
 __version__ = '$Revision: 0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingRD/StrippingB2XMuMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingRD/StrippingB2XMuMu.py
index bf8f80ead17879bb5263b3f52c017408ee8bde89..5ee37324415b186663430224441bd317cb059fe2 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingRD/StrippingB2XMuMu.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingRD/StrippingB2XMuMu.py
@@ -19,7 +19,6 @@ __version__ = '$Revision: 1.2 $'
 __all__ = ('B2XMuMuConf', 'default_config')
 
 
-from Gaudi.Configuration import *
 from LHCbKernel.Configuration import *  # check if needed
 
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingRD/StrippingB2XTau.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingRD/StrippingB2XTau.py
index 8f3f40d4d2fa42fe2952d91be7ce7ed045dacd24..d2cb8108d382812e609aba7c2edc6887a533565e 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingRD/StrippingB2XTau.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingRD/StrippingB2XTau.py
@@ -9,15 +9,12 @@
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
 from StandardParticles import StdLooseKaons
-from StandardParticles import StdAllLoosePions, StdAllNoPIDsPions
-from copy import deepcopy
-from StandardParticles import StdLoosePions, StdTightPions
-from StandardParticles import StdNoPIDsKaons, StdNoPIDsPions, StdTightMuons
+from StandardParticles import StdLoosePions
+from StandardParticles import StdTightMuons
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, OfflineVertexFitter, DaVinci__N3BodyDecays
-from Gaudi.Configuration import *
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N3BodyDecays, FilterDesktop
 __author__ = ['G. Mancinelli, J. Serrano']
 __date__ = '24/05/2010,15/01/2014'
 __version__ = '$Revision: 1.2 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingRD/StrippingB2XTauMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingRD/StrippingB2XTauMu.py
index ae80a64870a0162a82b78dd1e8516c6c496ef88b..810e9a208ac175d3b476a03bf34a1a05e74c1b07 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingRD/StrippingB2XTauMu.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingRD/StrippingB2XTauMu.py
@@ -25,8 +25,6 @@ __all__ = ('B2XTauMuConf',
            'default_config')
 
 
-from Gaudi.Configuration import *
-
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
 from PhysSelPython.Wrappers import Selection, MergedSelection
 from StrippingConf.StrippingLine import StrippingLine
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingRD/StrippingBLVLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingRD/StrippingBLVLines.py
index 6dc1f3c32133491d8eb768c09eb61fd804d97848..20e7e7d7a7d5e588a64fd707c52fa17e94306ce3 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingRD/StrippingBLVLines.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingRD/StrippingBLVLines.py
@@ -95,8 +95,7 @@ __all__ = ("BLVLinesConf",
 
 ###################################################################################################
 
-from Gaudi.Configuration import *
-from Configurables import FilterDesktop, CombineParticles, DaVinci__N3BodyDecays
+from Configurables import CombineParticles, DaVinci__N3BodyDecays
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingRD/StrippingBd2eeKstarBDT.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingRD/StrippingBd2eeKstarBDT.py
index 33f47f29ceaa85059794a0f7e9de85412021f226..f56a4e55e7f7a52d2447dcf0f983f77b7f685cf6 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingRD/StrippingBd2eeKstarBDT.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingRD/StrippingBd2eeKstarBDT.py
@@ -18,7 +18,6 @@ from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = ['Marie-Helene Schune', 'Jibo He']
 __date__ = '20/01/2012'
 __version__ = '$Revision: 1.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingRD/StrippingBeauty2XGamma.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingRD/StrippingBeauty2XGamma.py
index b876ae5d9b3e6d22750998716beee8e8e96b4a18..f15067d279ab9c6a8c877716265e623bdf8d4bbd 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingRD/StrippingBeauty2XGamma.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingRD/StrippingBeauty2XGamma.py
@@ -12,7 +12,7 @@
 B-> X Gamma selections
 """
 
-from StandardParticles import StdAllNoPIDsKaons, StdAllNoPIDsPions, StdLooseAllPhotons, StdLooseMergedPi0, StdLooseResolvedPi0, StdAllLooseGammaDD, StdAllLooseGammaLL, StdAllNoPIDsProtons
+from StandardParticles import StdAllLooseGammaDD, StdAllLooseGammaLL, StdAllNoPIDsPions, StdLooseAllPhotons, StdLooseMergedPi0, StdLooseResolvedPi0
 from Configurables import TisTosParticleTagger
 from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays as Combine4Particles
 from GaudiConfUtils.ConfigurableGenerators import DaVinci__N3BodyDecays as Combine3Particles
@@ -20,7 +20,6 @@ from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = ['Violaine Bellee', 'Albert Puig']
 __date__ = '08/04/2016'
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingRD/StrippingBs2MuMuLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingRD/StrippingBs2MuMuLines.py
index 6ed0f1ff2d94fe2aa3b66f0525cb5f231048f1b0..f471cc532b70a5e28fd0828ca74b985e254c074b 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingRD/StrippingBs2MuMuLines.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingRD/StrippingBs2MuMuLines.py
@@ -25,7 +25,7 @@ Exported symbols (use python help!):
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
-from Configurables import FilterDesktop, CombineParticles
+from Configurables import CombineParticles
 from Gaudi.Configuration import *
 from JetAccessories.JetMaker_Config import JetMakerConf
 from CommonParticles.Utils import *
@@ -159,7 +159,7 @@ def create_stdjets(strob, line_location, stdjets_name_ban, stdjets_name_addb):
         strob.StdJetsNoJetIDBan = [myconf1]
 
     # configure Data-On-Demand service
-    locations = updateDoD(myconf1)
+    updateDoD(myconf1)
 
     myconf2 = JetMakerConf(stdjets_name_addb,
                            Inputs=['Phys/PFParticles/Particles', line_location],
@@ -173,7 +173,7 @@ def create_stdjets(strob, line_location, stdjets_name_ban, stdjets_name_addb):
         strob.StdJetsNoJetIDAddB = [myconf2]
 
     # configure Data-On-Demand service
-    locations = updateDoD(myconf2)
+    updateDoD(myconf2)
 
 
 ##########################################
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingRD/StrippingBs2gammagamma.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingRD/StrippingBs2gammagamma.py
index 158db5f4c8ca7edbfdce8faccbacecedb0256e3a..30dd3664829a9606d3488e160a1ff92230465960 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingRD/StrippingBs2gammagamma.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingRD/StrippingBs2gammagamma.py
@@ -21,16 +21,11 @@ Exports the following stripping lines as instance data members:
 - Bs2gammagamma_NoConvWideLine  : wide line with 0 conversions
 '''
 
-from Configurables import (DiElectronMaker, ProtoParticleCALOFilter,
-                           ParticleTransporter, BremAdder)
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop  # , CombineParticles
-from CommonParticles import StdLooseAllPhotons
-from CommonParticles import StdAllLooseGammaConversion
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
 from Configurables import CombineParticles
-from Gaudi.Configuration import *
 __author__ = ['Sean Benson']
 __date__ = '2016/04/08'
 __version__ = '1.1'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingRD/StrippingBs2st2KKMuX.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingRD/StrippingBs2st2KKMuX.py
index 53f4155191d8afc755034ab6c642404b7f75bacc..f105ed628117302c196d81973d7e945d4b5bbb1e 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingRD/StrippingBs2st2KKMuX.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingRD/StrippingBs2st2KKMuX.py
@@ -22,9 +22,8 @@ Stripping lines:
 from StandardParticles import StdLooseMuons, StdLooseKaons, StdAllLooseKaons, StdMassConstrainedJpsi2MuMu
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand
+from PhysSelPython.Wrappers import Selection
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = ['Jianchun Wang']
 __date__ = '03/22/2015'
 __version__ = '$Revision: 0.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingRD/StrippingBu2LLK.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingRD/StrippingBu2LLK.py
index 81d36d68547a4f6d3fdab29e77b03b88bffd056f..8bd9c599bc1fa5345db3bff7ac707b8ba9ce6204 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingRD/StrippingBu2LLK.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingRD/StrippingBu2LLK.py
@@ -10,9 +10,8 @@
 ###############################################################################
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection, AutomaticData
+from PhysSelPython.Wrappers import DataOnDemand, MergedSelection, Selection
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, DaVinci__N3BodyDecays
-from Gaudi.Configuration import *
 __author__ = 'Patrick Koppenburg, Alex Shires, Thomas Blake, Luca Pescatore, Simone Bifani, Yasmine Amhis, Paula Alvarez Cartelle, Harry Cliff, Rafael Silva Coutinho'
 __date__ = '16/06/2014'
 __version__ = '$Revision: 3 $'
@@ -768,7 +767,6 @@ class Bu2LLKConf(LineBuilder):
         from StandardParticles import StdLooseMuons as Muons
         # from CommonParticles import StdLooseDetachedTau
         # Taus = DataOnDemand(Location = "Phys/StdLooseDetachedTau3pi/Particles")
-        from CommonParticles import StdTightDetachedTau
         Taus = DataOnDemand(Location="Phys/StdTightDetachedTau3pi/Particles")
 
         _DecayDescriptor = "[J/psi(1S) -> mu+ tau-]cc"
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingRD/StrippingBu2MajoLep.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingRD/StrippingBu2MajoLep.py
index 961fe2a146eaab148d7183186a1be049ae53675f..c3380097f8416a348b98e69fbc89bab18848428b 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingRD/StrippingBu2MajoLep.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingRD/StrippingBu2MajoLep.py
@@ -19,12 +19,10 @@ __version__ = 'V0.9'
 __all__ = ('Bu2MajoLepConf',
            'default_config')
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
+from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from GaudiKernel.SystemOfUnits import *
 
 from StandardParticles import StdLooseMuons as Muons
 from StandardParticles import StdLoosePions as Pions
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingRD/StrippingBu2MuNu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingRD/StrippingBu2MuNu.py
index 093b37f68ae083d7fcea980f498b8d601b1e28cb..53ebfe877490fa2db9f95fcace9e4f27c1030829 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingRD/StrippingBu2MuNu.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingRD/StrippingBu2MuNu.py
@@ -25,12 +25,11 @@ __all__ = ('Bu2MuNuConf',
            'default_config')
 
 from Gaudi.Configuration import *
-from PhysSelPython.Wrappers import Selection, DataOnDemand
+from PhysSelPython.Wrappers import DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from StandardParticles import StdTightMuons, StdTightANNMuons
 from CommonParticles.Utils import *
-from Configurables import FilterDesktop, CombineParticles
+from Configurables import FilterDesktop
 from JetAccessories.JetMaker_Config import JetMakerConf
 
 default_name = 'Bu2MuNu'
@@ -72,7 +71,7 @@ def create_stdjets(strobj, line_location, stdjets_name_ban):
         strobj.StdJetsNoJetIDBan = [myconf1]
 
     # configure Data-On-Demand service
-    locations = updateDoD(myconf1)
+    updateDoD(myconf1)
 
 
 relInfoJetsVars = ["JETNOMU1PX", "JETNOMU1PY", "JETNOMU1PZ", "JETNOMU1PT", "JETNOMU1JETWIDTH", "JETNOMU1NNTAG", "JETNOMU1MNF", "JETNOMU2PX", "JETNOMU2PY", "JETNOMU2PZ", "JETNOMU2PT", "JETNOMU2JETWIDTH", "JETNOMU2NNTAG",
@@ -268,7 +267,7 @@ class Bu2MuNuConf(LineBuilder):
                                            JetIDCut=False).algorithms[0]
 
         # configure Data-On-Demand service
-        locations = updateDoD(StdJetsNoJetIDNoBan)
+        updateDoD(StdJetsNoJetIDNoBan)
 
         # add the jets with the specific banning
         create_stdjets(self, self.ControlLine.outputLocation(),
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingRD/StrippingD23MuLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingRD/StrippingD23MuLines.py
index 0725ecd798e0099828ec0b644ba1f5d6119f0551..9cac5b811b4fe683ae8ab1818ebbc34986a48f2a 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingRD/StrippingD23MuLines.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingRD/StrippingD23MuLines.py
@@ -51,12 +51,11 @@ __all__ = ("D23MuLinesConf",
 #############################################################################
 
 from Gaudi.Configuration import *
-from Configurables import FilterDesktop, CombineParticles, DaVinci__N3BodyDecays
+from Configurables import DaVinci__N3BodyDecays
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 # from StrippingSelections.Utils import checkConfig
-from GaudiKernel.PhysicalConstants import c_light
 
 #############################################################################
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingRD/StrippingDarkBoson.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingRD/StrippingDarkBoson.py
index 1e573360994477ff49301aa3b3a323f18798cf49..e42cad2ffa26db0015272fe3a37258e312b6be6a 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingRD/StrippingDarkBoson.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingRD/StrippingDarkBoson.py
@@ -17,23 +17,18 @@ Author: M. Williams
 from Configurables import DiElectronMaker, ProtoParticleCALOFilter
 from GaudiConfUtils.ConfigurableGenerators import DaVinci__N3BodyDecays
 from CommonParticles.Utils import *
-from copy import deepcopy
 from Configurables import SubstitutePID
 from StandardParticles import StdAllLooseGammaLL, StdAllLooseGammaDD, \
     StdAllLooseElectrons, StdLooseAllPhotons  # , StdDiElectronFromTracks
 from Beauty2Charm_LoKiCuts import LoKiCuts
 from StandardParticles import StdAllNoPIDsPions, StdAllNoPIDsKaons, \
-    StdAllNoPIDsProtons, StdNoPIDsUpPions, StdAllLooseMuons, \
-    StdLooseDownMuons
-from Configurables import LoKi__VoidFilter
+    StdAllLooseMuons, StdLooseDownMuons
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import EventSelection
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
+from PhysSelPython.Wrappers import DataOnDemand, Selection
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
 from Gaudi.Configuration import *
-import re
 __author__ = ['Mike Williams']
 
 moduleName = 'DarkBoson'
@@ -252,7 +247,7 @@ class DarkBosonConf(LineBuilder):
         mmDDX = makeX(
             'MuMuDD', default_config['XDD'], 'KS0 -> mu+ mu-', [muDX])
         kkX = makeX('KK', default_config['XLL'], 'KS0 -> K+ K-', [kX])
-        kkDDX = makeX('KKDD', default_config['XDD'], 'KS0 -> K+ K-', [kDX])
+        makeX('KKDD', default_config['XDD'], 'KS0 -> K+ K-', [kDX])
         pipiX = makeX(
             'PiPi', default_config['XLLhard'], 'KS0 -> pi+ pi-', [piX])
         pipiDDX = makeX(
@@ -274,7 +269,7 @@ class DarkBosonConf(LineBuilder):
             'PiPiSSDD', default_config['XDD'], '[KS0 -> pi+ pi+]cc', [piDX])
         preSS = default_config['Prescales']['SS']
 
-        preDD = default_config['Prescales']['DD']
+        default_config['Prescales']['DD']
         preKK = default_config['Prescales']['KK']
 
         j = makeJ(default_config['J'], [muJ])
@@ -391,7 +386,7 @@ class DarkBosonConf(LineBuilder):
         kst = filterKst()
         self._makeBLine('B2JKst', ['[B0 -> J/psi(1S) K*(892)0]cc'],
                         [j, kst], default_config['B2KX'])
-        rho = makeRho([piB])
+        makeRho([piB])
         # self._makeBLine('B2RhoX2MuMu',['B0 -> rho(770)0 KS0'],[rho,mmX],
         #                default_config['B2HHX'])
         # self._makeBLine('B2RhoX2MuMuDD',['B0 -> rho(770)0 KS0'],[rho,mmDDX],
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingRD/StrippingDoubleSLForRX.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingRD/StrippingDoubleSLForRX.py
index c04d6c7bc25ac04102a5ecd3d2e30878506825a4..703ec457e7bfec5cc75b90127f8b3ae580a8eb65 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingRD/StrippingDoubleSLForRX.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingRD/StrippingDoubleSLForRX.py
@@ -19,7 +19,6 @@ from GaudiConfUtils.ConfigurableGenerators import (CombineParticles,
                                                    DaVinci__N3BodyDecays)
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from Gaudi.Configuration import *
 __author__ = 'M. Kreps, T. Blake, D. Loh'
 __date__ = '10/11/2016'
 __version__ = '$Revision: 1.0$'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingRD/StrippingHypb2L0HGamma.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingRD/StrippingHypb2L0HGamma.py
index fb11a22899308c69c98379bf3153a7465645ce7e..ecbacfd2c6b212eb8f365e777f9a9448bf0d6bc9 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingRD/StrippingHypb2L0HGamma.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingRD/StrippingHypb2L0HGamma.py
@@ -16,8 +16,8 @@ __all__ = ('Hypb2L0HGammaConf',
            'default_config', )
 
 from Gaudi.Configuration import *
-from Configurables import FilterDesktop, CombineParticles, TisTosParticleTagger
-from PhysSelPython.Wrappers import Selection, MergedSelection, DataOnDemand
+from Configurables import CombineParticles, FilterDesktop
+from PhysSelPython.Wrappers import DataOnDemand, Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from StandardParticles import StdLooseAllPhotons
@@ -408,7 +408,7 @@ def tisTosSelection(sel, TISTOSdict):
 
 
 def makevelotracks(name):
-    from Configurables import FastVeloTracking, TrackPrepareVelo, DecodeVeloRawBuffer, TrackEventFitter, TrackStateInitAlg,  TrackContainerCopy
+    from Configurables import FastVeloTracking, TrackContainerCopy, TrackStateInitAlg
     from TrackFitter.ConfiguredFitters import ConfiguredEventFitter
 
     MyFastVeloTracking = FastVeloTracking(
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingRD/StrippingKshort2MuMuMuMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingRD/StrippingKshort2MuMuMuMu.py
index 0eb02eba089e401f5b8d05f25aa574d3d0998143..af71823927f8d50ad7b3bb851a6a0a0605e974ab 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingRD/StrippingKshort2MuMuMuMu.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingRD/StrippingKshort2MuMuMuMu.py
@@ -15,15 +15,12 @@ derived, in large measure, from StrippingKshort2PiPiMuMu.py
 '''
 
 from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays
-from GaudiKernel.SystemOfUnits import MeV
-from StandardParticles import StdNoPIDsDownPions, StdLooseDownMuons
-from StandardParticles import StdAllLoosePions, StdAllLooseMuons, StdAllNoPIDsPions
-from StandardParticles import StdLoosePions, StdLooseMuons, StdNoPIDsPions
+from StandardParticles import StdLooseDownMuons
+from StandardParticles import StdAllLooseMuons
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
+from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
 __author__ = ['Mike Sokoloff']
 __date__ = '07 January 2014'
 __version__ = '$Revision: 0.1 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingRD/StrippingKshort2PiPiMuMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingRD/StrippingKshort2PiPiMuMu.py
index df7f615d006d7f8b2d9e4f2b4fb21c0a63c956f2..2077734097791267b6f75fb46e6e51b2ea45444d 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingRD/StrippingKshort2PiPiMuMu.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingRD/StrippingKshort2PiPiMuMu.py
@@ -10,15 +10,12 @@
 ###############################################################################
 
 from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays
-from GaudiKernel.SystemOfUnits import MeV
 from StandardParticles import StdNoPIDsDownPions, StdLooseDownMuons
-from StandardParticles import StdAllLoosePions, StdAllLooseMuons, StdAllNoPIDsPions
-from StandardParticles import StdLoosePions, StdLooseMuons, StdNoPIDsPions
+from StandardParticles import StdAllLooseMuons, StdAllLoosePions
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
+from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
 __author__ = ['Mike Sokoloff']
 __date__ = '25/10/2012'
 __version__ = '$Revision: 0.1 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingRD/StrippingKshort2eePiPi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingRD/StrippingKshort2eePiPi.py
index da78ba561a995d50ca08f28c7180c2d376edc373..f1c66b71d8bca485a8da728e91f430b40a8f727d 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingRD/StrippingKshort2eePiPi.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingRD/StrippingKshort2eePiPi.py
@@ -16,7 +16,6 @@ from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection
 from GaudiConfUtils.ConfigurableGenerators import DaVinci__N3BodyDecays as Combine3Particles
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
-from Gaudi.Configuration import *
 __author__ = ['Carla Marin']
 __date__ = '23/11/2016'
 __version__ = '$1.1 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingRD/StrippingLFVLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingRD/StrippingLFVLines.py
index dff1703008dbd91cf449348ac2dbb57ad32ca23e..1a3aa2f9456cc88f392c0cc4d3a794052cc263ee 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingRD/StrippingLFVLines.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingRD/StrippingLFVLines.py
@@ -23,14 +23,12 @@ __all__ = ('LFVLinesConf',
            'default_config',
            )
 
-from Gaudi.Configuration import *
 # from Configurables import FilterDesktop, CombineParticles
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, DaVinci__N3BodyDecays
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N3BodyDecays
 from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from GaudiKernel.PhysicalConstants import c_light
-from GaudiKernel.SystemOfUnits import GeV, MeV, mm
+from GaudiKernel.SystemOfUnits import MeV, mm
 from copy import deepcopy
 #
 # Configure related info tools
@@ -1181,7 +1179,7 @@ class LFVLinesConf(LineBuilder):
         hemu_name = name+'B2heMu'
         pmu_name = name+'B2hMu'
         bu_name = name+'Bu2KJPsiee'
-        taumu_name = name+'B2TauMu'
+        name+'B2TauMu'
         htaumu_name = name+'B2hTauMu'
         muetap_gamma_name = name+'Tau2MuEtaP2pipig'
         muetap_pi_name = name+'Tau2MuEtaP2pipipi'
@@ -1675,7 +1673,6 @@ def makeB2TauMu(name):
         "& (BPVVDCHI2> 225)"\
         "& (BPVIPCHI2()< 25) "
 
-    from CommonParticles import StdLooseDetachedTau, StdLooseDipion
     _stdLooseMuons = DataOnDemand(Location="Phys/StdLooseMuons/Particles")
     _stdLooseDetachedTaus = DataOnDemand(
         Location="Phys/StdLooseDetachedTau3pi/Particles")
@@ -2314,7 +2311,6 @@ def makeB2hTauMu(name):
                           "& (BPVVDCHI2> 225)"\
                           "& (BPVIPCHI2()< 16) "  # maybe 16
 
-    from CommonParticles import StdLooseDetachedTau, StdLooseDipion
     _stdLooseMuons = DataOnDemand(Location="Phys/StdLooseMuons/Particles")
     _stdLooseDetachedTaus = DataOnDemand(
         Location="Phys/StdLooseDetachedTau3pi/Particles")
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingRD/StrippingLb2L0Gamma.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingRD/StrippingLb2L0Gamma.py
index 048e24b93a02626bd3b5b98e17e081330ef91c75..698e0dbb30bb3876bc5a609bc7b3716a923898e6 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingRD/StrippingLb2L0Gamma.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingRD/StrippingLb2L0Gamma.py
@@ -25,9 +25,6 @@ __date__ = "14.11.2016"
 __version__ = "2.0"
 __all__ = ("default_config", "StrippingLb2L0GammaConf")
 
-import os
-
-from Gaudi.Configuration import *
 
 from Configurables import CombineParticles
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
@@ -36,9 +33,7 @@ from PhysSelPython.Wrappers import Selection, MergedSelection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 
-from StandardParticles import StdAllNoPIDsPions, StdAllNoPIDsProtons
 from StandardParticles import StdLooseAllPhotons, StdAllLooseGammaDD, StdAllLooseGammaLL
-from StandardParticles import StdVeryLooseDetachedKst2Kpi
 from StandardParticles import StdLooseJpsi2MuMu
 
 default_config = {'NAME': 'Lb2L0Gamma',
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingRD/StrippingLc23MuLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingRD/StrippingLc23MuLines.py
index 4d0e65fd68afc24ab3e895df75533234dbff67f7..e57d2f0f1b089113abb2f0b33c8af7186c88f792 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingRD/StrippingLc23MuLines.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingRD/StrippingLc23MuLines.py
@@ -66,11 +66,10 @@ __all__ = ("Lc23MuLinesConf",
 ###################################################################################################
 
 from Gaudi.Configuration import *
-from Configurables import FilterDesktop, CombineParticles, DaVinci__N3BodyDecays
+from Configurables import DaVinci__N3BodyDecays
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from GaudiKernel.PhysicalConstants import c_light
 
 ###################################################################################################
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingRD/StrippingPhiToKSKS.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingRD/StrippingPhiToKSKS.py
index ff5893ed3c6e324c43ffa0d57bf6dafae4304e21..3a3bda0062db28d5b2687378589719ba90ee3660 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingRD/StrippingPhiToKSKS.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingRD/StrippingPhiToKSKS.py
@@ -23,8 +23,7 @@ from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from StandardParticles import StdAllLooseKaons, StdAllLooseMuons
-from Configurables import FitDecayTrees
-from PhysSelPython.Wrappers import AutomaticData, MergedSelection
+from PhysSelPython.Wrappers import MergedSelection
 
 __all__ = ('PhiToKSKSAllLinesConf',
            'TOSFilter',
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingRD/StrippingRareNStrange.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingRD/StrippingRareNStrange.py
index 45ebc9b804dc6280194074ac2c29d7eb2abd3648..96da26c9feb2c65e7046fe94c3d8a2b41e31ef0e 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingRD/StrippingRareNStrange.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingRD/StrippingRareNStrange.py
@@ -10,9 +10,8 @@
 ###############################################################################
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection, AutomaticData
+from PhysSelPython.Wrappers import Selection
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = 'Diego Martinez Santos, Carlos Vazquez, Xabier Cid, Jessica Prisciandaro'
 __date__ = '08/05/2015'
 __version__ = '$Revision: Not sure $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingRD/StrippingRareStrange.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingRD/StrippingRareStrange.py
index 59b26f2a269c2ed4a56fa90aba360dffc5e3432e..5a42379b69a5ff8994442a06480cc3afc7ceb662 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingRD/StrippingRareStrange.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingRD/StrippingRareStrange.py
@@ -51,15 +51,11 @@ __all__ = ('RareStrangeLinesConf',
 from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 from GaudiConfUtils.ConfigurableGenerators import DaVinci__N3BodyDecays as Combine3Particles
-from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays as Combine4Particles
-from CommonParticles import StdNoPIDsDownElectrons
 from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from GaudiKernel.PhysicalConstants import c_light
-from StandardParticles import (StdAllNoPIDsPions, StdNoPIDsDownPions,
-                               StdLoosePions, StdLooseDownMuons,
-                               StdLooseMergedPi0, StdLooseResolvedPi0, StdLooseDalitzPi0)
+from StandardParticles import (StdLooseMergedPi0, StdLooseResolvedPi0,
+                               StdLooseDalitzPi0)
 
 # from CommonParticles.StdLooseDalitzPi0 import (StdLoosePi02gee, StdLoosePi024e)
 
@@ -2150,7 +2146,7 @@ def makeLambdaPPiEE(name, config, inputs):
 
 
 def makevelotracks(name):
-    from Configurables import FastVeloTracking, TrackPrepareVelo, DecodeVeloRawBuffer, TrackEventFitter, TrackStateInitAlg,  TrackContainerCopy
+    from Configurables import FastVeloTracking, TrackContainerCopy, TrackStateInitAlg
     from TrackFitter.ConfiguredFitters import ConfiguredEventFitter
 
     MyFastVeloTracking = FastVeloTracking(
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingRD/StrippingTau23MuLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingRD/StrippingTau23MuLines.py
index d9cca6b4abd4adfc85706bc020d4c9d6bb00bbc1..efcddadd2c0c53eae31d65b7c110a301ad4317fa 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingRD/StrippingTau23MuLines.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingRD/StrippingTau23MuLines.py
@@ -35,7 +35,6 @@ from GaudiConfUtils.ConfigurableGenerators import DaVinci__N5BodyDecays as Combi
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from GaudiKernel.PhysicalConstants import c_light
 
 default_config = {
     'NAME': 'Tau23Mu',
@@ -70,7 +69,7 @@ class Tau23MuLinesConf(LineBuilder):
         # checkConfig(Bs2MuMuLinesConf.__configuration_keys__,config)
 
         tau_name = name+'Tau23Mu'
-        ds23PiTIS_name = name+'Ds23PiTIS'
+        name+'Ds23PiTIS'
         ds23Pi_name = name+'Ds23Pi'
         ds2PhiPi_name = name+'Ds2PhiPi'
         tau25_name = name+'Tau25Mu'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingRD/StrippingTau2LambdaMuLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingRD/StrippingTau2LambdaMuLines.py
index 8cd7c6388ff4ba895478a3cfeed968afa1a66ac5..bf1088a9316ebde507658a198795658fff5e954b 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingRD/StrippingTau2LambdaMuLines.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingRD/StrippingTau2LambdaMuLines.py
@@ -16,12 +16,10 @@ Exported symbols (use python help!):
    - 
 '''
 
-from GaudiKernel.PhysicalConstants import c_light
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
-from Configurables import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
+from Configurables import CombineParticles
 __author__ = ['Marcin Chrzaszcz']
 __date__ = '14/12/2012'
 __version__ = '$Revision: 1.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingRD/StrippingZVTOP.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingRD/StrippingZVTOP.py
index ea1f9b6208c57e34dfbe76c664ccab3384f31986..307ea9bc346fb872b84790dd9d88d1116d33d9ad 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingRD/StrippingZVTOP.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingRD/StrippingZVTOP.py
@@ -9,14 +9,12 @@
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
 from Configurables import TopoTauAlg, TopoVertexTool
-from StandardParticles import StdLooseKaons
-from StandardParticles import StdLoosePions, StdTightPions
-from StandardParticles import StdNoPIDsKaons, StdNoPIDsPions
+from StandardParticles import StdLoosePions
+from StandardParticles import StdNoPIDsPions
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, OfflineVertexFitter
-from Gaudi.Configuration import *
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop
 old__author__ = ['G. Mancinelli, J Cogan']
 __date__ = '14/01/2014'
 __version__ = '$Revision: 1.2 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingSL/StrippingB23MuNu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingSL/StrippingB23MuNu.py
index 5f1edbaaaac7ff2b810161a6accc4d35fe5b2590..cb73631db49326f0330f231f9d0bbcbe9652a3b2 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingSL/StrippingB23MuNu.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingSL/StrippingB23MuNu.py
@@ -19,15 +19,12 @@ __all__ = ('B23MuNuConf')
 Stripping selection for B to three muons and a neutrino.
 """
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop
 
-from PhysSelPython.Wrappers import Selection, AutomaticData, MergedSelection
+from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from LHCbKernel.Configuration import *  # check if needed
-from Configurables import SubstitutePID
-from Configurables import SubPIDMMFilter
 
 
 #################
@@ -189,15 +186,13 @@ class B23MuNuConf(LineBuilder):
         """
         Creates Jpsi as proxy for dimuon
         """
-        from PhysSelPython.Wrappers import AutomaticData, Selection, SelectionSequence, DataOnDemand, MergedSelection
+        from PhysSelPython.Wrappers import Selection
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         # from Configurables import CombineParticles
 
         CombineJpsi = CombineParticles(DecayDescriptors=["J/psi(1S) -> mu+ mu-", "[J/psi(1S) -> mu+ mu+]cc"],
                                        MotherCut="ALL")
 
-        sel_name = "Jpsi"
-
         from PhysSelPython.Wrappers import Selection
         SelJpsi = Selection("Sel_" + self.name + "_Jpsi", Algorithm=CombineJpsi,
                             RequiredSelections=[self.Muons])
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingSL/StrippingB2DMuForTauMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingSL/StrippingB2DMuForTauMu.py
index 24bd5252aa63ad2bd7e72f001e4bf7d92164b192..12dee166b3de78360c21d960e89150de48cebd46 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingSL/StrippingB2DMuForTauMu.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingSL/StrippingB2DMuForTauMu.py
@@ -18,12 +18,10 @@ __version__ = '$Revision: 2.0 $'
 
 from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from PhysSelPython.Wrappers import Selection, DataOnDemand
+from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from StandardParticles import StdLoosePions, StdAllLooseMuons, StdLooseKaons, StdLooseProtons, StdAllLoosePions, StdLooseMergedPi0, StdLooseResolvedPi0, StdAllNoPIDsMuons, StdLooseANNUpPions
-from Configurables import ConjugateNeutralPID
-from PhysSelPython.Wrappers import MergedSelection
+from StandardParticles import StdAllLooseMuons, StdAllNoPIDsMuons, StdLooseKaons, StdLoosePions, StdLooseProtons
 
 __all__ = ('B2DMuForTauMuconf',
            # 'makeb2DMuX',
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingSL/StrippingB2DMuNuX.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingSL/StrippingB2DMuNuX.py
index 17cd5b71dd5db077b2c2fbed4adfe216fa2128e8..be298e6b623e98c491c6fb9e112f98311749074e 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingSL/StrippingB2DMuNuX.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingSL/StrippingB2DMuNuX.py
@@ -13,14 +13,13 @@ __date__ = '23/07/2010'
 __version__ = '$Revision: 5.0 $'
 
 from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
+from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
 from PhysSelPython.Wrappers import Selection
-from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from StandardParticles import StdLoosePions, StdLooseMuons, StdLooseKaons, StdLooseProtons, StdLooseElectrons
 from StandardParticles import StdNoPIDsPions, StdNoPIDsKaons, StdNoPIDsProtons, StdNoPIDsMuons
 from StrippingB2DMuNuXUtils import *
-from GaudiKernel.SystemOfUnits import MeV, GeV, cm, mm
+from GaudiKernel.SystemOfUnits import GeV, MeV, mm
 
 __all__ = ('B2DMuNuXAllLinesConf',
            'default_config')
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingSL/StrippingB2DMuNuXUtils.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingSL/StrippingB2DMuNuXUtils.py
index 4c6dd348fed7388392b98366954d2b1dc0fbbe27..7bce3fa7f24650a21814814917551403af57f85c 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingSL/StrippingB2DMuNuXUtils.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingSL/StrippingB2DMuNuXUtils.py
@@ -13,11 +13,9 @@ __date__ = '06/03/2015'
 __version__ = '$Revision: 0.0 $'
 
 from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
-from StrippingUtils.Utils import LineBuilder
-from StandardParticles import StdLoosePions, StdLooseMuons, StdLooseKaons, StdLooseProtons, StdNoPIDsPions, StdLooseElectrons, StdNoPIDsMuons
 
 
 def BtoDlnuLine(module_name,
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingSL/StrippingB2Dlnu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingSL/StrippingB2Dlnu.py
index 314d6e309550b6649edc4e0deda1b41a781ac788..d9b1a081f6ec6651b558b666e7576c54a2581b3e 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingSL/StrippingB2Dlnu.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingSL/StrippingB2Dlnu.py
@@ -17,12 +17,10 @@ __version__ = '$Revision: 1.0 $'
 
 from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from PhysSelPython.Wrappers import Selection, DataOnDemand
+from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from StandardParticles import StdLoosePions, StdLooseMuons, StdLooseKaons, StdLooseProtons, StdAllLoosePions, StdLooseMergedPi0, StdLooseResolvedPi0, StdAllNoPIDsMuons, StdLooseANNUpPions, StdLooseElectrons
-from Configurables import ConjugateNeutralPID
-from PhysSelPython.Wrappers import MergedSelection
+from StandardParticles import StdAllNoPIDsMuons, StdLooseElectrons, StdLooseKaons, StdLooseMuons, StdLoosePions
 
 __all__ = ('B2DMuForLNuconf',
            # 'makeb2DMuX',
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingSL/StrippingB2DstMuNuIncl.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingSL/StrippingB2DstMuNuIncl.py
index 2deca338b3c3e54fbefa7fd0858949d287ad4315..1cc8f434534b20edd10910569fb0c5884c783bad 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingSL/StrippingB2DstMuNuIncl.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingSL/StrippingB2DstMuNuIncl.py
@@ -12,9 +12,8 @@ __author__ = ['Mika Vesterinen']
 __date__ = '04/04/2015'
 __version__ = '$Revision: 0.0 $'
 
-from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from PhysSelPython.Wrappers import Selection, DataOnDemand
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
+from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from StandardParticles import StdLoosePions, StdLooseMuons, StdLooseKaons, StdAllLoosePions
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingSL/StrippingB2PPbarMuForTauMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingSL/StrippingB2PPbarMuForTauMu.py
index bbf2f30af50a4d032dcbc3d8bd45d439db3c1f39..04dfcfdefa47c1de292fecc8a0d346b598e38f79 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingSL/StrippingB2PPbarMuForTauMu.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingSL/StrippingB2PPbarMuForTauMu.py
@@ -9,9 +9,7 @@
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
 
-import logging
 from StrippingUtils.Utils import LineBuilder
-from Gaudi.Configuration import *
 __author__ = ['Mark Smith']
 __date__ = '17/10/2016'
 __version__ = '$Revision: 1.0 $'
@@ -110,8 +108,6 @@ class B2PPbarMuForTauMuBuilder(LineBuilder):
     def __init__(self, name, config):
         LineBuilder.__init__(self, name, config)
 
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
-
         self.GECs = {"Code": "( recSummary(LHCb.RecSummary.nSPDhits,'Raw/Spd/Digits') < %(GEC_nSPDHits)s )" % config,
                      "Preambulo": ["from LoKiTracks.decorators import *"]}
 
@@ -420,7 +416,7 @@ class B2PPbarMuForTauMuBuilder(LineBuilder):
     ###### B->ppMuNu Signal ######
     def _bhad2PMuX_B(self):
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-        from PhysSelPython.Wrappers import Selection, MergedSelection
+        from PhysSelPython.Wrappers import Selection
 
         _pMu = CombineParticles(
             DecayDescriptors=self._config["DECAYS"], ReFitPVs=True)
@@ -437,7 +433,7 @@ class B2PPbarMuForTauMuBuilder(LineBuilder):
     ###### B->ppMuNu Signal for Topo Line ######
     def _bhad2PMuX_BTopo(self):
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-        from PhysSelPython.Wrappers import Selection, MergedSelection
+        from PhysSelPython.Wrappers import Selection
 
         _pMu = CombineParticles(
             DecayDescriptors=self._config["DECAYS"], ReFitPVs=True)
@@ -454,7 +450,7 @@ class B2PPbarMuForTauMuBuilder(LineBuilder):
     ###### B->ppMuNu Same-Sign protons ######
     def _bhad2PMuX_B_SS(self):
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-        from PhysSelPython.Wrappers import Selection, MergedSelection
+        from PhysSelPython.Wrappers import Selection
 
         _pMu = CombineParticles(
             DecayDescriptors=self._config["SSDECAYS"], ReFitPVs=True)
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingSL/StrippingB2XTauNu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingSL/StrippingB2XTauNu.py
index 8efb67709ccc4939a7afd4730bb973234c008b74..fcbc8d4cc08bc4620c7d772cbeb082e28c89109d 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingSL/StrippingB2XTauNu.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingSL/StrippingB2XTauNu.py
@@ -608,7 +608,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         self.__MakeB0d2DdoubleStarTauNuNonPhysTau__()
 
         from StrippingConf.StrippingLine import StrippingLine
-        from PhysSelPython.Wrappers import SelectionSequence
 
         # TisTos filter
         def filterTisTos(name, Input, myTisTosSpecs):
@@ -1126,7 +1125,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
 
         from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseJpsi2MuMu
 
         JpsiForBc = FilterDesktop(
             Code=self.totalJpsiCut
@@ -1145,7 +1143,7 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
 
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
+        from PhysSelPython.Wrappers import Selection
         from StandardParticles import StdLoosePions
 
         CombDdoubleStar2DstarPi = CombineParticles(
@@ -1167,7 +1165,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3pi/Particles')
@@ -1191,7 +1188,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3pi/Particles')
@@ -1215,7 +1211,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTauNonPhys
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3piNonPhys/Particles')
@@ -1239,7 +1234,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3pi/Particles')
@@ -1264,7 +1258,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3pi/Particles')
@@ -1289,7 +1282,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTauNonPhys
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3piNonPhys/Particles')
@@ -1313,7 +1305,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3pi/Particles')
@@ -1338,7 +1329,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3pi/Particles')
@@ -1363,7 +1353,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTauNonPhys
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3piNonPhys/Particles')
@@ -1388,7 +1377,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3pi/Particles')
@@ -1412,7 +1400,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTauNonPhys
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3piNonPhys/Particles')
@@ -1436,7 +1423,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3pi/Particles')
@@ -1461,7 +1447,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3pi/Particles')
@@ -1486,7 +1471,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTauNonPhys
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3piNonPhys/Particles')
@@ -1511,7 +1495,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3pi/Particles')
@@ -1537,7 +1520,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3pi/Particles')
@@ -1561,7 +1543,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3pi/Particles')
@@ -1587,7 +1568,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3pi/Particles')
@@ -1612,7 +1592,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTauNonPhys
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3piNonPhys/Particles')
@@ -1638,7 +1617,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3pi/Particles')
@@ -1662,7 +1640,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3pi/Particles')
@@ -1686,7 +1663,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3pi/Particles')
@@ -1711,7 +1687,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3pi/Particles')
@@ -1737,7 +1712,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTauNonPhys
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3piNonPhys/Particles')
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingSL/StrippingB2XuMuNu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingSL/StrippingB2XuMuNu.py
index 200bd7771aa4cf41977bcd119043ca3b1f036a1e..26632da6719ba79a45f0ca97230622d6e21c2285 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingSL/StrippingB2XuMuNu.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingSL/StrippingB2XuMuNu.py
@@ -9,9 +9,7 @@
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
 
-import logging
 from StrippingUtils.Utils import LineBuilder
-from Gaudi.Configuration import *
 __author__ = ['Phillip Urquijo, Alessandra Borgia']
 __date__ = '08/05/2010'
 __version__ = '$Revision: 1.6 $'
@@ -227,7 +225,7 @@ class B2XuMuNuBuilder(LineBuilder):
     def __init__(self, name, config):
         LineBuilder.__init__(self, name, config)
         self.config = config
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
+        from PhysSelPython.Wrappers import DataOnDemand
         self._stdLooseKsLL = DataOnDemand("Phys/StdLooseKsLL/Particles")
         self._stdLooseKsLD = DataOnDemand("Phys/StdLooseKsLD/Particles")
         self._stdLooseKsDD = DataOnDemand("Phys/StdLooseKsDD/Particles")
@@ -633,8 +631,8 @@ class B2XuMuNuBuilder(LineBuilder):
         if self._KSSel is not None:
             return self._KSSel
 
-        from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
+        from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
+        from PhysSelPython.Wrappers import Selection
 
         _code = FilterDesktop(Code=self._NominalKsSelection() % self._config)
 
@@ -754,7 +752,7 @@ class B2XuMuNuBuilder(LineBuilder):
 
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection
-        from StandardParticles import StdLoosePions, StdLooseMuons
+        from StandardParticles import StdLoosePions
 
         _Ksh = CombineParticles(
             DecayDescriptor="KS0 -> mu- pi+",
@@ -782,7 +780,7 @@ class B2XuMuNuBuilder(LineBuilder):
 
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection
-        from StandardParticles import StdLoosePions, StdLooseMuons
+        from StandardParticles import StdLoosePions
 
         _Ksh = CombineParticles(
             DecayDescriptor="KS0 -> mu+ pi-",
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingSL/StrippingCharmFromBSemiForHadronAsy.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingSL/StrippingCharmFromBSemiForHadronAsy.py
index ae6916ee10975107d80bf873fb0cf514d0ae100d..50c775a9989778091e07c14a177f345664ef901d 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingSL/StrippingCharmFromBSemiForHadronAsy.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingSL/StrippingCharmFromBSemiForHadronAsy.py
@@ -25,8 +25,7 @@ from Configurables import FilterDesktop, CombineParticles
 from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from StandardParticles import StdAllLoosePions, StdLoosePions, StdLooseMuons, StdLooseKaons, StdLooseProtons
-from Configurables import TisTosParticleTagger
+from StandardParticles import StdLooseKaons, StdLooseMuons, StdLoosePions
 
 __all__ = ('CharmFromBSemiForHadronAsyAllLinesConf',
            'TOSFilter',
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingSL/StrippingLb2pMuNuVub.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingSL/StrippingLb2pMuNuVub.py
index e10913eb9590d30fc0624576ebbc5a089ebecfc9..233c320a48e2e1db5dcc41254759cc48a4896b7b 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingSL/StrippingLb2pMuNuVub.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingSL/StrippingLb2pMuNuVub.py
@@ -9,9 +9,7 @@
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
 
-import logging
 from StrippingUtils.Utils import LineBuilder
-from Gaudi.Configuration import *
 __author__ = ['William Sutcliffe']
 __date__ = '19/01/2014'
 __version__ = '$Revision: 1.0 $'
@@ -137,8 +135,6 @@ class Lb2pMuNuVubBuilder(LineBuilder):
     def __init__(self, name, config):
         LineBuilder.__init__(self, name, config)
 
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
-
         self.GECs = {"Code": "( recSummaryTrack(LHCb.RecSummary.nLongTracks, TrLONG) < %(GEC_nLongTrk)s )" % config,
                      "Preambulo": ["from LoKiTracks.decorators import *"]}
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingSL/Strippingbhad2PMuX.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingSL/Strippingbhad2PMuX.py
index 3ba91114e26c7abd9eedb69152926b96d6fc5064..00920929d0c157380e67827dd082ac96b04c48e2 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingSL/Strippingbhad2PMuX.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping30r3/StrippingSL/Strippingbhad2PMuX.py
@@ -9,9 +9,7 @@
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
 
-import logging
 from StrippingUtils.Utils import LineBuilder
-from Gaudi.Configuration import *
 __author__ = ['William Sutcliffe', 'Patrick Owen']
 __date__ = '02/12/2015'
 __version__ = '$Revision: 2.0 $'
@@ -135,8 +133,6 @@ class bhad2PMuXBuilder(LineBuilder):
     def __init__(self, name, config):
         LineBuilder.__init__(self, name, config)
 
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
-
         self.GECs = {"Code": "( recSummaryTrack(LHCb.RecSummary.nLongTracks, TrLONG) < %(GEC_nLongTrk)s )" % config,
                      "Preambulo": ["from LoKiTracks.decorators import *"]}
 
@@ -458,7 +454,7 @@ class bhad2PMuXBuilder(LineBuilder):
     ###### Lb->pMuNu High M_corr Opposite Sign ######
     def _bhad2PMuX_Lb(self):
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-        from PhysSelPython.Wrappers import Selection, MergedSelection
+        from PhysSelPython.Wrappers import Selection
 
         _pMu = CombineParticles(
             DecayDescriptors=self._config["DECAYS"], ReFitPVs=True)
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingB2CC/StrippingB2JpsiHH.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingB2CC/StrippingB2JpsiHH.py
index 426a15a03fdb410fd33fba1d83ccac165f4c345b..ea80a2693083b0dd305af119c0794a0a03dd0088 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingB2CC/StrippingB2JpsiHH.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingB2CC/StrippingB2JpsiHH.py
@@ -20,18 +20,10 @@ __date__ = '10/11/2016'
 
 __all__ = ('B2JpsiHHConf', 'default_config')
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from CommonParticles.Utils import updateDoD
-from StandardParticles import StdLoosePions
-from StandardParticles import StdLooseKaons
-from StandardParticles import StdLooseProtons
-from StandardParticles import StdAllLooseKaons
-from StandardParticles import StdAllLooseProtons
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
+from PhysSelPython.Wrappers import DataOnDemand, Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from GaudiKernel.SystemOfUnits import MeV
 
 default_config = {
     'NAME': 'B2JpsiHH',
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingB2CC/StrippingB2JpsiPi0.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingB2CC/StrippingB2JpsiPi0.py
index 90740f80b4fbe5d7cdd945fc3fb2a4331ac1e49d..170baf2fb63c5dbaab6735a4dbe697c61ed379a3 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingB2CC/StrippingB2JpsiPi0.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingB2CC/StrippingB2JpsiPi0.py
@@ -14,15 +14,10 @@ __version__ = '$Revision: 1.1$'
 
 __all__ = ('B2JpsiPi0Conf', 'default_config')
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from CommonParticles.Utils import updateDoD
-from StandardParticles import StdLooseResolvedPi0
-from StandardParticles import StdLooseMergedPi0
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
+from PhysSelPython.Wrappers import DataOnDemand, Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from GaudiKernel.SystemOfUnits import MeV
 
 default_config = {
     # The real name of the lines is BetaS, this is a reference this for the Settings.
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingB2CC/StrippingB2JpsiPi0_Run1.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingB2CC/StrippingB2JpsiPi0_Run1.py
index 3f5f0443aa9132ab2494cbb48813c4ad8991fc1b..1bf462e0083a2da3704b1f804d03b10239ecd920 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingB2CC/StrippingB2JpsiPi0_Run1.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingB2CC/StrippingB2JpsiPi0_Run1.py
@@ -14,15 +14,10 @@ __version__ = '$Revision: 1.2$'
 
 __all__ = ('B2JpsiPi0Conf_RI', 'default_config')
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from CommonParticles.Utils import updateDoD
-from StandardParticles import StdLooseResolvedPi0
-from StandardParticles import StdLooseMergedPi0
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
+from PhysSelPython.Wrappers import DataOnDemand, Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from GaudiKernel.SystemOfUnits import MeV
 
 default_config = {
     # The real name of the lines is BetaS, this is a reference this for the Settings.
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingB2CC/StrippingB2JpsiXforBeta_s.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingB2CC/StrippingB2JpsiXforBeta_s.py
index 34edcbc0093c97dfb6ab063776e3a0eb8b81cf7c..17422d9265cab98bdc0f1293adce9ef2bfaaec57 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingB2CC/StrippingB2JpsiXforBeta_s.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingB2CC/StrippingB2JpsiXforBeta_s.py
@@ -26,16 +26,12 @@ __version__ = '$Revision: 4.0$'
 
 __all__ = ('B2JpsiXforBeta_sConf', 'default_config')
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from CommonParticles.Utils import updateDoD
 from StandardParticles import StdLoosePions
 from StandardParticles import StdLooseKaons
-from StandardParticles import StdAllLooseKaons
 from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from GaudiKernel.SystemOfUnits import MeV
 
 default_config = {
     'NAME': 'BetaS',
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingB2CC/StrippingBd2JpsieeKS.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingB2CC/StrippingBd2JpsieeKS.py
index 447acfd66a8a888ea16f056888b1b5a41ccee167..ccac3244d5f71227250f84d9c5d0c485845ab5b3 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingB2CC/StrippingBd2JpsieeKS.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingB2CC/StrippingBd2JpsieeKS.py
@@ -8,16 +8,10 @@
 # granted to it by virtue of its status as an Intergovernmental Organization  #
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
-from GaudiKernel.SystemOfUnits import MeV
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
-from StandardParticles import StdAllLooseKaons
-from StandardParticles import StdLooseKaons
-from StandardParticles import StdLoosePions
-from CommonParticles.Utils import updateDoD
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = 'Ramon Niet'
 __date__ = '2014/10/23'
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingB2CC/StrippingBs2EtacPhiBDT.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingB2CC/StrippingBs2EtacPhiBDT.py
index b6e256eaa1235a84cbf3b68362eea9bf7f387897..30d69a2c110a19ab5a45303854da636781997f4f 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingB2CC/StrippingBs2EtacPhiBDT.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingB2CC/StrippingBs2EtacPhiBDT.py
@@ -17,7 +17,6 @@ from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
-from Gaudi.Configuration import *
 __author__ = ['Morgan Martin, Jibo He']
 __date__ = '20/08/2014'
 __version__ = '$Revision: 1.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingB2CC/StrippingBs2JpsieePhi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingB2CC/StrippingBs2JpsieePhi.py
index 933c2f46f93196ffa448a855cea7a82e5fca3652..ee8bf0cf2aad66cd3771f048a336fffb0ed8165d 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingB2CC/StrippingBs2JpsieePhi.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingB2CC/StrippingBs2JpsieePhi.py
@@ -12,7 +12,6 @@ from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from Configurables import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = 'Artur Ukleja, Jibo He, Konrad Klimaszewski'
 __date__ = '2011/03/01'
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingB2OC/Beauty2Charm_B2DXBuilder.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingB2OC/Beauty2Charm_B2DXBuilder.py
index e6930dfa54fdec19d728b767ed2a2cd4eecb0dc3..d8e959730e62f2112751de926f188d3330cae25a 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingB2OC/Beauty2Charm_B2DXBuilder.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingB2OC/Beauty2Charm_B2DXBuilder.py
@@ -12,11 +12,7 @@
 
 from copy import deepcopy
 from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-from PhysSelPython.Wrappers import Selection
-from Beauty2Charm_LoKiCuts import LoKiCuts
 from Beauty2Charm_Utils import *
-from Configurables import SubstitutePID
 
 # \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\#
 
@@ -1014,7 +1010,7 @@ class B2DXBuilder(object):
                                     "B- -> D*_2(2460)0 D0 K-"],
                   'B2D0st2460D0Pi': ["B+ -> D*_2(2460)0 D0 pi+",
                                      "B- -> D*_2(2460)0 D0 pi-"]}
-        input = self.dst.dpi_2460_pid+self.d.kpi_pid+self.topoKaons_PID
+        self.dst.dpi_2460_pid+self.d.kpi_pid+self.topoKaons_PID
         inputs = {'B2D0st2460D0K': self.dst.dpi_2460_pid+self.d.kpi_pid+self.topoKaons_PID,
                   'B2D0st2460D0Pi': self.dst.dpi_2460_pid+self.d.kpi_pid+self.topoPions_PID}
         rs = makeB2XSels(decays, '', inputs, self.config)
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingB2OC/Beauty2Charm_Bc2BXBuilder.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingB2OC/Beauty2Charm_Bc2BXBuilder.py
index 63ecc854364bae2f29d64ea2b95c3484988c7016..5bb9297a5c69f56bc7b9761489bf517623df7d3c 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingB2OC/Beauty2Charm_Bc2BXBuilder.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingB2OC/Beauty2Charm_Bc2BXBuilder.py
@@ -8,11 +8,9 @@
 # granted to it by virtue of its status as an Intergovernmental Organization  #
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
-from copy import deepcopy
 from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 from PhysSelPython.Wrappers import Selection, MergedSelection
-from Beauty2Charm_LoKiCuts import LoKiCuts
 from Beauty2Charm_Utils import *
 
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingB2OC/Beauty2Charm_Bc2DDBuilder.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingB2OC/Beauty2Charm_Bc2DDBuilder.py
index 17eda4547110606bb00b589ef9a9081a7ab985e7..44526bcd78bbc48eb6f8c6416c9eabdc38313ac4 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingB2OC/Beauty2Charm_Bc2DDBuilder.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingB2OC/Beauty2Charm_Bc2DDBuilder.py
@@ -11,10 +11,8 @@
 
 # \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\#
 
-from copy import deepcopy
 from Gaudi.Configuration import *
-from PhysSelPython.Wrappers import Selection, MergedSelection
-from Beauty2Charm_LoKiCuts import LoKiCuts
+from PhysSelPython.Wrappers import MergedSelection
 from Beauty2Charm_Utils import *
 # from Configurables import SubstitutePID
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingB2OC/Beauty2Charm_Bc2DXBuilder.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingB2OC/Beauty2Charm_Bc2DXBuilder.py
index 81cc1e9643beb97d6cd0d2618c4700761781dc0b..ebf213b794f94385813cca4d500843714848ef4c 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingB2OC/Beauty2Charm_Bc2DXBuilder.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingB2OC/Beauty2Charm_Bc2DXBuilder.py
@@ -10,9 +10,6 @@
 ###############################################################################
 from copy import deepcopy
 from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-from PhysSelPython.Wrappers import Selection, MergedSelection
-from Beauty2Charm_LoKiCuts import LoKiCuts
 from Beauty2Charm_Utils import *
 
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingB2OC/Beauty2Charm_DBuilder.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingB2OC/Beauty2Charm_DBuilder.py
index d6b9ccd1a0f0d9ee27234950cce9acdf93472eea..12089da920351bffe7565cdd11a269d2ccf1db85 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingB2OC/Beauty2Charm_DBuilder.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingB2OC/Beauty2Charm_DBuilder.py
@@ -315,7 +315,6 @@ class DBuilder(object):
         # self.k3pi_ddx_pid = [filterSelection('D2k3pi_for_DDX',LoKiCuts(['VCHI2DOF','BPVVDCHI2'],config_for_ddx).code(),self.k3pi_pid)]
 
         # use this below
-        d_cf_noMassWin = d_cf
         d_cf = LoKiCuts.combine([d_cf, "in_range(%s,MM,%s)" % (d_min, d_max)])
         ds_cf = LoKiCuts.combine(
             [ds_cf, "in_range(%s,MM,%s)" % (ds_min, ds_max)])
@@ -1800,9 +1799,6 @@ class DBuilder(object):
 
     def _makeD2PhiMuNu(self, up=False):
         '''makes Ds->phi mu nu'''
-        decays = [['phi(1020)', 'mu+']]
-        min = '1125.13*MeV'
-        max = '2168.49*MeV'
         cpkk = CombineParticles(CombinationCut="ADAMASS('phi(1020)') < 150*MeV",  # ( hasTopoChild() )
                                 MotherCut='(VFASPF(VCHI2/VDOF) < 10)',
                                 DaughtersCuts={'K+': '(PIDK>-10)'},
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingB2OC/Beauty2Charm_HHBuilder.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingB2OC/Beauty2Charm_HHBuilder.py
index d8fe4ecbe17ab0ec520c94a976ad35edd2915b1d..f3909f84f24aa054e0825e0f58ce84b8491379a3 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingB2OC/Beauty2Charm_HHBuilder.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingB2OC/Beauty2Charm_HHBuilder.py
@@ -10,7 +10,6 @@
 ###############################################################################
 # \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\#
 
-from copy import deepcopy
 from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 from PhysSelPython.Wrappers import Selection
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingB2OC/Beauty2Charm_HHHBuilder.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingB2OC/Beauty2Charm_HHHBuilder.py
index 75de6af8fc6a66ecf84cb1170d001c0fbbe0eed3..8c0987ed67f52808d68efea5301493d183df2888 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingB2OC/Beauty2Charm_HHHBuilder.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingB2OC/Beauty2Charm_HHHBuilder.py
@@ -10,9 +10,8 @@
 ###############################################################################
 # \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\#
 
-from copy import deepcopy
 from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N3BodyDecays
+from GaudiConfUtils.ConfigurableGenerators import DaVinci__N3BodyDecays
 from PhysSelPython.Wrappers import Selection
 from Beauty2Charm_LoKiCuts import LoKiCuts
 from Beauty2Charm_Utils import *
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingB2OC/Beauty2Charm_Lb2XBuilder.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingB2OC/Beauty2Charm_Lb2XBuilder.py
index cf3d996a2254f0b1fc911606c5b3b5643c73139c..5fb005dfa38b64fdd6aad17faa177c75bbed0cc5 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingB2OC/Beauty2Charm_Lb2XBuilder.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingB2OC/Beauty2Charm_Lb2XBuilder.py
@@ -1155,7 +1155,7 @@ class Lb2XBuilder(object):
 
     def _makeX2LcKPiPiPi(self):
         '''Makes RS + WS Xib -> Lc HH + c.c.'''
-        pions = self.pions
+        self.pions
         kaons = self.kaons
         pipipi = self.hhh.pipipi
         config = deepcopy(self.config)
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingB2OC/Beauty2Charm_LoKiCuts.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingB2OC/Beauty2Charm_LoKiCuts.py
index 54540ea2a223d554a751b02cf83000df4f3aa076..0fd327f8d32075591c9ca0e2d4dd434636c0ab35 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingB2OC/Beauty2Charm_LoKiCuts.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingB2OC/Beauty2Charm_LoKiCuts.py
@@ -10,11 +10,6 @@
 ###############################################################################
 # \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\#
 
-from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
-from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-from PhysSelPython.Wrappers import Selection, MergedSelection
-from StandardParticles import StdNoPIDsPions, StdNoPIDsKaons
 
 # \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\#
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingB2OC/Beauty2Charm_Utils.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingB2OC/Beauty2Charm_Utils.py
index cb2d7ea8c1ddf0415ab415c36f940ba4ebfcd712..d3d0bded79c4aceefda35165abe6775b7a157dd5 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingB2OC/Beauty2Charm_Utils.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingB2OC/Beauty2Charm_Utils.py
@@ -10,13 +10,11 @@
 ###############################################################################
 # \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\#
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-from PhysSelPython.Wrappers import DataOnDemand, Selection, MergedSelection, VoidEventSelection
+from PhysSelPython.Wrappers import DataOnDemand, Selection, VoidEventSelection
 from Beauty2Charm_LoKiCuts import LoKiCuts
 from Configurables import SubstitutePID
-from Configurables import ConeJetProxyFilter
 
 # \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\#
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingB2OC/StrippingB2DDphi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingB2OC/StrippingB2DDphi.py
index b0f8982f1efb389032da5f7becb2881e3c005379..92ca95c2ea3f7c46766aedbc04dbbc34c9c0b8ef 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingB2OC/StrippingB2DDphi.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingB2OC/StrippingB2DDphi.py
@@ -15,8 +15,7 @@ Author: M. Martinelli
 Notes: Excited states are included by placing the line in FULL.DST
 '''
 from PhysSelPython.Wrappers import Selection, DataOnDemand
-from Configurables import FilterDesktop, CombineParticles, DaVinci__N4BodyDecays
-from GaudiConfUtils.ConfigurableGenerators import CombineParticles
+from Configurables import DaVinci__N4BodyDecays, FilterDesktop
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 __author__ = ['Maurizio Martinelli']
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingB2OC/StrippingB2DXD2HMuNu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingB2OC/StrippingB2DXD2HMuNu.py
index 0c33c7610ceda08cc07fbbc35c72e2186d8d5d81..d01564ec9dde10135fe1fc2b84e567d131876e4c 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingB2OC/StrippingB2DXD2HMuNu.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingB2OC/StrippingB2DXD2HMuNu.py
@@ -12,13 +12,11 @@ __author__ = ['Wenbin Qian']
 __date__ = '09/11/2015'
 __version__ = '$Revision: 0.01 $'
 
-from Gaudi.Configuration import *
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, DaVinci__N4BodyDecays, DaVinci__N3BodyDecays
-from PhysSelPython.Wrappers import Selection, DataOnDemand
+from PhysSelPython.Wrappers import Selection
 from StandardParticles import StdLooseMuons, StdLoosePions, StdLooseKaons
-from GaudiKernel.SystemOfUnits import MeV, GeV, cm, mm
 
 __all__ = ('B2DXD2HMuNuBuilder',
            'default_config')
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingB2OC/StrippingB2DhhhLTUB.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingB2OC/StrippingB2DhhhLTUB.py
index 32740a839e6c5803a5f9a78cb0761bf31d5845e8..2d291c57b61d816dcf15c2585d0f10195c30d792 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingB2OC/StrippingB2DhhhLTUB.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingB2OC/StrippingB2DhhhLTUB.py
@@ -30,7 +30,6 @@ from StandardParticles import (StdAllNoPIDsPions, StdAllNoPIDsKaons,
 from Beauty2Charm_LoKiCuts import LoKiCuts
 from Beauty2Charm_Utils import *
 from GaudiConfUtils.ConfigurableGenerators import DaVinci__N3BodyDecays
-from Configurables import SubPIDMMFilter
 
 # Default configuration dictionary
 default_config = {
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingB2OC/StrippingB2nbody.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingB2OC/StrippingB2nbody.py
index 663bdbbf855c3d8d19dad3a29b6be667edaeedb9..04c84fc2dc39eb4b3d3d954f3c0083396e0c84fa 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingB2OC/StrippingB2nbody.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingB2OC/StrippingB2nbody.py
@@ -16,7 +16,6 @@ from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, MergedSelection, DataOnDemand, VoidEventSelection
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = ['Rudolf Oldeman']
 __date__ = '08/02/2011'
 __version__ = '$Revision: 1.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingB2OC/StrippingBeauty2Charm.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingB2OC/StrippingBeauty2Charm.py
index c48e6cd9261ea45bffd918aadf2890316b23348a..a85cf01b56a7b1984e60075a6cf1adbf67be4016 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingB2OC/StrippingBeauty2Charm.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingB2OC/StrippingBeauty2Charm.py
@@ -28,11 +28,9 @@ from Beauty2Charm_HHHBuilder import *
 from Beauty2Charm_HHBuilder import *
 from Beauty2Charm_DBuilder import *
 from StandardParticles import StdLooseAllPhotons, StdVeryLooseAllPhotons
-from Configurables import LoKi__VoidFilter
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import EventSelection
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
+from PhysSelPython.Wrappers import MergedSelection, Selection
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
 from Gaudi.Configuration import *
 import re
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingB2OC/StrippingDstarD02Kpipi0.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingB2OC/StrippingDstarD02Kpipi0.py
index 4e9947b7ea3069e1c1b444755ee1f84521a7b685..20a9a0349ca40965e5526f3348165187e69d9c4c 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingB2OC/StrippingDstarD02Kpipi0.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingB2OC/StrippingDstarD02Kpipi0.py
@@ -22,10 +22,10 @@ from StandardParticles import (StdAllNoPIDsPions,
                                StdAllNoPIDsKaons,
                                StdLooseMergedPi0,
                                StdLooseResolvedPi0)
-from StrippingUtils.Utils import LineBuilder, checkConfig
+from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, ConjugateNeutralPID
+from PhysSelPython.Wrappers import MergedSelection, Selection
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles, ConjugateNeutralPID
 __author__ = 'Andrea Contu'
 __date__ = '04/10/2010'
 __version__ = '$Revision: 1.5 $'
@@ -86,7 +86,6 @@ def makeD02kpipi0(name):
     str_D0_CombCuts = "(ADAMASS('D0')<200*MeV) & (ADOCA(1,2) < 1.5) & (AHASCHILD(((ABSID == 'K+') | (ABSID == 'pi+')) & (MIPCHI2DV(PRIMARY)>40)))"
     str_D0_MotherCuts = "(BPVDIRA>0.9) & (PT>2.5*GeV) & (VFASPF(VCHI2/VDOF)<10) & (BPVVDCHI2>36)"
     str_D0_DecayDescriptor_RS = "[D0 -> K- pi+ pi0]cc"
-    str_D0_Sidebands = "200*MeV"
 
     d0 = CombineParticles()
     d0.DecayDescriptor = str_D0_DecayDescriptor_RS
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingB2OC/StrippingLb2Lcpi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingB2OC/StrippingLb2Lcpi.py
index 34b20cffafba22aec461bec32e38de01ab302d7b..12591c47346493b51a22a436ed88fdc6c7a0b62e 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingB2OC/StrippingLb2Lcpi.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingB2OC/StrippingLb2Lcpi.py
@@ -12,19 +12,12 @@
 Module for selecting Lb->Lambda_c+ pi
 '''
 
-from StandardParticles import (StdAllNoPIDsPions, StdAllNoPIDsKaons,
-                               StdAllNoPIDsProtons, StdNoPIDsUpPions,
-                               StdLooseMuons, StdNoPIDsUpKaons,
-                               StdLooseResolvedPi0, StdLooseMergedPi0)
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from StandardParticles import StdLooseAllPhotons, StdVeryLooseAllPhotons
-from Configurables import LoKi__VoidFilter
 from PhysSelPython.Wrappers import MergedSelection
 from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
-from Gaudi.Configuration import *
 __author__ = ['Jiesheng Yu', 'Yuehong Xie']
 __date__ = '28/11/2016'
 __version__ = '$Revision: 2.0$'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBandQ/StrippingB2JpsiXforEM_s.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBandQ/StrippingB2JpsiXforEM_s.py
index d3aeeef75411f9cecca87053ee0faa991e8c7fd8..394fd7c3171d61beb9b93f762a890a248f2b190f 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBandQ/StrippingB2JpsiXforEM_s.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBandQ/StrippingB2JpsiXforEM_s.py
@@ -20,21 +20,11 @@ __version__ = '$Revision: 0.0 $'
 
 __all__ = ('B2JpsiXforEM_sConf', 'default_config')
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
 from Configurables import LoKi__PVReFitter, CombineParticles
-from CommonParticles.Utils import updateDoD
-from StandardParticles import StdLoosePions
-from StandardParticles import StdLooseKaons
-from StandardParticles import StdAllLooseKaons
-from StandardParticles import StdLooseResolvedPi0
-from StandardParticles import StdLooseMergedPi0
-from StandardParticles import StdNoPIDsPions
-from StandardParticles import StdLooseProtons
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
+from PhysSelPython.Wrappers import DataOnDemand, Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from GaudiKernel.SystemOfUnits import MeV
 
 default_config = {
     'NAME': 'B2JpsiXforEM',
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBandQ/StrippingBbbar2PhiPhi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBandQ/StrippingBbbar2PhiPhi.py
index 2c308991a8d9592619777fb7aad4c619a4a40437..fd4e526f5796889d5eb13efd1f1fca7adfbf4a97 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBandQ/StrippingBbbar2PhiPhi.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBandQ/StrippingBbbar2PhiPhi.py
@@ -21,12 +21,10 @@ confBbbar2PhiPhi = Bbbar2PhiPhiConf( name = 'Bbbar2PhiPhi', config = config_Bbba
 stream.appendLines( confBbbar2PhiPhi.lines() )
 '''
 
-from StandardParticles import StdNoPIDsProtons, StdNoPIDsPions, StdNoPIDsDownPions
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
+from PhysSelPython.Wrappers import DataOnDemand, Selection
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = ['Simone Stracka']
 __date__ = '10/03/2015'
 __all__ = (
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBandQ/StrippingBc2JpsiHBDT.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBandQ/StrippingBc2JpsiHBDT.py
index d973f13d2bc8b32c5045776e5b5d3f96bc618e74..7b5a84a9de9b55f09a9ef0da7469b5cc113c4602 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBandQ/StrippingBc2JpsiHBDT.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBandQ/StrippingBc2JpsiHBDT.py
@@ -18,7 +18,6 @@ from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = ['Jibo He']
 __date__ = '02/11/2013'
 __version__ = '$Revision: 2.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBandQ/StrippingBc2JpsiMuXNew.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBandQ/StrippingBc2JpsiMuXNew.py
index 946bad8366ac6019498b9d14e89f0a8899cf70d4..bd156feb81f0deaaf2a07b14df76bcbbcdd03d5c 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBandQ/StrippingBc2JpsiMuXNew.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBandQ/StrippingBc2JpsiMuXNew.py
@@ -18,7 +18,6 @@ from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = ['Jibo He']
 __date__ = '02/09/2010'
 __version__ = '$Revision: 2.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBandQ/StrippingCC2DD.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBandQ/StrippingCC2DD.py
index 58f89513ddb6f5ae23ad89c616deb7d8f0c6f719..39a30438368c27a6a42f57688de187a8b1135e72 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBandQ/StrippingCC2DD.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBandQ/StrippingCC2DD.py
@@ -22,8 +22,7 @@ Module for construction of CC->D D, where CC is a particle decaying to D D
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 __author__ = ['Lucio Anderlini', 'Andrea Bizzeti']
 __date__ = '2015-12-01'
 __version__ = '$Revision: 0.4 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBandQ/StrippingCcbar2Baryons.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBandQ/StrippingCcbar2Baryons.py
index e5a87f652fa30a90026cc6172bb112eb157c1e0f..3e235742a82cc6b6eef181ba5871e7096a9e965d 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBandQ/StrippingCcbar2Baryons.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBandQ/StrippingCcbar2Baryons.py
@@ -20,7 +20,6 @@ stream.appendLines( [
 ])
 '''
 
-from StandardParticles import StdNoPIDsProtons, StdNoPIDsPions, StdNoPIDsDownPions
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBandQ/StrippingCcbar2LstLst.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBandQ/StrippingCcbar2LstLst.py
index e880430a583a30505fa1d0a301f2d0578d4bd55f..fa5afb6734598eb18ef9475b8db9febd144e727c 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBandQ/StrippingCcbar2LstLst.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBandQ/StrippingCcbar2LstLst.py
@@ -12,12 +12,10 @@
 Module for selecting Ccbar->LstLst detached line, with loose PT, PID cuts. 
 '''
 
-from StandardParticles import StdNoPIDsProtons, StdNoPIDsKaons
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
+from PhysSelPython.Wrappers import DataOnDemand, Selection
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = ['Andrii Usachov']
 __date__ = '12/01/2017'
 
@@ -58,19 +56,19 @@ class Ccbar2LstLstConf(LineBuilder):
         self.name = name
         self.config = config
 
-        TRCHI2DOF = config['TRCHI2DOF']
-        KaonProbNNk = config['KaonProbNNk']
-        KaonPTSec = config['KaonPTSec']
-        ProtonProbNNp = config['ProtonProbNNp']
-        ProtonP = config['ProtonP']
-        ProtonPTSec = config['ProtonPTSec']
-        LstVtxChi2 = config['LstVtxChi2']
-        LstMinMass = config['LstMinMass']
-        LstMaxMass = config['LstMaxMass']
-        CombMaxMass = config['CombMaxMass']
-        CombMinMass = config['CombMinMass']
-        MaxMass = config['MaxMass']
-        MinMass = config['MinMass']
+        config['TRCHI2DOF']
+        config['KaonProbNNk']
+        config['KaonPTSec']
+        config['ProtonProbNNp']
+        config['ProtonP']
+        config['ProtonPTSec']
+        config['LstVtxChi2']
+        config['LstMinMass']
+        config['LstMaxMass']
+        config['CombMaxMass']
+        config['CombMinMass']
+        config['MaxMass']
+        config['MinMass']
 
         self.DetachedProtonForLst = self.createSubSel(OutputList="DetachedProtonForLst" + self.name,
                                                       InputList=DataOnDemand(
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBandQ/StrippingCcbar2PPPiPi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBandQ/StrippingCcbar2PPPiPi.py
index 28b6a56f5499cd8ecbce8b1d1e366f216f123073..91e5c78c655288eb933c6478d1eafcaee3904f84 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBandQ/StrippingCcbar2PPPiPi.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBandQ/StrippingCcbar2PPPiPi.py
@@ -12,12 +12,11 @@
 Module for selecting charmonium -> p pbar pi pi 
 '''
 
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
+from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
 from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
-from Gaudi.Configuration import *
 __author__ = ['Jibo He']
 __date__ = '12/11/2015'
 __version__ = '$Revision: 1.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBandQ/StrippingCcbar2PhiPhi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBandQ/StrippingCcbar2PhiPhi.py
index 93c8ad489c2db762a825531b6348226662cd1f87..a15c69b638fe064abee546bfdde9868d50d5c12f 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBandQ/StrippingCcbar2PhiPhi.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBandQ/StrippingCcbar2PhiPhi.py
@@ -21,12 +21,10 @@ confCcbar2PhiPhi = Ccbar2PhiPhiConf( name = 'Ccbar2PhiPhi', config = config_Ccba
 stream.appendLines( confCcbar2PhiPhi.lines() )
 '''
 
-from StandardParticles import StdNoPIDsProtons, StdNoPIDsPions, StdNoPIDsDownPions
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
+from PhysSelPython.Wrappers import DataOnDemand, Selection
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = ['Jibo He']
 __date__ = '20/01/2012'
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBandQ/StrippingCcbar2PhiPhiDetached.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBandQ/StrippingCcbar2PhiPhiDetached.py
index 9cece8aa8a316b6c48d7062407ae3c5e4a4703e3..8d48d19f4b11b35402f710baec49d8b99bec7f11 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBandQ/StrippingCcbar2PhiPhiDetached.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBandQ/StrippingCcbar2PhiPhiDetached.py
@@ -15,12 +15,10 @@ Inherited from StrippingCcbar2PhiPhi.py; moved To FullDST
 
 '''
 
-from StandardParticles import StdNoPIDsProtons, StdNoPIDsPions, StdNoPIDsDownPions
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
+from PhysSelPython.Wrappers import DataOnDemand, Selection
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = ['Jibo He, Liupan An']
 __date__ = '11/01/2017'
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBandQ/StrippingCcbar2PhiPhiPiPi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBandQ/StrippingCcbar2PhiPhiPiPi.py
index 3255f0fb24ce2bf3d5dedf3d48901b1a3b7fdf4c..8ded03963ceb90126c111e3d53772e2529b17348 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBandQ/StrippingCcbar2PhiPhiPiPi.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBandQ/StrippingCcbar2PhiPhiPiPi.py
@@ -12,12 +12,11 @@
 Module for selecting charmonium -> phi phi pi pi 
 '''
 
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
+from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
 from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
-from Gaudi.Configuration import *
 __author__ = ['Andrii Usachov']
 __date__ = '10/04/2017'
 __version__ = '$Revision: 1.1 $'
@@ -60,12 +59,12 @@ class Ccbar2PhiPhiPiPiConf(LineBuilder):
         self.name = name
         self.config = config
 
-        PhiVtxChi2 = config['PhiVtxChi2']
-        PhiMassW = config['PhiMassW']
-        KaonPT = config['KaonPT']
-        TRCHI2DOF = config['TRCHI2DOF']
-        KaonProbNNk = config['KaonProbNNk']
-        KaonIPCHI2 = config['KaonIPCHI2']
+        config['PhiVtxChi2']
+        config['PhiMassW']
+        config['KaonPT']
+        config['TRCHI2DOF']
+        config['KaonProbNNk']
+        config['KaonIPCHI2']
 
         self.SelPions = self.createSubSel(OutputList=self.name + "SelPions",
                                           InputList=DataOnDemand(
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBandQ/StrippingCcbar2PpbarNew.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBandQ/StrippingCcbar2PpbarNew.py
index ba5bfcce7fc9271b49567ec7bbb144a59fd454a9..f711b5e65190e11ae2eb374ed11b89af560461a7 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBandQ/StrippingCcbar2PpbarNew.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBandQ/StrippingCcbar2PpbarNew.py
@@ -18,9 +18,8 @@ Module for Charmonium->p pbar, including three lines
 
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
+from PhysSelPython.Wrappers import Selection
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 __author__ = ['Jibo He']
 __date__ = '03/10/2010'
 __version__ = '$Revision: 1.2 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBandQ/StrippingChiCJPsiGammaConv.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBandQ/StrippingChiCJPsiGammaConv.py
index 0974ad33bc785e6c21ccfbd8abd76c1de3c8330d..13c82277579b4165c559b3e45a8dc8a26f329028 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBandQ/StrippingChiCJPsiGammaConv.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBandQ/StrippingChiCJPsiGammaConv.py
@@ -11,8 +11,7 @@
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
-from Configurables import FilterDesktop, CombineParticles, OfflineVertexFitter
-from Gaudi.Configuration import *
+from Configurables import CombineParticles, FilterDesktop
 __author__ = 'Edwige Tournefier'
 __date__ = '08/06/2012'
 __version__ = '$ 1.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBandQ/StrippingDiMuonForXsection.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBandQ/StrippingDiMuonForXsection.py
index 99d45c194f644de10f8a90371ed1079dcd2e147e..7ceb214bd70cc59ffa52391a7a3321cce9dba642 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBandQ/StrippingDiMuonForXsection.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBandQ/StrippingDiMuonForXsection.py
@@ -16,7 +16,6 @@ from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
-from Gaudi.Configuration import *
 __author__ = ['Jibo He']
 __date__ = '28/03/2012'
 __version__ = '$Revision: 1.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBandQ/StrippingDiMuonNew.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBandQ/StrippingDiMuonNew.py
index 7c60c2e0a15b0e700724dae73d54a428fd669c7a..dd539e9d69fb0fa229c32fd245d281db456c4fed 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBandQ/StrippingDiMuonNew.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBandQ/StrippingDiMuonNew.py
@@ -60,7 +60,6 @@ from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand, EventSelection
 from Configurables import LoKi__VoidFilter
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
-from Gaudi.Configuration import *
 __author__ = ['Jibo He']
 __date__ = '30/09/2010'
 __version__ = '$Revision: 1.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBandQ/StrippingHeavyBaryons.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBandQ/StrippingHeavyBaryons.py
index fdc48e45e9d8cddbdbd0c89c4f67663a329603f3..500f8829198f1352b6129c8bf22fff77d3f04e68 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBandQ/StrippingHeavyBaryons.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBandQ/StrippingHeavyBaryons.py
@@ -12,14 +12,10 @@
 Stripping line for HeavyBaryons studies : Xi_b-, Xi_b0 and Omega_b-
 Author: Yasmine Amhis
 '''
-from GaudiKernel.SystemOfUnits import MeV
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
-from StandardParticles import StdAllLoosePions, StdAllLooseKaons
-from StandardParticles import StdLoosePions, StdNoPIDsDownPions, StdLooseKaons, StdLooseDownKaons
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = ['Yasmine Amhis']
 __date__ = '19/05/2011'
 __version__ = '$Revision: 1.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBandQ/StrippingLb2EtacKp.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBandQ/StrippingLb2EtacKp.py
index 8a3c40d6d917cd55ada1e72c0055edbb6fc858d4..a589ceeb17ed97f680fa80aba492a758463d9474 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBandQ/StrippingLb2EtacKp.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBandQ/StrippingLb2EtacKp.py
@@ -17,7 +17,6 @@ from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
-from Gaudi.Configuration import *
 __author__ = ['Liming Zhang', 'Xuesong Liu']
 __date__ = '23/11/2016'
 __version__ = '$Revision: 2.0$'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBandQ/StrippingOmegab2XicKpi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBandQ/StrippingOmegab2XicKpi.py
index 8a70403dd8fa18dfaddeb8195f9451277a91f501..d421f354b44c7aabc1d6b1a430c6eb0805291530 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBandQ/StrippingOmegab2XicKpi.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBandQ/StrippingOmegab2XicKpi.py
@@ -25,8 +25,7 @@ __all__ = ('Omegab2XicKpiConf',
            'makeOmegab2XicKpi',
            'default_config')
 
-from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBandQ/StrippingPPMuMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBandQ/StrippingPPMuMu.py
index cfa93241546b8cb1958f0c080bce3ed3974eb196..1e28adc9f8419151808afa067316d7a0f98387fb 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBandQ/StrippingPPMuMu.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBandQ/StrippingPPMuMu.py
@@ -12,12 +12,11 @@
 Module for selecting Hc -> p pbar mu mu
 '''
 
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
+from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
 from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
-from Gaudi.Configuration import *
 __author__ = ['Liupan An']
 __date__ = '18/05/2017'
 __version__ = '$Revision: 1.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBandQ/StrippingXibc.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBandQ/StrippingXibc.py
index ed73d91a4d03fe2ff6427b7cd54ccc7ed18aeaa7..d0446cddfd42feba526eaf11c9d8cf13a4160779 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBandQ/StrippingXibc.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBandQ/StrippingXibc.py
@@ -47,17 +47,11 @@ __all__ = ('XibcBuilder'  # LineBuilder class specialization
            )
 
 
-from Gaudi.Configuration import *
-
 from Configurables import FilterDesktop, CombineParticles
 from PhysSelPython.Wrappers import Selection, AutomaticData, MergedSelection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 
-from CommonParticles.StdLooseLambda import StdLooseLambdaLL, StdLooseLambdaDD
-from GaudiKernel.SystemOfUnits import MeV, GeV, mm
-from Configurables import TisTosParticleTagger
-
 
 default_name = "Xibc"
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBandQ/StrippingXibcBDT.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBandQ/StrippingXibcBDT.py
index 5520ac91aac71eded5064eb9daf551c6b35891fe..28b1ca4c2d5b6567ed207d4b3cd2e8dcd52a9324 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBandQ/StrippingXibcBDT.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBandQ/StrippingXibcBDT.py
@@ -33,8 +33,6 @@ from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticle
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, MergedSelection, DataOnDemand
-from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays
-from Gaudi.Configuration import *
 __author__ = ['Jibo He']
 __date__ = '20/11/2016'
 __version__ = '$Revision: 1.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBandQ/StrippingXiccBDT.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBandQ/StrippingXiccBDT.py
index 0fda677dfb8d63acd803c2278c95da8b32d22700..7dde23cf7ee6e3329158f6ed2ef36ed1b1c5655c 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBandQ/StrippingXiccBDT.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBandQ/StrippingXiccBDT.py
@@ -30,9 +30,7 @@ Xicc+  -> D+ p+ K-
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, MergedSelection, DataOnDemand
-from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays
-from Gaudi.Configuration import *
+from PhysSelPython.Wrappers import DataOnDemand, Selection
 __author__ = ['Jibo He']
 __date__ = '20/11/2016'
 __version__ = '$Revision: 1.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBnoC/StrippingB24pLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBnoC/StrippingB24pLines.py
index e6bad3da52314d2caae05ef30b8b7b7fcca28860..2c1172dbb74000f5040e77da3fe574900c5ad5a6 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBnoC/StrippingB24pLines.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBnoC/StrippingB24pLines.py
@@ -54,12 +54,10 @@ Exported symbols (use python help!):
    - 
 """
 
-from GaudiKernel.PhysicalConstants import c_light
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
-from Configurables import FilterDesktop, CombineParticles, DaVinci__N4BodyDecays
-from Gaudi.Configuration import *
+from Configurables import DaVinci__N4BodyDecays
 __author__ = ["Oliver Gruenberg"]
 __date__ = "07.12.2015"
 __version__ = "$Revision: 2.0 $"
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBnoC/StrippingB2CharmlessInclusive.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBnoC/StrippingB2CharmlessInclusive.py
index 7bf48ad34997ee3249ce7e2636285a51f6bb908b..e8e50e609900adc84c6b7f9853341ff1a6cc8ec1 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBnoC/StrippingB2CharmlessInclusive.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBnoC/StrippingB2CharmlessInclusive.py
@@ -16,9 +16,8 @@ from StandardParticles import StdLooseKsDD, StdLooseKsLL
 from StandardParticles import StdNoPIDsPions, StdLooseAllPhotons, StdLooseMergedPi0, StdLooseResolvedPi0
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand, SimpleSelection
+from PhysSelPython.Wrappers import Selection, SimpleSelection
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = ['Fred Blanc', 'Luca Pescatore']
 __date__ = '30/11/2016'
 __version__ = '$Revision: 3.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBnoC/StrippingB2HHBDT.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBnoC/StrippingB2HHBDT.py
index 227b08ce58545a0732c4f80380aac399232c66de..0e33808fbd0fbf40b5c871086dac6f487b3932f6 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBnoC/StrippingB2HHBDT.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBnoC/StrippingB2HHBDT.py
@@ -24,16 +24,13 @@ __all__ = ('B2HHBDTLines',
            'applyBDT',
            'default_config')
 
-from Gaudi.Configuration import *
 
-from GaudiKernel.SystemOfUnits import *
-
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 from StandardParticles import StdNoPIDsPions
 
 from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
-from StrippingUtils.Utils import LineBuilder, checkConfig
+from StrippingUtils.Utils import LineBuilder
 
 
 default_config = {
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBnoC/StrippingB2HHPi0.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBnoC/StrippingB2HHPi0.py
index f1095b036f3e034d540b8411e06b8865e0c3ff0c..ef02d37ee2de63dc6ef7b277b662a495617f7774 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBnoC/StrippingB2HHPi0.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBnoC/StrippingB2HHPi0.py
@@ -27,9 +27,8 @@ __all__ = ('StrippingB2HHPi0Conf',
            'makeB2HHPi0M',
            'default_config')
 
-from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from PhysSelPython.Wrappers import Selection, DataOnDemand
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
+from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from StandardParticles import StdNoPIDsPions, StdLooseMergedPi0, StdLooseResolvedPi0
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBnoC/StrippingB2KShh.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBnoC/StrippingB2KShh.py
index 2463c7b70c62a7b3577e86b85f49cf9209ac3f6f..f78ff4257f990c135f6d8f799f4e23f12ce9484b 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBnoC/StrippingB2KShh.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBnoC/StrippingB2KShh.py
@@ -25,7 +25,6 @@ __version__ = 'Stripping24r1/Stripping26r1'
 __all__ = {'B2KShhConf',
            'default_config'}
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, DaVinci__N3BodyDecays
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBnoC/StrippingB2KShhh.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBnoC/StrippingB2KShhh.py
index f95cf109667b3401f5eb904c78285279c34d00b5..07d236ac77af02d637424d32f3f4e637192ba3e1 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBnoC/StrippingB2KShhh.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBnoC/StrippingB2KShhh.py
@@ -27,13 +27,13 @@ __all__ = ('B2KShhhConf',
 
 from Gaudi.Configuration import *
 
-from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N4BodyDecays
+from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays
 from StandardParticles import StdNoPIDsPions, StdNoPIDsKaons  # ipchi2 cut
 from StandardParticles import StdLooseKsDD, StdLooseKsLL
 
-from PhysSelPython.Wrappers import Selection, MergedSelection
+from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
-from StrippingUtils.Utils import LineBuilder, checkConfig
+from StrippingUtils.Utils import LineBuilder
 
 from Configurables import FilterDesktop
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBnoC/StrippingB2Ksthh.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBnoC/StrippingB2Ksthh.py
index 94a25a2714e9626cb22e6966b9ad7a1955d78eb9..a39998cb04eef71b62a1bf9337b6fb914d58a917 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBnoC/StrippingB2Ksthh.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBnoC/StrippingB2Ksthh.py
@@ -22,7 +22,6 @@ __version__ = 'Stripping26'
 __all__ = {'B2KsthhConf',
            'default_config'}
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
@@ -176,7 +175,7 @@ class B2KsthhConf(LineBuilder):
         _massCutHigh = "(AM<(5279+%s)*MeV)" % config['B_Mhigh']
         _aptCut = "(APT>%s*MeV)" % config['B_APTmin']
         _daugMedPtCut = "(ANUM(PT>%s*MeV)>=2)" % config['BDaug_MedPT_PT']
-        _daugMaxPtIPCut = "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['BDaug_MaxPT_IP']
+        "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['BDaug_MaxPT_IP']
         _daugPtSumCut = "((APT1+APT2+APT3)>%s*MeV)" % config['BDaug_PTsum']
 
         _combCuts = _aptCut
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBnoC/StrippingB2TwoBaryons.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBnoC/StrippingB2TwoBaryons.py
index 3672d2598d6998ab4cdabeed5e1cd906662153ff..5a03142a75c0c7aadbcac42a43742401351fb49b 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBnoC/StrippingB2TwoBaryons.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBnoC/StrippingB2TwoBaryons.py
@@ -31,11 +31,10 @@ from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
 from StandardParticles import StdLooseProtons
 from StandardParticles import StdNoPIDsPions as Pions
-from CommonParticles.StdLooseLambda import StdLooseLambdaLL, StdLooseLambdaDD
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
-from StrippingUtils.Utils import LineBuilder, checkConfig
-from GaudiKernel.SystemOfUnits import MeV, GeV, mm, ns
+from StrippingUtils.Utils import LineBuilder
+from GaudiKernel.SystemOfUnits import GeV, MeV, mm
 
 default_config = {'NAME': 'B2TwoBaryons',
                   'WGs': ['BnoC'],
@@ -157,7 +156,7 @@ class B2TwoBaryonLines(LineBuilder):
 
         B2PPbarName = name + "B2PPbar"
 
-        B2PPSameSignName = name + "B2PPSameSign"
+        name + "B2PPSameSign"
 
         B2Lp_dd_name = name+'B2PLambdabarDD'
         B2Lp_ll_name = name+'B2PLambdabarLL'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBnoC/StrippingB2XEta.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBnoC/StrippingB2XEta.py
index e1adec50004bf9392e263cc5cb3ba465d4e08bf7..95fbd42162ff7cf67819bcb2ccbe2b4f88c30155 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBnoC/StrippingB2XEta.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBnoC/StrippingB2XEta.py
@@ -25,9 +25,7 @@ from StandardParticles import StdLoosePions as Pions
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, DaVinci__N3BodyDecays
-from PhysSelPython.Wrappers import DataOnDemand, Selection, SelectionSequence, MergedSelection
-from GaudiKernel import SystemOfUnits as Units
-from Gaudi.Configuration import *
+from PhysSelPython.Wrappers import DataOnDemand, MergedSelection, Selection
 __author__ = ['Timothy Williams']
 __date__ = '1/12/2016'
 __version__ = 'Stripping26r1'
@@ -564,7 +562,7 @@ class B2XEtaConf(LineBuilder):
         _trackCuts = _track_PT+'&'+_track_Chi2+'&'+_track_GPCut+'&'+_track_PIDCut
         _combCuts = _massCut+'&'+_docaCut
         _combCut12Doca = "ACHI2DOCA(1,2)<%s" % config['eta_DOCA']
-        _combCut12Vtx = "(VFASPF(VCHI2/VDOF)<%s)" % config['eta_vtxChi2']
+        "(VFASPF(VCHI2/VDOF)<%s)" % config['eta_vtxChi2']
         _combCut12 = _combCut12Doca
 
         # _eta3Pi=CombineParticles("eta3Pi",
@@ -592,7 +590,7 @@ class B2XEtaConf(LineBuilder):
         _trackCuts = _track_PT+'&'+_track_Chi2+'&'+_track_GPCut+'&'+_track_PIDCut
         _combCuts = _massCut+'&'+_docaCut
         _combCut12Doca = "ACHI2DOCA(1,2)<%s" % config['eta_prime_DOCA']
-        _combCut12Vtx = "(VFASPF(VCHI2/VDOF)<%s)" % config['eta_prime_vtxChi2']
+        "(VFASPF(VCHI2/VDOF)<%s)" % config['eta_prime_vtxChi2']
         _combCut12 = _combCut12Doca
 
         # _etap=CombineParticles("etap",
@@ -883,7 +881,7 @@ class B2XEtaConf(LineBuilder):
         _combCuts = _massCut+'&'+_docaCut
         _allCuts = _PTCut+'&'+_vtxCut+'&'+_diraCut+'&'+_IPChi2Cut
         _combCut12Doca = "ACHI2DOCA(1,2)<%s" % config['LbDaug_LL_maxDocaChi2']
-        _combCut12Vtx = "(VFASPF(VCHI2/VDOF)<%s)" % config['Lb_VtxChi2']
+        "(VFASPF(VCHI2/VDOF)<%s)" % config['Lb_VtxChi2']
         _combCut12 = _combCut12Doca
 
         _Lb2pKetap = DaVinci__N3BodyDecays(DecayDescriptor="[Lambda_b0 -> p+ K- eta_prime]cc",
@@ -921,7 +919,7 @@ class B2XEtaConf(LineBuilder):
         _combCuts = _massCut
         _allCuts = _PTCut+'&'+_IPChi2Cut+'&'+_vtxCut+'&'+_diraCut
         _combCut12Doca = "ACHI2DOCA(1,2)<%s" % config['LbDaug_LL_maxDocaChi2']
-        _combCut12Vtx = "(VFASPF(VCHI2/VDOF)<%s)" % config['Lb_VtxChi2']
+        "(VFASPF(VCHI2/VDOF)<%s)" % config['Lb_VtxChi2']
         _combCut12 = _combCut12Doca
 
         _Lb2pKeta3Pi = DaVinci__N3BodyDecays(DecayDescriptor="[Lambda_b0 -> p+ K- eta]cc",
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBnoC/StrippingB2a1Pi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBnoC/StrippingB2a1Pi.py
index 29c0766744b242c4ed1be4817cca727495bcb265..9f701cc986294843a275fb204128fb9f3c88fb1d 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBnoC/StrippingB2a1Pi.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBnoC/StrippingB2a1Pi.py
@@ -17,7 +17,6 @@ from Configurables import DaVinci__N4BodyDecays
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
-from Gaudi.Configuration import *
 __author__ = ['Daniel Vieira, Jibo He']
 __date__ = '01/12/2016'
 __version__ = '$Revision: 1.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBnoC/StrippingB2pphh.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBnoC/StrippingB2pphh.py
old mode 100755
new mode 100644
index 782d89e7466f93f490e15dd1095ac153359b502b..99d5b7265b684f2c69cc962f37bc4fe0b20ac220
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBnoC/StrippingB2pphh.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBnoC/StrippingB2pphh.py
@@ -25,16 +25,13 @@ __all__ = ('B2pphhConf',
            )
 
 
-from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop
+from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
 # from Configurables import DaVinci__N4BodyDecays
 from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays
 
-from StandardParticles import StdAllNoPIDsKaons, StdAllNoPIDsPions, StdAllNoPIDsProtons
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from Configurables import LoKi__VoidFilter as VoidFilter
 
 default_config = {
     'NAME': 'B2pphh',
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBnoC/StrippingBc2hhh_BnoC.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBnoC/StrippingBc2hhh_BnoC.py
index cc0952e7ed4c72dc5b618028ac8bc563928c126d..21b92fa5aab68df4d68f10c50e59c126b546bd31 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBnoC/StrippingBc2hhh_BnoC.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBnoC/StrippingBc2hhh_BnoC.py
@@ -23,13 +23,11 @@ Exported symbols (use python help!):
    - makeppK_excl  
 '''
 
-from Configurables import LoKi__VoidFilter as VoidFilter
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection
 import StandardParticles
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 __author__ = ['Alvaro Gomes', 'Adlene Hicheur']
 __date__ = '31/08/2014'
 __version__ = '$Revision: 1.5 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBnoC/StrippingBs2KKhh.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBnoC/StrippingBs2KKhh.py
index cc743704a31afe9960dc904fcabf1a694c0af26c..1f66a1746034805023be6fad668962c1444b5bf3 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBnoC/StrippingBs2KKhh.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBnoC/StrippingBs2KKhh.py
@@ -27,7 +27,6 @@ from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop
-from Gaudi.Configuration import *
 __author__ = ['Sean Benson', 'Adam Morris', 'Laurence Carson']
 __date__ = '22/11/2016'
 __version__ = '3.2'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBnoC/StrippingBs2KSKS_Run2.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBnoC/StrippingBs2KSKS_Run2.py
index 629ca8140bd72d6380100393e840bf791f2f2cd9..6afaa37fab4f411e76010a848c09d7d72e5a05d9 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBnoC/StrippingBs2KSKS_Run2.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBnoC/StrippingBs2KSKS_Run2.py
@@ -22,15 +22,11 @@ __date__ = '13/09/2016'
 __version__ = 'Run2'
 __all__ = {'Bs2KSKSConf', 'default_config'}
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
+from PhysSelPython.Wrappers import DataOnDemand, Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 
-from StandardParticles import StdNoPIDsPions as Pions
-from StandardParticles import StdNoPIDsDownPions as DownPions
-
 
 default_config = {
     'NAME': 'Bs2KSKS',
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBnoC/StrippingBs2Kst_0Kst_0.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBnoC/StrippingBs2Kst_0Kst_0.py
index a98f9f87f8206e9ad5c75903c11841c3ce21aa12..fc4400565299e55e6d3d64c2f0dfb059d918d5dd 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBnoC/StrippingBs2Kst_0Kst_0.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBnoC/StrippingBs2Kst_0Kst_0.py
@@ -19,11 +19,8 @@ Exported symbols (use python help!):
 
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, SelectionSequence, DataOnDemand
+from PhysSelPython.Wrappers import DataOnDemand, Selection
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-from CommonParticles.Utils import *
-from LHCbKernel.Configuration import *
-from Gaudi.Configuration import *
 __author__ = ['Brais Sanmartin Sedes']
 __date__ = '12/11/2015'
 __version__ = '5.1'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBnoC/StrippingBs2PhiKst0.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBnoC/StrippingBs2PhiKst0.py
index ceb8daa24373fc0cd210ec42fdbc56fd456f51e4..0c1ff7d620f2ef3058536bb8bbba7bedc35b168a 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBnoC/StrippingBs2PhiKst0.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBnoC/StrippingBs2PhiKst0.py
@@ -20,11 +20,8 @@ Exported symbols (use python help!):
 
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, SelectionSequence, DataOnDemand
+from PhysSelPython.Wrappers import DataOnDemand, Selection
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-from CommonParticles.Utils import *
-from LHCbKernel.Configuration import *
-from Gaudi.Configuration import *
 __author__ = ['Brais Sanmartin Sedes']
 __date__ = '01/12/2015'
 __version__ = '5.0'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBnoC/StrippingBs2PhiPhi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBnoC/StrippingBs2PhiPhi.py
index f2cbc909ab0ba7ccdfaa7a90b8ec50e77523c36e..d8de299e30c7706a8175b72a9d163d7022a65ea3 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBnoC/StrippingBs2PhiPhi.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBnoC/StrippingBs2PhiPhi.py
@@ -24,12 +24,10 @@ Exports the following stripping lines as instance data members:
 
 from StandardParticles import StdAllLooseANNKaons as MyLooseKaons
 from StandardParticles import StdLooseANNUpKaons as MyLooseUpKaons
-import StandardParticles
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
+from PhysSelPython.Wrappers import Selection
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 __author__ = ['Sean Benson']
 __date__ = '2013/08/15'
 __version__ = '3.0'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBnoC/StrippingBu2Ksthh.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBnoC/StrippingBu2Ksthh.py
index 5a06d1502605fd2037a6b16043d5efb150ce86d5..032717bced65040c1e6edaf12520110a1398cd1d 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBnoC/StrippingBu2Ksthh.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBnoC/StrippingBu2Ksthh.py
@@ -23,7 +23,6 @@ __version__ = 'Stripping26'
 __all__ = {'Bu2KsthhConf',
            'default_config'}
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
@@ -302,7 +301,7 @@ class Bu2KsthhConf(LineBuilder):
         _massCutHigh = "(AM<(5279+%s)*MeV)" % config['B_Mhigh']
         _aptCut = "(APT>%s*MeV)" % config['B_APTmin']
         _daugMedPtCut = "(ANUM(PT>%s*MeV)>=2)" % config['BDaug_MedPT_PT']
-        _daugMaxPtIPCut = "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['BDaug_MaxPT_IP']
+        "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['BDaug_MaxPT_IP']
         _maxDocaChi2Cut = "(ACUTDOCACHI2(%s,''))" % config['BDaug_DD_maxDocaChi2']
         _daugPtSumCut = "((APT1+APT2+APT3)>%s*MeV)" % config['BDaug_DD_PTsum']
 
@@ -359,7 +358,7 @@ class Bu2KsthhConf(LineBuilder):
         _massCutHigh = "(AM<(5279+%s)*MeV)" % config['B_Mhigh']
         _aptCut = "(APT>%s*MeV)" % config['B_APTmin']
         _daugMedPtCut = "(ANUM(PT>%s*MeV)>=2)" % config['BDaug_MedPT_PT']
-        _daugMaxPtIPCut = "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['BDaug_MaxPT_IP']
+        "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['BDaug_MaxPT_IP']
         _maxDocaChi2Cut = "(ACUTDOCACHI2(%s,''))" % config['BDaug_LL_maxDocaChi2']
         _daugPtSumCut = "((APT1+APT2+APT3)>%s*MeV)" % config['BDaug_LL_PTsum']
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBnoC/StrippingBu2hhh.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBnoC/StrippingBu2hhh.py
index 890eba4692dbe06517c0d7aee8f51d320cca8a64..62ede4129b7f2bd6ff173b27d26ebf7e47e4e6ea 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBnoC/StrippingBu2hhh.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBnoC/StrippingBu2hhh.py
@@ -22,13 +22,11 @@ Exported symbols (use python help!):
    - makepph_incl
 '''
 
-from Configurables import LoKi__VoidFilter as VoidFilter
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection
 import StandardParticles
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 __author__ = ['Irina Nasteva', 'Jussara Miranda', 'Alvaro Gomes']
 __date__ = '19/05/2017'
 __version__ = 'Stripping29'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBnoC/StrippingBu2rho0rhoPlus.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBnoC/StrippingBu2rho0rhoPlus.py
index 6ff36ce6304e5d819eb96fe6ca06587bb1baa6cc..51df1d5067b9100ee67537610b0005b048a5d51f 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBnoC/StrippingBu2rho0rhoPlus.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBnoC/StrippingBu2rho0rhoPlus.py
@@ -21,7 +21,6 @@ from StrippingUtils.Utils import LineBuilder, checkConfig
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = "Jason E Andrews"
 __date__ = "26/11/2016"
 __version__ = "4.0"
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBnoC/StrippingButo5h.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBnoC/StrippingButo5h.py
index be4eeb8a2dc0617afde7aab5929540d3bc8d05c7..65e1b29f0dde00492a6a5432e53292b9bc4c81a7 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBnoC/StrippingButo5h.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBnoC/StrippingButo5h.py
@@ -23,13 +23,11 @@ Exported symbols (use python help!):
    - makeppKpipi_excl
 '''
 
-from Configurables import LoKi__VoidFilter as VoidFilter
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection
 import StandardParticles
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 __author__ = ['Luiz Gustavo de Oliveira',
               'Alvaro Gomes', 'Bruno Souza de Paula']
 __date__ = '22/Aug/2014'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBnoC/StrippingD2HHBDT.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBnoC/StrippingD2HHBDT.py
index 6bee345112d54e258044f31f0e7d809849b112f7..98ef43000bc5732a81fe2e10bace645263334787 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBnoC/StrippingD2HHBDT.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBnoC/StrippingD2HHBDT.py
@@ -23,14 +23,13 @@ __all__ = ('D2HHBDTLines',
            'makeD2HHBDT',
            'default_config')
 
-from Gaudi.Configuration import *
 
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
 from StandardParticles import StdNoPIDsKaons, StdAllNoPIDsPions
 
 from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
-from StrippingUtils.Utils import LineBuilder, checkConfig
+from StrippingUtils.Utils import LineBuilder
 
 
 default_config = {
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBnoC/StrippingHb2Charged2Body.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBnoC/StrippingHb2Charged2Body.py
index 11da99218434ae71c894fa73b708dca4ee60de5d..3b3424d2fb6688333e151f52793701a7a2c00dbe 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBnoC/StrippingHb2Charged2Body.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBnoC/StrippingHb2Charged2Body.py
@@ -23,14 +23,13 @@ __all__ = ('Hb2Charged2BodyLines',
            'makeB2Charged2Body',
            'default_config')
 
-from Gaudi.Configuration import *
 
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-from StandardParticles import StdNoPIDsPions, StdLooseProtons, StdLooseKaons
+from StandardParticles import StdNoPIDsPions
 
 from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
-from StrippingUtils.Utils import LineBuilder, checkConfig
+from StrippingUtils.Utils import LineBuilder
 
 
 default_config = {
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBnoC/StrippingHb2V0V0h.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBnoC/StrippingHb2V0V0h.py
index 6b1c9eb94b261dbc185e979f0314ffe2bd69f930..f3104c9b58e73817c70f7fa7e3d68a0b9ecf0860 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBnoC/StrippingHb2V0V0h.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBnoC/StrippingHb2V0V0h.py
@@ -22,7 +22,6 @@ __date__ = '10/02/2017'
 __version__ = 'Stripping28'
 __all__ = 'Hb2V0V0hConf'
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBnoC/StrippingLb2V0hh.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBnoC/StrippingLb2V0hh.py
index c2e428e39111ecbcc3289b28272ce5a9de2ffb91..61dc7972f8dc320a7c8305eb888e7e21d3f2e7b7 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBnoC/StrippingLb2V0hh.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBnoC/StrippingLb2V0hh.py
@@ -25,7 +25,6 @@ __date__ = '11/01/2017'
 __version__ = 'Stripping28'
 __all__ = 'Lb2V0hhConf'
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
@@ -211,8 +210,8 @@ class Lb2V0hhConf(LineBuilder):
         _vtxCut = "(VFASPF(VCHI2)<%s)   " % config['Lambda_DD_VtxChi2']
         _fdChi2Cut = "(BPVVDCHI2>%s)" % config['Lambda_DD_FDChi2']
         _momCut = "(P>%s*MeV)" % config['Lambda_DD_Pmin']
-        _trkGhostProbCut1 = "(CHILDCUT((TRGHOSTPROB<%s),1))" % config['Trk_GhostProb']
-        _trkGhostProbCut2 = "(CHILDCUT((TRGHOSTPROB<%s),2))" % config['Trk_GhostProb']
+        "(CHILDCUT((TRGHOSTPROB<%s),1))" % config['Trk_GhostProb']
+        "(CHILDCUT((TRGHOSTPROB<%s),2))" % config['Trk_GhostProb']
 
         _allCuts = _momCut
         _allCuts += '&'+_massCut
@@ -267,8 +266,8 @@ class Lb2V0hhConf(LineBuilder):
         _vtxCut = "(VFASPF(VCHI2)<%s)   " % config['Lambda_DD_VtxChi2']
         _fdChi2Cut = "(BPVVDCHI2>%s)" % config['Lambda_DD_FDChi2']
         _momCut = "(P>%s*MeV)" % config['Lambda_DD_Pmin']
-        _trkGhostProbCut1 = "(CHILDCUT((TRGHOSTPROB<%s),1))" % config['Trk_GhostProb']
-        _trkGhostProbCut2 = "(CHILDCUT((TRGHOSTPROB<%s),2))" % config['Trk_GhostProb']
+        "(CHILDCUT((TRGHOSTPROB<%s),1))" % config['Trk_GhostProb']
+        "(CHILDCUT((TRGHOSTPROB<%s),2))" % config['Trk_GhostProb']
 
         _allCuts = _momCut
         _allCuts += '&'+_massCut
@@ -301,7 +300,7 @@ class Lb2V0hhConf(LineBuilder):
         _massCutHigh = "(AM<(5619+%s)*MeV)" % config['Lb_2bodyMhigh']
         _aptCut = "(APT>%s*MeV)" % config['Lb_APTmin']
         _daugMedPtCut = "(ANUM(PT>%s*MeV)>=2)" % config['LbDaug_MedPT_PT']
-        _daugMaxPtIPCut = "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP']
+        "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP']
         _maxDocaChi2Cut = "(ACUTDOCACHI2(%s,''))" % config['LbDaug_DD_maxDocaChi2']
         _daugPtSumCut = "(APT1>%s*MeV)" % config['Lbh_DD_PTMin']
 
@@ -352,7 +351,7 @@ class Lb2V0hhConf(LineBuilder):
         _massCutHigh = "(AM<(5619+%s)*MeV)" % config['Lb_Mhigh']
         _aptCut = "(APT>%s*MeV)" % config['Lb_APTmin']
         _daugMedPtCut = "(ANUM(PT>%s*MeV)>=2)" % config['LbDaug_MedPT_PT']
-        _daugMaxPtIPCut = "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP']
+        "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP']
         _maxDocaChi2Cut = "(ACUTDOCACHI2(%s,''))" % config['LbDaug_DD_maxDocaChi2']
         _daugPtSumCut = "((APT1+APT2+APT3)>%s*MeV)" % config['LbDaug_DD_PTsum']
 
@@ -368,7 +367,7 @@ class Lb2V0hhConf(LineBuilder):
         _vtxChi2Cut = "(VFASPF(VCHI2)<%s)" % config['Lb_VtxChi2']
         _diraCut = "(BPVDIRA>%s)" % config['Lb_DD_Dira']
         _ipChi2Cut = "(MIPCHI2DV(PRIMARY)<%s)" % config['Lb_DD_IPCHI2wrtPV']
-        _fdCut = "(VFASPF(VMINVDDV(PRIMARY))>%s)" % config['Lb_FDwrtPV']
+        "(VFASPF(VMINVDDV(PRIMARY))>%s)" % config['Lb_FDwrtPV']
         _fdChi2Cut = "(BPVVDCHI2>%s)" % config['Lb_DD_FDChi2']
 
         _motherCuts = _ptCut
@@ -540,7 +539,7 @@ class Lb2V0hhConf(LineBuilder):
         _massCutHigh = "(AM<(5619+%s)*MeV)" % config['Lb_2bodyMhigh']
         _aptCut = "(APT>%s*MeV)" % config['Lb_APTmin']
         _daugMedPtCut = "(ANUM(PT>%s*MeV)>=2)" % config['LbDaug_MedPT_PT']
-        _daugMaxPtIPCut = "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP']
+        "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP']
         _maxDocaChi2Cut = "(ACUTDOCACHI2(%s,''))" % config['LbDaug_LD_maxDocaChi2']
         _daugPtSumCut = "(APT1>%s*MeV)" % config['Lbh_LD_PTMin']
 
@@ -591,7 +590,7 @@ class Lb2V0hhConf(LineBuilder):
         _massCutHigh = "(AM<(5619+%s)*MeV)" % config['Lb_Mhigh']
         _aptCut = "(APT>%s*MeV)" % config['Lb_APTmin']
         _daugMedPtCut = "(ANUM(PT>%s*MeV)>=2)" % config['LbDaug_MedPT_PT']
-        _daugMaxPtIPCut = "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP']
+        "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP']
         _maxDocaChi2Cut = "(ACUTDOCACHI2(%s,''))" % config['LbDaug_LD_maxDocaChi2']
         _daugPtSumCut = "((APT1+APT2+APT3)>%s*MeV)" % config['LbDaug_LD_PTsum']
 
@@ -607,7 +606,7 @@ class Lb2V0hhConf(LineBuilder):
         _vtxChi2Cut = "(VFASPF(VCHI2)<%s)" % config['Lb_VtxChi2']
         _diraCut = "(BPVDIRA>%s)" % config['Lb_LD_Dira']
         _ipChi2Cut = "(MIPCHI2DV(PRIMARY)<%s)" % config['Lb_LD_IPCHI2wrtPV']
-        _fdCut = "(VFASPF(VMINVDDV(PRIMARY))>%s)" % config['Lb_FDwrtPV']
+        "(VFASPF(VMINVDDV(PRIMARY))>%s)" % config['Lb_FDwrtPV']
         _fdChi2Cut = "(BPVVDCHI2>%s)" % config['Lb_LD_FDChi2']
 
         _motherCuts = _ptCut
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBnoC/StrippingXb23ph.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBnoC/StrippingXb23ph.py
index 44ba838d436b418c4eaef7372eccd95c28426134..ef24837631cfc50b46aabe0cc7dba0c8cdeb66fd 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBnoC/StrippingXb23ph.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBnoC/StrippingXb23ph.py
@@ -22,7 +22,6 @@ from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, DaVinci__N4Body
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection
-from Gaudi.Configuration import *
 __author__ = ['Jinlin Fu', 'Maurizio Martinelli', 'Andrea Merli']
 __date__ = '12/11/2015'
 __version__ = 'v1r0'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBnoC/StrippingXb2p3h.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBnoC/StrippingXb2p3h.py
index d07d7e52c17b8a01201968b3a1b929751c31bc9d..2c10d1f20bf15892c5e8ef6a5861130250a0a8ae 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBnoC/StrippingXb2p3h.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBnoC/StrippingXb2p3h.py
@@ -22,7 +22,6 @@ from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, DaVinci__N4Body
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection
-from Gaudi.Configuration import *
 __author__ = ['Jan Mickelle V. Maratas', 'Stephane Monteil', 'Andrea Merli']
 __date__ = '01/04/2016'
 __version__ = 'v1r0'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBnoC/StrippingXb2phh.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBnoC/StrippingXb2phh.py
index ae62ac803dcda11696229820fa7bcb3737c75114..35432dcb4a93cdbf47f1ec738735037534d82c07 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBnoC/StrippingXb2phh.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingBnoC/StrippingXb2phh.py
@@ -22,7 +22,6 @@ from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, DaVinci__N3Body
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection
-from Gaudi.Configuration import *
 __author__ = ['Jan Mickelle V. Maratas', 'Stephane Monteil', 'Thomas Latham']
 __date__ = '24/11/2016'
 __version__ = 'v1r0'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCalib/StrippingCharmFromBSemiForHadronAsy.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCalib/StrippingCharmFromBSemiForHadronAsy.py
index c458c3e6c38ed0b1337c2e69289afaa140b1e0f3..98fad852e24de6fd9dc371c05e6185a34f3863c8 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCalib/StrippingCharmFromBSemiForHadronAsy.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCalib/StrippingCharmFromBSemiForHadronAsy.py
@@ -19,14 +19,12 @@ __author__ = ['Mika Vesterinen']
 __date__ = '10/03/2013'
 __version__ = '$Revision: 0.0 $'
 
-from Gaudi.Configuration import *
 
 from Configurables import FilterDesktop, CombineParticles
 from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from StandardParticles import StdAllLoosePions, StdLoosePions, StdLooseMuons, StdLooseKaons, StdLooseProtons
-from Configurables import TisTosParticleTagger
+from StandardParticles import StdLooseKaons, StdLooseMuons, StdLoosePions
 
 __all__ = ('CharmFromBSemiForHadronAsyAllLinesConf',
            'TOSFilter',
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCalib/StrippingCharmFromBSemiForProtonPID.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCalib/StrippingCharmFromBSemiForProtonPID.py
index 6c6f284aa3e1a4515a633a71cb0e569c1bd4ad6f..4afa986a85d324f44e240132151f3ef9c83846fe 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCalib/StrippingCharmFromBSemiForProtonPID.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCalib/StrippingCharmFromBSemiForProtonPID.py
@@ -18,12 +18,11 @@ __author__ = ['Mika Vesterinen']
 __date__ = '19/03/2013'
 __version__ = '$Revision: 0.0 $'
 
-from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from StandardParticles import StdLoosePions, StdLooseMuons, StdLooseKaons, StdLooseProtons, StdNoPIDsProtons
+from StandardParticles import StdLooseKaons, StdLooseMuons, StdLoosePions, StdNoPIDsProtons
 
 __all__ = ('CharmFromBSemiForProtonPIDAllLinesConf',
            'default_config')
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCalib/StrippingD02KPiPi0.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCalib/StrippingD02KPiPi0.py
index b8f25c6552ad8b11e685418ec13a2ac622d2bef8..7fd939520aebcb1dc21eb98628f0836710acb20c 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCalib/StrippingD02KPiPi0.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCalib/StrippingD02KPiPi0.py
@@ -25,9 +25,8 @@ __all__ = ('StrippingD02KPiPi0Conf',
            'makeD02KPiPi0M',
            'default_config')
 
-from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from PhysSelPython.Wrappers import Selection, DataOnDemand
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
+from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from StandardParticles import StdTightPions, StdTightKaons, StdLooseMergedPi0, StdLooseResolvedPi0
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCalib/StrippingD02KPiPi0DalitzPartReco.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCalib/StrippingD02KPiPi0DalitzPartReco.py
index ac92a6c8cd5234f3436c2a8b2ed17b8fbf90700a..c14b9b11f394fd5c53a93657f063a53eb32b8e66 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCalib/StrippingD02KPiPi0DalitzPartReco.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCalib/StrippingD02KPiPi0DalitzPartReco.py
@@ -8,9 +8,7 @@
 # granted to it by virtue of its status as an Intergovernmental Organization  #
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
-import logging
 from StrippingUtils.Utils import LineBuilder
-from Gaudi.Configuration import *
 __author__ = ['Greg Ciezarek', 'Liang Sun', 'Adam Davis']
 __date__ = '18/05/2017'
 __version__ = '$Revision: 0.01 $'
@@ -75,7 +73,6 @@ class D2KPiPi0_PartRecoBuilder(LineBuilder):
     def __init__(self, name, config):
         LineBuilder.__init__(self, name, config)
         self._config = config
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
 
         # self.GECs = { "Code":"( recSummaryTrack(LHCb.RecSummary.nLongTracks, TrLONG) < %(GEC_nLongTrk)s )" % config,
         #              "Preambulo": ["from LoKiTracks.decorators import *"]}
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCalib/StrippingD0ForBXX.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCalib/StrippingD0ForBXX.py
index bd7db7dbc518eb886e4f9c11699b772d11dd126b..b5eea4d7cb0b283585ff2aa80e59a84aa67c7051 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCalib/StrippingD0ForBXX.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCalib/StrippingD0ForBXX.py
@@ -20,7 +20,7 @@ from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from StandardParticles import StdLoosePions, StdLooseKaons, StdLooseProtons, StdAllLoosePions
+from StandardParticles import StdAllLoosePions, StdLooseKaons, StdLoosePions
 
 
 name = 'confD0forBXX'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCalib/StrippingDstarD02hhPi0PartRecoForPhotonCalib.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCalib/StrippingDstarD02hhPi0PartRecoForPhotonCalib.py
index 2ba67af334eae228bcc4631671e720a47832f25c..24016b4581d15a4b5d5680241382dc7f9d461b1b 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCalib/StrippingDstarD02hhPi0PartRecoForPhotonCalib.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCalib/StrippingDstarD02hhPi0PartRecoForPhotonCalib.py
@@ -31,15 +31,15 @@ from Gaudi.Configuration import *
 
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 from StandardParticles import StdAllNoPIDsPions, StdNoPIDsPions, StdNoPIDsKaons
-from StandardParticles import StdLooseAllPhotons, StdLooseResolvedPi0, StdLooseMergedPi0
+from StandardParticles import StdLooseAllPhotons
 
 from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
-from StrippingUtils.Utils import LineBuilder, checkConfig
+from StrippingUtils.Utils import LineBuilder
 
 from Configurables import FilterDesktop
 
-from GaudiKernel.SystemOfUnits import GeV, MeV, picosecond, mm
+from GaudiKernel.SystemOfUnits import GeV, MeV, picosecond
 
 default_config = {
     'NAME': 'DstarD2hhGammaCalib',
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCalib/StrippingElectronID.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCalib/StrippingElectronID.py
index bf94193e893deec6c859161698f7d8b89c97d281..c7194bf19e12188f115c381bc32cb4b85acdbdd0 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCalib/StrippingElectronID.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCalib/StrippingElectronID.py
@@ -23,9 +23,8 @@ stream.appendLines( [
 
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand
+from PhysSelPython.Wrappers import Selection
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = ['Jibo He']
 __date__ = '03/10/2010'
 __version__ = '$Revision: 1.2 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCalib/StrippingJPsiForSL.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCalib/StrippingJPsiForSL.py
index 66d3cf569e7e3d642fb1e90689c09009970a9f91..f83a469f0d79f559f3b8f1ce7fa0a29617c07287 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCalib/StrippingJPsiForSL.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCalib/StrippingJPsiForSL.py
@@ -20,11 +20,10 @@ __version__ = '$Revision: 0.1 $'
 
 from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from PhysSelPython.Wrappers import Selection, DataOnDemand
+from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from StandardParticles import StdLoosePions, StdLooseMuons, StdLooseKaons, StdLooseProtons, StdNoPIDsPions, StdNoPIDsMuons, StdLooseMergedPi0, StdLooseResolvedPi0, StdLooseElectrons, StdNoPIDsKaons
-from Configurables import TisTosParticleTagger
+from StandardParticles import StdNoPIDsKaons, StdNoPIDsMuons
 
 __all__ = ('JPsiForSLAllLinesConf',
            'confdict')
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCalib/StrippingLowPtMuID.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCalib/StrippingLowPtMuID.py
index e464daa38af084e2fe15b4361cf28811d5f35524..3d23ab459b03643fbc73c746b15dc3c53ffa71ed 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCalib/StrippingLowPtMuID.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCalib/StrippingLowPtMuID.py
@@ -19,12 +19,9 @@ largely cloned from line written by 'S.Furcas', 'G.Lanfranchi', 'M.Palutan', 'A.
 
 from StandardParticles import StdAllNoPIDsMuons
 from StrippingUtils.Utils import LineBuilder
-from Configurables import LoKi__Hybrid__CoreFactory as CoreFactory
-from Configurables import LoKi__VoidFilter as VoidFilter
-from PhysSelPython.Wrappers import DataOnDemand, Selection, SelectionSequence, MergedSelection
+from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 __author__ = ['G.Ciezarek', ]
 __date__ = '03/12/2015'
 __version__ = '$Revision: 1.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCalib/StrippingMuIDCalib.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCalib/StrippingMuIDCalib.py
index fa526c7de7798e9c785db1267e66b84f2fbda70c..5315ade7f441c7b2d725f402698ad8b2e8264931 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCalib/StrippingMuIDCalib.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCalib/StrippingMuIDCalib.py
@@ -22,15 +22,12 @@ lb = builder( 'MuIDCalib', config_params )
 
 '''
 
-from StandardParticles import StdAllNoPIDsKaons, StdAllNoPIDsMuons, StdAllNoPIDsPions, StdAllNoPIDsProtons
+from StandardParticles import StdAllNoPIDsMuons
 from StandardParticles import StdNoPIDsKaons, StdNoPIDsMuons, StdNoPIDsPions, StdNoPIDsProtons
 from StrippingUtils.Utils import LineBuilder
-from Configurables import LoKi__Hybrid__CoreFactory as CoreFactory
-from Configurables import LoKi__VoidFilter as VoidFilter
-from PhysSelPython.Wrappers import DataOnDemand, Selection, SelectionSequence, MergedSelection
+from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 __author__ = ['S.Furcas', 'G.Lanfranchi',
               'M.Palutan', 'A.Sarti', 'D.Milanes', 'MuID Team']
 __date__ = '23/08/2011'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCalib/StrippingNoPIDDstarWithD02RSKPi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCalib/StrippingNoPIDDstarWithD02RSKPi.py
index 2befca63e578f571871f18da1613a3faede20cf7..85aec575e004b92f91ff50d0ad27b2df6512995d 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCalib/StrippingNoPIDDstarWithD02RSKPi.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCalib/StrippingNoPIDDstarWithD02RSKPi.py
@@ -13,10 +13,8 @@
 from StandardParticles import StdAllNoPIDsKaons, StdAllNoPIDsPions
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from LHCbKernel.Configuration import *
-from Gaudi.Configuration import *
+from PhysSelPython.Wrappers import Selection
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 __author__ = ['Philip Xing', 'Andrew Powell']
 __date__ = '23rd August 2012'
 __version__ = '$Revision: 7.0 $'
@@ -42,7 +40,7 @@ StrippingReport                                                INFO Event 100000
 __all__ = ('NoPIDDstarWithD02RSKPiConf', 'default_config')
 
 
-from GaudiKernel.SystemOfUnits import mm, cm, MeV, GeV
+from GaudiKernel.SystemOfUnits import GeV, MeV
 # from Configurables import FilterDesktop, CombineParticles
 
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCalib/StrippingPIDCalib.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCalib/StrippingPIDCalib.py
index e82b56942c59e477e1ffb32c01de970afd9167d4..e6940ae61dbda7b537d24906799f4de48712e814 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCalib/StrippingPIDCalib.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCalib/StrippingPIDCalib.py
@@ -35,9 +35,7 @@ from Configurables import DaVinci__N3BodyDecays
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
 from Configurables import CombineParticles
-from Gaudi.Configuration import *
 __author__ = ['Lucio Anderlini']
 __date__ = '25/02/2015'
 __version__ = '$Revision: 1.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCalib/StrippingTrackEffD0ToKPi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCalib/StrippingTrackEffD0ToKPi.py
index c9b3c9d601a65f088de7340302fbce473317e417..ee9bc7b3c33e1df66f060255828429ab64903996 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCalib/StrippingTrackEffD0ToKPi.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCalib/StrippingTrackEffD0ToKPi.py
@@ -17,7 +17,7 @@ from Configurables import FilterDesktop, CombineParticles
 from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from StandardParticles import StdLooseKaons, StdLoosePions, StdAllLoosePions, StdAllNoPIDsPions
+from StandardParticles import StdAllLoosePions, StdLooseKaons, StdLoosePions
 from SelPy.utils import (UniquelyNamedObject,
                          ClonableObject,
                          SelectionBase)
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCalib/StrippingTrackEffDownMuon.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCalib/StrippingTrackEffDownMuon.py
old mode 100755
new mode 100644
index 155b6c9c0b54cbf2b245fe7b9772534074be5ff7..9a57840a9b089143b807e43cb963af939856dfdb
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCalib/StrippingTrackEffDownMuon.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCalib/StrippingTrackEffDownMuon.py
@@ -43,34 +43,26 @@ __all__ = ('StrippingTrackEffDownMuonConf',
 # FIXME Write includes in a cleaner way
 from Gaudi.Configuration import *
 from LHCbKernel.Configuration import *
-from DAQSys.DecoderClass import Decoder
 from Configurables import GaudiSequencer
 from Configurables import UnpackTrack, ChargedProtoParticleMaker, DelegatingTrackSelector, TrackSelector, BestPIDParticleMaker
-from TrackFitter.ConfiguredFitters import ConfiguredFit
 from Configurables import TrackStateInitAlg
 from StrippingConf.StrippingLine import StrippingLine
-from Configurables import ChargedProtoParticleAddMuonInfo, MuonIDAlgLite
+from Configurables import ChargedProtoParticleAddMuonInfo
 from MuonID import ConfiguredMuonIDs
 from Configurables import ChargedProtoCombineDLLsAlg, ProtoParticleMUONFilter
-from PhysSelPython.Wrappers import Selection, DataOnDemand
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
+from PhysSelPython.Wrappers import Selection
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 
 from StrippingUtils.Utils import LineBuilder
-from Configurables import LoKi__VoidFilter
-from os import environ
 from Gaudi.Configuration import *
-import GaudiKernel.ProcessJobOptions
-from GaudiKernel.SystemOfUnits import mm
 
 from GaudiConfUtils.ConfigurableGenerators import TisTosParticleTagger
 from StandardParticles import StdAllLooseMuons
 from Configurables import GaudiSequencer
 from Configurables import TrackToDST
-from Configurables import TrackSys
 from Configurables import PatSeeding, PatSeedingTool, PatLongLivedTracking
-from PhysSelPython.Wrappers import AutomaticData
 # Get the fitters
-from TrackFitter.ConfiguredFitters import ConfiguredFit, ConfiguredFitSeed, ConfiguredFitDownstream
+from TrackFitter.ConfiguredFitters import ConfiguredFitDownstream
 from PatAlgorithms import PatAlgConf
 
 from SelPy.utils import (UniquelyNamedObject,
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCalib/StrippingTrackEffMuonTT.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCalib/StrippingTrackEffMuonTT.py
index 209c32e07098eea5868c3878bf6d35c142f39038..f0d7ae5fde2eff6848b480b33530282be73d9505 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCalib/StrippingTrackEffMuonTT.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCalib/StrippingTrackEffMuonTT.py
@@ -62,11 +62,10 @@ __all__ = ('StrippingTrackEffMuonTTConf',
            'makeBJpsiKTrackEff',
            'filterHLT2ForBJpsiK')
 
-from Gaudi.Configuration import *
-from PhysSelPython.Wrappers import Selection, DataOnDemand, ChargedProtoParticleSelection
+from PhysSelPython.Wrappers import ChargedProtoParticleSelection, Selection
 from StrippingConf.StrippingLine import StrippingLine
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from StrippingUtils.Utils import LineBuilder, checkConfig
+from StrippingUtils.Utils import LineBuilder
 from StandardParticles import StdLooseKaons, StdLooseMuons, StdAllLooseMuons
 
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCalib/StrippingTrackEffVeloMuon.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCalib/StrippingTrackEffVeloMuon.py
old mode 100755
new mode 100644
index d0fa14fabc19b099a584dda86fdab2e9b14d49e2..934794e6eebc3bc3a42a0273e30c3e1e4a6028c7
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCalib/StrippingTrackEffVeloMuon.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCalib/StrippingTrackEffVeloMuon.py
@@ -40,30 +40,22 @@ __all__ = ('StrippingTrackEffVeloMuonConf',
            )
 
 
-from Gaudi.Configuration import *
-from LHCbKernel.Configuration import *
 from Configurables import CombineParticles
-from PhysSelPython.Wrappers import Selection, SelectionSequence, DataOnDemand
-from Configurables import ChargedProtoParticleMaker, NoPIDsParticleMaker, DataOnDemandSvc, DelegatingTrackSelector, TrackSelector, CombinedParticleMaker, BestPIDParticleMaker
+from PhysSelPython.Wrappers import Selection
+from Configurables import ChargedProtoParticleMaker, DataOnDemandSvc, DelegatingTrackSelector, NoPIDsParticleMaker, TrackSelector
 from Configurables import FastVeloTracking
 
 from StrippingConf.StrippingLine import StrippingLine
-from Configurables import TrackStateInitAlg, TrackEventFitter, TrackPrepareVelo, TrackContainerCopy, Tf__PatVeloSpaceTool, StandaloneMuonRec
-from Configurables import TrackCloneFinder
+from Configurables import StandaloneMuonRec, TrackPrepareVelo
 from StrippingUtils.Utils import LineBuilder
 from StandardParticles import StdLooseMuons
 
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, TisTosParticleTagger
 
 from Configurables import GaudiSequencer
-from Configurables import TrackSys
-from PhysSelPython.Wrappers import AutomaticData
 # Get the fitters
-from TrackFitter.ConfiguredFitters import ConfiguredFit
 
-from Configurables import TrackEventCloneKiller, VeloMuonBuilder
-from Configurables import TrackEventFitter, TrackMasterFitter
-from Configurables import TrackKalmanFilter, TrackMasterExtrapolator
+from Configurables import VeloMuonBuilder
 # from TrackFitter.ConfiguredFitters import ConfiguredFastFitter
 # from Configurables import TrackCloneFinder
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCharm/StrippingB2ppipiSigmacmm_Lcpi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCharm/StrippingB2ppipiSigmacmm_Lcpi.py
index 316195569102a380d44bcad73ab40d9b4b2ffcc8..25cd049b1fac0d99feae2dbf2e80a306df5abcd1 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCharm/StrippingB2ppipiSigmacmm_Lcpi.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCharm/StrippingB2ppipiSigmacmm_Lcpi.py
@@ -31,12 +31,11 @@ __all__ = ('StrippingB2ppipiSigmacmm_Lcpi_Conf', 'makepifromSigmacmm', 'makeThre
            )
 
 from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, ConjugateNeutralPID, DaVinci__N3BodyDecays
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N3BodyDecays, FilterDesktop
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
-from StrippingUtils.Utils import checkConfig, LineBuilder
+from StrippingUtils.Utils import LineBuilder
 from GaudiKernel.SystemOfUnits import MeV, GeV, mm
-from copy import copy
 
 name = 'StrippingB2ppipiSigmacmm_Lcpi'
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCharm/StrippingChargedHyperons.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCharm/StrippingChargedHyperons.py
index 920c9faefc12697a4686bb708606c7aefce7c812..1e9ecbdf32eac322732659ae13423893f4c17ced 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCharm/StrippingChargedHyperons.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCharm/StrippingChargedHyperons.py
@@ -21,13 +21,9 @@ __version__ = '$Revision: 1.0 $'
 __all__ = ('StrippingChargedHyperonsConf', 'default_config')
 
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from StandardParticles import StdLoosePions, StdNoPIDsDownPions, StdLooseKaons, StdLooseDownKaons
-from StandardParticles import StdAllLoosePions, StdAllLooseKaons
 
 from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
-from PhysSelPython.Wrappers import MultiSelectionSequence
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from GaudiKernel.SystemOfUnits import MeV, mm, picosecond
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCharm/StrippingCharm2PPX.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCharm/StrippingCharm2PPX.py
index 8f420ab23681879eda33d3f11a9c1854083e6f5d..1776621bc50d11dd212c17cc7c967c25e7570f68 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCharm/StrippingCharm2PPX.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCharm/StrippingCharm2PPX.py
@@ -26,7 +26,7 @@ __all__ = (
     'StrippingCharm2PPXConf'  # ???
 )
 
-from GaudiKernel.SystemOfUnits import MeV, GeV, mm, mrad
+from GaudiKernel.SystemOfUnits import GeV, MeV, mm
 from Configurables import CombineParticles, FilterDesktop
 # from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop, DaVinci__N3BodyDecays
 from StandardParticles import (
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCharm/StrippingCharmForVub.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCharm/StrippingCharmForVub.py
index addb5112d833323e807d80a2fcd5d1c6ef104d89..196b7aca8b732e4ce87cfa408c9240c9d4ca9fe8 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCharm/StrippingCharmForVub.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCharm/StrippingCharmForVub.py
@@ -31,9 +31,8 @@ __all__ = ('CharmForVubConf',
            'makeDstarD02HMuNu')
 
 from Gaudi.Configuration import *
-from Configurables import SubstitutePID
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
+from PhysSelPython.Wrappers import MergedSelection, Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from StandardParticles import StdLooseMuons, StdLooseKaons, StdAllLoosePions, StdLoosePions
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCharm/StrippingD02KSKS.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCharm/StrippingD02KSKS.py
index 048a0f735673d789716920a6b813f3734a817158..2e831b063d5dd66449d672d2c0c14659bb9d9210 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCharm/StrippingD02KSKS.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCharm/StrippingD02KSKS.py
@@ -25,9 +25,8 @@ __date__ = '15/05/2014'
 __version__ = 'Stripping23'
 __all__ = 'D02KSKSConf'
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
+from PhysSelPython.Wrappers import DataOnDemand, Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 
@@ -556,7 +555,7 @@ class D02KSKSConf(LineBuilder):
         _daughterCuts = "(TRGHOSTPROB <=%s )" % config['slowPi_LLL_TRGHOSTPROB']
 
         # 40
-        _vertexChi2_cut = "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_LL']
+        "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_LL']
 
         # 200
         _combCuts = "(ADAMASS('D*(2010)+') < %s*MeV)" % config['Dst_mass_LL']
@@ -593,7 +592,7 @@ class D02KSKSConf(LineBuilder):
         _daughterCuts = "(TRGHOSTPROB <=%s )" % config['slowPi_LLU_TRGHOSTPROB']
 
         # 40
-        _vertexChi2_cut = "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_LL']
+        "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_LL']
 
         # 200
         _combCuts = "(ADAMASS('D*(2010)+') < %s*MeV)" % config['Dst_mass_LL']
@@ -630,7 +629,7 @@ class D02KSKSConf(LineBuilder):
         _daughterCuts = "(TRGHOSTPROB <=%s )" % config['slowPi_LDL_TRGHOSTPROB']
 
         # 40
-        _vertexChi2_cut = "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_LD']
+        "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_LD']
 
         # 200
         _combCuts = "(ADAMASS('D*(2010)+') < %s*MeV)" % config['Dst_mass_LD']
@@ -667,7 +666,7 @@ class D02KSKSConf(LineBuilder):
         _daughterCuts = "(TRGHOSTPROB <=%s )" % config['slowPi_LDU_TRGHOSTPROB']
 
         # 40
-        _vertexChi2_cut = "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_LD']
+        "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_LD']
 
         # 200
         _combCuts = "(ADAMASS('D*(2010)+') < %s*MeV)" % config['Dst_mass_LD']
@@ -704,7 +703,7 @@ class D02KSKSConf(LineBuilder):
         _daughterCuts = "(TRGHOSTPROB <=%s )" % config['slowPi_DDL_TRGHOSTPROB']
 
         # 40
-        _vertexChi2_cut = "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_DD']
+        "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_DD']
 
         # 200
         _combCuts = "(ADAMASS('D*(2010)+') < %s*MeV)" % config['Dst_mass_DD']
@@ -741,7 +740,7 @@ class D02KSKSConf(LineBuilder):
         _daughterCuts = "(TRGHOSTPROB <=%s )" % config['slowPi_DDU_TRGHOSTPROB']
 
         # 40
-        _vertexChi2_cut = "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_DD']
+        "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_DD']
 
         # 200
         _combCuts = "(ADAMASS('D*(2010)+') < %s*MeV)" % config['Dst_mass_DD']
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCharm/StrippingD2HHHKs.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCharm/StrippingD2HHHKs.py
index e5639b90812290f4e2226c3b0c140285aa788b00..8b56f2ae08f0d364c45bed96aa90657daee77a7d 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCharm/StrippingD2HHHKs.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCharm/StrippingD2HHHKs.py
@@ -22,19 +22,18 @@ __version__ = '$Revision: 0.1 $'
 __all__ = ('D2HHHKsLines',
            'default_config')
 
-from Gaudi.Configuration import *
 
-from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N4BodyDecays
+from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays
 from StandardParticles import StdNoPIDsPions, StdNoPIDsKaons
 from StandardParticles import StdLooseKsDD, StdLooseKsLL
 
 from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
-from StrippingUtils.Utils import LineBuilder, checkConfig
+from StrippingUtils.Utils import LineBuilder
 
 from Configurables import FilterDesktop
 
-from GaudiKernel.SystemOfUnits import GeV, MeV, picosecond, mm
+from GaudiKernel.SystemOfUnits import MeV, mm, picosecond
 
 
 default_config = {
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCharm/StrippingD2HHHPi0.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCharm/StrippingD2HHHPi0.py
index 6083359069ac88d66ad4d2d0c3f6c4a785962da6..8557b0ed7b6ea3312ecd34ede82d7cbd720f6775 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCharm/StrippingD2HHHPi0.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCharm/StrippingD2HHHPi0.py
@@ -22,19 +22,18 @@ __version__ = '$Revision: 0.1 $'
 __all__ = ('D2HHHPi0Lines',
            'default_config')
 
-from Gaudi.Configuration import *
 
-from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N4BodyDecays
+from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays
 from StandardParticles import StdNoPIDsPions, StdNoPIDsKaons
 from StandardParticles import StdLooseResolvedPi0, StdLooseMergedPi0
 
 from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
-from StrippingUtils.Utils import LineBuilder, checkConfig
+from StrippingUtils.Utils import LineBuilder
 
 from Configurables import FilterDesktop
 
-from GaudiKernel.SystemOfUnits import GeV, MeV, picosecond, mm
+from GaudiKernel.SystemOfUnits import GeV, MeV, picosecond
 
 
 default_config = {
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCharm/StrippingD2HMuNu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCharm/StrippingD2HMuNu.py
index 2ceba3956453266f579b29b43ab66b82c4dc906a..0b1aa8422f7bb32ab3d194b98dead0e474772019 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCharm/StrippingD2HMuNu.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCharm/StrippingD2HMuNu.py
@@ -9,9 +9,7 @@
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
 
-import logging
 from StrippingUtils.Utils import LineBuilder
-from Gaudi.Configuration import *
 __author__ = ['Liang Sun', 'Adam Davis']
 __date__ = '09/11/2015'
 __version__ = '$Revision: 0.01 $'
@@ -98,7 +96,6 @@ class D2HLepNuBuilder(LineBuilder):
     def __init__(self, name, config):
         LineBuilder.__init__(self, name, config)
         self._config = config
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
 
         self.GECs = {"Code": "( recSummaryTrack(LHCb.RecSummary.nLongTracks, TrLONG) < %(GEC_nLongTrk)s )" % config,
                      "Preambulo": ["from LoKiTracks.decorators import *"]}
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCharm/StrippingD2KS0H_conf.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCharm/StrippingD2KS0H_conf.py
index d58964475590bc2e6571bcd929685425e3694bc1..e5b9f6c8683eaaab3109aca8686f163c2f08aef0 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCharm/StrippingD2KS0H_conf.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCharm/StrippingD2KS0H_conf.py
@@ -44,9 +44,9 @@ from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticle
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StandardParticles import StdLoosePions, StdLooseKaons
 from StrippingConf.StrippingLine import StrippingLine
-from StrippingUtils.Utils import LineBuilder, checkConfig
+from StrippingUtils.Utils import LineBuilder
 from Configurables import TisTosParticleTagger
-from GaudiKernel.SystemOfUnits import GeV, MeV, picosecond, mm
+from GaudiKernel.SystemOfUnits import MeV, mm, picosecond
 
 default_name = 'D2KS0H'
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCharm/StrippingD2PiPi0.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCharm/StrippingD2PiPi0.py
index d9497b537d62b4f47d50823fd91deba0eb2349fa..3ac31a1bcad019f7cd123dfa6682935c986f1026 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCharm/StrippingD2PiPi0.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCharm/StrippingD2PiPi0.py
@@ -33,7 +33,7 @@ __all__ = (
 
 )
 
-from GaudiKernel.SystemOfUnits import MeV, GeV, mrad, picosecond
+from GaudiKernel.SystemOfUnits import MeV, picosecond
 
 from StandardParticles import (
     StdAllNoPIDsKaons,
@@ -51,7 +51,7 @@ from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 
 # from Configurables import CombineParticles, FilterDesktop
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, ConjugateNeutralPID, DaVinci__N3BodyDecays
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N3BodyDecays
 
 default_config = {
     'D2Pi0H': {
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCharm/StrippingD2XMuMuSS.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCharm/StrippingD2XMuMuSS.py
index 6cb43802872df951b5676b3b0a91f42091655f73..f2ecc06f375c01960838df612bae449a097161ea 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCharm/StrippingD2XMuMuSS.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCharm/StrippingD2XMuMuSS.py
@@ -9,14 +9,13 @@
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
 
-from StandardParticles import StdAllLooseElectrons, StdAllNoPIDsElectrons
+from StandardParticles import StdAllLooseElectrons
 from StandardParticles import StdAllLooseKaons, StdAllLoosePions, StdAllLooseMuons, StdAllNoPIDsPions, StdAllNoPIDsKaons
-from StandardParticles import StdLooseKaons, StdLoosePions, StdLooseMuons, StdNoPIDsPions, StdNoPIDsKaons, StdLooseProtons, StdAllNoPIDsProtons
+from StandardParticles import StdAllNoPIDsProtons, StdLooseKaons, StdLooseMuons, StdLoosePions, StdLooseProtons
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, OfflineVertexFitter
-from Gaudi.Configuration import *
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop
 import copy
 __author__ = ['Malcolm John', 'B. Viaud', 'O. Kochebina']
 __date__ = '25/6/2012'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCharm/StrippingD2hh.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCharm/StrippingD2hh.py
index 51c213ed2d3c259435dcd6aef0631877156b6bb0..a370c49abb16101fe062f7fa9fd7c27efecb37e3 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCharm/StrippingD2hh.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCharm/StrippingD2hh.py
@@ -24,7 +24,6 @@ __all__ = ('D2hhBuilder',
 '''
 This file contains stripping lines for time-dependent two-body charm analyses of mixing, yCP, and A_Gamma
 '''
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
@@ -129,7 +128,7 @@ class D2hhBuilder(LineBuilder):
         stdNoPIDsPions = StdAllNoPIDsPions
 
         d2kpi_name = name+'PromptD2KPi'
-        d0RS_name = name+'PromptD0RS'
+        name+'PromptD0RS'
         d0WS_name = name+'PromptD0WS'
         d2kk_name = name+'PromptD2KK'
         d2pipi_name = name+'PromptD2PiPi'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCharm/StrippingD2hhh_FTcalib.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCharm/StrippingD2hhh_FTcalib.py
index a2634fb2514991cc0b3becfb3fddb946697cd959..1da556644748ff942ad7731f59efe24c6a946ea6 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCharm/StrippingD2hhh_FTcalib.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCharm/StrippingD2hhh_FTcalib.py
@@ -29,13 +29,10 @@ __version__ = '$Revision: 0.0 $'
 __all__ = ('D2hhhFTCalibConf',
            'makeStdD2hhhFT')
 
-from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
+from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from StandardParticles import (StdNoPIDsPions,
-                               StdTightKaons)
 
 name = "D2hhhFTCalib"
 # Cuts to be implemented vy the Stripping team in Stripping Settings
@@ -245,7 +242,6 @@ def globalEventCutFilter(name,
     if MaxTrSIZE == None:
         return None
 
-    from Configurables import LoKi__VoidFilter as VoidFilter
     from Configurables import LoKi__Hybrid__CoreFactory as CoreFactory
     modules = CoreFactory('CoreFactory').Modules
     for i in ['LoKiTracks.decorators']:
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCharm/StrippingD2hhh_conf.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCharm/StrippingD2hhh_conf.py
index 436d8a20ebfa69a07273b9fc952667e306a823fd..49374bf7789c8403fcf3e4660b179452634cef16 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCharm/StrippingD2hhh_conf.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCharm/StrippingD2hhh_conf.py
@@ -38,8 +38,7 @@ from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticle
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from StandardParticles import (StdNoPIDsPions,
-                               StdTightKaons)
+from StandardParticles import StdNoPIDsPions
 
 name = "D2hhh"
 # Cuts to be implemented vy the Stripping team in Stripping Settings
@@ -717,7 +716,6 @@ def globalEventCutFilter(name,
     if MaxTrSIZE == None:
         return None
 
-    from Configurables import LoKi__VoidFilter as VoidFilter
     from Configurables import LoKi__Hybrid__CoreFactory as CoreFactory
     modules = CoreFactory('CoreFactory').Modules
     for i in ['LoKiTracks.decorators']:
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCharm/StrippingDstarD02xx.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCharm/StrippingDstarD02xx.py
index ce2ac8d8facde4ad7816e78bcb9fd402160bb81a..e052e20eec4a83a6f489851d64e937c3ee00b05f 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCharm/StrippingDstarD02xx.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCharm/StrippingDstarD02xx.py
@@ -22,8 +22,7 @@ __all__ = ('StrippingDstarD02xxConf', 'combinetwobody', 'combineDstar', 'default
             where xx = {mu mu, pi pi, pi mu, k mu, ... }
             
 '''
-from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCharm/StrippingDstarD0ToHHPi0.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCharm/StrippingDstarD0ToHHPi0.py
index fd5188441bc83f651edf601e0fc081e5761b90a2..9f366f1a65e17dac9704f2cda14ac7c90073bb1d 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCharm/StrippingDstarD0ToHHPi0.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCharm/StrippingDstarD0ToHHPi0.py
@@ -17,13 +17,11 @@ Module for D* tagged D0 -> hhpi0.
 Supersedes StrippingDstarD2hhpi0
 """
 
-from Gaudi.Configuration import *
 from Configurables import FilterDesktop, CombineParticles, OfflineVertexFitter
 from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from StandardParticles import StdAllLoosePions, StdLoosePions, StdLooseKaons, StdLooseResolvedPi0, StdLooseMergedPi0
-from Configurables import TisTosParticleTagger
 
 __all__ = ('DstarD0ToHHPi0AllLinesBuilder',
            'DstarMaker',
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCharm/StrippingDstarD2HHHH.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCharm/StrippingDstarD2HHHH.py
index 79b905d65e08f76846da8aeebd29e1bd52022454..15c8bc47e0445328a0083162a53a4335865cca1b 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCharm/StrippingDstarD2HHHH.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCharm/StrippingDstarD2HHHH.py
@@ -22,16 +22,15 @@ __version__ = '$Revision: 1.0 $'
 __all__ = ('DstarD2HHHHLines',
            'default_config')
 
-from Gaudi.Configuration import *
 
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N4BodyDecays
 from StandardParticles import StdAllNoPIDsPions, StdNoPIDsPions, StdNoPIDsKaons
 
 from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
-from StrippingUtils.Utils import LineBuilder, checkConfig
+from StrippingUtils.Utils import LineBuilder
 
-from GaudiKernel.SystemOfUnits import GeV, MeV, picosecond, mm
+from GaudiKernel.SystemOfUnits import MeV, picosecond
 
 
 default_config = {
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCharm/StrippingDstarD2KSHHPi0.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCharm/StrippingDstarD2KSHHPi0.py
index 1a1c91b788986c0a547216e92ee30ee234979f5e..2cf7967d07c7867df16b8b2cfa45c3c0ddd24ac4 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCharm/StrippingDstarD2KSHHPi0.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCharm/StrippingDstarD2KSHHPi0.py
@@ -22,18 +22,17 @@ __version__ = '$Revision: 1.0 $'
 __all__ = ('DstarD2KSHHPi0Lines',
            'default_config')
 
-from Gaudi.Configuration import *
 
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N4BodyDecays
 from StandardParticles import StdAllNoPIDsPions, StdNoPIDsPions, StdNoPIDsKaons, StdLooseResolvedPi0, StdLooseMergedPi0, StdLooseKsDD, StdLooseKsLL
 
 from PhysSelPython.Wrappers import Selection, MergedSelection
 from StrippingConf.StrippingLine import StrippingLine
-from StrippingUtils.Utils import LineBuilder, checkConfig
+from StrippingUtils.Utils import LineBuilder
 
 from Configurables import FilterDesktop
 
-from GaudiKernel.SystemOfUnits import GeV, MeV, picosecond, mm
+from GaudiKernel.SystemOfUnits import MeV, mm, picosecond
 
 
 default_config = {
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCharm/StrippingDstarD2KShh.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCharm/StrippingDstarD2KShh.py
index 0446a490bf8b78aaa6a090c0170ee5d84241b931..8bb88c690db0782705ee07f1579b03266ff72d96 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCharm/StrippingDstarD2KShh.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCharm/StrippingDstarD2KShh.py
@@ -34,7 +34,6 @@ __all__ = ('DstarD2KShhBuilder',
            'makeD2KShh',
            'makeDstar')
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCharm/StrippingDstarD2XGamma.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCharm/StrippingDstarD2XGamma.py
index 1575053319e4358cb7754f031f3cae2d700fd95f..3c27a0af512acea7459896bcb8390d7c4bed0501 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCharm/StrippingDstarD2XGamma.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCharm/StrippingDstarD2XGamma.py
@@ -24,7 +24,6 @@ __version__ = '$Revision: 0.1 $'
 __all__ = ('DstarD2XGammaLines',
            'default_config')
 
-from Gaudi.Configuration import *
 
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 from StandardParticles import StdAllNoPIDsPions, StdNoPIDsPions, StdNoPIDsKaons
@@ -32,11 +31,11 @@ from StandardParticles import StdLooseAllPhotons, StdAllLooseGammaLL, StdAllLoos
 
 from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
-from StrippingUtils.Utils import LineBuilder, checkConfig
+from StrippingUtils.Utils import LineBuilder
 
 from Configurables import FilterDesktop
 
-from GaudiKernel.SystemOfUnits import GeV, MeV, picosecond, mm
+from GaudiKernel.SystemOfUnits import GeV, MeV, picosecond
 
 default_config = {
     'NAME': 'DstarD2XGamma',
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCharm/StrippingDstarPromptWithD02HHHH.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCharm/StrippingDstarPromptWithD02HHHH.py
index 5cd1680c5af7909806e39f9bb70564d0691dcb38..1a859d894a30bab66760ecd0f7edbf2015c36de4 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCharm/StrippingDstarPromptWithD02HHHH.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCharm/StrippingDstarPromptWithD02HHHH.py
@@ -36,11 +36,10 @@ __version__ = '$Revision: 1.2 $'
 __all__ = ('DstarPromptWithD02HHHHConf', 'makeD02hhhh',
            'makePromptDstar', 'default_config')
 
-from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, ConjugateNeutralPID
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles, ConjugateNeutralPID
 from PhysSelPython.Wrappers import Selection, MergedSelection
 from StrippingConf.StrippingLine import StrippingLine
-from StrippingUtils.Utils import checkConfig, LineBuilder
+from StrippingUtils.Utils import LineBuilder
 from GaudiKernel.SystemOfUnits import MeV, GeV, mm
 from copy import copy
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCharm/StrippingDstarPromptWithD02HHMuMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCharm/StrippingDstarPromptWithD02HHMuMu.py
index e83ad60bb1ff3c30f6cfd21e7ea0e2fb6ead7646..a1c41727aab9df91366ea29963944e783d29f676 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCharm/StrippingDstarPromptWithD02HHMuMu.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCharm/StrippingDstarPromptWithD02HHMuMu.py
@@ -29,11 +29,10 @@ __version__ = '$Revision: 2.0 $'
 __all__ = ('DstarPromptWithD02HHLLConf', 'makeD02hhll',
            'makePromptDstar', 'default_config')
 
-from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, ConjugateNeutralPID
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles, ConjugateNeutralPID
 from PhysSelPython.Wrappers import Selection, MergedSelection
 from StrippingConf.StrippingLine import StrippingLine
-from StrippingUtils.Utils import checkConfig, LineBuilder
+from StrippingUtils.Utils import LineBuilder
 from GaudiKernel.SystemOfUnits import MeV, GeV, mm
 from copy import copy
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCharm/StrippingExcitedDsSpectroscopy.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCharm/StrippingExcitedDsSpectroscopy.py
index 6b08898929e9ee290d51640d43d073b4a548a98b..dadd6c5c25c094fb4e5dfdef695cd98af0384ee1 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCharm/StrippingExcitedDsSpectroscopy.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCharm/StrippingExcitedDsSpectroscopy.py
@@ -321,7 +321,6 @@ def globalEventCutFilter(name,
     if MaxTrSIZE == None:
         return None
 
-    from Configurables import LoKi__VoidFilter as VoidFilter
     from Configurables import LoKi__Hybrid__CoreFactory as CoreFactory
     modules = CoreFactory('CoreFactory').Modules
     for i in ['LoKiTracks.decorators']:
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCharm/StrippingHc2V02H.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCharm/StrippingHc2V02H.py
index 5f63de83baa118d330a0b95e541553d6a8e4581f..ca96215521b00ad6379d0a82538d3ada0714a5a3 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCharm/StrippingHc2V02H.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCharm/StrippingHc2V02H.py
@@ -27,11 +27,9 @@ __all__ = (
 )
 
 from GaudiKernel.SystemOfUnits import MeV, GeV, mm, mrad
-from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop, DaVinci__N3BodyDecays
+from GaudiConfUtils.ConfigurableGenerators import DaVinci__N3BodyDecays, FilterDesktop
 from StandardParticles import StdNoPIDsPions as InputPions
 from StandardParticles import StdNoPIDsKaons as InputKaons
-from StandardParticles import StdLooseLambdaLL as InputLambdasLL
-from StandardParticles import StdLooseLambdaDD as InputLambdasDD
 
 from PhysSelPython.Wrappers import Selection, MergedSelection, DataOnDemand
 from StrippingUtils.Utils import LineBuilder
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCharm/StrippingHc2V03H.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCharm/StrippingHc2V03H.py
index 94eff4bffe2ae26b10ad743334c485bd92dbaf99..359b595a4323bd424a630fb3c0b1911072cdc86b 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCharm/StrippingHc2V03H.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCharm/StrippingHc2V03H.py
@@ -27,11 +27,9 @@ __all__ = (
 )
 
 from GaudiKernel.SystemOfUnits import MeV, GeV, mm, mrad
-from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop, DaVinci__N4BodyDecays
+from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays, FilterDesktop
 from StandardParticles import StdNoPIDsPions as InputPions
 from StandardParticles import StdNoPIDsKaons as InputKaons
-from StandardParticles import StdLooseLambdaLL as InputLambdasLL
-from StandardParticles import StdLooseLambdaDD as InputLambdasDD
 
 from PhysSelPython.Wrappers import Selection, MergedSelection, DataOnDemand
 from StrippingUtils.Utils import LineBuilder
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCharm/StrippingHc2V2H.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCharm/StrippingHc2V2H.py
index 1cc1e18bb59332589773894f931054575d3bd57d..62f83f01a95c995d84514559ea3eb725d34e7335 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCharm/StrippingHc2V2H.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCharm/StrippingHc2V2H.py
@@ -29,8 +29,6 @@ from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDeskto
 from StandardParticles import StdNoPIDsDownPions as InputDownPions
 from StandardParticles import StdNoPIDsPions as InputPions
 from StandardParticles import StdNoPIDsKaons as InputKaons
-from StandardParticles import StdLooseLambdaLL as InputLambdasLL
-from StandardParticles import StdLooseLambdaDD as InputLambdasDD
 
 from PhysSelPython.Wrappers import Selection, MergedSelection, DataOnDemand
 from StrippingUtils.Utils import LineBuilder
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCharm/StrippingHc2V3H.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCharm/StrippingHc2V3H.py
index 8860909e6ec1c8f2862b43d64f75e5158a1c67e3..05d0ef19028d88f3cf40161b0e7b207226c117e3 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCharm/StrippingHc2V3H.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCharm/StrippingHc2V3H.py
@@ -31,8 +31,6 @@ from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDeskto
 from StandardParticles import StdNoPIDsDownPions as InputDownPions
 from StandardParticles import StdNoPIDsPions as InputPions
 from StandardParticles import StdNoPIDsKaons as InputKaons
-from StandardParticles import StdLooseLambdaLL as InputLambdasLL
-from StandardParticles import StdLooseLambdaDD as InputLambdasDD
 
 from PhysSelPython.Wrappers import Selection, MergedSelection, DataOnDemand
 from StrippingUtils.Utils import LineBuilder
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCharm/StrippingKKPiPi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCharm/StrippingKKPiPi.py
index cedaab2089da1034f1207a1c958ba82c6e694ba7..767a1fdbf50445fb204987a0cc70c2f97dfb5421 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCharm/StrippingKKPiPi.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCharm/StrippingKKPiPi.py
@@ -12,12 +12,11 @@
 Module for selecting [cs][ubar dbar] -> K+ K+ pi- pi-
 '''
 
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
+from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
 from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
-from Gaudi.Configuration import *
 __author__ = ['Mengzhen Wang']
 __date__ = '10/10/2017'
 __version__ = '$Revision: 1.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCharm/StrippingLambdac2V03H.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCharm/StrippingLambdac2V03H.py
index 8c19d9d3aeebd29855bd2d76b366fe9611b08aaf..9689bee39c9e7d84a61e56605ba3bb5f443ec5d1 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCharm/StrippingLambdac2V03H.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCharm/StrippingLambdac2V03H.py
@@ -27,7 +27,7 @@ __all__ = (
 )
 
 from GaudiKernel.SystemOfUnits import MeV, GeV, mm, mrad
-from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop, DaVinci__N4BodyDecays
+from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays, FilterDesktop
 from StandardParticles import StdNoPIDsPions as InputPions
 from StandardParticles import StdNoPIDsKaons as InputKaons
 from StandardParticles import StdLooseLambdaLL as InputLambdasLL
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCharm/StrippingLc2L0LLpi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCharm/StrippingLc2L0LLpi.py
index 0165e116e9da33c044fd297b7fa4c1090c6cbf39..0a027afeb1d2d303ea6a37758bc2b3bf4bb5f79d 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCharm/StrippingLc2L0LLpi.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCharm/StrippingLc2L0LLpi.py
@@ -12,17 +12,10 @@
 Module for selecting Lambda_c+->Lambda pi+
 '''
 
-from StandardParticles import (StdAllLoosePions, StdLooseProtons,
-                               StdLoosePions, StdNoPIDsUpPions)
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from StandardParticles import StdLooseAllPhotons, StdVeryLooseAllPhotons
-from Configurables import LoKi__VoidFilter
-from PhysSelPython.Wrappers import MergedSelection
-from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
-from Gaudi.Configuration import *
 __author__ = ['Guiyun Ding', 'Jiesheng Yu', 'Yuehong Xie']
 __date__ = '28/11/2016'
 __version__ = '$Revision: 2.0$'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCharm/StrippingNeutralCBaryons.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCharm/StrippingNeutralCBaryons.py
index bf6d1603296752d86c0e7c13ec03b037aa4b7dd0..165e0fbf71ca71084e7f0b7ac538d4257975d87f 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCharm/StrippingNeutralCBaryons.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCharm/StrippingNeutralCBaryons.py
@@ -23,13 +23,9 @@ __version__ = '$Revision: 1.0 $'
 __all__ = ('StrippingNeutralCBaryonsConf', 'default_config')
 
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from StandardParticles import StdLoosePions, StdNoPIDsDownPions, StdLooseKaons, StdLooseDownKaons
-from StandardParticles import StdAllLoosePions, StdAllLooseKaons
 
 from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
-from PhysSelPython.Wrappers import MultiSelectionSequence
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from GaudiKernel.SystemOfUnits import MeV, mm, picosecond
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCharm/StrippingXic2HHH.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCharm/StrippingXic2HHH.py
index e34807cd11d54a2a33e0a1189dffe5a4b8d17475..32300611aa84de3bdf0390670c07b3849c390e20 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCharm/StrippingXic2HHH.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCharm/StrippingXic2HHH.py
@@ -8,18 +8,15 @@
 # granted to it by virtue of its status as an Intergovernmental Organization  #
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
-from StandardParticles import StdNoPIDsPions, StdNoPIDsKaons, StdNoPIDsProtons, StdAllNoPIDsProtons
-from Configurables import TisTosParticleTagger
+from StandardParticles import StdNoPIDsKaons, StdNoPIDsPions, StdNoPIDsProtons
 from StrippingUtils.Utils import LineBuilder
-from PhysSelPython.Wrappers import MultiSelectionSequence
-from PhysSelPython.Wrappers import Selection, DataOnDemand, AutomaticData, MergedSelection
+from PhysSelPython.Wrappers import DataOnDemand, MergedSelection, Selection
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
 from Configurables import FilterDesktop, CombineParticles
 from LHCbKernel.Configuration import *
-from GaudiKernel.SystemOfUnits import MeV, mm, ns
+from GaudiKernel.SystemOfUnits import MeV, mm
 from StrippingConf.StrippingLine import StrippingLine
 from Gaudi.Configuration import *
-import re
 all
 ''' Xic+ and Theta+ lines Designed by Yury Shcheglov, Alexey Dzyuba, Nelya Sagidova to study Xic+ and Theta+ particles '''
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCharm/StrippingXicc.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCharm/StrippingXicc.py
index 2468c2d79739511bfdefe170463aa125124d506e..45478d9be226dbd5e3fdd09b0ff769294d99d064 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCharm/StrippingXicc.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingCharm/StrippingXicc.py
@@ -52,9 +52,6 @@ from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticle
 from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from StandardParticles import StdAllLoosePions, StdAllLooseKaons, StdAllLooseProtons
-from StandardParticles import StdLoosePions
-from CommonParticles.StdLooseLambda import StdLooseLambdaLL, StdLooseLambdaDD
 from GaudiKernel.SystemOfUnits import MeV, GeV, mm
 from Configurables import TisTosParticleTagger
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingIFT/StrippingHeavyIonD02KPiPi0.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingIFT/StrippingHeavyIonD02KPiPi0.py
index 3e380b9342ba9bebae1a3195dcadf08a1b598fc9..8ffdf55b27ce401ff26b2fe355cc99597f755347 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingIFT/StrippingHeavyIonD02KPiPi0.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingIFT/StrippingHeavyIonD02KPiPi0.py
@@ -25,9 +25,8 @@ __all__ = ('StrippingHeavyIonD02KPiPi0Conf',
            'makeD02KPiPi0M',
            'default_config')
 
-from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from PhysSelPython.Wrappers import Selection, DataOnDemand
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
+from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from StandardParticles import StdTightPions, StdTightKaons, StdLooseMergedPi0, StdLooseResolvedPi0
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingIFT/StrippingHeavyIonDiMuon.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingIFT/StrippingHeavyIonDiMuon.py
index 0c2b044b5fe850934f513781b14f5faf5b8fc181..e97c2ed82a33c94fba2489f2b078001b5dc839e6 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingIFT/StrippingHeavyIonDiMuon.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingIFT/StrippingHeavyIonDiMuon.py
@@ -17,8 +17,7 @@ from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 from StandardParticles import StdAllLooseMuons
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand
-from Gaudi.Configuration import *
+from PhysSelPython.Wrappers import Selection
 __author__ = ['Emilie MAURICE']
 __date__ = ''
 __version__ = '$Revision: 2.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingIFT/StrippingHeavyIonDst2D0KPiForPID.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingIFT/StrippingHeavyIonDst2D0KPiForPID.py
index 4282eb3c7b386840ce3bb3a47569a6a981e3194c..c3ba0aa8f46df637625d1f88481903dd9414f15e 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingIFT/StrippingHeavyIonDst2D0KPiForPID.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingIFT/StrippingHeavyIonDst2D0KPiForPID.py
@@ -13,10 +13,8 @@
 from StandardParticles import StdAllNoPIDsKaons, StdAllNoPIDsPions
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from LHCbKernel.Configuration import *
-from Gaudi.Configuration import *
+from PhysSelPython.Wrappers import Selection
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 __author__ = ['Philip Xing', 'Andrew Powell']
 __date__ = '23rd August 2012'
 __version__ = '$Revision: 7.0 $'
@@ -36,7 +34,7 @@ Usage:
 __all__ = ('HeavyIonDst2D0KPiForPIDConf', 'default_config', "D0", "Dstar")
 
 
-from GaudiKernel.SystemOfUnits import mm, cm, MeV, GeV
+from GaudiKernel.SystemOfUnits import GeV, MeV
 # from Configurables import FilterDesktop, CombineParticles
 
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingIFT/StrippingHeavyIonOthercc.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingIFT/StrippingHeavyIonOthercc.py
index 8b2646261f0a63495352f4a665d035a33536a2e3..0c56eb32606ca137ee0e97099fd1810e155b01f7 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingIFT/StrippingHeavyIonOthercc.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingIFT/StrippingHeavyIonOthercc.py
@@ -17,8 +17,7 @@ from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 from StandardParticles import StdNoPIDsElectrons, StdLooseProtons, StdLooseMuons
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand
-from Gaudi.Configuration import *
+from PhysSelPython.Wrappers import Selection
 __author__ = ['Emilie MAURICE']
 __date__ = ''
 __version__ = '$Revision: 1.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingIFT/StrippingHeavyIonPIDCalib.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingIFT/StrippingHeavyIonPIDCalib.py
index 4d96b70412efeeaa567401f7247511c02704fc0f..635480e78d2cba544bf3537d6a6d0e92293ac75f 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingIFT/StrippingHeavyIonPIDCalib.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingIFT/StrippingHeavyIonPIDCalib.py
@@ -37,7 +37,6 @@ from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
 from Gaudi.Configuration import *
 __author__ = ['Yanxi ZHANG']
 __date__ = '25/02/2015'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingIFT/StrippingHeavyIonTopology.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingIFT/StrippingHeavyIonTopology.py
index 6a1c048309106a56999ee047f44263074d6502c5..8308d72b5faed1731235c6cd48d682ca5b65d690 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingIFT/StrippingHeavyIonTopology.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingIFT/StrippingHeavyIonTopology.py
@@ -12,14 +12,9 @@
 Module for selecting specific topology
 '''
 
-from Configurables import FilterDesktop, CombineParticles
-from LoKiPhys.functions import SOURCE
-from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-from StandardParticles import StdAllLooseMuons, StdAllLoosePions, StdAllNoPIDsPions, StdLoosePhotons
+from Configurables import FilterDesktop
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand
-from Gaudi.Configuration import *
 __author__ = ['Emilie MAURICE']
 __date__ = ''
 __version__ = '$Revision: 1.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingIFT/StrippingHeavyIonTrackEffDownMuon.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingIFT/StrippingHeavyIonTrackEffDownMuon.py
index ce5d14b9240dd356b0f3139a35fb649aca062aed..10036bf8ebd21b9cf3a337366fb0f9e3e186504d 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingIFT/StrippingHeavyIonTrackEffDownMuon.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingIFT/StrippingHeavyIonTrackEffDownMuon.py
@@ -43,34 +43,26 @@ __all__ = ('StrippingHeavyIonTrackEffDownMuonConf',
 # FIXME Write includes in a cleaner way
 from Gaudi.Configuration import *
 from LHCbKernel.Configuration import *
-from DAQSys.DecoderClass import Decoder
 from Configurables import GaudiSequencer
 from Configurables import UnpackTrack, ChargedProtoParticleMaker, DelegatingTrackSelector, TrackSelector, BestPIDParticleMaker
-from TrackFitter.ConfiguredFitters import ConfiguredFit
 from Configurables import TrackStateInitAlg
 from StrippingConf.StrippingLine import StrippingLine
-from Configurables import ChargedProtoParticleAddMuonInfo, MuonIDAlgLite
+from Configurables import ChargedProtoParticleAddMuonInfo
 from MuonID import ConfiguredMuonIDs
 from Configurables import ChargedProtoCombineDLLsAlg, ProtoParticleMUONFilter
-from PhysSelPython.Wrappers import Selection, DataOnDemand
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
+from PhysSelPython.Wrappers import Selection
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 
 from StrippingUtils.Utils import LineBuilder
-from Configurables import LoKi__VoidFilter
-from os import environ
 from Gaudi.Configuration import *
-import GaudiKernel.ProcessJobOptions
-from GaudiKernel.SystemOfUnits import mm
 
 from GaudiConfUtils.ConfigurableGenerators import TisTosParticleTagger
 from StandardParticles import StdAllLooseMuons
 from Configurables import GaudiSequencer
 from Configurables import TrackToDST
-from Configurables import TrackSys
 from Configurables import PatSeeding, PatSeedingTool, PatLongLivedTracking
-from PhysSelPython.Wrappers import AutomaticData
 # Get the fitters
-from TrackFitter.ConfiguredFitters import ConfiguredFit, ConfiguredFitSeed, ConfiguredFitDownstream
+from TrackFitter.ConfiguredFitters import ConfiguredFitDownstream
 from PatAlgorithms import PatAlgConf
 
 from SelPy.utils import (UniquelyNamedObject,
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingIFT/StrippingHeavyIonTrackEffMuonTT.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingIFT/StrippingHeavyIonTrackEffMuonTT.py
index 353e33b90208d82b9d6f48c7e29de85839020ca4..e7b8a349477e610a58f6cdeb5fb59970072dccc3 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingIFT/StrippingHeavyIonTrackEffMuonTT.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingIFT/StrippingHeavyIonTrackEffMuonTT.py
@@ -63,10 +63,10 @@ __all__ = ('StrippingHeavyionTrackEffMuonTTConf',
            'filterHLT2ForBJpsiK')
 
 from Gaudi.Configuration import *
-from PhysSelPython.Wrappers import Selection, DataOnDemand, ChargedProtoParticleSelection
+from PhysSelPython.Wrappers import ChargedProtoParticleSelection, Selection
 from StrippingConf.StrippingLine import StrippingLine
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from StrippingUtils.Utils import LineBuilder, checkConfig
+from StrippingUtils.Utils import LineBuilder
 from StandardParticles import StdLooseKaons, StdLooseMuons, StdAllLooseMuons
 
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingIFT/StrippingHeavyIonTrackEffVeloMuon.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingIFT/StrippingHeavyIonTrackEffVeloMuon.py
index c91e15ecaaebcc3d1474c5d85d300398604504da..9b65c27646a93f1c79d2addef700eb3463f95e85 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingIFT/StrippingHeavyIonTrackEffVeloMuon.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingIFT/StrippingHeavyIonTrackEffVeloMuon.py
@@ -40,17 +40,14 @@ __all__ = ('HeavyIonTrackEffVeloMuonConf',
            )
 
 
-from Gaudi.Configuration import *
-from LHCbKernel.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 # from Configurables import CombineParticles
-from PhysSelPython.Wrappers import Selection, SelectionSequence, DataOnDemand
-from Configurables import ChargedProtoParticleMaker, NoPIDsParticleMaker, DataOnDemandSvc, DelegatingTrackSelector, TrackSelector, CombinedParticleMaker, BestPIDParticleMaker
+from PhysSelPython.Wrappers import Selection
+from Configurables import ChargedProtoParticleMaker, DataOnDemandSvc, DelegatingTrackSelector, NoPIDsParticleMaker, TrackSelector
 from Configurables import FastVeloTracking
 
 from StrippingConf.StrippingLine import StrippingLine
-from Configurables import TrackStateInitAlg, TrackEventFitter, TrackPrepareVelo, TrackContainerCopy, Tf__PatVeloSpaceTool, StandaloneMuonRec
-from Configurables import TrackCloneFinder
+from Configurables import StandaloneMuonRec, TrackPrepareVelo
 from StrippingUtils.Utils import LineBuilder
 # changed from StdLooseMuons, yanxi
 from StandardParticles import StdAllLooseMuons
@@ -59,14 +56,9 @@ from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, TisTosParticleT
 # from Configurables import TisTosParticleTagger
 
 from Configurables import GaudiSequencer
-from Configurables import TrackSys
-from PhysSelPython.Wrappers import AutomaticData
 # Get the fitters
-from TrackFitter.ConfiguredFitters import ConfiguredFit
 
-from Configurables import TrackEventCloneKiller, VeloMuonBuilder
-from Configurables import TrackEventFitter, TrackMasterFitter
-from Configurables import TrackKalmanFilter, TrackMasterExtrapolator
+from Configurables import VeloMuonBuilder
 # from TrackFitter.ConfiguredFitters import ConfiguredFastFitter
 # from Configurables import TrackCloneFinder
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingIFT/__init__.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingIFT/__init__.py
index 5daef51c849875bdbd5cc12713c05fd755ff9b9a..6dc68e5b1cb7ce0fa368018976bf8adce91bbf56 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingIFT/__init__.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingIFT/__init__.py
@@ -17,18 +17,8 @@ from StrippingUtils.Utils import getBuilderConfFromModule as _getcon
 from StrippingUtils.Utils import getLineBuildersFromModule as _getter
 __author__ = 'Juan Palacios palacios@physik.uzh.ch'
 
-import StrippingHeavyIonOpenCharm
-import StrippingHeavyIonWMuNu
 # import StrippingHeavyIonConvertedPhoton
-import StrippingHeavyIonDiMuon
-import StrippingHeavyIonOthercc
-import StrippingHeavyIonTopology
 # import StrippingHeavyIonGammaHadron
-import StrippingHeavyIonTrackEffMuonTT
-import StrippingHeavyIonTrackEffDownMuon
-import StrippingHeavyIonD02KPiPi0
-import StrippingHeavyIonMiniBias
-import StrippingHeavyIonSingleElectron
 
 from sys import modules as _modules
 _this = _modules[__name__]
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingMiniBias/StrippingBadEvents.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingMiniBias/StrippingBadEvents.py
index 4d837a2f722d72d1c7683e8f61d6316db037f332..460036843530f41526b7139b73c204dba3cf9160 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingMiniBias/StrippingBadEvents.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingMiniBias/StrippingBadEvents.py
@@ -8,7 +8,6 @@
 # granted to it by virtue of its status as an Intergovernmental Organization  #
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
-from PhysSelPython.Wrappers import Selection
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 __author__ = 'Andrea Contu'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingMiniBias/StrippingMiniBias.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingMiniBias/StrippingMiniBias.py
index 7ba890fe41b117c0dcaaac7777296c741c397754..f791c6cd1cfac775c9b2357307a4044a5100eb87 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingMiniBias/StrippingMiniBias.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingMiniBias/StrippingMiniBias.py
@@ -8,7 +8,6 @@
 # granted to it by virtue of its status as an Intergovernmental Organization  #
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
-from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 __author__ = 'Patrick Koppenburg'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingQEE/DisplVertices_Utils.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingQEE/DisplVertices_Utils.py
index f9e3c9136e46dcf7697209e381ff7735b840ed2e..bcd9752464adf9657cb3a290918226a7d0f05341 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingQEE/DisplVertices_Utils.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingQEE/DisplVertices_Utils.py
@@ -14,12 +14,11 @@ Utilities for displaced vertex stripping: wrapper class around PatPV3D
 
 __all__ = ("SelectionFromAlgorithmWithTools", "SelectionPatPV3DWrapper")
 
-from GaudiConfUtils import isConfigurable
 
 from SelPy.utils import (UniquelyNamedObject, ClonableObject, SelectionBase, compatibleSequences,
-                         IncompatibleInputLocations, CloneCallable, makeOutputLocation, setOutputLocation)
+                         IncompatibleInputLocations, makeOutputLocation, setOutputLocation)
 
-from PhysSelPython.Wrappers import checkConfigurable, checkName
+from PhysSelPython.Wrappers import checkName
 
 
 def connectToRequiredSelections(selection, inputSetter):
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingQEE/StrippingA1MuMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingQEE/StrippingA1MuMu.py
old mode 100755
new mode 100644
index 91e62b0b649d88ac57d91a3cf24db5351e7b19de..281aebf4be79ceaf5c90e7533eb04d49847e5185
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingQEE/StrippingA1MuMu.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingQEE/StrippingA1MuMu.py
@@ -23,11 +23,9 @@ A_1 -> mu+ mu-, based on functionality from StrippingDiMuonNew by Jibo He.
 
 """
 
-from Gaudi.Configuration import *
-from LHCbKernel.Configuration import *
 
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
-from PhysSelPython.Wrappers import Selection, DataOnDemand, SimpleSelection
+from PhysSelPython.Wrappers import SimpleSelection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from GaudiKernel.SystemOfUnits import MeV
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingQEE/StrippingA2MuMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingQEE/StrippingA2MuMu.py
index 64c106858ef1dd3206b2083b5ea5e630aec55ae8..cd47529d168278a387e79f1f772ca7cf3b1d8040 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingQEE/StrippingA2MuMu.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingQEE/StrippingA2MuMu.py
@@ -22,7 +22,7 @@ from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from StandardParticles import StdAllLooseMuons, StdAllNoPIDsMuons
+from StandardParticles import StdAllLooseMuons
 from GaudiKernel.SystemOfUnits import GeV
 
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingQEE/StrippingA2MuMuSameSign.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingQEE/StrippingA2MuMuSameSign.py
index 5911c40e36b1e66721231826c818abbc79aed758..a89a6a8b5ff2bf6571b4fe0fcaeb93088567f2a5 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingQEE/StrippingA2MuMuSameSign.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingQEE/StrippingA2MuMuSameSign.py
@@ -22,7 +22,7 @@ from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from StandardParticles import StdAllLooseMuons, StdAllNoPIDsMuons
+from StandardParticles import StdAllLooseMuons
 from GaudiKernel.SystemOfUnits import GeV
 
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingQEE/StrippingDY2MuMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingQEE/StrippingDY2MuMu.py
index 9c7c8a7706d666e3fac7a8f8316de58468cc8b74..6a28183b934ae8110dbdef65c4d96d44dd261b82 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingQEE/StrippingDY2MuMu.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingQEE/StrippingDY2MuMu.py
@@ -26,9 +26,8 @@ __author__ = ['J. Anderson']
 
 __all__ = 'DY2MuMuConf', 'default_config'
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-from PhysSelPython.Wrappers import Selection, SimpleSelection
+from PhysSelPython.Wrappers import SimpleSelection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from StandardParticles import StdAllLooseMuons
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingQEE/StrippingDY2ee.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingQEE/StrippingDY2ee.py
index e1e5fb0bec27db97687652501ba17ba46baca814..25b226c2dcf544b3b1e376446c208bdd7c266ceb 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingQEE/StrippingDY2ee.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingQEE/StrippingDY2ee.py
@@ -20,9 +20,8 @@ __author__ = ['S.Bifani', 'D.Ward']
 
 __all__ = ('DY2eeConf', 'default_config')
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-from PhysSelPython.Wrappers import Selection, DataOnDemand
+from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from StandardParticles import StdAllNoPIDsElectrons
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingQEE/StrippingDisplVertices.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingQEE/StrippingDisplVertices.py
index 5b0be7ca6bf6610767d8a683238e401caadf2f20..ce06625eaa039ad6c4e22c1a114beaf965dbb3b8 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingQEE/StrippingDisplVertices.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingQEE/StrippingDisplVertices.py
@@ -40,7 +40,6 @@ __all__ = ('DisplVerticesConf', 'default_config')
 
 from Gaudi.Configuration import *
 from GaudiKernel import SystemOfUnits as units
-from LHCbKernel.Configuration import DEBUG, VERBOSE
 
 import logging
 logger = logging.getLogger(__name__)
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingQEE/StrippingDitau.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingQEE/StrippingDitau.py
old mode 100755
new mode 100644
index fa049324f79a44e720a641aa2ed2cdc857f4435e..3e2dd3df509a4ead7bb1a73e4cccd6e5f2e99c0f
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingQEE/StrippingDitau.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingQEE/StrippingDitau.py
@@ -155,8 +155,7 @@ Derived from works of S.Farry & P. Ilten
 
 """
 
-import os
-from GaudiKernel.SystemOfUnits import MeV, GeV, micrometer
+from GaudiKernel.SystemOfUnits import GeV, MeV
 from PhysSelPython.Wrappers import Selection, SimpleSelection, PassThroughSelection, MergedSelection, AutomaticData
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
@@ -894,7 +893,7 @@ def Tuples():
 
     """
     import re
-    from DecayTreeTuple.Configuration import DecayTreeTuple, EventTuple
+    from DecayTreeTuple.Configuration import DecayTreeTuple
 
     seq = GaudiSequencer('TupleSeq')
     seq.ModeOR = True
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingQEE/StrippingExotica.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingQEE/StrippingExotica.py
old mode 100755
new mode 100644
index 167e32419624abab366a0d63517ecd6788c2ee19..10f3e69f1febffdd8b075b09ce35ac3eb759631f
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingQEE/StrippingExotica.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingQEE/StrippingExotica.py
@@ -28,10 +28,10 @@ Hlt2ExoticaPrmptDiMuonHighMass
 
 """
 
-from GaudiKernel.SystemOfUnits import MeV, GeV, mm, picosecond
+from GaudiKernel.SystemOfUnits import MeV, mm, picosecond
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-from PhysSelPython.Wrappers import Selection, SimpleSelection, MergedSelection, AutomaticData
+from PhysSelPython.Wrappers import AutomaticData, SimpleSelection
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingQEE/StrippingFullDiJets.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingQEE/StrippingFullDiJets.py
index 9f9b7b90a54554d0ddb97629f1717b25aa1ff1a4..cf5af4522353ef4302dda2251df7b6096c0bbf73 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingQEE/StrippingFullDiJets.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingQEE/StrippingFullDiJets.py
@@ -9,14 +9,10 @@
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
 
-from Gaudi.Configuration import *
-from Configurables import FilterDesktop, CombineParticles, LoKi__VertexFitter
+from Configurables import CombineParticles, LoKi__VertexFitter
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from StandardParticles import StdJets
-from CommonParticles.Utils import *
-from Configurables import FilterJet
 from GaudiKernel.SystemOfUnits import GeV
 
 __author__ = "Xabier Cid Vidal", "Cedric Potterat", "William Barter"
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingQEE/StrippingHighPtTau.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingQEE/StrippingHighPtTau.py
index 0e662ae5f9f67f2da91fa8d860c467cb8a86d3d2..73441ff9f33a761cb443cb1ea6090213b19a40c8 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingQEE/StrippingHighPtTau.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingQEE/StrippingHighPtTau.py
@@ -24,7 +24,7 @@ from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from StandardParticles import StdAllNoPIDsPions, StdAllLoosePions, StdLooseResolvedPi0, StdLooseMergedPi0
+from StandardParticles import StdAllLoosePions, StdLooseMergedPi0, StdLooseResolvedPi0
 from GaudiKernel.SystemOfUnits import GeV
 from Configurables import FilterDesktop
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingQEE/StrippingLFVExotica.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingQEE/StrippingLFVExotica.py
old mode 100755
new mode 100644
index 2bf574eb7468fe6c40938ffb348946afd38940f8..a9d1c96028d99dbab4600ebc072f7e7e0bb49dc5
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingQEE/StrippingLFVExotica.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingQEE/StrippingLFVExotica.py
@@ -106,7 +106,7 @@ def create_stdjets(strob, line_location, stdjets_name_ban):
         strob.StdJetsNoJetIDBan = [myconf1]
 
     # configure Data-On-Demand service
-    locations = updateDoD(myconf1)
+    updateDoD(myconf1)
 
 
 relInfoJetsVars = ["JETNOMU1PX", "JETNOMU1PY", "JETNOMU1PZ", "JETNOMU1PT", "JETNOMU1JETWIDTH", "JETNOMU1NNTAG", "JETNOMU1MNF", "JETNOMU2PX", "JETNOMU2PY", "JETNOMU2PZ", "JETNOMU2PT", "JETNOMU2JETWIDTH", "JETNOMU2NNTAG", "JETNOMU2MNF", "JETNOMU3PX", "JETNOMU3PY",
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingQEE/StrippingLLP2MuX.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingQEE/StrippingLLP2MuX.py
index 16654f3c9d1acc1925968a5d39f0087bea5086a7..f93bc4732424f6eaeb1951cb1a244ef0de7e8b5e 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingQEE/StrippingLLP2MuX.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingQEE/StrippingLLP2MuX.py
@@ -16,7 +16,6 @@ from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import AutomaticData, Selection
 from GaudiKernel import SystemOfUnits as units
-from LHCbKernel.Configuration import *
 __author__ = "Pieter David"
 __date__ = "2014-08-28"
 __all__ = ("LLP2MuXConf", "default_config")
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingQEE/StrippingLb2dp.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingQEE/StrippingLb2dp.py
old mode 100755
new mode 100644
index cf2bf7494c36f78187f495fe46a2fcfe068338e0..cbd7593f597ef30b0f56f7070b78fe66905549e5
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingQEE/StrippingLb2dp.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingQEE/StrippingLb2dp.py
@@ -23,15 +23,11 @@ __all__ = ('Lb2dpConf',
            )
 
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop
-from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays
 
-from StandardParticles import StdAllNoPIDsPions, StdAllNoPIDsProtons,  StdAllNoPIDsKaons
 from PhysSelPython.Wrappers import Selection, DataOnDemand, SimpleSelection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from Configurables import LoKi__VoidFilter as VoidFilter
 
 default_config = {
     'NAME': 'Lb2dp',
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingQEE/StrippingMicroDiJets.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingQEE/StrippingMicroDiJets.py
index bad4ad03547afb3eb1d9a6db8a0584899cd101c9..6334bd68bc3e5b0ba62caddeaae6ed5407bb4f92 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingQEE/StrippingMicroDiJets.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingQEE/StrippingMicroDiJets.py
@@ -10,13 +10,12 @@
 ###############################################################################
 
 from Gaudi.Configuration import *
-from Configurables import FilterDesktop, CombineParticles, LoKi__VertexFitter
+from Configurables import CombineParticles
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from StandardParticles import StdJets
 from CommonParticles.Utils import *
-from Configurables import FilterJet, ClearDaughters
+from Configurables import ClearDaughters
 from GaudiKernel.SystemOfUnits import GeV
 
 __author__ = "Xabier Cid Vidal", "Cedric Potterat", "William Barter"
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingQEE/StrippingMuMuSS.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingQEE/StrippingMuMuSS.py
index 2624678f1fc33a1d4e6229645bb86db4dda018d1..36fb89fcb7c0d8920bb6af3e43213c4dc04aa22c 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingQEE/StrippingMuMuSS.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingQEE/StrippingMuMuSS.py
@@ -26,7 +26,7 @@ __author__ = (
 )
 
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-from PhysSelPython.Wrappers import Selection, SimpleSelection
+from PhysSelPython.Wrappers import SimpleSelection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from StandardParticles import StdAllLooseMuons
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingQEE/StrippingSbarSCorrelations.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingQEE/StrippingSbarSCorrelations.py
index 578635fa7ef787c7ed772e61fa98a130acd5ab9f..9c45d8c730a8ea34174573f64728abd920769a54 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingQEE/StrippingSbarSCorrelations.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingQEE/StrippingSbarSCorrelations.py
@@ -21,10 +21,8 @@ Long tracks only
 from GaudiKernel.SystemOfUnits import MeV, GeV
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
-from StandardParticles import StdAllNoPIDsPions, StdTightKaons, StdAllNoPIDsProtons
+from PhysSelPython.Wrappers import DataOnDemand, Selection
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = ['Florin MACIUC']
 __date__ = '24/08/2013'
 __version__ = '$Revision: 1.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingQEE/StrippingStrangeBaryons.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingQEE/StrippingStrangeBaryons.py
index f3dd8ebdec4e50abd2bed892959740435ac5d9b5..2405f0e9c6f1695dd9f652d6aae992473b3135a2 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingQEE/StrippingStrangeBaryons.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingQEE/StrippingStrangeBaryons.py
@@ -18,14 +18,10 @@ Xi -> Lambda pi,   Omega -> Lambda K
 LLL DDL DDD
 '''
 
-from GaudiKernel.SystemOfUnits import MeV
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
-from CommonParticles import StdLooseLambda
-from StandardParticles import StdLoosePions, StdNoPIDsDownPions, StdLooseKaons, StdLooseDownKaons, StdLooseProtons, StdNoPIDsDownProtons
+from PhysSelPython.Wrappers import DataOnDemand, Selection
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = ['Mihai Straticiuc', 'Florin Maciuc', 'Nguyen Thi Dung']
 __date__ = '26/06/2012'
 __version__ = '$Revision: 0.3 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingQEE/StrippingStrangeBaryonsNoPID.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingQEE/StrippingStrangeBaryonsNoPID.py
index 668986b834d39169c5ae15803bf5d5fb33cff67b..208ab8bad23a5e36e2a0a609a82dd6ca2fc9d012 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingQEE/StrippingStrangeBaryonsNoPID.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingQEE/StrippingStrangeBaryonsNoPID.py
@@ -18,12 +18,10 @@ Xi -> Lambda pi,   Omega -> Lambda K
 LLL
 '''
 
-from GaudiKernel.SystemOfUnits import MeV
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
+from PhysSelPython.Wrappers import DataOnDemand, Selection
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = ['Florin Maciuc']
 __date__ = '13/01/2014'
 __version__ = '$Revision: 0.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingQEE/StrippingTaggedJets.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingQEE/StrippingTaggedJets.py
old mode 100755
new mode 100644
index 295b8a41d2618b3fecf00a4f5a1b7c033637686d..bb3326270087d013f8ced34035ee104c1c23848b
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingQEE/StrippingTaggedJets.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingQEE/StrippingTaggedJets.py
@@ -10,11 +10,10 @@
 ###############################################################################
 
 from Gaudi.Configuration import *
-from Configurables import FilterDesktop, CombineParticles, LoKi__VertexFitter
+from Configurables import CombineParticles, LoKi__VertexFitter
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from StandardParticles import StdJets
 from CommonParticles.Utils import *
 from Configurables import FilterJet
 from GaudiKernel.SystemOfUnits import GeV
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingQEE/StrippingW2nH.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingQEE/StrippingW2nH.py
index cc373f666cb49309b9f3e2efe0dae8e52ac260a4..22eacc1d77ba55838726dc481db0fa8f76e6bf1d 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingQEE/StrippingW2nH.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingQEE/StrippingW2nH.py
@@ -26,7 +26,6 @@ from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from StandardParticles import StdAllNoPIDsPions
 from GaudiKernel.SystemOfUnits import GeV
-from GaudiKernel.SystemOfUnits import MeV
 
 
 default_config = {
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingQEE/StrippingWJets.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingQEE/StrippingWJets.py
old mode 100755
new mode 100644
index ae80ec7c3f67ef962664ed45183a235fcd9c9d4f..48a0b2de2b4dc719b98a7a0de39e0eae96ed4f4f
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingQEE/StrippingWJets.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingQEE/StrippingWJets.py
@@ -22,14 +22,12 @@ They are then cover a phasespace complementarily on each other.
 
 """
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
 from Configurables import CombineParticles, LoKi__VertexFitter
 from PhysSelPython.Wrappers import Selection, SimpleSelection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from StandardParticles import StdAllLooseMuons, StdAllNoPIDsElectrons, StdJets
-from CommonParticles.Utils import *
 from GaudiKernel.SystemOfUnits import GeV, MeV
 
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingQEE/StrippingWRareDecay.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingQEE/StrippingWRareDecay.py
index de1eaf98e07a599774f9667406768492a892a465..f599f543313af3af803cfd1ae503077a399fbebb 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingQEE/StrippingWRareDecay.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingQEE/StrippingWRareDecay.py
@@ -21,8 +21,7 @@ from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from GaudiKernel.SystemOfUnits import MeV, GeV, mm, picosecond
-from Gaudi.Configuration import *
+from GaudiKernel.SystemOfUnits import MeV, picosecond
 __author__ = ['Hang Yin', 'Qundong Han']
 __date__ = '11/29/2016'
 __version__ = '$Revision: 2.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingQEE/StrippingWe.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingQEE/StrippingWe.py
index 0820e8b431f0bb8891ac3f88f980c3fcbe0a181c..3e509fb26655db393ee396f8d85f74a24b0c62d7 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingQEE/StrippingWe.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingQEE/StrippingWe.py
@@ -21,7 +21,6 @@ We control: StdAllNoPIDsElectrons, PRS>50Mev & E_ECal/P>0.1 & E_HCal/P<0.05 & pT
 __all__ = 'WeConf', 'default_config'
 __author__ = 'S. Bifani', 'D. Ward'
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
 from PhysSelPython.Wrappers import SimpleSelection
 from StrippingConf.StrippingLine import StrippingLine
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingQEE/StrippingZ02ee.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingQEE/StrippingZ02ee.py
index e797011998c7d9201276f70cdabaa1b30ae4d70f..f6977308a75475dc2fd7e695d713190194177820 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingQEE/StrippingZ02ee.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingQEE/StrippingZ02ee.py
@@ -23,7 +23,6 @@ __all__ = (
     'default_config',
 )
 
-from Gaudi.Configuration import *
 from GaudiKernel.SystemOfUnits import GeV, MeV
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 from PhysSelPython.Wrappers import SimpleSelection
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingQEE/StrippingZ02nH.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingQEE/StrippingZ02nH.py
index 2f8d8eb612b1c353cf08c5e72ca77ae205eb7a72..35de5f4d789850497ba9aa5b71430ef065284077 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingQEE/StrippingZ02nH.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingQEE/StrippingZ02nH.py
@@ -26,7 +26,6 @@ from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from StandardParticles import StdAllNoPIDsPions
 from GaudiKernel.SystemOfUnits import GeV
-from GaudiKernel.SystemOfUnits import MeV
 
 
 default_config = {
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingQEE/StrippingZ0RareDecay.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingQEE/StrippingZ0RareDecay.py
index 57c2091f2ac6a4efcb43bd28c4251acba348f513..e181b28533d1769723804e5ccc2d55ce3dfbccea 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingQEE/StrippingZ0RareDecay.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingQEE/StrippingZ0RareDecay.py
@@ -22,8 +22,7 @@ __version__ = '$Revision: 2.0 $'
 
 __all__ = 'default_config', 'Z0RareDecayConf'
 
-from Gaudi.Configuration import *
-from GaudiKernel.SystemOfUnits import MeV, GeV, mm
+from GaudiKernel.SystemOfUnits import MeV
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
 from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
 from StrippingConf.StrippingLine import StrippingLine
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingQEE/depreciated/StrippingDijets.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingQEE/depreciated/StrippingDijets.py
index f0793d3411791797729ad540397e458f4646f78b..975321a6b30b00b6f80aee11878eb20ba9d16b84 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingQEE/depreciated/StrippingDijets.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingQEE/depreciated/StrippingDijets.py
@@ -15,8 +15,7 @@
 __all__ = ('DijetsConf',
            'default_config')
 
-from Gaudi.Configuration import *
-from GaudiKernel.SystemOfUnits import MeV, GeV, mm
+from GaudiKernel.SystemOfUnits import GeV, MeV
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingQEE/depreciated/StrippingHighPtTopoJets.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingQEE/depreciated/StrippingHighPtTopoJets.py
index 73ca61d9e7e0914a21b65e40361131e8f38c026d..6078cdec364615de35d547f813533d0a763afeef 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingQEE/depreciated/StrippingHighPtTopoJets.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingQEE/depreciated/StrippingHighPtTopoJets.py
@@ -21,8 +21,6 @@ __all__ = ('default_config', 'HighPtTopoJetsConf')
 # \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\#
 
 
-from Gaudi.Configuration import *
-from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from PhysSelPython.Wrappers import EventSelection
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingQEE/depreciated/StrippingJets.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingQEE/depreciated/StrippingJets.py
index 02e5fc43080729f2f38d0bc0bde65232a21f0202..55abf24d99577dcb8f10b30fda8803015b0c09f0 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingQEE/depreciated/StrippingJets.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingQEE/depreciated/StrippingJets.py
@@ -15,13 +15,11 @@
 __all__ = ('JetsConf',
            'default_config')
 
-from Gaudi.Configuration import *
-from GaudiKernel.SystemOfUnits import MeV, GeV, mm
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
+from GaudiKernel.SystemOfUnits import GeV, MeV
+from PhysSelPython.Wrappers import MergedSelection, Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
-from JetAccessories.JetMaker_Config import JetMakerConf
 from StandardParticles import StdJets, StdAllNoPIDsPions
 from Configurables import CombineParticles
 from Configurables import TopologicalTagging
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/Beauty2Charm_LoKiCuts.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/Beauty2Charm_LoKiCuts.py
index ce5265655cf518aa12121d3a5728d84c36da26cd..666cef80aacee423a071365fe7281c63e506e27d 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/Beauty2Charm_LoKiCuts.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/Beauty2Charm_LoKiCuts.py
@@ -10,11 +10,6 @@
 ###############################################################################
 # \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\#
 
-from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
-from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-from PhysSelPython.Wrappers import Selection, MergedSelection
-from StandardParticles import StdNoPIDsPions, StdNoPIDsKaons
 
 # \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\#
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingB02Lcmu_pKpi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingB02Lcmu_pKpi.py
index 3d6992fd337683bf5bcf97e994e4fd64705add4f..93bd54fbf8871329e8e7bcb95f7722d9913e1cff 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingB02Lcmu_pKpi.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingB02Lcmu_pKpi.py
@@ -14,7 +14,6 @@ from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = ['Nikita Beliy', 'Jibo He']
 __date__ = '28/11/2016'
 __version__ = '$Revision: 1.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingB23MuLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingB23MuLines.py
index a6e53abda621d1f1b0efe6185553c1b46aae67e6..15ea2076dcaea1a75c4fec8295e895be19887b4a 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingB23MuLines.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingB23MuLines.py
@@ -55,13 +55,11 @@ __all__ = ("B23MuLinesConf",
 
 #############################################################################
 
-from Gaudi.Configuration import *
-from Configurables import FilterDesktop, CombineParticles, DaVinci__N3BodyDecays
+from Configurables import DaVinci__N3BodyDecays
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 # from StrippingSelections.Utils import checkConfig
-from GaudiKernel.PhysicalConstants import c_light
 
 #############################################################################
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingB2KLLXInclusive.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingB2KLLXInclusive.py
index a9d2ffd4e4d8d6444da6c3df3731248c13fce6e7..61a740d6b5d3d92a7f2015b59a5021738a7a2958 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingB2KLLXInclusive.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingB2KLLXInclusive.py
@@ -19,15 +19,12 @@ __all__ = ('B2KLLXInclusiveConf', 'default_config')
 Stripping selection for inclusively selected B->KmumuX decays.
 """
 
-from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop
+from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
 
 from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from LHCbKernel.Configuration import *  # check if needed
-from Configurables import SubstitutePID
-from Configurables import SubPIDMMFilter
 
 
 #################
@@ -333,7 +330,6 @@ class B2KLLXInclusiveConf(LineBuilder):
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         CombineDiMuon = CombineParticles()
         CombineDiMuon.DecayDescriptors = ["[B+ -> J/psi(1S) K+]cc"]
-        sel_name = "InclKLL"
         CombineDiMuon.MotherCut = self.InclKLLCut
         # choose
         leptons = self.InclLeptons
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingB2KstTauTau.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingB2KstTauTau.py
index 7fa4e34f7391f574a5616ba643bd1bd634ba973c..3773946c371792166f74fcee7bc85e1b6f50b4d0 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingB2KstTauTau.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingB2KstTauTau.py
@@ -15,8 +15,7 @@ from StandardParticles import StdTightMuons
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, OfflineVertexFitter, DaVinci__N3BodyDecays
-from Gaudi.Configuration import *
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N3BodyDecays, FilterDesktop
 __author__ = [' G. Mancinelli, J. Serrano']
 __date__ = '15/08/2014'
 __version__ = '$Revision: 0.1 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingB2LLXBDT.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingB2LLXBDT.py
index bd5cec16fcf3b97dfe5754895aa711f2ae2f3a7a..6ba3cd2237f97cc9bf2f590c2791b34a235a7310 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingB2LLXBDT.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingB2LLXBDT.py
@@ -20,8 +20,6 @@ from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticle
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, MergedSelection
-from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays
-from Gaudi.Configuration import *
 __author__ = ['Jibo He']
 __date__ = '20/11/2015'
 __version__ = '$Revision: 1.0 $'
@@ -240,7 +238,7 @@ class B2LLXBDTConf(LineBuilder):
         """
         Kshort, both LL and DD
         """
-        from StandardParticles import StdLooseKsDD, StdLooseKsLL
+        from StandardParticles import StdLooseKsDD
 
         self.SelKsDD = self.createSubSel(OutputList=self.name + "SelKsDD",
                                          InputList=StdLooseKsDD,
@@ -276,7 +274,7 @@ class B2LLXBDTConf(LineBuilder):
         """
         Lambda, both LL and DD
         """
-        from StandardParticles import StdLooseLambdaDD, StdLooseLambdaLL
+        from StandardParticles import StdLooseLambdaDD
 
         self.SelLambdaDD = self.createSubSel(OutputList=self.name + "SelLambdaDD",
                                              InputList=StdLooseLambdaDD,
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingB2Lambda0MuLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingB2Lambda0MuLines.py
index a054613d0704a7963e610f2572ba88b082f66814..fa771110364f67cbc9d0958eab12334187a60802 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingB2Lambda0MuLines.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingB2Lambda0MuLines.py
@@ -21,7 +21,6 @@ __all__ = ('B2Lambda0MuLines',
            'default_config')
 
 from StandardParticles import StdLoosePions, StdLooseMuons, StdLooseDownMuons, StdNoPIDsDownPions
-from Configurables import TisTosParticleTagger
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingB2MuMuMuMuLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingB2MuMuMuMuLines.py
index e8be535494b2f042b5e0ac87439ef9f4f7c4bd9d..e6a830521e3233715c6896a50d0ffe4616617755 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingB2MuMuMuMuLines.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingB2MuMuMuMuLines.py
@@ -19,7 +19,7 @@ from Beauty2Charm_LoKiCuts import LoKiCuts
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
-from Configurables import FilterDesktop, CombineParticles
+from Configurables import CombineParticles
 from Gaudi.Configuration import *
 __author__ = ['Diego Martinez Santos', 'Johannes Albrecht',
               'Konstantinos A. Petridis', 'Alexander Baranov']
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingB2XLL.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingB2XLL.py
old mode 100755
new mode 100644
index 893c8f7d24822aaf5128c145a0ea679b0efd25cc..54c9d8dbdf1774215b4f2574855ce20420b67924
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingB2XLL.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingB2XLL.py
@@ -10,9 +10,8 @@
 ###############################################################################
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection, AutomaticData
+from PhysSelPython.Wrappers import MergedSelection, Selection
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = 'Raja Nandakumar, Fergus Wilson, Stefania Ricciardi'
 __date__ = '04/11/2015'
 __version__ = '$Revision: 0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingB2XMuMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingB2XMuMu.py
index 8e508e6b18835068583f0559bb639cf60f677970..d21cafebb79a26d75af3a595a92a930cb6d90a9e 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingB2XMuMu.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingB2XMuMu.py
@@ -19,7 +19,6 @@ __version__ = '$Revision: 1.2 $'
 __all__ = ('B2XMuMuConf', 'default_config')
 
 
-from Gaudi.Configuration import *
 from LHCbKernel.Configuration import *  # check if needed
 
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingB2XTau.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingB2XTau.py
index 517783103a608cd604736482dbbe74b381a5b355..a0b9fd6185ec14bea5b7db245b9617a357253bea 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingB2XTau.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingB2XTau.py
@@ -9,15 +9,12 @@
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
 from StandardParticles import StdLooseKaons
-from StandardParticles import StdAllLoosePions, StdAllNoPIDsPions
-from copy import deepcopy
-from StandardParticles import StdLoosePions, StdTightPions
-from StandardParticles import StdNoPIDsKaons, StdNoPIDsPions, StdTightMuons
+from StandardParticles import StdLoosePions
+from StandardParticles import StdTightMuons
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, OfflineVertexFitter, DaVinci__N3BodyDecays
-from Gaudi.Configuration import *
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N3BodyDecays, FilterDesktop
 __author__ = ['G. Mancinelli, J. Serrano']
 __date__ = '24/05/2010,15/01/2014'
 __version__ = '$Revision: 1.2 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingB2XTauMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingB2XTauMu.py
index 525f26baa4a85deecc6c3905b94542f685fd9239..a16db3ca6bc746730c0eeda8f40ec83488908781 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingB2XTauMu.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingB2XTauMu.py
@@ -25,8 +25,6 @@ __all__ = ('B2XTauMuConf',
            'default_config')
 
 
-from Gaudi.Configuration import *
-
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
 from PhysSelPython.Wrappers import Selection, MergedSelection
 from StrippingConf.StrippingLine import StrippingLine
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingBLVLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingBLVLines.py
index 8bf68933cf866f19e4931849021862745276afe7..a5196ce34b14f3f32b717e3c7fcb254e2f21f2fa 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingBLVLines.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingBLVLines.py
@@ -95,8 +95,7 @@ __all__ = ("BLVLinesConf",
 
 ###################################################################################################
 
-from Gaudi.Configuration import *
-from Configurables import FilterDesktop, CombineParticles, DaVinci__N3BodyDecays
+from Configurables import CombineParticles, DaVinci__N3BodyDecays
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingBd2KSLLX.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingBd2KSLLX.py
index 419b0f7505b9bb8f7a0008bd6bd040167c12c60a..54c987ef8b72fd7e148a11fb44cebadb12188639 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingBd2KSLLX.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingBd2KSLLX.py
@@ -10,9 +10,8 @@
 ###############################################################################
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection, AutomaticData
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, DaVinci__N3BodyDecays
-from Gaudi.Configuration import *
+from PhysSelPython.Wrappers import MergedSelection, Selection
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop
 __author__ = 'SB'
 __date__ = '08/10/2017'
 __version__ = '$Revision: 1 $'
@@ -47,15 +46,8 @@ class Bd2KSLLXConf(LineBuilder):
         mmXLine_name = name + "_mm"
         eeXLine_name = name + "_ee"
 
-        from StandardParticles import StdLoosePions as Pions
-        from StandardParticles import StdLooseKaons as Kaons
-        from StandardParticles import StdLooseKstar2Kpi as Kstars
-        from StandardParticles import StdLoosePhi2KK as Phis
         from StandardParticles import StdLooseKsLL as KshortsLL
         from StandardParticles import StdLooseKsDD as KshortsDD
-        from StandardParticles import StdLooseLambdaLL as LambdasLL
-        from StandardParticles import StdLooseLambdaDD as LambdasDD
-        from StandardParticles import StdLooseLambdastar2pK as Lambdastars
 
         SelKshortsLL = self._filterHadron(name="KshortsLLFor" + self._name,
                                           sel=KshortsLL,
@@ -64,12 +56,10 @@ class Bd2KSLLXConf(LineBuilder):
                                           sel=KshortsDD,
                                           params=config)
 
-        from StandardParticles import StdDiElectronFromTracks as DiElectronsFromTracks
         from StandardParticles import StdLooseDiElectron as DiElectrons
         from StandardParticles import StdLooseDiMuon as DiMuons
 
-        ElecID = "(PIDe > %(PIDe)s)" % config
-        MuonID = "(HASMUON)&(ISMUON)"
+        "(PIDe > %(PIDe)s)" % config
 
         DiElectronID = "(2 == NINTREE((ABSID==11)&(PIDe > %(PIDe)s)))" % config
         DiMuonID = "(2 == NINTREE((ABSID==13)&(HASMUON)&(ISMUON)))"
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingBd2eeKstarBDT.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingBd2eeKstarBDT.py
index 1a6b3547113e58f48bff1e36952cfc3fb4d30295..6776dcdf27807a56103010584c7a22734b4a8a3f 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingBd2eeKstarBDT.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingBd2eeKstarBDT.py
@@ -18,7 +18,6 @@ from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = ['Marie-Helene Schune', 'Jibo He']
 __date__ = '20/01/2012'
 __version__ = '$Revision: 1.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingBeauty2XGamma.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingBeauty2XGamma.py
index 2e6bf787464fbff1add640fdc82bfa3ddb9e9806..9a9cce9fd0828c91902e720481e1aae7638ef2bd 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingBeauty2XGamma.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingBeauty2XGamma.py
@@ -12,7 +12,7 @@
 B-> X Gamma selections
 """
 
-from StandardParticles import StdAllNoPIDsKaons, StdAllNoPIDsPions, StdLooseAllPhotons, StdLooseMergedPi0, StdLooseResolvedPi0, StdAllLooseGammaDD, StdAllLooseGammaLL, StdAllNoPIDsProtons
+from StandardParticles import StdAllLooseGammaDD, StdAllLooseGammaLL, StdAllNoPIDsPions, StdLooseAllPhotons, StdLooseMergedPi0, StdLooseResolvedPi0
 from Configurables import TisTosParticleTagger
 from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays as Combine4Particles
 from GaudiConfUtils.ConfigurableGenerators import DaVinci__N3BodyDecays as Combine3Particles
@@ -20,7 +20,6 @@ from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = ['Violaine Bellee', 'Albert Puig']
 __date__ = '08/04/2016'
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingBs2MuMuGamma.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingBs2MuMuGamma.py
index 0cfb5425d7a51fe618e72a66a2e6e2062510e41d..f1f37c46035071eccb7cf880d283aafb532e0b8f 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingBs2MuMuGamma.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingBs2MuMuGamma.py
@@ -15,7 +15,7 @@ Authors: Meril Reboud, Jean-Francois Marchand
 """
 
 ########################################################################
-from StrippingUtils.Utils import LineBuilder, checkConfig
+from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Combine3BodySelection
 from StandardParticles import StdLooseMuons, StdLooseAllPhotons
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingBs2MuMuLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingBs2MuMuLines.py
index 83814baf180de07952b534a10d4fed42b9b8eb7d..d1be9584f636ad8990b8634c4b788bbc3c8dc160 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingBs2MuMuLines.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingBs2MuMuLines.py
@@ -26,7 +26,7 @@ from Gaudi.Configuration import *
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
-from Configurables import FilterDesktop, CombineParticles
+from Configurables import CombineParticles
 from JetAccessories.JetMaker_Config import JetMakerConf
 from CommonParticles.Utils import *
 from Gaudi.Configuration import *
@@ -159,7 +159,7 @@ def create_stdjets(strob, line_location, stdjets_name_ban, stdjets_name_addb):
         strob.StdJetsNoJetIDBan = [myconf1]
 
     # configure Data-On-Demand service
-    locations = updateDoD(myconf1)
+    updateDoD(myconf1)
 
     myconf2 = JetMakerConf(stdjets_name_addb,
                            Inputs=['Phys/PFParticles/Particles', line_location],
@@ -173,7 +173,7 @@ def create_stdjets(strob, line_location, stdjets_name_ban, stdjets_name_addb):
         strob.StdJetsNoJetIDAddB = [myconf2]
 
     # configure Data-On-Demand service
-    locations = updateDoD(myconf2)
+    updateDoD(myconf2)
 
 ##########################################
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingBs2gammagamma.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingBs2gammagamma.py
index 86510ca26f4da8eff4c4db3ad69b59c81565b172..4845bae8a45a42390b25ddb09a3d68ffa3960853 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingBs2gammagamma.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingBs2gammagamma.py
@@ -21,16 +21,11 @@ Exports the following stripping lines as instance data members:
 - Bs2gammagamma_NoConvWideLine  : wide line with 0 conversions
 '''
 
-from Configurables import (DiElectronMaker, ProtoParticleCALOFilter,
-                           ParticleTransporter, BremAdder)
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop  # , CombineParticles
-from CommonParticles import StdLooseAllPhotons
-from CommonParticles import StdAllLooseGammaConversion
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
 from Configurables import CombineParticles
-from Gaudi.Configuration import *
 __author__ = ['Sean Benson']
 __date__ = '2016/04/08'
 __version__ = '1.1'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingBs2st2KKMuX.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingBs2st2KKMuX.py
index 86d2fbe036d44821a158f2fba4fe7e558c1d3d55..22e9c5c994936c1db65ca0b5c70f9d8f5601bd3b 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingBs2st2KKMuX.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingBs2st2KKMuX.py
@@ -22,9 +22,8 @@ Stripping lines:
 from StandardParticles import StdLooseMuons, StdLooseKaons, StdAllLooseKaons, StdMassConstrainedJpsi2MuMu
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand
+from PhysSelPython.Wrappers import Selection
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = ['Jianchun Wang']
 __date__ = '03/22/2015'
 __version__ = '$Revision: 0.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingBu2LLK.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingBu2LLK.py
index 63c81011de681a6edfddcd16b2dab98c98e1afc8..f267e32df1c5ee380ccbf4ab468240ae3c1d7432 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingBu2LLK.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingBu2LLK.py
@@ -10,9 +10,8 @@
 ###############################################################################
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection, AutomaticData
+from PhysSelPython.Wrappers import DataOnDemand, MergedSelection, Selection
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, DaVinci__N3BodyDecays
-from Gaudi.Configuration import *
 __author__ = 'Patrick Koppenburg, Alex Shires, Thomas Blake, Luca Pescatore, Simone Bifani, Yasmine Amhis, Paula Alvarez Cartelle, Harry Cliff, Rafael Silva Coutinho'
 __date__ = '16/06/2014'
 __version__ = '$Revision: 3 $'
@@ -766,7 +765,6 @@ class Bu2LLKConf(LineBuilder):
         from StandardParticles import StdLooseMuons as Muons
         # from CommonParticles import StdLooseDetachedTau
         # Taus = DataOnDemand(Location = "Phys/StdLooseDetachedTau3pi/Particles")
-        from CommonParticles import StdTightDetachedTau
         Taus = DataOnDemand(Location="Phys/StdTightDetachedTau3pi/Particles")
 
         _DecayDescriptor = "[J/psi(1S) -> mu+ tau-]cc"
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingBu2MajoLep.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingBu2MajoLep.py
index 5a96cdedd562ea723f6b2b20d6b2cf30f98f517f..850c2f87ccfaddc8f68a9b6e087f3f6d41cebbb1 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingBu2MajoLep.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingBu2MajoLep.py
@@ -19,12 +19,10 @@ __version__ = 'V0.9'
 __all__ = ('Bu2MajoLepConf',
            'default_config')
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
+from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from GaudiKernel.SystemOfUnits import *
 
 from StandardParticles import StdLooseMuons as Muons
 from StandardParticles import StdLoosePions as Pions
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingBu2MuNu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingBu2MuNu.py
index 19ce21e90e54ca7bc0f65d55187d37c95520c6d9..4163901dd65f50c70f659de9c335932f2c9649fa 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingBu2MuNu.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingBu2MuNu.py
@@ -25,12 +25,11 @@ __all__ = ('Bu2MuNuConf',
            'default_config')
 
 from Gaudi.Configuration import *
-from PhysSelPython.Wrappers import Selection, DataOnDemand
+from PhysSelPython.Wrappers import DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from StandardParticles import StdTightMuons, StdTightANNMuons
 from CommonParticles.Utils import *
-from Configurables import FilterDesktop, CombineParticles
+from Configurables import FilterDesktop
 from JetAccessories.JetMaker_Config import JetMakerConf
 
 default_name = 'Bu2MuNu'
@@ -72,7 +71,7 @@ def create_stdjets(strobj, line_location, stdjets_name_ban):
         strobj.StdJetsNoJetIDBan = [myconf1]
 
     # configure Data-On-Demand service
-    locations = updateDoD(myconf1)
+    updateDoD(myconf1)
 
 
 relInfoJetsVars = ["JETNOMU1PX", "JETNOMU1PY", "JETNOMU1PZ", "JETNOMU1PT", "JETNOMU1JETWIDTH", "JETNOMU1NNTAG", "JETNOMU1MNF", "JETNOMU2PX", "JETNOMU2PY", "JETNOMU2PZ", "JETNOMU2PT", "JETNOMU2JETWIDTH", "JETNOMU2NNTAG",
@@ -255,7 +254,7 @@ class Bu2MuNuConf(LineBuilder):
                                            JetIDCut=False).algorithms[0]
 
         # configure Data-On-Demand service
-        locations = updateDoD(StdJetsNoJetIDNoBan)
+        updateDoD(StdJetsNoJetIDNoBan)
 
         # add the jets with the specific banning
         create_stdjets(self, self.ControlLine.outputLocation(),
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingD23MuLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingD23MuLines.py
index 9d9153bde02604dd6518511524323b953c58b810..a119c6aadabeb6405ae23f48d28004723f035a3b 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingD23MuLines.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingD23MuLines.py
@@ -51,12 +51,11 @@ __all__ = ("D23MuLinesConf",
 #############################################################################
 
 from Gaudi.Configuration import *
-from Configurables import FilterDesktop, CombineParticles, DaVinci__N3BodyDecays
+from Configurables import DaVinci__N3BodyDecays
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 # from StrippingSelections.Utils import checkConfig
-from GaudiKernel.PhysicalConstants import c_light
 
 #############################################################################
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingDarkBoson.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingDarkBoson.py
index 9cbd23ab60ae4ca685775a5b5320a32475dbf7cd..5f0ed1ef98e3e1a3ccc913ce00f38b85106147d8 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingDarkBoson.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingDarkBoson.py
@@ -17,23 +17,18 @@ Author: M. Williams
 from Configurables import DiElectronMaker, ProtoParticleCALOFilter
 from GaudiConfUtils.ConfigurableGenerators import DaVinci__N3BodyDecays
 from CommonParticles.Utils import *
-from copy import deepcopy
 from Configurables import SubstitutePID
 from StandardParticles import StdAllLooseGammaLL, StdAllLooseGammaDD, \
     StdAllLooseElectrons, StdLooseAllPhotons  # , StdDiElectronFromTracks
 from Beauty2Charm_LoKiCuts import LoKiCuts
 from StandardParticles import StdAllNoPIDsPions, StdAllNoPIDsKaons, \
-    StdAllNoPIDsProtons, StdNoPIDsUpPions, StdAllLooseMuons, \
-    StdLooseDownMuons
-from Configurables import LoKi__VoidFilter
+    StdAllLooseMuons, StdLooseDownMuons
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import EventSelection
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
+from PhysSelPython.Wrappers import DataOnDemand, Selection
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
 from Gaudi.Configuration import *
-import re
 __author__ = ['Mike Williams']
 
 moduleName = 'DarkBoson'
@@ -251,7 +246,7 @@ class DarkBosonConf(LineBuilder):
         mmDDX = makeX(
             'MuMuDD', default_config['XDD'], 'KS0 -> mu+ mu-', [muDX])
         kkX = makeX('KK', default_config['XLL'], 'KS0 -> K+ K-', [kX])
-        kkDDX = makeX('KKDD', default_config['XDD'], 'KS0 -> K+ K-', [kDX])
+        makeX('KKDD', default_config['XDD'], 'KS0 -> K+ K-', [kDX])
         pipiX = makeX(
             'PiPi', default_config['XLLhard'], 'KS0 -> pi+ pi-', [piX])
         pipiDDX = makeX(
@@ -273,7 +268,7 @@ class DarkBosonConf(LineBuilder):
             'PiPiSSDD', default_config['XDD'], '[KS0 -> pi+ pi+]cc', [piDX])
         preSS = default_config['Prescales']['SS']
 
-        preDD = default_config['Prescales']['DD']
+        default_config['Prescales']['DD']
         preKK = default_config['Prescales']['KK']
 
         j = makeJ(default_config['J'], [muJ])
@@ -390,7 +385,7 @@ class DarkBosonConf(LineBuilder):
         kst = filterKst()
         self._makeBLine('B2JKst', ['[B0 -> J/psi(1S) K*(892)0]cc'],
                         [j, kst], default_config['B2KX'])
-        rho = makeRho([piB])
+        makeRho([piB])
         # self._makeBLine('B2RhoX2MuMu',['B0 -> rho(770)0 KS0'],[rho,mmX],
         #                default_config['B2HHX'])
         # self._makeBLine('B2RhoX2MuMuDD',['B0 -> rho(770)0 KS0'],[rho,mmDDX],
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingDoubleSLForRX.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingDoubleSLForRX.py
index f7e5ccc228e7525247584f38f94bf53502f3cdea..3116bd40e9e8d6da906924d79ac8c85fabf37565 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingDoubleSLForRX.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingDoubleSLForRX.py
@@ -19,7 +19,6 @@ from GaudiConfUtils.ConfigurableGenerators import (CombineParticles,
                                                    DaVinci__N3BodyDecays)
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from Gaudi.Configuration import *
 __author__ = 'M. Kreps, T. Blake, D. Loh'
 __date__ = '10/11/2016'
 __version__ = '$Revision: 1.0$'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingHypb2L0HGamma.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingHypb2L0HGamma.py
index a27f2b802e4eee076f4e6206460bfe7d93425e0f..8aa7364b240e809728204854aa69def4f54b34e8 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingHypb2L0HGamma.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingHypb2L0HGamma.py
@@ -16,8 +16,8 @@ __all__ = ('Hypb2L0HGammaConf',
            'default_config', )
 
 from Gaudi.Configuration import *
-from Configurables import FilterDesktop, CombineParticles, TisTosParticleTagger
-from PhysSelPython.Wrappers import Selection, MergedSelection, DataOnDemand
+from Configurables import CombineParticles, FilterDesktop
+from PhysSelPython.Wrappers import DataOnDemand, Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from StandardParticles import StdLooseAllPhotons
@@ -378,7 +378,7 @@ def tisTosSelection(sel, TISTOSdict):
 
 
 def makevelotracks(name):
-    from Configurables import FastVeloTracking, TrackPrepareVelo, DecodeVeloRawBuffer, TrackEventFitter, TrackStateInitAlg,  TrackContainerCopy
+    from Configurables import FastVeloTracking, TrackContainerCopy, TrackStateInitAlg
     from TrackFitter.ConfiguredFitters import ConfiguredEventFitter
 
     MyFastVeloTracking = FastVeloTracking(
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingK0s2XXMuMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingK0s2XXMuMu.py
index 454c44356bf363573cfae8fad85f13e9b83e92ea..dc8a94331712da6fda2d902eeaadf4a4c7f30f0f 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingK0s2XXMuMu.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingK0s2XXMuMu.py
@@ -19,9 +19,7 @@ from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection
 from StandardParticles import StdAllLoosePions, StdAllLooseMuons
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-from GaudiKernel.PhysicalConstants import c_light
-from GaudiKernel.SystemOfUnits import MeV, m, mm, picosecond
-from Gaudi.Configuration import *
+from GaudiKernel.SystemOfUnits import MeV, mm, picosecond
 __author__ = ['Miguel Ramos Pernas']
 __date__ = '10/10/2017'
 __version__ = '$Revision: 0.00 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingKshort2MuMuMuMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingKshort2MuMuMuMu.py
index 86a943e5a6fb41852c6a9f29c92389947b9c890f..81ef82f2043ed504638103a44bd0a0e915d41771 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingKshort2MuMuMuMu.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingKshort2MuMuMuMu.py
@@ -15,15 +15,12 @@ derived, in large measure, from StrippingKshort2PiPiMuMu.py
 '''
 
 from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays
-from GaudiKernel.SystemOfUnits import MeV
-from StandardParticles import StdNoPIDsDownPions, StdLooseDownMuons
-from StandardParticles import StdAllLoosePions, StdAllLooseMuons, StdAllNoPIDsPions
-from StandardParticles import StdLoosePions, StdLooseMuons, StdNoPIDsPions
+from StandardParticles import StdLooseDownMuons
+from StandardParticles import StdAllLooseMuons
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
+from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
 __author__ = ['Mike Sokoloff']
 __date__ = '07 January 2014'
 __version__ = '$Revision: 0.1 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingKshort2PiPiMuMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingKshort2PiPiMuMu.py
index 0955f65fa0e2efdcb575b1c11a7ad439f53a1944..07b134c737342e2921702f4d74fa30eda7121cf9 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingKshort2PiPiMuMu.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingKshort2PiPiMuMu.py
@@ -10,15 +10,12 @@
 ###############################################################################
 
 from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays
-from GaudiKernel.SystemOfUnits import MeV
 from StandardParticles import StdNoPIDsDownPions, StdLooseDownMuons
-from StandardParticles import StdAllLoosePions, StdAllLooseMuons, StdAllNoPIDsPions
-from StandardParticles import StdLoosePions, StdLooseMuons, StdNoPIDsPions
+from StandardParticles import StdAllLooseMuons, StdAllLoosePions
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
+from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
 __author__ = ['Mike Sokoloff']
 __date__ = '25/10/2012'
 __version__ = '$Revision: 0.1 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingKshort2eePiPi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingKshort2eePiPi.py
index 45b59c0fd9ae49240a75a9caff9e2ff006af5fa5..832334778db6e7c5c42f3ac70aab3b7cd6ca4026 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingKshort2eePiPi.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingKshort2eePiPi.py
@@ -16,7 +16,6 @@ from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection
 from GaudiConfUtils.ConfigurableGenerators import DaVinci__N3BodyDecays as Combine3Particles
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
-from Gaudi.Configuration import *
 __author__ = ['Carla Marin']
 __date__ = '23/11/2016'
 __version__ = '$1.1 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingLFVLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingLFVLines.py
index 74fd08ad335bd6ee80751d0a051978311b1265c7..a7307b99e3a5ac1225dfa3c3d83bd3465872f841 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingLFVLines.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingLFVLines.py
@@ -23,14 +23,12 @@ __all__ = ('LFVLinesConf',
            'default_config',
            )
 
-from Gaudi.Configuration import *
 # from Configurables import FilterDesktop, CombineParticles
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, DaVinci__N3BodyDecays
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N3BodyDecays
 from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from GaudiKernel.PhysicalConstants import c_light
-from GaudiKernel.SystemOfUnits import GeV, MeV, mm
+from GaudiKernel.SystemOfUnits import MeV, mm
 from copy import deepcopy
 #
 # Configure related info tools
@@ -1177,7 +1175,7 @@ class LFVLinesConf(LineBuilder):
         hemu_name = name+'B2heMu'
         pmu_name = name+'B2hMu'
         bu_name = name+'Bu2KJPsiee'
-        taumu_name = name+'B2TauMu'
+        name+'B2TauMu'
         htaumu_name = name+'B2hTauMu'
         muetap_gamma_name = name+'Tau2MuEtaP2pipig'
         muetap_pi_name = name+'Tau2MuEtaP2pipipi'
@@ -1684,7 +1682,6 @@ def makeB2TauMu(name):
         "& (BPVVDCHI2> 225)"\
         "& (BPVIPCHI2()< 25) "
 
-    from CommonParticles import StdLooseDetachedTau, StdLooseDipion
     _stdLooseMuons = DataOnDemand(Location="Phys/StdLooseMuons/Particles")
     _stdLooseDetachedTaus = DataOnDemand(
         Location="Phys/StdLooseDetachedTau3pi/Particles")
@@ -2324,7 +2321,6 @@ def makeB2hTauMu(name):
                           "& (BPVVDCHI2> 225)"\
                           "& (BPVIPCHI2()< 16) "  # maybe 16
 
-    from CommonParticles import StdLooseDetachedTau, StdLooseDipion
     _stdLooseMuons = DataOnDemand(Location="Phys/StdLooseMuons/Particles")
     _stdLooseDetachedTaus = DataOnDemand(
         Location="Phys/StdLooseDetachedTau3pi/Particles")
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingLb2L0Gamma.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingLb2L0Gamma.py
index 8c5b2ce8e1fe6efd952c2e31aae1cd4773e6ca2c..29f8067fd4dafb46840ba7a46cde320cd917a56f 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingLb2L0Gamma.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingLb2L0Gamma.py
@@ -25,9 +25,6 @@ __date__ = "14.11.2016"
 __version__ = "2.0"
 __all__ = ("default_config", "StrippingLb2L0GammaConf")
 
-import os
-
-from Gaudi.Configuration import *
 
 from Configurables import CombineParticles
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
@@ -36,9 +33,7 @@ from PhysSelPython.Wrappers import Selection, MergedSelection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 
-from StandardParticles import StdAllNoPIDsPions, StdAllNoPIDsProtons
 from StandardParticles import StdLooseAllPhotons, StdAllLooseGammaDD, StdAllLooseGammaLL
-from StandardParticles import StdVeryLooseDetachedKst2Kpi
 from StandardParticles import StdLooseJpsi2MuMu
 
 default_config = {'NAME': 'Lb2L0Gamma',
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingLc23MuLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingLc23MuLines.py
index 6acafdde8c6e7891b5fa784cd7a09f4926b90d52..d433a7839c1839ac9f84be9cf1208f7094d86d2b 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingLc23MuLines.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingLc23MuLines.py
@@ -66,11 +66,10 @@ __all__ = ("Lc23MuLinesConf",
 ###################################################################################################
 
 from Gaudi.Configuration import *
-from Configurables import FilterDesktop, CombineParticles, DaVinci__N3BodyDecays
+from Configurables import DaVinci__N3BodyDecays
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from GaudiKernel.PhysicalConstants import c_light
 
 ###################################################################################################
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingPhiToKSKS.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingPhiToKSKS.py
index ff157859dd3877ab38f9cad234fb49a80418e50d..1a62ef5db16a204dc0a3d66d1fd1d1f75d4a04d4 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingPhiToKSKS.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingPhiToKSKS.py
@@ -23,8 +23,7 @@ from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from StandardParticles import StdAllLooseKaons, StdAllLooseMuons
-from Configurables import FitDecayTrees
-from PhysSelPython.Wrappers import AutomaticData, MergedSelection
+from PhysSelPython.Wrappers import MergedSelection
 
 __all__ = ('PhiToKSKSAllLinesConf',
            'TOSFilter',
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingRareNStrange.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingRareNStrange.py
index a24627bc3e07197df367fefe4a22da371088d698..ff85ddd9295400d397f4543aa160622a121c5a9b 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingRareNStrange.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingRareNStrange.py
@@ -10,9 +10,8 @@
 ###############################################################################
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection, AutomaticData
+from PhysSelPython.Wrappers import Selection
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = 'Diego Martinez Santos, Carlos Vazquez, Xabier Cid, Jessica Prisciandaro'
 __date__ = '08/05/2015'
 __version__ = '$Revision: Not sure $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingRareStrange.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingRareStrange.py
index 6f7264e1db8f4045b2b139a11daa3e90056e3c44..bba73d994ee42cf94a9237f00597a4d7be7cc54d 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingRareStrange.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingRareStrange.py
@@ -59,15 +59,11 @@ __all__ = ('RareStrangeLinesConf',
 from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 from GaudiConfUtils.ConfigurableGenerators import DaVinci__N3BodyDecays as Combine3Particles
-from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays as Combine4Particles
-from CommonParticles import StdNoPIDsDownElectrons
 from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from GaudiKernel.PhysicalConstants import c_light
-from StandardParticles import (StdAllNoPIDsPions, StdNoPIDsDownPions,
-                               StdLoosePions, StdLooseDownMuons,
-                               StdLooseMergedPi0, StdLooseResolvedPi0, StdLooseDalitzPi0)
+from StandardParticles import (StdLooseMergedPi0, StdLooseResolvedPi0,
+                               StdLooseDalitzPi0)
 
 # from CommonParticles.StdLooseDalitzPi0 import (StdLoosePi02gee, StdLoosePi024e)
 
@@ -2786,7 +2782,7 @@ def makeLambdaPPiEE(name, config, inputs):
 
 
 def makevelotracks(name):
-    from Configurables import FastVeloTracking, TrackPrepareVelo, DecodeVeloRawBuffer, TrackEventFitter, TrackStateInitAlg,  TrackContainerCopy
+    from Configurables import FastVeloTracking, TrackContainerCopy, TrackStateInitAlg
     from TrackFitter.ConfiguredFitters import ConfiguredEventFitter
 
     MyFastVeloTracking = FastVeloTracking(
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingStrangeSL.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingStrangeSL.py
index f328a4ad421ec3eebf7d41f4f90b3974aa66defa..70bb42a092e709bc9197e4434d6809dcc2105d13 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingStrangeSL.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingStrangeSL.py
@@ -35,23 +35,12 @@ __all__ = ('default_config',
            'StrangeSLConf',
            )
 
-import os
 
-from Gaudi.Configuration import *
-
-from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-
-from GaudiConfUtils.ConfigurableGenerators import DaVinci__N3BodyDecays as Combine3Particles
-from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays as Combine4Particles
-from CommonParticles import StdNoPIDsDownElectrons
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
+from PhysSelPython.Wrappers import DataOnDemand, Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from GaudiKernel.PhysicalConstants import c_light
 from GaudiKernel.SystemOfUnits import MeV
 
-from StandardParticles import StdAllNoPIDsPions, StdLoosePions, StdLooseProtons, StdAllLoosePions, StdAllLooseMuons
-from StandardParticles import StdLooseMergedPi0, StdLooseResolvedPi0, StdLooseDalitzPi0
 from PhysConf.Selections import CombineSelection
 
 default_config = {
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingTau23MuLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingTau23MuLines.py
index 5671eec2903b81d281b9ff5eaaa5a2fbf9c127b1..47ad42c6670341e9349f43fc4ad0adb901cfd560 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingTau23MuLines.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingTau23MuLines.py
@@ -35,7 +35,6 @@ from GaudiConfUtils.ConfigurableGenerators import DaVinci__N5BodyDecays as Combi
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from GaudiKernel.PhysicalConstants import c_light
 
 default_config = {
     'NAME': 'Tau23Mu',
@@ -70,7 +69,7 @@ class Tau23MuLinesConf(LineBuilder):
         # checkConfig(Bs2MuMuLinesConf.__configuration_keys__,config)
 
         tau_name = name+'Tau23Mu'
-        ds23PiTIS_name = name+'Ds23PiTIS'
+        name+'Ds23PiTIS'
         ds23Pi_name = name+'Ds23Pi'
         ds2PhiPi_name = name+'Ds2PhiPi'
         tau25_name = name+'Tau25Mu'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingTau2LambdaMuLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingTau2LambdaMuLines.py
index 6f7caa01d008433cca4a3184d6bdfeb2a9bcd909..2e5401740f914b698345c335bfe29788f1e7ed2e 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingTau2LambdaMuLines.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingTau2LambdaMuLines.py
@@ -16,12 +16,10 @@ Exported symbols (use python help!):
    - 
 '''
 
-from GaudiKernel.PhysicalConstants import c_light
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
-from Configurables import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
+from Configurables import CombineParticles
 __author__ = ['Marcin Chrzaszcz']
 __date__ = '14/12/2012'
 __version__ = '$Revision: 1.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingZVTOP.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingZVTOP.py
index fd8d8fb2b6f2472e943df46da0403976455d02c8..ea376d1a5cc2e65d03472dfef7e7302c6547bcc7 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingZVTOP.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingRD/StrippingZVTOP.py
@@ -9,14 +9,12 @@
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
 from Configurables import TopoTauAlg, TopoVertexTool
-from StandardParticles import StdLooseKaons
-from StandardParticles import StdLoosePions, StdTightPions
-from StandardParticles import StdNoPIDsKaons, StdNoPIDsPions
+from StandardParticles import StdLoosePions
+from StandardParticles import StdNoPIDsPions
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, OfflineVertexFitter
-from Gaudi.Configuration import *
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop
 __author__ = ['Giampi Mancinelli', 'Julien Cogan', 'Justine Serrano']
 
 __date__ = '14/01/2014'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingSL/StrippingB23MuNu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingSL/StrippingB23MuNu.py
index 11d81c34fb0178677727235bc3bd636b83427207..97c4220c4e62f1a00d3c320d5f76806aba8c4c4a 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingSL/StrippingB23MuNu.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingSL/StrippingB23MuNu.py
@@ -19,15 +19,12 @@ __all__ = ('B23MuNuConf')
 Stripping selection for B to three muons and a neutrino.
 """
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop
 
-from PhysSelPython.Wrappers import Selection, AutomaticData, MergedSelection
+from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from LHCbKernel.Configuration import *  # check if needed
-from Configurables import SubstitutePID
-from Configurables import SubPIDMMFilter
 
 
 #################
@@ -161,15 +158,13 @@ class B23MuNuConf(LineBuilder):
         """
         Creates Jpsi as proxy for dimuon
         """
-        from PhysSelPython.Wrappers import AutomaticData, Selection, SelectionSequence, DataOnDemand, MergedSelection
+        from PhysSelPython.Wrappers import Selection
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         # from Configurables import CombineParticles
 
         CombineJpsi = CombineParticles(DecayDescriptors=["J/psi(1S) -> mu+ mu-", "[J/psi(1S) -> mu+ mu+]cc"],
                                        MotherCut="ALL")
 
-        sel_name = "Jpsi"
-
         from PhysSelPython.Wrappers import Selection
         SelJpsi = Selection("Sel_" + self.name + "_Jpsi", Algorithm=CombineJpsi,
                             RequiredSelections=[self.Muons])
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingSL/StrippingB2DMuForTauMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingSL/StrippingB2DMuForTauMu.py
index bbb6591f636c547192b1c9759ebfeedf27b88e2b..8bd9a436ea3d941e0b4ec5b3610d262206579753 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingSL/StrippingB2DMuForTauMu.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingSL/StrippingB2DMuForTauMu.py
@@ -18,12 +18,10 @@ __version__ = '$Revision: 2.0 $'
 
 from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from PhysSelPython.Wrappers import Selection, DataOnDemand
+from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from StandardParticles import StdLoosePions, StdAllLooseMuons, StdLooseKaons, StdLooseProtons, StdAllLoosePions, StdLooseMergedPi0, StdLooseResolvedPi0, StdAllNoPIDsMuons, StdLooseANNUpPions
-from Configurables import ConjugateNeutralPID
-from PhysSelPython.Wrappers import MergedSelection
+from StandardParticles import StdAllLooseMuons, StdAllNoPIDsMuons, StdLooseKaons, StdLoosePions, StdLooseProtons
 
 __all__ = ('B2DMuForTauMuconf',
            # 'makeb2DMuX',
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingSL/StrippingB2DMuNuX.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingSL/StrippingB2DMuNuX.py
index 0fa1d0bb48771ddfac6b951f87f7770c026e7907..3f1895420257b936983292bfb8cb8d753b366db8 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingSL/StrippingB2DMuNuX.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingSL/StrippingB2DMuNuX.py
@@ -13,14 +13,13 @@ __date__ = '23/07/2010'
 __version__ = '$Revision: 5.0 $'
 
 from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
+from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
 from PhysSelPython.Wrappers import Selection
-from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from StandardParticles import StdLoosePions, StdLooseMuons, StdLooseKaons, StdLooseProtons, StdLooseElectrons
 from StandardParticles import StdNoPIDsPions, StdNoPIDsKaons, StdNoPIDsProtons, StdNoPIDsMuons
 from StrippingB2DMuNuXUtils import *
-from GaudiKernel.SystemOfUnits import MeV, GeV, cm, mm
+from GaudiKernel.SystemOfUnits import GeV, MeV, mm
 
 __all__ = ('B2DMuNuXAllLinesConf',
            'default_config')
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingSL/StrippingB2DMuNuXUtils.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingSL/StrippingB2DMuNuXUtils.py
index 6130e13de2c5b9fe72cd44d5967aeceaa4452074..e91f29e3fa36cef61e702f06f89eb4418ddf4695 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingSL/StrippingB2DMuNuXUtils.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingSL/StrippingB2DMuNuXUtils.py
@@ -13,11 +13,9 @@ __date__ = '06/03/2015'
 __version__ = '$Revision: 0.0 $'
 
 from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
-from StrippingUtils.Utils import LineBuilder
-from StandardParticles import StdLoosePions, StdLooseMuons, StdLooseKaons, StdLooseProtons, StdNoPIDsPions, StdLooseElectrons, StdNoPIDsMuons
 
 
 def BtoDlnuLine(module_name,
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingSL/StrippingB2Dlnu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingSL/StrippingB2Dlnu.py
index 0c8d00bd94717af821926626f5446a85cb20a902..b05a05c95319c31661cfe61524eca70e234905c3 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingSL/StrippingB2Dlnu.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingSL/StrippingB2Dlnu.py
@@ -17,12 +17,10 @@ __version__ = '$Revision: 1.0 $'
 
 from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from PhysSelPython.Wrappers import Selection, DataOnDemand
+from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from StandardParticles import StdLoosePions, StdLooseMuons, StdLooseKaons, StdLooseProtons, StdAllLoosePions, StdLooseMergedPi0, StdLooseResolvedPi0, StdAllNoPIDsMuons, StdLooseANNUpPions, StdLooseElectrons
-from Configurables import ConjugateNeutralPID
-from PhysSelPython.Wrappers import MergedSelection
+from StandardParticles import StdAllNoPIDsMuons, StdLooseElectrons, StdLooseKaons, StdLooseMuons, StdLoosePions
 
 __all__ = ('B2DMuForLNuconf',
            # 'makeb2DMuX',
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingSL/StrippingB2DstMuNuIncl.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingSL/StrippingB2DstMuNuIncl.py
index 6abd041bf344194b0ad86747d5d5622ae5fdddf9..3a91f70e613b554c2c0d5b7095d89a8eb3c67f3d 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingSL/StrippingB2DstMuNuIncl.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingSL/StrippingB2DstMuNuIncl.py
@@ -12,9 +12,8 @@ __author__ = ['Mika Vesterinen']
 __date__ = '04/04/2015'
 __version__ = '$Revision: 0.0 $'
 
-from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from PhysSelPython.Wrappers import Selection, DataOnDemand
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
+from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from StandardParticles import StdLoosePions, StdLooseMuons, StdLooseKaons, StdAllLoosePions
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingSL/StrippingB2PPbarMuForTauMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingSL/StrippingB2PPbarMuForTauMu.py
index 227d8a8091e67e8ea8df49a41e2188e9742eef93..95c00a6d9ecb34afe71644b4c77e5a6bc3bd5c44 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingSL/StrippingB2PPbarMuForTauMu.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingSL/StrippingB2PPbarMuForTauMu.py
@@ -9,9 +9,7 @@
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
 
-import logging
 from StrippingUtils.Utils import LineBuilder
-from Gaudi.Configuration import *
 __author__ = ['Mark Smith']
 __date__ = '17/10/2016'
 __version__ = '$Revision: 1.0 $'
@@ -107,8 +105,6 @@ class B2PPbarMuForTauMuBuilder(LineBuilder):
     def __init__(self, name, config):
         LineBuilder.__init__(self, name, config)
 
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
-
         self.GECs = {"Code": "( recSummary(LHCb.RecSummary.nSPDhits,'Raw/Spd/Digits') < %(GEC_nSPDHits)s )" % config,
                      "Preambulo": ["from LoKiTracks.decorators import *"]}
 
@@ -417,7 +413,7 @@ class B2PPbarMuForTauMuBuilder(LineBuilder):
     ###### B->ppMuNu Signal ######
     def _bhad2PMuX_B(self):
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-        from PhysSelPython.Wrappers import Selection, MergedSelection
+        from PhysSelPython.Wrappers import Selection
 
         _pMu = CombineParticles(
             DecayDescriptors=self._config["DECAYS"], ReFitPVs=True)
@@ -434,7 +430,7 @@ class B2PPbarMuForTauMuBuilder(LineBuilder):
     ###### B->ppMuNu Signal for Topo Line ######
     def _bhad2PMuX_BTopo(self):
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-        from PhysSelPython.Wrappers import Selection, MergedSelection
+        from PhysSelPython.Wrappers import Selection
 
         _pMu = CombineParticles(
             DecayDescriptors=self._config["DECAYS"], ReFitPVs=True)
@@ -451,7 +447,7 @@ class B2PPbarMuForTauMuBuilder(LineBuilder):
     ###### B->ppMuNu Same-Sign protons ######
     def _bhad2PMuX_B_SS(self):
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-        from PhysSelPython.Wrappers import Selection, MergedSelection
+        from PhysSelPython.Wrappers import Selection
 
         _pMu = CombineParticles(
             DecayDescriptors=self._config["SSDECAYS"], ReFitPVs=True)
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingSL/StrippingB2XTauNu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingSL/StrippingB2XTauNu.py
index a13e9a7e3428a1424d2871a1fcbe7e13a926d225..0a377c80f717ababd9f478d54f8febe9a9ee8597 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingSL/StrippingB2XTauNu.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingSL/StrippingB2XTauNu.py
@@ -492,7 +492,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         self.__MakeB0d2DdoubleStarTauNuNonPhysTau__()
 
         from StrippingConf.StrippingLine import StrippingLine
-        from PhysSelPython.Wrappers import SelectionSequence
 
         # TisTos filter
         def filterTisTos(name, Input, myTisTosSpecs):
@@ -1010,7 +1009,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
 
         from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseJpsi2MuMu
 
         JpsiForBc = FilterDesktop(
             Code=self.totalJpsiCut
@@ -1029,7 +1027,7 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
 
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
+        from PhysSelPython.Wrappers import Selection
         from StandardParticles import StdLoosePions
 
         CombDdoubleStar2DstarPi = CombineParticles(
@@ -1051,7 +1049,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3pi/Particles')
@@ -1075,7 +1072,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3pi/Particles')
@@ -1099,7 +1095,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTauNonPhys
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3piNonPhys/Particles')
@@ -1123,7 +1118,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3pi/Particles')
@@ -1148,7 +1142,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3pi/Particles')
@@ -1173,7 +1166,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTauNonPhys
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3piNonPhys/Particles')
@@ -1197,7 +1189,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3pi/Particles')
@@ -1222,7 +1213,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3pi/Particles')
@@ -1247,7 +1237,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTauNonPhys
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3piNonPhys/Particles')
@@ -1272,7 +1261,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3pi/Particles')
@@ -1296,7 +1284,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTauNonPhys
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3piNonPhys/Particles')
@@ -1320,7 +1307,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3pi/Particles')
@@ -1345,7 +1331,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3pi/Particles')
@@ -1370,7 +1355,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTauNonPhys
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3piNonPhys/Particles')
@@ -1395,7 +1379,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3pi/Particles')
@@ -1421,7 +1404,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3pi/Particles')
@@ -1445,7 +1427,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3pi/Particles')
@@ -1471,7 +1452,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3pi/Particles')
@@ -1496,7 +1476,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTauNonPhys
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3piNonPhys/Particles')
@@ -1522,7 +1501,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3pi/Particles')
@@ -1546,7 +1524,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3pi/Particles')
@@ -1570,7 +1547,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3pi/Particles')
@@ -1595,7 +1571,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3pi/Particles')
@@ -1621,7 +1596,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTauNonPhys
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3piNonPhys/Particles')
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingSL/StrippingB2XuMuNu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingSL/StrippingB2XuMuNu.py
index 9d03d6dd68ac7b5f0e074b84009d96deb78028f8..8346c42213aa24183dc99f9d2cae06e2d51a2167 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingSL/StrippingB2XuMuNu.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingSL/StrippingB2XuMuNu.py
@@ -9,9 +9,7 @@
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
 
-import logging
 from StrippingUtils.Utils import LineBuilder
-from Gaudi.Configuration import *
 __author__ = ['Phillip Urquijo, Alessandra Borgia']
 __date__ = '08/05/2010'
 __version__ = '$Revision: 1.6 $'
@@ -221,7 +219,7 @@ class B2XuMuNuBuilder(LineBuilder):
     def __init__(self, name, config):
         LineBuilder.__init__(self, name, config)
         self.config = config
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
+        from PhysSelPython.Wrappers import DataOnDemand
         self._stdLooseKsLL = DataOnDemand("Phys/StdLooseKsLL/Particles")
         self._stdLooseKsLD = DataOnDemand("Phys/StdLooseKsLD/Particles")
         self._stdLooseKsDD = DataOnDemand("Phys/StdLooseKsDD/Particles")
@@ -627,8 +625,8 @@ class B2XuMuNuBuilder(LineBuilder):
         if self._KSSel is not None:
             return self._KSSel
 
-        from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
+        from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
+        from PhysSelPython.Wrappers import Selection
 
         _code = FilterDesktop(Code=self._NominalKsSelection() % self._config)
 
@@ -748,7 +746,7 @@ class B2XuMuNuBuilder(LineBuilder):
 
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection
-        from StandardParticles import StdLoosePions, StdLooseMuons
+        from StandardParticles import StdLoosePions
 
         _Ksh = CombineParticles(
             DecayDescriptor="KS0 -> mu- pi+",
@@ -776,7 +774,7 @@ class B2XuMuNuBuilder(LineBuilder):
 
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection
-        from StandardParticles import StdLoosePions, StdLooseMuons
+        from StandardParticles import StdLoosePions
 
         _Ksh = CombineParticles(
             DecayDescriptor="KS0 -> mu+ pi-",
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingSL/StrippingCharmFromBSemiForHadronAsy.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingSL/StrippingCharmFromBSemiForHadronAsy.py
index a80fcb301fa6917bd97160506a3b0a679ff40777..ddaec2925512363daba54947938f97bdafffeb41 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingSL/StrippingCharmFromBSemiForHadronAsy.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingSL/StrippingCharmFromBSemiForHadronAsy.py
@@ -25,8 +25,7 @@ from Configurables import FilterDesktop, CombineParticles
 from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from StandardParticles import StdAllLoosePions, StdLoosePions, StdLooseMuons, StdLooseKaons, StdLooseProtons
-from Configurables import TisTosParticleTagger
+from StandardParticles import StdLooseKaons, StdLooseMuons, StdLoosePions
 
 __all__ = ('CharmFromBSemiForHadronAsyAllLinesConf',
            'TOSFilter',
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingSL/Strippingbhad2PMuX.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingSL/Strippingbhad2PMuX.py
index e89305332152e8ebc4ee1e72a7f10cd8d9d2dfae..f46738721f8dbfce869e840a1aa8cbb13c6fdd2f 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingSL/Strippingbhad2PMuX.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r1/StrippingSL/Strippingbhad2PMuX.py
@@ -9,9 +9,7 @@
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
 
-import logging
 from StrippingUtils.Utils import LineBuilder
-from Gaudi.Configuration import *
 __author__ = ['William Sutcliffe', 'Patrick Owen']
 __date__ = '02/12/2015'
 __version__ = '$Revision: 2.0 $'
@@ -132,8 +130,6 @@ class bhad2PMuXBuilder(LineBuilder):
     def __init__(self, name, config):
         LineBuilder.__init__(self, name, config)
 
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
-
         self.GECs = {"Code": "( recSummaryTrack(LHCb.RecSummary.nLongTracks, TrLONG) < %(GEC_nLongTrk)s )" % config,
                      "Preambulo": ["from LoKiTracks.decorators import *"]}
 
@@ -455,7 +451,7 @@ class bhad2PMuXBuilder(LineBuilder):
     ###### Lb->pMuNu High M_corr Opposite Sign ######
     def _bhad2PMuX_Lb(self):
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-        from PhysSelPython.Wrappers import Selection, MergedSelection
+        from PhysSelPython.Wrappers import Selection
 
         _pMu = CombineParticles(
             DecayDescriptors=self._config["DECAYS"], ReFitPVs=True)
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingB2CC/StrippingB2JpsiHH.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingB2CC/StrippingB2JpsiHH.py
index 6ff1488617634fd007d8a12547b6a594ae4d4936..9661c75a75522aa8815ff60794ec74f220936c52 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingB2CC/StrippingB2JpsiHH.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingB2CC/StrippingB2JpsiHH.py
@@ -20,18 +20,10 @@ __date__ = '10/11/2016'
 
 __all__ = ('B2JpsiHHConf', 'default_config')
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from CommonParticles.Utils import updateDoD
-from StandardParticles import StdLoosePions
-from StandardParticles import StdLooseKaons
-from StandardParticles import StdLooseProtons
-from StandardParticles import StdAllLooseKaons
-from StandardParticles import StdAllLooseProtons
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
+from PhysSelPython.Wrappers import DataOnDemand, Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from GaudiKernel.SystemOfUnits import MeV
 
 default_config = {
     'NAME': 'B2JpsiHH',
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingB2CC/StrippingB2JpsiPi0.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingB2CC/StrippingB2JpsiPi0.py
index d101d6736bd6fbc066c9d3a41641c3443833d8e3..07e3c0f585f807e2d4aca22d4bdb1025c417bb2f 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingB2CC/StrippingB2JpsiPi0.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingB2CC/StrippingB2JpsiPi0.py
@@ -14,15 +14,10 @@ __version__ = '$Revision: 1.1$'
 
 __all__ = ('B2JpsiPi0Conf', 'default_config')
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from CommonParticles.Utils import updateDoD
-from StandardParticles import StdLooseResolvedPi0
-from StandardParticles import StdLooseMergedPi0
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
+from PhysSelPython.Wrappers import DataOnDemand, Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from GaudiKernel.SystemOfUnits import MeV
 
 default_config = {
     # The real name of the lines is BetaS, this is a reference this for the Settings.
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingB2CC/StrippingB2JpsiPi0_Run1.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingB2CC/StrippingB2JpsiPi0_Run1.py
index 98d9454e367d35177c8710e0664fbec2eaefeea4..ca1071c4660938aa4aa6560a2e1bfd3c18313a12 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingB2CC/StrippingB2JpsiPi0_Run1.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingB2CC/StrippingB2JpsiPi0_Run1.py
@@ -14,15 +14,10 @@ __version__ = '$Revision: 1.2$'
 
 __all__ = ('B2JpsiPi0Conf_RI', 'default_config')
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from CommonParticles.Utils import updateDoD
-from StandardParticles import StdLooseResolvedPi0
-from StandardParticles import StdLooseMergedPi0
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
+from PhysSelPython.Wrappers import DataOnDemand, Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from GaudiKernel.SystemOfUnits import MeV
 
 default_config = {
     # The real name of the lines is BetaS, this is a reference this for the Settings.
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingB2CC/StrippingB2JpsiXforBeta_s.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingB2CC/StrippingB2JpsiXforBeta_s.py
index 098bb6abdfaea54665c8b9d58093c40360f73805..45db0c074b99c56d0ecc2b01c7a78d41221789c0 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingB2CC/StrippingB2JpsiXforBeta_s.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingB2CC/StrippingB2JpsiXforBeta_s.py
@@ -26,16 +26,12 @@ __version__ = '$Revision: 4.0$'
 
 __all__ = ('B2JpsiXforBeta_sConf', 'default_config')
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from CommonParticles.Utils import updateDoD
 from StandardParticles import StdLoosePions
 from StandardParticles import StdLooseKaons
-from StandardParticles import StdAllLooseKaons
 from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from GaudiKernel.SystemOfUnits import MeV
 
 default_config = {
     'NAME': 'BetaS',
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingB2CC/StrippingBd2JpsieeKS.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingB2CC/StrippingBd2JpsieeKS.py
index 07219a0d2951c613809802dd40aa568790631ead..09096eb19abdb19a36493251300e6cba80b16e90 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingB2CC/StrippingBd2JpsieeKS.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingB2CC/StrippingBd2JpsieeKS.py
@@ -8,16 +8,10 @@
 # granted to it by virtue of its status as an Intergovernmental Organization  #
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
-from GaudiKernel.SystemOfUnits import MeV
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
-from StandardParticles import StdAllLooseKaons
-from StandardParticles import StdLooseKaons
-from StandardParticles import StdLoosePions
-from CommonParticles.Utils import updateDoD
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = 'Ramon Niet'
 __date__ = '2014/10/23'
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingB2CC/StrippingBs2EtacPhiBDT.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingB2CC/StrippingBs2EtacPhiBDT.py
index d69562e93974639a7ed7d97c104f670f03ca44a0..51b7aaa9cd5881166fe14986d4e116af3a69992c 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingB2CC/StrippingBs2EtacPhiBDT.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingB2CC/StrippingBs2EtacPhiBDT.py
@@ -17,7 +17,6 @@ from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
-from Gaudi.Configuration import *
 __author__ = ['Morgan Martin, Jibo He']
 __date__ = '20/08/2014'
 __version__ = '$Revision: 1.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingB2CC/StrippingBs2JpsieePhi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingB2CC/StrippingBs2JpsieePhi.py
index e348ef543ce16847b7f3e983e4dd1dada22c6425..7ddeef2463dfe7bcc313536aa70f0533707bd4d9 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingB2CC/StrippingBs2JpsieePhi.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingB2CC/StrippingBs2JpsieePhi.py
@@ -12,7 +12,6 @@ from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from Configurables import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = 'Artur Ukleja, Jibo He, Konrad Klimaszewski'
 __date__ = '2011/03/01'
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingB2OC/Beauty2Charm_B2DXBuilder.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingB2OC/Beauty2Charm_B2DXBuilder.py
index 541ddeee2f42ea3e80fcfb74eb36f3a8aa993a29..78bf5b5654648fe05ca072dbfc6398e44abf39eb 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingB2OC/Beauty2Charm_B2DXBuilder.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingB2OC/Beauty2Charm_B2DXBuilder.py
@@ -12,11 +12,7 @@
 
 from copy import deepcopy
 from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-from PhysSelPython.Wrappers import Selection
-from Beauty2Charm_LoKiCuts import LoKiCuts
 from Beauty2Charm_Utils import *
-from Configurables import SubstitutePID
 
 # \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\#
 
@@ -1014,7 +1010,7 @@ class B2DXBuilder(object):
                                     "B- -> D*_2(2460)0 D0 K-"],
                   'B2D0st2460D0Pi': ["B+ -> D*_2(2460)0 D0 pi+",
                                      "B- -> D*_2(2460)0 D0 pi-"]}
-        input = self.dst.dpi_2460_pid+self.d.kpi_pid+self.topoKaons_PID
+        self.dst.dpi_2460_pid+self.d.kpi_pid+self.topoKaons_PID
         inputs = {'B2D0st2460D0K': self.dst.dpi_2460_pid+self.d.kpi_pid+self.topoKaons_PID,
                   'B2D0st2460D0Pi': self.dst.dpi_2460_pid+self.d.kpi_pid+self.topoPions_PID}
         rs = makeB2XSels(decays, '', inputs, self.config)
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingB2OC/Beauty2Charm_Bc2BXBuilder.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingB2OC/Beauty2Charm_Bc2BXBuilder.py
index b6f87b17a91e7aee89aaf7e40919f477b8952426..ee3e5514565abe4c20d0ea41b02a6dca09bb3d3e 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingB2OC/Beauty2Charm_Bc2BXBuilder.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingB2OC/Beauty2Charm_Bc2BXBuilder.py
@@ -8,11 +8,9 @@
 # granted to it by virtue of its status as an Intergovernmental Organization  #
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
-from copy import deepcopy
 from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 from PhysSelPython.Wrappers import Selection, MergedSelection
-from Beauty2Charm_LoKiCuts import LoKiCuts
 from Beauty2Charm_Utils import *
 
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingB2OC/Beauty2Charm_Bc2DDBuilder.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingB2OC/Beauty2Charm_Bc2DDBuilder.py
index 97d0925f7065d9aa9c1983797ddf4689b27c2c7a..5d9ad7c3081eed161b72e98fd8d9f52289a48fd8 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingB2OC/Beauty2Charm_Bc2DDBuilder.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingB2OC/Beauty2Charm_Bc2DDBuilder.py
@@ -11,10 +11,8 @@
 
 # \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\#
 
-from copy import deepcopy
 from Gaudi.Configuration import *
-from PhysSelPython.Wrappers import Selection, MergedSelection
-from Beauty2Charm_LoKiCuts import LoKiCuts
+from PhysSelPython.Wrappers import MergedSelection
 from Beauty2Charm_Utils import *
 # from Configurables import SubstitutePID
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingB2OC/Beauty2Charm_Bc2DXBuilder.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingB2OC/Beauty2Charm_Bc2DXBuilder.py
index 9296ddf6f105f560d6bf5a96234f7288575c8738..d9598e8c1d88a6f4cfd526cb1e806023c0818ee5 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingB2OC/Beauty2Charm_Bc2DXBuilder.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingB2OC/Beauty2Charm_Bc2DXBuilder.py
@@ -10,9 +10,6 @@
 ###############################################################################
 from copy import deepcopy
 from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-from PhysSelPython.Wrappers import Selection, MergedSelection
-from Beauty2Charm_LoKiCuts import LoKiCuts
 from Beauty2Charm_Utils import *
 
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingB2OC/Beauty2Charm_DBuilder.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingB2OC/Beauty2Charm_DBuilder.py
index fd77399ae9ceb43dc7fefb37b7d4eee03ff07872..789ce80dedcda4d50c3002b94f85f1f49f3f0ba2 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingB2OC/Beauty2Charm_DBuilder.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingB2OC/Beauty2Charm_DBuilder.py
@@ -315,7 +315,6 @@ class DBuilder(object):
         # self.k3pi_ddx_pid = [filterSelection('D2k3pi_for_DDX',LoKiCuts(['VCHI2DOF','BPVVDCHI2'],config_for_ddx).code(),self.k3pi_pid)]
 
         # use this below
-        d_cf_noMassWin = d_cf
         d_cf = LoKiCuts.combine([d_cf, "in_range(%s,MM,%s)" % (d_min, d_max)])
         ds_cf = LoKiCuts.combine(
             [ds_cf, "in_range(%s,MM,%s)" % (ds_min, ds_max)])
@@ -1800,9 +1799,6 @@ class DBuilder(object):
 
     def _makeD2PhiMuNu(self, up=False):
         '''makes Ds->phi mu nu'''
-        decays = [['phi(1020)', 'mu+']]
-        min = '1125.13*MeV'
-        max = '2168.49*MeV'
         cpkk = CombineParticles(CombinationCut="ADAMASS('phi(1020)') < 150*MeV",  # ( hasTopoChild() )
                                 MotherCut='(VFASPF(VCHI2/VDOF) < 10)',
                                 DaughtersCuts={'K+': '(PIDK>-10)'},
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingB2OC/Beauty2Charm_HHBuilder.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingB2OC/Beauty2Charm_HHBuilder.py
index f91cef3b54256d316e6b93d3473acaa77f5e751a..a5f7f08c862bb76c6184b30c38e9347a02ddb3f2 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingB2OC/Beauty2Charm_HHBuilder.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingB2OC/Beauty2Charm_HHBuilder.py
@@ -10,7 +10,6 @@
 ###############################################################################
 # \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\#
 
-from copy import deepcopy
 from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 from PhysSelPython.Wrappers import Selection
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingB2OC/Beauty2Charm_HHHBuilder.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingB2OC/Beauty2Charm_HHHBuilder.py
index 73bdd42ab2d419c0060f6e52c520cd6457336577..148169c3681a9a8c2655d407509db953311ff55d 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingB2OC/Beauty2Charm_HHHBuilder.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingB2OC/Beauty2Charm_HHHBuilder.py
@@ -10,9 +10,8 @@
 ###############################################################################
 # \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\#
 
-from copy import deepcopy
 from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N3BodyDecays
+from GaudiConfUtils.ConfigurableGenerators import DaVinci__N3BodyDecays
 from PhysSelPython.Wrappers import Selection
 from Beauty2Charm_LoKiCuts import LoKiCuts
 from Beauty2Charm_Utils import *
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingB2OC/Beauty2Charm_Lb2XBuilder.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingB2OC/Beauty2Charm_Lb2XBuilder.py
index 3650ed5d9b23de714524d04abfa82d0c9b06df53..38d85b42af6ee313d1b390a6890db6768a914ccb 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingB2OC/Beauty2Charm_Lb2XBuilder.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingB2OC/Beauty2Charm_Lb2XBuilder.py
@@ -1155,7 +1155,7 @@ class Lb2XBuilder(object):
 
     def _makeX2LcKPiPiPi(self):
         '''Makes RS + WS Xib -> Lc HH + c.c.'''
-        pions = self.pions
+        self.pions
         kaons = self.kaons
         pipipi = self.hhh.pipipi
         config = deepcopy(self.config)
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingB2OC/Beauty2Charm_LoKiCuts.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingB2OC/Beauty2Charm_LoKiCuts.py
index da5ba556db6406c1de78f96f4fe4e84ea4811d7f..b376cda82c538e3b997c3fc99c2e51c5e2c66663 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingB2OC/Beauty2Charm_LoKiCuts.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingB2OC/Beauty2Charm_LoKiCuts.py
@@ -10,11 +10,6 @@
 ###############################################################################
 # \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\#
 
-from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
-from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-from PhysSelPython.Wrappers import Selection, MergedSelection
-from StandardParticles import StdNoPIDsPions, StdNoPIDsKaons
 
 # \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\#
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingB2OC/Beauty2Charm_Utils.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingB2OC/Beauty2Charm_Utils.py
index 53e1e9516368913bfc8ab783a50057c32b708278..5aa6a17bb0175186102c8a7e04a3b83bf601af65 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingB2OC/Beauty2Charm_Utils.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingB2OC/Beauty2Charm_Utils.py
@@ -10,13 +10,11 @@
 ###############################################################################
 # \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\#
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-from PhysSelPython.Wrappers import DataOnDemand, Selection, MergedSelection, VoidEventSelection
+from PhysSelPython.Wrappers import DataOnDemand, Selection, VoidEventSelection
 from Beauty2Charm_LoKiCuts import LoKiCuts
 from Configurables import SubstitutePID
-from Configurables import ConeJetProxyFilter
 
 # \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\#
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingB2OC/StrippingB2DDphi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingB2OC/StrippingB2DDphi.py
index fc49b483ca68045c51c0273d61218eead2284ac3..649ee42b6509a2f9cec56b73be76880c9fb180dc 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingB2OC/StrippingB2DDphi.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingB2OC/StrippingB2DDphi.py
@@ -15,8 +15,7 @@ Author: M. Martinelli
 Notes: Excited states are included by placing the line in FULL.DST
 '''
 from PhysSelPython.Wrappers import Selection, DataOnDemand
-from Configurables import FilterDesktop, CombineParticles, DaVinci__N4BodyDecays
-from GaudiConfUtils.ConfigurableGenerators import CombineParticles
+from Configurables import DaVinci__N4BodyDecays, FilterDesktop
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 __author__ = ['Maurizio Martinelli']
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingB2OC/StrippingB2DXD2HMuNu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingB2OC/StrippingB2DXD2HMuNu.py
index e31b819ffef4b0ca065196961a68d156446a0000..da52d1d716806d5a347dd1e2f33834589c781fb6 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingB2OC/StrippingB2DXD2HMuNu.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingB2OC/StrippingB2DXD2HMuNu.py
@@ -12,13 +12,11 @@ __author__ = ['Wenbin Qian']
 __date__ = '09/11/2015'
 __version__ = '$Revision: 0.01 $'
 
-from Gaudi.Configuration import *
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, DaVinci__N4BodyDecays, DaVinci__N3BodyDecays
-from PhysSelPython.Wrappers import Selection, DataOnDemand
+from PhysSelPython.Wrappers import Selection
 from StandardParticles import StdLooseMuons, StdLoosePions, StdLooseKaons
-from GaudiKernel.SystemOfUnits import MeV, GeV, cm, mm
 
 __all__ = ('B2DXD2HMuNuBuilder',
            'default_config')
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingB2OC/StrippingB2DhhhLTUB.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingB2OC/StrippingB2DhhhLTUB.py
index fffd8e491bba10bbf0f31e72f2c296ec758af5e9..f3dd308be8affa5995e434730f4b7cb064117856 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingB2OC/StrippingB2DhhhLTUB.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingB2OC/StrippingB2DhhhLTUB.py
@@ -30,7 +30,6 @@ from StandardParticles import (StdAllNoPIDsPions, StdAllNoPIDsKaons,
 from Beauty2Charm_LoKiCuts import LoKiCuts
 from Beauty2Charm_Utils import *
 from GaudiConfUtils.ConfigurableGenerators import DaVinci__N3BodyDecays
-from Configurables import SubPIDMMFilter
 
 # Default configuration dictionary
 default_config = {
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingB2OC/StrippingB2nbody.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingB2OC/StrippingB2nbody.py
index 9084c61c074c73f98bf558b297ff5c69772ebf9a..2e6227101d962626e6855be64335539fb7fa9376 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingB2OC/StrippingB2nbody.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingB2OC/StrippingB2nbody.py
@@ -16,7 +16,6 @@ from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, MergedSelection, DataOnDemand, VoidEventSelection
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = ['Rudolf Oldeman']
 __date__ = '08/02/2011'
 __version__ = '$Revision: 1.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingB2OC/StrippingBeauty2Charm.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingB2OC/StrippingBeauty2Charm.py
index 13669f766511f7336026d2ff63a228c655334931..07fcaee5ff0263ab31305c5558eb7ad1c44b5882 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingB2OC/StrippingBeauty2Charm.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingB2OC/StrippingBeauty2Charm.py
@@ -28,11 +28,9 @@ from Beauty2Charm_HHHBuilder import *
 from Beauty2Charm_HHBuilder import *
 from Beauty2Charm_DBuilder import *
 from StandardParticles import StdLooseAllPhotons, StdVeryLooseAllPhotons
-from Configurables import LoKi__VoidFilter
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import EventSelection
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
+from PhysSelPython.Wrappers import MergedSelection, Selection
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
 from Gaudi.Configuration import *
 import re
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingB2OC/StrippingDstarD02Kpipi0.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingB2OC/StrippingDstarD02Kpipi0.py
index 5ff751290de17bf77f93b252ea943ad9fde4ab6f..94ae3fe820bfc97cbf14546bcf54af26c9eb5e7b 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingB2OC/StrippingDstarD02Kpipi0.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingB2OC/StrippingDstarD02Kpipi0.py
@@ -22,10 +22,10 @@ from StandardParticles import (StdAllNoPIDsPions,
                                StdAllNoPIDsKaons,
                                StdLooseMergedPi0,
                                StdLooseResolvedPi0)
-from StrippingUtils.Utils import LineBuilder, checkConfig
+from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, ConjugateNeutralPID
+from PhysSelPython.Wrappers import MergedSelection, Selection
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles, ConjugateNeutralPID
 __author__ = 'Andrea Contu'
 __date__ = '04/10/2010'
 __version__ = '$Revision: 1.5 $'
@@ -85,7 +85,6 @@ def makeD02kpipi0(name):
     str_D0_CombCuts = "(ADAMASS('D0')<200*MeV) & (ADOCA(1,2) < 1.5) & (AHASCHILD(((ABSID == 'K+') | (ABSID == 'pi+')) & (MIPCHI2DV(PRIMARY)>40)))"
     str_D0_MotherCuts = "(BPVDIRA>0.9) & (PT>2.5*GeV) & (VFASPF(VCHI2/VDOF)<10) & (BPVVDCHI2>36)"
     str_D0_DecayDescriptor_RS = "[D0 -> K- pi+ pi0]cc"
-    str_D0_Sidebands = "200*MeV"
 
     d0 = CombineParticles()
     d0.DecayDescriptor = str_D0_DecayDescriptor_RS
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingB2OC/StrippingLb2Lcpi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingB2OC/StrippingLb2Lcpi.py
index 0b22157303eb41ca14c2a78e4c6266ef085aa405..ad295973223de82f6f6d12eee5f86169e7f2563d 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingB2OC/StrippingLb2Lcpi.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingB2OC/StrippingLb2Lcpi.py
@@ -12,19 +12,12 @@
 Module for selecting Lb->Lambda_c+ pi
 '''
 
-from StandardParticles import (StdAllNoPIDsPions, StdAllNoPIDsKaons,
-                               StdAllNoPIDsProtons, StdNoPIDsUpPions,
-                               StdLooseMuons, StdNoPIDsUpKaons,
-                               StdLooseResolvedPi0, StdLooseMergedPi0)
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from StandardParticles import StdLooseAllPhotons, StdVeryLooseAllPhotons
-from Configurables import LoKi__VoidFilter
 from PhysSelPython.Wrappers import MergedSelection
 from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
-from Gaudi.Configuration import *
 __author__ = ['Jiesheng Yu', 'Yuehong Xie']
 __date__ = '28/11/2016'
 __version__ = '$Revision: 2.0$'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBandQ/StrippingB2JpsiXforEM_s.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBandQ/StrippingB2JpsiXforEM_s.py
index bc246c589889244c88c690d5538697934211a86c..42cf65a760892339a2d0e813f799d123ac3e1dee 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBandQ/StrippingB2JpsiXforEM_s.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBandQ/StrippingB2JpsiXforEM_s.py
@@ -20,21 +20,11 @@ __version__ = '$Revision: 0.0 $'
 
 __all__ = ('B2JpsiXforEM_sConf', 'default_config')
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
 from Configurables import LoKi__PVReFitter, CombineParticles
-from CommonParticles.Utils import updateDoD
-from StandardParticles import StdLoosePions
-from StandardParticles import StdLooseKaons
-from StandardParticles import StdAllLooseKaons
-from StandardParticles import StdLooseResolvedPi0
-from StandardParticles import StdLooseMergedPi0
-from StandardParticles import StdNoPIDsPions
-from StandardParticles import StdLooseProtons
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
+from PhysSelPython.Wrappers import DataOnDemand, Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from GaudiKernel.SystemOfUnits import MeV
 
 default_config = {
     'NAME': 'B2JpsiXforEM',
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBandQ/StrippingBbbar2PhiPhi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBandQ/StrippingBbbar2PhiPhi.py
index 68d2ae631f967ead0fd39b8d78a4f7850226577b..99d49369aa31255be87f60d200a2ca96c9e5513c 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBandQ/StrippingBbbar2PhiPhi.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBandQ/StrippingBbbar2PhiPhi.py
@@ -21,12 +21,10 @@ confBbbar2PhiPhi = Bbbar2PhiPhiConf( name = 'Bbbar2PhiPhi', config = config_Bbba
 stream.appendLines( confBbbar2PhiPhi.lines() )
 '''
 
-from StandardParticles import StdNoPIDsProtons, StdNoPIDsPions, StdNoPIDsDownPions
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
+from PhysSelPython.Wrappers import DataOnDemand, Selection
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = ['Simone Stracka']
 __date__ = '10/03/2015'
 __all__ = (
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBandQ/StrippingBc2JpsiHBDT.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBandQ/StrippingBc2JpsiHBDT.py
index 9fff4e97511b05b78e9a0f69f8190a87a6e94427..0f2af87a6076525ab1b0cdac932cd4254a9efa35 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBandQ/StrippingBc2JpsiHBDT.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBandQ/StrippingBc2JpsiHBDT.py
@@ -18,7 +18,6 @@ from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = ['Jibo He']
 __date__ = '02/11/2013'
 __version__ = '$Revision: 2.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBandQ/StrippingBc2JpsiMuXNew.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBandQ/StrippingBc2JpsiMuXNew.py
index 187d4d70008c6cb4acaae0c988ab23ab721428d3..422fa39bf0c88c53879fe511ad3ddeca3c23a8a5 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBandQ/StrippingBc2JpsiMuXNew.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBandQ/StrippingBc2JpsiMuXNew.py
@@ -18,7 +18,6 @@ from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = ['Jibo He']
 __date__ = '02/09/2010'
 __version__ = '$Revision: 2.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBandQ/StrippingCC2DD.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBandQ/StrippingCC2DD.py
index 56531b5bc3b8fdc4481e313939be1de765f199f4..1598c1f9f6758d00f48ef8bf734fa3a0c8aff035 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBandQ/StrippingCC2DD.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBandQ/StrippingCC2DD.py
@@ -22,8 +22,7 @@ Module for construction of CC->D D, where CC is a particle decaying to D D
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 __author__ = ['Lucio Anderlini', 'Andrea Bizzeti']
 __date__ = '2015-12-01'
 __version__ = '$Revision: 0.4 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBandQ/StrippingCcbar2Baryons.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBandQ/StrippingCcbar2Baryons.py
index db1a8e674f1380c30d293b155b447db888789b0c..db554d3a6a13854cfb39cfac28c9ae01af445eb9 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBandQ/StrippingCcbar2Baryons.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBandQ/StrippingCcbar2Baryons.py
@@ -20,7 +20,6 @@ stream.appendLines( [
 ])
 '''
 
-from StandardParticles import StdNoPIDsProtons, StdNoPIDsPions, StdNoPIDsDownPions
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBandQ/StrippingCcbar2LstLst.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBandQ/StrippingCcbar2LstLst.py
index 6515f84ca12e36c6d06a892e69e95360c9e2f3f4..ad9039b46d5a61c5253f7122661786c7e8731fe8 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBandQ/StrippingCcbar2LstLst.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBandQ/StrippingCcbar2LstLst.py
@@ -21,12 +21,10 @@ confCcbar2LstLst = Ccbar2LstLstConf( name = 'Ccbar2LstLst', config = config_Ccba
 stream.appendLines( confCcbar2LstLst.lines() )
 '''
 
-from StandardParticles import StdNoPIDsProtons, StdNoPIDsKaons
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
+from PhysSelPython.Wrappers import DataOnDemand, Selection
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = ['Andrii Usachov']
 __date__ = '12/01/2017'
 
@@ -70,22 +68,22 @@ class Ccbar2LstLstConf(LineBuilder):
         self.name = name
         self.config = config
 
-        TRCHI2DOF = config['TRCHI2DOF']
-        CcbarPT = config['CcbarPT']
-        KaonProbNNk = config['KaonProbNNk']
-        KaonPT = config['KaonPT']
-        KaonPTSec = config['KaonPTSec']
-        ProtonProbNNp = config['ProtonProbNNp']
-        ProtonPT = config['ProtonPT']
-        ProtonPTSec = config['ProtonPTSec']
-        LstVtxChi2 = config['LstVtxChi2']
-        LstMinMass = config['LstMinMass']
-        LstMaxMass = config['LstMaxMass']
-        CombMaxMass = config['CombMaxMass']
-        CombMinMass = config['CombMinMass']
-        MaxMass = config['MaxMass']
-        MinMass = config['MinMass']
-        Lst_TisTosSpecs = config['Lst_TisTosSpecs']
+        config['TRCHI2DOF']
+        config['CcbarPT']
+        config['KaonProbNNk']
+        config['KaonPT']
+        config['KaonPTSec']
+        config['ProtonProbNNp']
+        config['ProtonPT']
+        config['ProtonPTSec']
+        config['LstVtxChi2']
+        config['LstMinMass']
+        config['LstMaxMass']
+        config['CombMaxMass']
+        config['CombMinMass']
+        config['MaxMass']
+        config['MinMass']
+        config['Lst_TisTosSpecs']
 
         """
         Unbiased, require Hlt Tis
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBandQ/StrippingCcbar2PPPiPi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBandQ/StrippingCcbar2PPPiPi.py
index 1baf5793c54d1cf7c0db705b5b635116d72951ee..98fdb7f110d844cb8f222f2e0825cfc55a7129da 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBandQ/StrippingCcbar2PPPiPi.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBandQ/StrippingCcbar2PPPiPi.py
@@ -12,12 +12,11 @@
 Module for selecting charmonium -> p pbar pi pi 
 '''
 
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
+from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
 from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
-from Gaudi.Configuration import *
 __author__ = ['Jibo He']
 __date__ = '12/11/2015'
 __version__ = '$Revision: 1.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBandQ/StrippingCcbar2PhiPhi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBandQ/StrippingCcbar2PhiPhi.py
index 699437c3bc06d6f9ef8d71ef25d59e5854abaa77..28e46f5fd73a17d752f06d7afb1020754dfa86ea 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBandQ/StrippingCcbar2PhiPhi.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBandQ/StrippingCcbar2PhiPhi.py
@@ -21,12 +21,10 @@ confCcbar2PhiPhi = Ccbar2PhiPhiConf( name = 'Ccbar2PhiPhi', config = config_Ccba
 stream.appendLines( confCcbar2PhiPhi.lines() )
 '''
 
-from StandardParticles import StdNoPIDsProtons, StdNoPIDsPions, StdNoPIDsDownPions
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
+from PhysSelPython.Wrappers import DataOnDemand, Selection
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = ['Jibo He']
 __date__ = '20/01/2012'
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBandQ/StrippingCcbar2PhiPhiDetached.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBandQ/StrippingCcbar2PhiPhiDetached.py
index e6a23c416236ec260cbde0f7e27ef419c26d8b63..2efa73daa63445c07e6f9422398282c433d6429a 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBandQ/StrippingCcbar2PhiPhiDetached.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBandQ/StrippingCcbar2PhiPhiDetached.py
@@ -15,12 +15,10 @@ Inherited from StrippingCcbar2PhiPhi.py; moved To FullDST
 
 '''
 
-from StandardParticles import StdNoPIDsProtons, StdNoPIDsPions, StdNoPIDsDownPions
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
+from PhysSelPython.Wrappers import DataOnDemand, Selection
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = ['Jibo He, Liupan An']
 __date__ = '11/01/2017'
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBandQ/StrippingCcbar2PhiPhiPiPi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBandQ/StrippingCcbar2PhiPhiPiPi.py
index ddb88e1954def91543a3f0a59a00716f5bd235d7..9090289120899103df433cf45001623eeaf79cdd 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBandQ/StrippingCcbar2PhiPhiPiPi.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBandQ/StrippingCcbar2PhiPhiPiPi.py
@@ -12,12 +12,11 @@
 Module for selecting charmonium -> phi phi pi pi 
 '''
 
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
+from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
 from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
-from Gaudi.Configuration import *
 __author__ = ['Andrii Usachov']
 __date__ = '10/04/2017'
 __version__ = '$Revision: 1.1 $'
@@ -61,12 +60,12 @@ class Ccbar2PhiPhiPiPiConf(LineBuilder):
         self.name = name
         self.config = config
 
-        PhiVtxChi2 = config['PhiVtxChi2']
-        PhiMassW = config['PhiMassW']
-        KaonPT = config['KaonPT']
-        TRCHI2DOF = config['TRCHI2DOF']
-        KaonProbNNk = config['KaonProbNNk']
-        KaonIPCHI2 = config['KaonIPCHI2']
+        config['PhiVtxChi2']
+        config['PhiMassW']
+        config['KaonPT']
+        config['TRCHI2DOF']
+        config['KaonProbNNk']
+        config['KaonIPCHI2']
 
         self.SelPions = self.createSubSel(OutputList=self.name + "SelPions",
                                           InputList=DataOnDemand(
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBandQ/StrippingCcbar2PpbarNew.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBandQ/StrippingCcbar2PpbarNew.py
index 516985c59ccaf3e62e2b0cd6e7854be4d026b219..9d41a780f5f17e24bf58cf91f33a808d5da77441 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBandQ/StrippingCcbar2PpbarNew.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBandQ/StrippingCcbar2PpbarNew.py
@@ -18,9 +18,8 @@ Module for Charmonium->p pbar, including three lines
 
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
+from PhysSelPython.Wrappers import Selection
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 __author__ = ['Jibo He']
 __date__ = '03/10/2010'
 __version__ = '$Revision: 1.2 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBandQ/StrippingChiCJPsiGammaConv.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBandQ/StrippingChiCJPsiGammaConv.py
index 39414a2916b0f53397182e29fb2a9b81b1302a97..b17f83d5302ed3c59a1e107d4f81d3c06f495239 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBandQ/StrippingChiCJPsiGammaConv.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBandQ/StrippingChiCJPsiGammaConv.py
@@ -11,8 +11,7 @@
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
-from Configurables import FilterDesktop, CombineParticles, OfflineVertexFitter
-from Gaudi.Configuration import *
+from Configurables import CombineParticles, FilterDesktop
 __author__ = 'Edwige Tournefier'
 __date__ = '08/06/2012'
 __version__ = '$ 1.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBandQ/StrippingDiMuonForXsection.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBandQ/StrippingDiMuonForXsection.py
index 21f73ebac0f9dc811485e0f2194e3dbe6c8f586e..ce4daa1211b88144135f0f2588520bea0acef116 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBandQ/StrippingDiMuonForXsection.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBandQ/StrippingDiMuonForXsection.py
@@ -16,7 +16,6 @@ from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
-from Gaudi.Configuration import *
 __author__ = ['Jibo He']
 __date__ = '28/03/2012'
 __version__ = '$Revision: 1.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBandQ/StrippingDiMuonNew.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBandQ/StrippingDiMuonNew.py
index 8a272ad23d094d840fc6955b2c67f3976834c915..f0e46c0b4d08131b87ba289d29dd2ab04d08ee3b 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBandQ/StrippingDiMuonNew.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBandQ/StrippingDiMuonNew.py
@@ -60,7 +60,6 @@ from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand, EventSelection
 from Configurables import LoKi__VoidFilter
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
-from Gaudi.Configuration import *
 __author__ = ['Jibo He']
 __date__ = '30/09/2010'
 __version__ = '$Revision: 1.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBandQ/StrippingHeavyBaryons.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBandQ/StrippingHeavyBaryons.py
index eb64c175072af830020f5799a7c17fc8dfcb6121..fa0dcf9a66313c735015d48754857948cd7efd09 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBandQ/StrippingHeavyBaryons.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBandQ/StrippingHeavyBaryons.py
@@ -12,14 +12,10 @@
 Stripping line for HeavyBaryons studies : Xi_b-, Xi_b0 and Omega_b-
 Author: Yasmine Amhis
 '''
-from GaudiKernel.SystemOfUnits import MeV
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
-from StandardParticles import StdAllLoosePions, StdAllLooseKaons
-from StandardParticles import StdLoosePions, StdNoPIDsDownPions, StdLooseKaons, StdLooseDownKaons
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = ['Yasmine Amhis']
 __date__ = '19/05/2011'
 __version__ = '$Revision: 1.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBandQ/StrippingLb2EtacKp.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBandQ/StrippingLb2EtacKp.py
index 0c836118d6ad2de1e6aa2c2dedac2917dacca810..63e11ca5d4abca4914b64c29f42f7397f5565146 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBandQ/StrippingLb2EtacKp.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBandQ/StrippingLb2EtacKp.py
@@ -17,7 +17,6 @@ from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
-from Gaudi.Configuration import *
 __author__ = ['Liming Zhang', 'Xuesong Liu']
 __date__ = '23/11/2016'
 __version__ = '$Revision: 2.0$'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBandQ/StrippingOmegab2XicKpi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBandQ/StrippingOmegab2XicKpi.py
index 3e2d953e5c68e5184050887ee4d64c459de21acd..8d75e01e9198aae28302595b73bca42da91b8059 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBandQ/StrippingOmegab2XicKpi.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBandQ/StrippingOmegab2XicKpi.py
@@ -25,8 +25,7 @@ __all__ = ('Omegab2XicKpiConf',
            'makeOmegab2XicKpi',
            'default_config')
 
-from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBandQ/StrippingPPMuMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBandQ/StrippingPPMuMu.py
index 1df5d93b87bbdb9dae5bf3778b297ca01759bc14..fcea01500647f725d298f5a17513a6a9ec45cd4d 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBandQ/StrippingPPMuMu.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBandQ/StrippingPPMuMu.py
@@ -12,12 +12,11 @@
 Module for selecting Hc -> p pbar mu mu
 '''
 
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
+from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
 from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
-from Gaudi.Configuration import *
 __author__ = ['Liupan An']
 __date__ = '18/05/2017'
 __version__ = '$Revision: 1.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBandQ/StrippingXibc.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBandQ/StrippingXibc.py
index 09c274076ab77b1ffa445d4027da57cc7c71076c..73028a237e89513bcf5c298f108bcad2a1ff9f07 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBandQ/StrippingXibc.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBandQ/StrippingXibc.py
@@ -47,17 +47,11 @@ __all__ = ('XibcBuilder'  # LineBuilder class specialization
            )
 
 
-from Gaudi.Configuration import *
-
 from Configurables import FilterDesktop, CombineParticles
 from PhysSelPython.Wrappers import Selection, AutomaticData, MergedSelection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 
-from CommonParticles.StdLooseLambda import StdLooseLambdaLL, StdLooseLambdaDD
-from GaudiKernel.SystemOfUnits import MeV, GeV, mm
-from Configurables import TisTosParticleTagger
-
 
 default_name = "Xibc"
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBandQ/StrippingXibcBDT.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBandQ/StrippingXibcBDT.py
index fbb6cc13c3ac13de0c21873fee47d7b215a1fd13..c4c8bfdaa9f3eda289dc29405819cbcec755f3ab 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBandQ/StrippingXibcBDT.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBandQ/StrippingXibcBDT.py
@@ -33,8 +33,6 @@ from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticle
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, MergedSelection, DataOnDemand
-from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays
-from Gaudi.Configuration import *
 __author__ = ['Jibo He']
 __date__ = '20/11/2016'
 __version__ = '$Revision: 1.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBandQ/StrippingXic2HHHOld.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBandQ/StrippingXic2HHHOld.py
index 2b6300f560c23ceddc6c67fa4d6def48eb6cb5f9..578167c7681a568ba96718c7d1cb251d66778ff5 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBandQ/StrippingXic2HHHOld.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBandQ/StrippingXic2HHHOld.py
@@ -8,17 +8,15 @@
 # granted to it by virtue of its status as an Intergovernmental Organization  #
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
-from StandardParticles import StdNoPIDsPions, StdTightPions, StdNoPIDsKaons, StdAllNoPIDsProtons
-from Configurables import TisTosParticleTagger
+from StandardParticles import StdAllNoPIDsProtons, StdNoPIDsKaons, StdNoPIDsPions
 from StrippingUtils.Utils import LineBuilder
-from PhysSelPython.Wrappers import Selection, DataOnDemand, AutomaticData, MergedSelection
+from PhysSelPython.Wrappers import DataOnDemand, Selection
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
 from Configurables import FilterDesktop, CombineParticles
 from LHCbKernel.Configuration import *
 from GaudiKernel.SystemOfUnits import MeV, mm, ns
 from StrippingConf.StrippingLine import StrippingLine
 from Gaudi.Configuration import *
-import re
 all
 ''' Xic+ and Theta+ lines Designed by Yury Shcheglov, Alexey Dzyuba, Nelya Sagidova to study Xic+ and Theta+ particles '''
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBandQ/StrippingXiccBDT.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBandQ/StrippingXiccBDT.py
index cd4fb8c12ea0ad6a04988289df6f51c07a333a64..c47838a8934fb09a8fb5f516a09dd4c1fde9e069 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBandQ/StrippingXiccBDT.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBandQ/StrippingXiccBDT.py
@@ -30,9 +30,7 @@ Xicc+  -> D+ p+ K-
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, MergedSelection, DataOnDemand
-from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays
-from Gaudi.Configuration import *
+from PhysSelPython.Wrappers import DataOnDemand, Selection
 __author__ = ['Jibo He']
 __date__ = '20/11/2016'
 __version__ = '$Revision: 1.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBnoC/StrippingB24pLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBnoC/StrippingB24pLines.py
index 6a1293248e466cc67c4e7096a59950a675f613ad..d0ef68a9df8f43bd44f73227ae276cbb19015738 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBnoC/StrippingB24pLines.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBnoC/StrippingB24pLines.py
@@ -54,12 +54,10 @@ Exported symbols (use python help!):
    - 
 """
 
-from GaudiKernel.PhysicalConstants import c_light
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
-from Configurables import FilterDesktop, CombineParticles, DaVinci__N4BodyDecays
-from Gaudi.Configuration import *
+from Configurables import DaVinci__N4BodyDecays
 __author__ = ["Pietro Marino", "Oliver Gruenberg"]
 __date__ = "13.10.2017"
 __version__ = "$Revision: 3.0 $"
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBnoC/StrippingB2CharmlessInclusive.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBnoC/StrippingB2CharmlessInclusive.py
index cd9fc514663d296477d068a8eec81536e9237830..84e599e9d48ebeea579e8528cafbeae6f8f8ac8c 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBnoC/StrippingB2CharmlessInclusive.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBnoC/StrippingB2CharmlessInclusive.py
@@ -16,9 +16,8 @@ from StandardParticles import StdLooseKsDD, StdLooseKsLL
 from StandardParticles import StdNoPIDsPions, StdLooseAllPhotons, StdLooseMergedPi0, StdLooseResolvedPi0
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand, SimpleSelection
+from PhysSelPython.Wrappers import Selection, SimpleSelection
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = ['Fred Blanc', 'Luca Pescatore']
 __date__ = '30/11/2016'
 __version__ = '$Revision: 3.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBnoC/StrippingB2CharmlessQuasi2Body.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBnoC/StrippingB2CharmlessQuasi2Body.py
index 718d39a23d00335bf8f1dcbcc45b7eefac60df7c..722215da6a98e8cb098731d1b08547d32728e4c3 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBnoC/StrippingB2CharmlessQuasi2Body.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBnoC/StrippingB2CharmlessQuasi2Body.py
@@ -15,9 +15,8 @@ B->charmless quasi 2-body selection
 from StandardParticles import StdNoPIDsPions
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand
+from PhysSelPython.Wrappers import Selection
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = ['Fred Blanc']
 __date__ = '25/07/2014'
 __version__ = '$Revision: 2.8 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBnoC/StrippingB2HHBDT.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBnoC/StrippingB2HHBDT.py
index 373482252891dafc2ebd794bee38e3c31665f7d5..87ef9edbab077d9500e2cb0ecdd4587476dededd 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBnoC/StrippingB2HHBDT.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBnoC/StrippingB2HHBDT.py
@@ -24,16 +24,13 @@ __all__ = ('B2HHBDTLines',
            'applyBDT',
            'default_config')
 
-from Gaudi.Configuration import *
 
-from GaudiKernel.SystemOfUnits import *
-
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 from StandardParticles import StdNoPIDsPions
 
 from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
-from StrippingUtils.Utils import LineBuilder, checkConfig
+from StrippingUtils.Utils import LineBuilder
 
 
 default_config = {
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBnoC/StrippingB2HHPi0.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBnoC/StrippingB2HHPi0.py
index 7f0781e48280454c550a19cc42c39585db39a8db..37ddfd7720d7364819cb7952fb6e6c0bb7e2da3d 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBnoC/StrippingB2HHPi0.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBnoC/StrippingB2HHPi0.py
@@ -26,9 +26,8 @@ __all__ = ('StrippingB2HHPi0Conf',
            'makeB2HHPi0M',
            'default_config')
 
-from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from PhysSelPython.Wrappers import Selection, DataOnDemand
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
+from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from StandardParticles import StdNoPIDsPions, StdLooseMergedPi0, StdLooseResolvedPi0
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBnoC/StrippingB2KShh.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBnoC/StrippingB2KShh.py
index b6ed5f7d633af57ed6f8b1a89d7dd2ee9323b11e..213f6377bb60d399cc798f1fb8a9e6aa0513e6ae 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBnoC/StrippingB2KShh.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBnoC/StrippingB2KShh.py
@@ -25,7 +25,6 @@ __version__ = 'Stripping24r1/Stripping26r1'
 __all__ = {'B2KShhConf',
            'default_config'}
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, DaVinci__N3BodyDecays
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBnoC/StrippingB2KShhh.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBnoC/StrippingB2KShhh.py
index a35d44f01b8e80ef2a95c24cc8c95dbc14879bed..19e01960a41605b77b968788e4fbd7fa7704664a 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBnoC/StrippingB2KShhh.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBnoC/StrippingB2KShhh.py
@@ -27,13 +27,13 @@ __all__ = ('B2KShhhConf',
 
 from Gaudi.Configuration import *
 
-from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N4BodyDecays
+from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays
 from StandardParticles import StdNoPIDsPions, StdNoPIDsKaons  # ipchi2 cut
 from StandardParticles import StdLooseKsDD, StdLooseKsLL
 
-from PhysSelPython.Wrappers import Selection, MergedSelection
+from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
-from StrippingUtils.Utils import LineBuilder, checkConfig
+from StrippingUtils.Utils import LineBuilder
 
 from Configurables import FilterDesktop
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBnoC/StrippingB2Ksthh.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBnoC/StrippingB2Ksthh.py
index e878d03046af779ac332df6b113e19552f52d4db..1bfb413fe01485a34aaaeb592f39f482172a42ad 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBnoC/StrippingB2Ksthh.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBnoC/StrippingB2Ksthh.py
@@ -22,7 +22,6 @@ __version__ = 'Stripping26'
 __all__ = {'B2KsthhConf',
            'default_config'}
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
@@ -176,7 +175,7 @@ class B2KsthhConf(LineBuilder):
         _massCutHigh = "(AM<(5279+%s)*MeV)" % config['B_Mhigh']
         _aptCut = "(APT>%s*MeV)" % config['B_APTmin']
         _daugMedPtCut = "(ANUM(PT>%s*MeV)>=2)" % config['BDaug_MedPT_PT']
-        _daugMaxPtIPCut = "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['BDaug_MaxPT_IP']
+        "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['BDaug_MaxPT_IP']
         _daugPtSumCut = "((APT1+APT2+APT3)>%s*MeV)" % config['BDaug_PTsum']
 
         _combCuts = _aptCut
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBnoC/StrippingB2TwoBaryons.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBnoC/StrippingB2TwoBaryons.py
index be5394ee6af7729db44cf59ecfeedb504d8b1b27..26bb8d6f679d13ed169bc510a1472696a873ae14 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBnoC/StrippingB2TwoBaryons.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBnoC/StrippingB2TwoBaryons.py
@@ -31,11 +31,10 @@ from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
 from StandardParticles import StdLooseProtons
 from StandardParticles import StdNoPIDsPions as Pions
-from CommonParticles.StdLooseLambda import StdLooseLambdaLL, StdLooseLambdaDD
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
-from StrippingUtils.Utils import LineBuilder, checkConfig
-from GaudiKernel.SystemOfUnits import MeV, GeV, mm, ns
+from StrippingUtils.Utils import LineBuilder
+from GaudiKernel.SystemOfUnits import GeV, MeV, mm
 
 default_config = {'NAME': 'B2TwoBaryons',
                   'WGs': ['BnoC'],
@@ -157,7 +156,7 @@ class B2TwoBaryonLines(LineBuilder):
 
         B2PPbarName = name + "B2PPbar"
 
-        B2PPSameSignName = name + "B2PPSameSign"
+        name + "B2PPSameSign"
 
         B2Lp_dd_name = name+'B2PLambdabarDD'
         B2Lp_ll_name = name+'B2PLambdabarLL'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBnoC/StrippingB2XEta.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBnoC/StrippingB2XEta.py
index ed24e9afa098a704c220dc1576bebc7f4b618dc8..a85b63d0f6c48630471d87c4ec99d3ff00e14140 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBnoC/StrippingB2XEta.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBnoC/StrippingB2XEta.py
@@ -25,9 +25,7 @@ from StandardParticles import StdLoosePions as Pions
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, DaVinci__N3BodyDecays
-from PhysSelPython.Wrappers import DataOnDemand, Selection, SelectionSequence, MergedSelection
-from GaudiKernel import SystemOfUnits as Units
-from Gaudi.Configuration import *
+from PhysSelPython.Wrappers import DataOnDemand, MergedSelection, Selection
 __author__ = ['Timothy Williams']
 __date__ = '1/12/2016'
 __version__ = 'Stripping26r1'
@@ -564,7 +562,7 @@ class B2XEtaConf(LineBuilder):
         _trackCuts = _track_PT+'&'+_track_Chi2+'&'+_track_GPCut+'&'+_track_PIDCut
         _combCuts = _massCut+'&'+_docaCut
         _combCut12Doca = "ACHI2DOCA(1,2)<%s" % config['eta_DOCA']
-        _combCut12Vtx = "(VFASPF(VCHI2/VDOF)<%s)" % config['eta_vtxChi2']
+        "(VFASPF(VCHI2/VDOF)<%s)" % config['eta_vtxChi2']
         _combCut12 = _combCut12Doca
 
         # _eta3Pi=CombineParticles("eta3Pi",
@@ -592,7 +590,7 @@ class B2XEtaConf(LineBuilder):
         _trackCuts = _track_PT+'&'+_track_Chi2+'&'+_track_GPCut+'&'+_track_PIDCut
         _combCuts = _massCut+'&'+_docaCut
         _combCut12Doca = "ACHI2DOCA(1,2)<%s" % config['eta_prime_DOCA']
-        _combCut12Vtx = "(VFASPF(VCHI2/VDOF)<%s)" % config['eta_prime_vtxChi2']
+        "(VFASPF(VCHI2/VDOF)<%s)" % config['eta_prime_vtxChi2']
         _combCut12 = _combCut12Doca
 
         # _etap=CombineParticles("etap",
@@ -883,7 +881,7 @@ class B2XEtaConf(LineBuilder):
         _combCuts = _massCut+'&'+_docaCut
         _allCuts = _PTCut+'&'+_vtxCut+'&'+_diraCut+'&'+_IPChi2Cut
         _combCut12Doca = "ACHI2DOCA(1,2)<%s" % config['LbDaug_LL_maxDocaChi2']
-        _combCut12Vtx = "(VFASPF(VCHI2/VDOF)<%s)" % config['Lb_VtxChi2']
+        "(VFASPF(VCHI2/VDOF)<%s)" % config['Lb_VtxChi2']
         _combCut12 = _combCut12Doca
 
         _Lb2pKetap = DaVinci__N3BodyDecays(DecayDescriptor="[Lambda_b0 -> p+ K- eta_prime]cc",
@@ -921,7 +919,7 @@ class B2XEtaConf(LineBuilder):
         _combCuts = _massCut
         _allCuts = _PTCut+'&'+_IPChi2Cut+'&'+_vtxCut+'&'+_diraCut
         _combCut12Doca = "ACHI2DOCA(1,2)<%s" % config['LbDaug_LL_maxDocaChi2']
-        _combCut12Vtx = "(VFASPF(VCHI2/VDOF)<%s)" % config['Lb_VtxChi2']
+        "(VFASPF(VCHI2/VDOF)<%s)" % config['Lb_VtxChi2']
         _combCut12 = _combCut12Doca
 
         _Lb2pKeta3Pi = DaVinci__N3BodyDecays(DecayDescriptor="[Lambda_b0 -> p+ K- eta]cc",
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBnoC/StrippingB2a1Pi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBnoC/StrippingB2a1Pi.py
index 7122ae867e7e6cb1bde58f2cfdfd30aa0d240f52..db0bacbfa565ae7b8150163fc8c4c7c5352aa931 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBnoC/StrippingB2a1Pi.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBnoC/StrippingB2a1Pi.py
@@ -17,7 +17,6 @@ from Configurables import DaVinci__N4BodyDecays
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
-from Gaudi.Configuration import *
 __author__ = ['Daniel Vieira, Jibo He']
 __date__ = '01/12/2016'
 __version__ = '$Revision: 1.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBnoC/StrippingB2pphh.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBnoC/StrippingB2pphh.py
old mode 100755
new mode 100644
index 98e460d757a794b2d939f602b94d4d3711f5533b..193ff53fe70d045102b03995d531bb12320411a7
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBnoC/StrippingB2pphh.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBnoC/StrippingB2pphh.py
@@ -25,16 +25,13 @@ __all__ = ('B2pphhConf',
            )
 
 
-from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop
+from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
 # from Configurables import DaVinci__N4BodyDecays
 from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays
 
-from StandardParticles import StdAllNoPIDsKaons, StdAllNoPIDsPions, StdAllNoPIDsProtons
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from Configurables import LoKi__VoidFilter as VoidFilter
 
 default_config = {
     'NAME': 'B2pphh',
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBnoC/StrippingBc2hhh_BnoC.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBnoC/StrippingBc2hhh_BnoC.py
index 36ea85af4db7abafbbe99eee0a7538f4826c1b68..7f9a438ee86d830276cf2cf989aed20166beaece 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBnoC/StrippingBc2hhh_BnoC.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBnoC/StrippingBc2hhh_BnoC.py
@@ -23,13 +23,11 @@ Exported symbols (use python help!):
    - makeppK_excl  
 '''
 
-from Configurables import LoKi__VoidFilter as VoidFilter
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection
 import StandardParticles
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 __author__ = ['Alvaro Gomes', 'Adlene Hicheur']
 __date__ = '31/08/2014'
 __version__ = '$Revision: 1.5 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBnoC/StrippingBs2KKhh.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBnoC/StrippingBs2KKhh.py
index dde55525b06f816fc6920690629b551e37b69fcd..f12ace21ab9ca71d0ce07d7e6f00c9dd259533d1 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBnoC/StrippingBs2KKhh.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBnoC/StrippingBs2KKhh.py
@@ -27,7 +27,6 @@ from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop
-from Gaudi.Configuration import *
 __author__ = ['Sean Benson', 'Adam Morris', 'Laurence Carson']
 __date__ = '22/11/2016'
 __version__ = '3.2'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBnoC/StrippingBs2KSKS_Run2.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBnoC/StrippingBs2KSKS_Run2.py
index 4580afecf4c01f9e41baf8c5acbcf0d2a19381ab..9b3c212035d7adeee4c570b05c5ed9d7e786e124 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBnoC/StrippingBs2KSKS_Run2.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBnoC/StrippingBs2KSKS_Run2.py
@@ -22,15 +22,11 @@ __date__ = '13/09/2016'
 __version__ = 'Run2'
 __all__ = {'Bs2KSKSConf', 'default_config'}
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
+from PhysSelPython.Wrappers import DataOnDemand, Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 
-from StandardParticles import StdNoPIDsPions as Pions
-from StandardParticles import StdNoPIDsDownPions as DownPions
-
 
 default_config = {
     'NAME': 'Bs2KSKS',
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBnoC/StrippingBs2Kst_0Kst_0.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBnoC/StrippingBs2Kst_0Kst_0.py
index b53f616c921d0b54652c488e0c38cac1f5ce4524..7a979a9eaf956b50a902298fa49f660dce2481fd 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBnoC/StrippingBs2Kst_0Kst_0.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBnoC/StrippingBs2Kst_0Kst_0.py
@@ -19,11 +19,8 @@ Exported symbols (use python help!):
 
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, SelectionSequence, DataOnDemand
+from PhysSelPython.Wrappers import DataOnDemand, Selection
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-from CommonParticles.Utils import *
-from LHCbKernel.Configuration import *
-from Gaudi.Configuration import *
 __author__ = ['Brais Sanmartin Sedes']
 __date__ = '12/11/2015'
 __version__ = '5.1'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBnoC/StrippingBs2PhiKst0.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBnoC/StrippingBs2PhiKst0.py
index aef03c61961f38f6f068ef062a0becf2559328ff..760de6aa13d7b0a722662b7dd528b6f1674d806c 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBnoC/StrippingBs2PhiKst0.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBnoC/StrippingBs2PhiKst0.py
@@ -20,11 +20,8 @@ Exported symbols (use python help!):
 
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, SelectionSequence, DataOnDemand
+from PhysSelPython.Wrappers import DataOnDemand, Selection
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-from CommonParticles.Utils import *
-from LHCbKernel.Configuration import *
-from Gaudi.Configuration import *
 __author__ = ['Brais Sanmartin Sedes']
 __date__ = '01/12/2015'
 __version__ = '5.0'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBnoC/StrippingBs2PhiPhi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBnoC/StrippingBs2PhiPhi.py
index 58996ef52a66510db5fb60dbf44832780557590c..611bd2bca00562eb1a482bbb1419ddd2a0c0f97f 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBnoC/StrippingBs2PhiPhi.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBnoC/StrippingBs2PhiPhi.py
@@ -24,12 +24,10 @@ Exports the following stripping lines as instance data members:
 
 from StandardParticles import StdAllLooseANNKaons as MyLooseKaons
 from StandardParticles import StdLooseANNUpKaons as MyLooseUpKaons
-import StandardParticles
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
+from PhysSelPython.Wrappers import Selection
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 __author__ = ['Sean Benson']
 __date__ = '2013/08/15'
 __version__ = '3.0'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBnoC/StrippingBu2Ksthh.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBnoC/StrippingBu2Ksthh.py
index 1fd6ba79106d4c72d1f5378548dde305d33378e6..4f9c1afdf1ca56cd839fd46540b523d1043c3014 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBnoC/StrippingBu2Ksthh.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBnoC/StrippingBu2Ksthh.py
@@ -23,7 +23,6 @@ __version__ = 'Stripping26'
 __all__ = {'Bu2KsthhConf',
            'default_config'}
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
@@ -302,7 +301,7 @@ class Bu2KsthhConf(LineBuilder):
         _massCutHigh = "(AM<(5279+%s)*MeV)" % config['B_Mhigh']
         _aptCut = "(APT>%s*MeV)" % config['B_APTmin']
         _daugMedPtCut = "(ANUM(PT>%s*MeV)>=2)" % config['BDaug_MedPT_PT']
-        _daugMaxPtIPCut = "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['BDaug_MaxPT_IP']
+        "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['BDaug_MaxPT_IP']
         _maxDocaChi2Cut = "(ACUTDOCACHI2(%s,''))" % config['BDaug_DD_maxDocaChi2']
         _daugPtSumCut = "((APT1+APT2+APT3)>%s*MeV)" % config['BDaug_DD_PTsum']
 
@@ -359,7 +358,7 @@ class Bu2KsthhConf(LineBuilder):
         _massCutHigh = "(AM<(5279+%s)*MeV)" % config['B_Mhigh']
         _aptCut = "(APT>%s*MeV)" % config['B_APTmin']
         _daugMedPtCut = "(ANUM(PT>%s*MeV)>=2)" % config['BDaug_MedPT_PT']
-        _daugMaxPtIPCut = "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['BDaug_MaxPT_IP']
+        "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['BDaug_MaxPT_IP']
         _maxDocaChi2Cut = "(ACUTDOCACHI2(%s,''))" % config['BDaug_LL_maxDocaChi2']
         _daugPtSumCut = "((APT1+APT2+APT3)>%s*MeV)" % config['BDaug_LL_PTsum']
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBnoC/StrippingBu2hhh.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBnoC/StrippingBu2hhh.py
index b0e05de78958b36146c5a12809f45d4740bb2fa6..a56f353bf291873105ec54cba5728f3b553b07bd 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBnoC/StrippingBu2hhh.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBnoC/StrippingBu2hhh.py
@@ -22,13 +22,11 @@ Exported symbols (use python help!):
    - makepph_incl
 '''
 
-from Configurables import LoKi__VoidFilter as VoidFilter
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection
 import StandardParticles
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 __author__ = ['Irina Nasteva', 'Jussara Miranda', 'Alvaro Gomes']
 __date__ = '19/05/2017'
 __version__ = 'Stripping29'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBnoC/StrippingBu2rho0rhoPlus.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBnoC/StrippingBu2rho0rhoPlus.py
index b3c5e6c8c3f30a98e89149776396db914e3521a7..f8977b65f3b942bc77dcabdcef4e8eaafc84d344 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBnoC/StrippingBu2rho0rhoPlus.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBnoC/StrippingBu2rho0rhoPlus.py
@@ -21,7 +21,6 @@ from StrippingUtils.Utils import LineBuilder, checkConfig
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = "Jason E Andrews"
 __date__ = "26/11/2016"
 __version__ = "4.0"
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBnoC/StrippingButo5h.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBnoC/StrippingButo5h.py
index f513b2eb8e791c982132575a578c37ea43972bc1..86d97904e5f34fc79cf9ebc9ad39fa87262f2f8e 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBnoC/StrippingButo5h.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBnoC/StrippingButo5h.py
@@ -23,13 +23,11 @@ Exported symbols (use python help!):
    - makeppKpipi_excl
 '''
 
-from Configurables import LoKi__VoidFilter as VoidFilter
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection
 import StandardParticles
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 __author__ = ['Luiz Gustavo de Oliveira',
               'Alvaro Gomes', 'Bruno Souza de Paula']
 __date__ = '22/Aug/2014'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBnoC/StrippingD2HHBDT.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBnoC/StrippingD2HHBDT.py
index 0dfb222d2ab5dafe519ef756d69dd2b74431bea4..91e98da0d8961d715e47786f01a3c51a0d58cbec 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBnoC/StrippingD2HHBDT.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBnoC/StrippingD2HHBDT.py
@@ -23,14 +23,13 @@ __all__ = ('D2HHBDTLines',
            'makeD2HHBDT',
            'default_config')
 
-from Gaudi.Configuration import *
 
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
 from StandardParticles import StdNoPIDsKaons, StdAllNoPIDsPions
 
 from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
-from StrippingUtils.Utils import LineBuilder, checkConfig
+from StrippingUtils.Utils import LineBuilder
 
 
 default_config = {
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBnoC/StrippingHb2Charged2Body.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBnoC/StrippingHb2Charged2Body.py
index 5892ee9c6a978ec163161067545b8241aff5219a..213bb72f76914d8e9fde9fce72f99f9a8376da9d 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBnoC/StrippingHb2Charged2Body.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBnoC/StrippingHb2Charged2Body.py
@@ -23,14 +23,13 @@ __all__ = ('Hb2Charged2BodyLines',
            'makeB2Charged2Body',
            'default_config')
 
-from Gaudi.Configuration import *
 
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-from StandardParticles import StdNoPIDsPions, StdLooseProtons, StdLooseKaons
+from StandardParticles import StdNoPIDsPions
 
 from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
-from StrippingUtils.Utils import LineBuilder, checkConfig
+from StrippingUtils.Utils import LineBuilder
 
 
 default_config = {
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBnoC/StrippingHb2V0V0h.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBnoC/StrippingHb2V0V0h.py
index f6702785b326d61efc44578825e2016852c82b2c..52ebfc4bea96f799009c3fb522ae04cb32319278 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBnoC/StrippingHb2V0V0h.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBnoC/StrippingHb2V0V0h.py
@@ -22,7 +22,6 @@ __date__ = '10/02/2017'
 __version__ = 'Stripping28'
 __all__ = 'Hb2V0V0hConf'
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBnoC/StrippingLb2V0hh.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBnoC/StrippingLb2V0hh.py
index 2641bd9d0ee5387a26e5a643e9ad1450e372db4e..afba240ffc7f72f48dd0ad804fb20c88e61b20f2 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBnoC/StrippingLb2V0hh.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBnoC/StrippingLb2V0hh.py
@@ -25,7 +25,6 @@ __date__ = '21/05/2015'
 __version__ = 'Stripping23'
 __all__ = 'Lb2V0hhConf'
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
@@ -392,7 +391,7 @@ class Lb2V0hhConf(LineBuilder):
         _vtxChi2Cut = "(VFASPF(VCHI2)<%s)" % config['Lb_VtxChi2']
         _diraCut = "(BPVDIRA>%s)" % config['Lb_DD_Dira']
         _ipChi2Cut = "(MIPCHI2DV(PRIMARY)<%s)" % config['Lb_DD_IPCHI2wrtPV']
-        _fdCut = "(VFASPF(VMINVDDV(PRIMARY))>%s)" % config['Lb_FDwrtPV']
+        "(VFASPF(VMINVDDV(PRIMARY))>%s)" % config['Lb_FDwrtPV']
         _fdChi2Cut = "(BPVVDCHI2>%s)" % config['Lb_DD_FDChi2']
 
         _motherCuts = _ptCut+'&'+_vtxChi2Cut+'&'+_diraCut+'&'+_ipChi2Cut+'&'+_fdChi2Cut
@@ -597,7 +596,7 @@ class Lb2V0hhConf(LineBuilder):
         _vtxChi2Cut = "(VFASPF(VCHI2)<%s)" % config['Lb_VtxChi2']
         _diraCut = "(BPVDIRA>%s)" % config['Lb_LD_Dira']
         _ipChi2Cut = "(MIPCHI2DV(PRIMARY)<%s)" % config['Lb_LD_IPCHI2wrtPV']
-        _fdCut = "(VFASPF(VMINVDDV(PRIMARY))>%s)" % config['Lb_FDwrtPV']
+        "(VFASPF(VMINVDDV(PRIMARY))>%s)" % config['Lb_FDwrtPV']
         _fdChi2Cut = "(BPVVDCHI2>%s)" % config['Lb_LD_FDChi2']
 
         _motherCuts = _ptCut+'&'+_vtxChi2Cut+'&'+_diraCut+'&'+_ipChi2Cut+'&'+_fdChi2Cut
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBnoC/StrippingXb23ph.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBnoC/StrippingXb23ph.py
index 8067c7a6d01c2b569906174d551aad6998b32877..f09fc331bb17fe13ce14781f527fb8055987ec83 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBnoC/StrippingXb23ph.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBnoC/StrippingXb23ph.py
@@ -22,7 +22,6 @@ from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, DaVinci__N4Body
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection
-from Gaudi.Configuration import *
 __author__ = ['Jinlin Fu', 'Maurizio Martinelli', 'Andrea Merli']
 __date__ = '12/11/2015'
 __version__ = 'v1r0'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBnoC/StrippingXb2p3h.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBnoC/StrippingXb2p3h.py
index b2c3ad4b4899c94b787cce91c7fcdb640b88197d..19d8a03d1836fbec11592ab3c6a8c98aef3be41a 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBnoC/StrippingXb2p3h.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBnoC/StrippingXb2p3h.py
@@ -22,7 +22,6 @@ from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, DaVinci__N4Body
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection
-from Gaudi.Configuration import *
 __author__ = ['Jan Mickelle V. Maratas', 'Stephane Monteil', 'Andrea Merli']
 __date__ = '01/04/2016'
 __version__ = 'v1r0'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBnoC/StrippingXb2phh.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBnoC/StrippingXb2phh.py
index b19f47e926fd172852930b68a68b191c324a6bc5..8ab8cbe05188bf8bdb14e4a0f4f9d9e03b129e9a 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBnoC/StrippingXb2phh.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingBnoC/StrippingXb2phh.py
@@ -22,7 +22,6 @@ from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, DaVinci__N3Body
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection
-from Gaudi.Configuration import *
 __author__ = ['Jan Mickelle V. Maratas', 'Stephane Monteil', 'Thomas Latham']
 __date__ = '24/11/2016'
 __version__ = 'v1r0'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCalib/StrippingCharmFromBSemiForHadronAsy.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCalib/StrippingCharmFromBSemiForHadronAsy.py
index 7b207e6c145457c2c1cabcdea0c84d473e0a9929..f1542028672636e33782cbbc8d9c498b46dc82de 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCalib/StrippingCharmFromBSemiForHadronAsy.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCalib/StrippingCharmFromBSemiForHadronAsy.py
@@ -19,14 +19,12 @@ __author__ = ['Mika Vesterinen']
 __date__ = '10/03/2013'
 __version__ = '$Revision: 0.0 $'
 
-from Gaudi.Configuration import *
 
 from Configurables import FilterDesktop, CombineParticles
 from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from StandardParticles import StdAllLoosePions, StdLoosePions, StdLooseMuons, StdLooseKaons, StdLooseProtons
-from Configurables import TisTosParticleTagger
+from StandardParticles import StdLooseKaons, StdLooseMuons, StdLoosePions
 
 __all__ = ('CharmFromBSemiForHadronAsyAllLinesConf',
            'TOSFilter',
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCalib/StrippingCharmFromBSemiForProtonPID.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCalib/StrippingCharmFromBSemiForProtonPID.py
index 92af0a7a1eee98722cedfcfba8308f8eec1d876b..81115d7fe35ae7d0e1c7fb77acbfafb29da9fb93 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCalib/StrippingCharmFromBSemiForProtonPID.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCalib/StrippingCharmFromBSemiForProtonPID.py
@@ -18,12 +18,11 @@ __author__ = ['Mika Vesterinen']
 __date__ = '19/03/2013'
 __version__ = '$Revision: 0.0 $'
 
-from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from StandardParticles import StdLoosePions, StdLooseMuons, StdLooseKaons, StdLooseProtons, StdNoPIDsProtons
+from StandardParticles import StdLooseKaons, StdLooseMuons, StdLoosePions, StdNoPIDsProtons
 
 __all__ = ('CharmFromBSemiForProtonPIDAllLinesConf',
            'default_config')
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCalib/StrippingD02KPiPi0.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCalib/StrippingD02KPiPi0.py
index 162aeb0dd27f065b18aa50e6a38d07b76d96d0de..115a1c5c4bc1b7c5361bf0f30a9b9e21504af64d 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCalib/StrippingD02KPiPi0.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCalib/StrippingD02KPiPi0.py
@@ -25,9 +25,8 @@ __all__ = ('StrippingD02KPiPi0Conf',
            'makeD02KPiPi0M',
            'default_config')
 
-from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from PhysSelPython.Wrappers import Selection, DataOnDemand
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
+from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from StandardParticles import StdTightPions, StdTightKaons, StdLooseMergedPi0, StdLooseResolvedPi0
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCalib/StrippingD02KPiPi0DalitzPartReco.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCalib/StrippingD02KPiPi0DalitzPartReco.py
index 329adac1d867595f4a4003d27412fbb641ed7903..66aa89c6a3615c55878a174ff92567271c8c9ee8 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCalib/StrippingD02KPiPi0DalitzPartReco.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCalib/StrippingD02KPiPi0DalitzPartReco.py
@@ -8,9 +8,7 @@
 # granted to it by virtue of its status as an Intergovernmental Organization  #
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
-import logging
 from StrippingUtils.Utils import LineBuilder
-from Gaudi.Configuration import *
 __author__ = ['Greg Ciezarek', 'Liang Sun', 'Adam Davis']
 __date__ = '18/05/2017'
 __version__ = '$Revision: 0.01 $'
@@ -75,7 +73,6 @@ class D2KPiPi0_PartRecoBuilder(LineBuilder):
     def __init__(self, name, config):
         LineBuilder.__init__(self, name, config)
         self._config = config
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
 
         # self.GECs = { "Code":"( recSummaryTrack(LHCb.RecSummary.nLongTracks, TrLONG) < %(GEC_nLongTrk)s )" % config,
         #              "Preambulo": ["from LoKiTracks.decorators import *"]}
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCalib/StrippingD0ForBXX.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCalib/StrippingD0ForBXX.py
index 769c83ae0334fff286071b114aebff90455a172d..f24af2698a14718a337e2e7bc878ea42c6ec8be6 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCalib/StrippingD0ForBXX.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCalib/StrippingD0ForBXX.py
@@ -20,7 +20,7 @@ from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from StandardParticles import StdLoosePions, StdLooseKaons, StdLooseProtons, StdAllLoosePions
+from StandardParticles import StdAllLoosePions, StdLooseKaons, StdLoosePions
 
 
 name = 'confD0forBXX'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCalib/StrippingElectronID.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCalib/StrippingElectronID.py
index b9dfbf8674035ebbfe76393fcd267f95404e8221..c7400e8e63bf2c304fe5bc3da358064626dfb9c3 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCalib/StrippingElectronID.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCalib/StrippingElectronID.py
@@ -23,9 +23,8 @@ stream.appendLines( [
 
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand
+from PhysSelPython.Wrappers import Selection
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = ['Jibo He']
 __date__ = '03/10/2010'
 __version__ = '$Revision: 1.2 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCalib/StrippingJPsiForSL.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCalib/StrippingJPsiForSL.py
index 0901cc37bb50e4481e53abf0adae10028ec19d3b..8290b32fde2ed55d4087a0b25c4c5a16e3c4e373 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCalib/StrippingJPsiForSL.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCalib/StrippingJPsiForSL.py
@@ -20,11 +20,10 @@ __version__ = '$Revision: 0.1 $'
 
 from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from PhysSelPython.Wrappers import Selection, DataOnDemand
+from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from StandardParticles import StdLoosePions, StdLooseMuons, StdLooseKaons, StdLooseProtons, StdNoPIDsPions, StdNoPIDsMuons, StdLooseMergedPi0, StdLooseResolvedPi0, StdLooseElectrons, StdNoPIDsKaons
-from Configurables import TisTosParticleTagger
+from StandardParticles import StdNoPIDsKaons, StdNoPIDsMuons
 
 __all__ = ('JPsiForSLAllLinesConf',
            'confdict')
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCalib/StrippingLowPtMuID.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCalib/StrippingLowPtMuID.py
index 2c8d1c88b056a88fce019885c14c847b2dad2f35..b1034d405ac3978291097c410171c439e4a6b7af 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCalib/StrippingLowPtMuID.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCalib/StrippingLowPtMuID.py
@@ -19,12 +19,9 @@ largely cloned from line written by 'S.Furcas', 'G.Lanfranchi', 'M.Palutan', 'A.
 
 from StandardParticles import StdAllNoPIDsMuons
 from StrippingUtils.Utils import LineBuilder
-from Configurables import LoKi__Hybrid__CoreFactory as CoreFactory
-from Configurables import LoKi__VoidFilter as VoidFilter
-from PhysSelPython.Wrappers import DataOnDemand, Selection, SelectionSequence, MergedSelection
+from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 __author__ = ['G.Ciezarek', ]
 __date__ = '03/12/2015'
 __version__ = '$Revision: 1.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCalib/StrippingMuIDCalib.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCalib/StrippingMuIDCalib.py
index bc111971fba45936693ba7c559a0079e36daa071..e70ca9d5698c0590500879b3b9b7a2c886aaeebf 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCalib/StrippingMuIDCalib.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCalib/StrippingMuIDCalib.py
@@ -22,15 +22,12 @@ lb = builder( 'MuIDCalib', config_params )
 
 '''
 
-from StandardParticles import StdAllNoPIDsKaons, StdAllNoPIDsMuons, StdAllNoPIDsPions, StdAllNoPIDsProtons
+from StandardParticles import StdAllNoPIDsMuons
 from StandardParticles import StdNoPIDsKaons, StdNoPIDsMuons, StdNoPIDsPions, StdNoPIDsProtons
 from StrippingUtils.Utils import LineBuilder
-from Configurables import LoKi__Hybrid__CoreFactory as CoreFactory
-from Configurables import LoKi__VoidFilter as VoidFilter
-from PhysSelPython.Wrappers import DataOnDemand, Selection, SelectionSequence, MergedSelection
+from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 __author__ = ['S.Furcas', 'G.Lanfranchi',
               'M.Palutan', 'A.Sarti', 'D.Milanes', 'MuID Team']
 __date__ = '23/08/2011'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCalib/StrippingNoPIDDstarWithD02RSKPi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCalib/StrippingNoPIDDstarWithD02RSKPi.py
index 0c80077a3ee046c7f4e2450c335aa758b3e4a2eb..5b545751189fdfbd02d713c93bdbedcdd01a325a 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCalib/StrippingNoPIDDstarWithD02RSKPi.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCalib/StrippingNoPIDDstarWithD02RSKPi.py
@@ -13,10 +13,8 @@
 from StandardParticles import StdAllNoPIDsKaons, StdAllNoPIDsPions
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from LHCbKernel.Configuration import *
-from Gaudi.Configuration import *
+from PhysSelPython.Wrappers import Selection
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 __author__ = ['Philip Xing', 'Andrew Powell']
 __date__ = '23rd August 2012'
 __version__ = '$Revision: 7.0 $'
@@ -42,7 +40,7 @@ StrippingReport                                                INFO Event 100000
 __all__ = ('NoPIDDstarWithD02RSKPiConf', 'default_config')
 
 
-from GaudiKernel.SystemOfUnits import mm, cm, MeV, GeV
+from GaudiKernel.SystemOfUnits import GeV, MeV
 # from Configurables import FilterDesktop, CombineParticles
 
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCalib/StrippingPIDCalib.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCalib/StrippingPIDCalib.py
index 9fd00b35156af86a3c21a2b4c0fb4c11589535d9..ff38d7bcf8580fc0e5f6990b2151fc54c2e340f8 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCalib/StrippingPIDCalib.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCalib/StrippingPIDCalib.py
@@ -35,9 +35,7 @@ from Configurables import DaVinci__N3BodyDecays
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
 from Configurables import CombineParticles
-from Gaudi.Configuration import *
 __author__ = ['Lucio Anderlini']
 __date__ = '25/02/2015'
 __version__ = '$Revision: 1.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCalib/StrippingTrackEffD0ToKPi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCalib/StrippingTrackEffD0ToKPi.py
index 96a8666b55c13f9afe210c83a363c4c7302b3498..5afe8fb6611cf5f9d0ce219c46a4b418f0d70286 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCalib/StrippingTrackEffD0ToKPi.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCalib/StrippingTrackEffD0ToKPi.py
@@ -17,7 +17,7 @@ from Configurables import FilterDesktop, CombineParticles
 from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from StandardParticles import StdLooseKaons, StdLoosePions, StdAllLoosePions, StdAllNoPIDsPions
+from StandardParticles import StdAllLoosePions, StdLooseKaons, StdLoosePions
 from SelPy.utils import (UniquelyNamedObject,
                          ClonableObject,
                          SelectionBase)
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCalib/StrippingTrackEffDownMuon.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCalib/StrippingTrackEffDownMuon.py
old mode 100755
new mode 100644
index ff7ca8fc3482bfc030ade360db660d3bb3e5ae86..f0e488bfb1905fd6a46beef2ce82e133e8b836cb
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCalib/StrippingTrackEffDownMuon.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCalib/StrippingTrackEffDownMuon.py
@@ -43,34 +43,26 @@ __all__ = ('StrippingTrackEffDownMuonConf',
 # FIXME Write includes in a cleaner way
 from Gaudi.Configuration import *
 from LHCbKernel.Configuration import *
-from DAQSys.DecoderClass import Decoder
 from Configurables import GaudiSequencer
 from Configurables import UnpackTrack, ChargedProtoParticleMaker, DelegatingTrackSelector, TrackSelector, BestPIDParticleMaker
-from TrackFitter.ConfiguredFitters import ConfiguredFit
 from Configurables import TrackStateInitAlg
 from StrippingConf.StrippingLine import StrippingLine
-from Configurables import ChargedProtoParticleAddMuonInfo, MuonIDAlgLite
+from Configurables import ChargedProtoParticleAddMuonInfo
 from MuonID import ConfiguredMuonIDs
 from Configurables import ChargedProtoCombineDLLsAlg, ProtoParticleMUONFilter
-from PhysSelPython.Wrappers import Selection, DataOnDemand
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
+from PhysSelPython.Wrappers import Selection
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 
 from StrippingUtils.Utils import LineBuilder
-from Configurables import LoKi__VoidFilter
-from os import environ
 from Gaudi.Configuration import *
-import GaudiKernel.ProcessJobOptions
-from GaudiKernel.SystemOfUnits import mm
 
 from GaudiConfUtils.ConfigurableGenerators import TisTosParticleTagger
 from StandardParticles import StdAllLooseMuons
 from Configurables import GaudiSequencer
 from Configurables import TrackToDST
-from Configurables import TrackSys
 from Configurables import PatSeeding, PatSeedingTool, PatLongLivedTracking
-from PhysSelPython.Wrappers import AutomaticData
 # Get the fitters
-from TrackFitter.ConfiguredFitters import ConfiguredFit, ConfiguredFitSeed, ConfiguredFitDownstream
+from TrackFitter.ConfiguredFitters import ConfiguredFitDownstream
 from PatAlgorithms import PatAlgConf
 
 from SelPy.utils import (UniquelyNamedObject,
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCalib/StrippingTrackEffMuonTT.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCalib/StrippingTrackEffMuonTT.py
index 641201574c8f09bca329978057c4acc7969dd736..f27b71e4d680425be1de988e64d75b2686a0c282 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCalib/StrippingTrackEffMuonTT.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCalib/StrippingTrackEffMuonTT.py
@@ -62,11 +62,10 @@ __all__ = ('StrippingTrackEffMuonTTConf',
            'makeBJpsiKTrackEff',
            'filterHLT2ForBJpsiK')
 
-from Gaudi.Configuration import *
-from PhysSelPython.Wrappers import Selection, DataOnDemand, ChargedProtoParticleSelection
+from PhysSelPython.Wrappers import ChargedProtoParticleSelection, Selection
 from StrippingConf.StrippingLine import StrippingLine
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from StrippingUtils.Utils import LineBuilder, checkConfig
+from StrippingUtils.Utils import LineBuilder
 from StandardParticles import StdLooseKaons, StdLooseMuons, StdAllLooseMuons
 
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCalib/StrippingTrackEffVeloMuon.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCalib/StrippingTrackEffVeloMuon.py
old mode 100755
new mode 100644
index 9a14b8675059438ed88c4a5294e9f1bd31c001a1..10dd862824db4aa233d749f14173d33947ea2f17
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCalib/StrippingTrackEffVeloMuon.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCalib/StrippingTrackEffVeloMuon.py
@@ -40,30 +40,22 @@ __all__ = ('StrippingTrackEffVeloMuonConf',
            )
 
 
-from Gaudi.Configuration import *
-from LHCbKernel.Configuration import *
 from Configurables import CombineParticles
-from PhysSelPython.Wrappers import Selection, SelectionSequence, DataOnDemand
-from Configurables import ChargedProtoParticleMaker, NoPIDsParticleMaker, DataOnDemandSvc, DelegatingTrackSelector, TrackSelector, CombinedParticleMaker, BestPIDParticleMaker
+from PhysSelPython.Wrappers import Selection
+from Configurables import ChargedProtoParticleMaker, DataOnDemandSvc, DelegatingTrackSelector, NoPIDsParticleMaker, TrackSelector
 from Configurables import FastVeloTracking
 
 from StrippingConf.StrippingLine import StrippingLine
-from Configurables import TrackStateInitAlg, TrackEventFitter, TrackPrepareVelo, TrackContainerCopy, Tf__PatVeloSpaceTool, StandaloneMuonRec
-from Configurables import TrackCloneFinder
+from Configurables import StandaloneMuonRec, TrackPrepareVelo
 from StrippingUtils.Utils import LineBuilder
 from StandardParticles import StdLooseMuons
 
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, TisTosParticleTagger
 
 from Configurables import GaudiSequencer
-from Configurables import TrackSys
-from PhysSelPython.Wrappers import AutomaticData
 # Get the fitters
-from TrackFitter.ConfiguredFitters import ConfiguredFit
 
-from Configurables import TrackEventCloneKiller, VeloMuonBuilder
-from Configurables import TrackEventFitter, TrackMasterFitter
-from Configurables import TrackKalmanFilter, TrackMasterExtrapolator
+from Configurables import VeloMuonBuilder
 # from TrackFitter.ConfiguredFitters import ConfiguredFastFitter
 # from Configurables import TrackCloneFinder
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCharm/StrippingB2ppipiSigmacmm_Lcpi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCharm/StrippingB2ppipiSigmacmm_Lcpi.py
index 83239c94ced3a8a9d0eb6984bb527b872ec43a1c..6e136b7bac83e851400df8c22e3c067c7ec38db2 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCharm/StrippingB2ppipiSigmacmm_Lcpi.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCharm/StrippingB2ppipiSigmacmm_Lcpi.py
@@ -31,12 +31,11 @@ __all__ = ('StrippingB2ppipiSigmacmm_Lcpi_Conf', 'makepifromSigmacmm', 'makeThre
            )
 
 from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, ConjugateNeutralPID, DaVinci__N3BodyDecays
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N3BodyDecays, FilterDesktop
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
-from StrippingUtils.Utils import checkConfig, LineBuilder
+from StrippingUtils.Utils import LineBuilder
 from GaudiKernel.SystemOfUnits import MeV, GeV, mm
-from copy import copy
 
 name = 'StrippingB2ppipiSigmacmm_Lcpi'
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCharm/StrippingChargedHyperons.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCharm/StrippingChargedHyperons.py
index 5607b756d06c80cb7dfb1a025b910cad33bbee0b..6a46e95972bceac9d25ddf9b615334fb36577533 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCharm/StrippingChargedHyperons.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCharm/StrippingChargedHyperons.py
@@ -21,13 +21,9 @@ __version__ = '$Revision: 1.0 $'
 __all__ = ('StrippingChargedHyperonsConf', 'default_config')
 
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from StandardParticles import StdLoosePions, StdNoPIDsDownPions, StdLooseKaons, StdLooseDownKaons
-from StandardParticles import StdAllLoosePions, StdAllLooseKaons
 
 from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
-from PhysSelPython.Wrappers import MultiSelectionSequence
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from GaudiKernel.SystemOfUnits import MeV, mm, picosecond
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCharm/StrippingCharm2PPX.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCharm/StrippingCharm2PPX.py
index fefe1d3422c22f4f00fb68d64a79d8356a02d31b..802e8316c7219207b7d0df5943ad07eff3520be7 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCharm/StrippingCharm2PPX.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCharm/StrippingCharm2PPX.py
@@ -26,7 +26,7 @@ __all__ = (
     'StrippingCharm2PPXConf'  # ???
 )
 
-from GaudiKernel.SystemOfUnits import MeV, GeV, mm, mrad
+from GaudiKernel.SystemOfUnits import GeV, MeV, mm
 from Configurables import CombineParticles, FilterDesktop
 # from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop, DaVinci__N3BodyDecays
 from StandardParticles import (
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCharm/StrippingCharmForVub.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCharm/StrippingCharmForVub.py
index 96f3dd5c148c592b2c4d56028233c34a4d02b5fa..89ec6575ae96f2e1ea3add0e4f542acb5fc081cb 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCharm/StrippingCharmForVub.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCharm/StrippingCharmForVub.py
@@ -31,9 +31,8 @@ __all__ = ('CharmForVubConf',
            'makeDstarD02HMuNu')
 
 from Gaudi.Configuration import *
-from Configurables import SubstitutePID
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
+from PhysSelPython.Wrappers import MergedSelection, Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from StandardParticles import StdLooseMuons, StdLooseKaons, StdAllLoosePions, StdLoosePions
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCharm/StrippingD02KSKS.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCharm/StrippingD02KSKS.py
index cd0f357900e2fdf26f21aaf1aed7029b8265b59a..5c0183ffd6fe19db8a1cde097f2ca90273537cbe 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCharm/StrippingD02KSKS.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCharm/StrippingD02KSKS.py
@@ -25,9 +25,8 @@ __date__ = '15/05/2014'
 __version__ = 'Stripping23'
 __all__ = 'D02KSKSConf'
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
+from PhysSelPython.Wrappers import DataOnDemand, Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 
@@ -611,7 +610,7 @@ class D02KSKSConf(LineBuilder):
         _daughterCuts = "(TRGHOSTPROB <=%s )" % config['slowPi_LLL_TRGHOSTPROB']
 
         # 40
-        _vertexChi2_cut = "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_LL']
+        "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_LL']
 
         # 200
         _combCuts = "(ADAMASS('D*(2010)+') < %s*MeV)" % config['Dst_mass_LL']
@@ -648,7 +647,7 @@ class D02KSKSConf(LineBuilder):
         _daughterCuts = "(TRGHOSTPROB <=%s )" % config['slowPi_LLU_TRGHOSTPROB']
 
         # 40
-        _vertexChi2_cut = "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_LL']
+        "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_LL']
 
         # 200
         _combCuts = "(ADAMASS('D*(2010)+') < %s*MeV)" % config['Dst_mass_LL']
@@ -685,7 +684,7 @@ class D02KSKSConf(LineBuilder):
         _daughterCuts = "(TRGHOSTPROB <=%s )" % config['slowPi_LDL_TRGHOSTPROB']
 
         # 40
-        _vertexChi2_cut = "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_LD']
+        "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_LD']
 
         # 200
         _combCuts = "(ADAMASS('D*(2010)+') < %s*MeV)" % config['Dst_mass_LD']
@@ -722,7 +721,7 @@ class D02KSKSConf(LineBuilder):
         _daughterCuts = "(TRGHOSTPROB <=%s )" % config['slowPi_LDU_TRGHOSTPROB']
 
         # 40
-        _vertexChi2_cut = "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_LD']
+        "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_LD']
 
         # 200
         _combCuts = "(ADAMASS('D*(2010)+') < %s*MeV)" % config['Dst_mass_LD']
@@ -759,7 +758,7 @@ class D02KSKSConf(LineBuilder):
         _daughterCuts = "(TRGHOSTPROB <=%s )" % config['slowPi_DDL_TRGHOSTPROB']
 
         # 40
-        _vertexChi2_cut = "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_DD']
+        "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_DD']
 
         # 200
         _combCuts = "(ADAMASS('D*(2010)+') < %s*MeV)" % config['Dst_mass_DD']
@@ -796,7 +795,7 @@ class D02KSKSConf(LineBuilder):
         _daughterCuts = "(TRGHOSTPROB <=%s )" % config['slowPi_DDU_TRGHOSTPROB']
 
         # 40
-        _vertexChi2_cut = "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_DD']
+        "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_DD']
 
         # 200
         _combCuts = "(ADAMASS('D*(2010)+') < %s*MeV)" % config['Dst_mass_DD']
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCharm/StrippingD2HHHKs.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCharm/StrippingD2HHHKs.py
index 9a861cb097ab87e3083a67ea9248943b3612da2c..b60a33fa55c9b6da278721f3014e7d306e05d771 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCharm/StrippingD2HHHKs.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCharm/StrippingD2HHHKs.py
@@ -22,19 +22,18 @@ __version__ = '$Revision: 0.1 $'
 __all__ = ('D2HHHKsLines',
            'default_config')
 
-from Gaudi.Configuration import *
 
-from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N4BodyDecays
+from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays
 from StandardParticles import StdNoPIDsPions, StdNoPIDsKaons
 from StandardParticles import StdLooseKsDD, StdLooseKsLL
 
 from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
-from StrippingUtils.Utils import LineBuilder, checkConfig
+from StrippingUtils.Utils import LineBuilder
 
 from Configurables import FilterDesktop
 
-from GaudiKernel.SystemOfUnits import GeV, MeV, picosecond, mm
+from GaudiKernel.SystemOfUnits import MeV, mm, picosecond
 
 
 default_config = {
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCharm/StrippingD2HHHPi0.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCharm/StrippingD2HHHPi0.py
index ed8648686363780edfce58bff954cdeb421f24b8..f006ce35a79955f71a0723f3ae1a483b3b33069a 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCharm/StrippingD2HHHPi0.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCharm/StrippingD2HHHPi0.py
@@ -22,19 +22,18 @@ __version__ = '$Revision: 0.1 $'
 __all__ = ('D2HHHPi0Lines',
            'default_config')
 
-from Gaudi.Configuration import *
 
-from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N4BodyDecays
+from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays
 from StandardParticles import StdNoPIDsPions, StdNoPIDsKaons
 from StandardParticles import StdLooseResolvedPi0, StdLooseMergedPi0
 
 from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
-from StrippingUtils.Utils import LineBuilder, checkConfig
+from StrippingUtils.Utils import LineBuilder
 
 from Configurables import FilterDesktop
 
-from GaudiKernel.SystemOfUnits import GeV, MeV, picosecond, mm
+from GaudiKernel.SystemOfUnits import GeV, MeV, picosecond
 
 
 default_config = {
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCharm/StrippingD2HMuNu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCharm/StrippingD2HMuNu.py
index 5f50a64468770bc59fdc136644a3e2419eded047..b7803b39122404b43cceb17df7e5b251913c3ff6 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCharm/StrippingD2HMuNu.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCharm/StrippingD2HMuNu.py
@@ -9,9 +9,7 @@
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
 
-import logging
 from StrippingUtils.Utils import LineBuilder
-from Gaudi.Configuration import *
 __author__ = ['Liang Sun', 'Adam Davis']
 __date__ = '09/11/2015'
 __version__ = '$Revision: 0.01 $'
@@ -98,7 +96,6 @@ class D2HLepNuBuilder(LineBuilder):
     def __init__(self, name, config):
         LineBuilder.__init__(self, name, config)
         self._config = config
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
 
         self.GECs = {"Code": "( recSummaryTrack(LHCb.RecSummary.nLongTracks, TrLONG) < %(GEC_nLongTrk)s )" % config,
                      "Preambulo": ["from LoKiTracks.decorators import *"]}
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCharm/StrippingD2KS0H_conf.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCharm/StrippingD2KS0H_conf.py
index 61aa4a7c39883854dbb03015f117de36e9d8489b..99e1b1032f2a671266146c036cade2c5eea7d4b8 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCharm/StrippingD2KS0H_conf.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCharm/StrippingD2KS0H_conf.py
@@ -44,9 +44,9 @@ from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticle
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StandardParticles import StdLoosePions, StdLooseKaons
 from StrippingConf.StrippingLine import StrippingLine
-from StrippingUtils.Utils import LineBuilder, checkConfig
+from StrippingUtils.Utils import LineBuilder
 from Configurables import TisTosParticleTagger
-from GaudiKernel.SystemOfUnits import GeV, MeV, picosecond, mm
+from GaudiKernel.SystemOfUnits import MeV, mm, picosecond
 
 default_name = 'D2KS0H'
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCharm/StrippingD2PiPi0.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCharm/StrippingD2PiPi0.py
index 3b0409acbbfd03b6273526bd0fcdb67d1c80616c..0b95d641540e601a41a5bbdcaefb88ee6985f3a3 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCharm/StrippingD2PiPi0.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCharm/StrippingD2PiPi0.py
@@ -33,7 +33,7 @@ __all__ = (
 
 )
 
-from GaudiKernel.SystemOfUnits import MeV, GeV, mrad, picosecond
+from GaudiKernel.SystemOfUnits import MeV, picosecond
 
 from StandardParticles import (
     StdAllNoPIDsKaons,
@@ -51,7 +51,7 @@ from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 
 # from Configurables import CombineParticles, FilterDesktop
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, ConjugateNeutralPID, DaVinci__N3BodyDecays
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N3BodyDecays
 
 default_config = {
     'D2Pi0H': {
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCharm/StrippingD2XMuMuSS.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCharm/StrippingD2XMuMuSS.py
index 63052973a0d26de1b430874492a8932ac9f35ca5..d25cc78a559d20061372c19afc0a60d1d662980a 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCharm/StrippingD2XMuMuSS.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCharm/StrippingD2XMuMuSS.py
@@ -9,14 +9,13 @@
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
 
-from StandardParticles import StdAllLooseElectrons, StdAllNoPIDsElectrons
+from StandardParticles import StdAllLooseElectrons
 from StandardParticles import StdAllLooseKaons, StdAllLoosePions, StdAllLooseMuons, StdAllNoPIDsPions, StdAllNoPIDsKaons
-from StandardParticles import StdLooseKaons, StdLoosePions, StdLooseMuons, StdNoPIDsPions, StdNoPIDsKaons, StdLooseProtons, StdAllNoPIDsProtons
+from StandardParticles import StdAllNoPIDsProtons, StdLooseKaons, StdLooseMuons, StdLoosePions, StdLooseProtons
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, OfflineVertexFitter
-from Gaudi.Configuration import *
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop
 import copy
 __author__ = ['Malcolm John', 'B. Viaud', 'O. Kochebina']
 __date__ = '25/6/2012'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCharm/StrippingD2hh.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCharm/StrippingD2hh.py
index 04f7a2eaa894bfd8dee3118acc2d9051ddc23f06..132e325c858cd552d79410e5e81d7f9a35dee470 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCharm/StrippingD2hh.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCharm/StrippingD2hh.py
@@ -24,7 +24,6 @@ __all__ = ('D2hhBuilder',
 '''
 This file contains stripping lines for time-dependent two-body charm analyses of mixing, yCP, and A_Gamma
 '''
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
@@ -185,7 +184,7 @@ class D2hhBuilder(LineBuilder):
         stdNoPIDsPions = StdAllNoPIDsPions
 
         d2kpi_name = name+'PromptD2KPi'
-        d0RS_name = name+'PromptD0RS'
+        name+'PromptD0RS'
         d0WS_name = name+'PromptD0WS'
         d2kk_name = name+'PromptD2KK'
         d2pipi_name = name+'PromptD2PiPi'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCharm/StrippingD2hhh_FTcalib.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCharm/StrippingD2hhh_FTcalib.py
index ca556fcd061283943c85050142dc1fed957ecac9..92b63ab8b8227f8c599d9d0f7cb9e45c01f9045d 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCharm/StrippingD2hhh_FTcalib.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCharm/StrippingD2hhh_FTcalib.py
@@ -29,13 +29,10 @@ __version__ = '$Revision: 0.0 $'
 __all__ = ('D2hhhFTCalibConf',
            'makeStdD2hhhFT')
 
-from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
+from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from StandardParticles import (StdNoPIDsPions,
-                               StdTightKaons)
 
 name = "D2hhhFTCalib"
 # Cuts to be implemented vy the Stripping team in Stripping Settings
@@ -267,7 +264,6 @@ def globalEventCutFilter(name,
     if MaxTrSIZE == None:
         return None
 
-    from Configurables import LoKi__VoidFilter as VoidFilter
     from Configurables import LoKi__Hybrid__CoreFactory as CoreFactory
     modules = CoreFactory('CoreFactory').Modules
     for i in ['LoKiTracks.decorators']:
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCharm/StrippingD2hhh_conf.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCharm/StrippingD2hhh_conf.py
index 4edfcbbf716005d89bb67e23f49675568d265d87..2b5bbdd7a698b23b875296f72fd7238fedbf32cf 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCharm/StrippingD2hhh_conf.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCharm/StrippingD2hhh_conf.py
@@ -38,8 +38,7 @@ from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticle
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from StandardParticles import (StdNoPIDsPions,
-                               StdTightKaons)
+from StandardParticles import StdNoPIDsPions
 
 name = "D2hhh"
 # Cuts to be implemented vy the Stripping team in Stripping Settings
@@ -755,7 +754,6 @@ def globalEventCutFilter(name,
     if MaxTrSIZE == None:
         return None
 
-    from Configurables import LoKi__VoidFilter as VoidFilter
     from Configurables import LoKi__Hybrid__CoreFactory as CoreFactory
     modules = CoreFactory('CoreFactory').Modules
     for i in ['LoKiTracks.decorators']:
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCharm/StrippingDstarD02xx.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCharm/StrippingDstarD02xx.py
index d6432a15ead58ad1d9a1a2025b9183e69ba4b5c5..31c1f92b10774f78337efc200c2dd331c386037b 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCharm/StrippingDstarD02xx.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCharm/StrippingDstarD02xx.py
@@ -22,8 +22,7 @@ __all__ = ('StrippingDstarD02xxConf', 'combinetwobody', 'combineDstar', 'default
             where xx = {mu mu, pi pi, pi mu, k mu, ... }
             
 '''
-from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCharm/StrippingDstarD0ToHHPi0.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCharm/StrippingDstarD0ToHHPi0.py
index bf75d26a702888468823abf0528c496c6fdb49d4..0fc805cafbcf5b5c715add7f71c675ce9f033aef 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCharm/StrippingDstarD0ToHHPi0.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCharm/StrippingDstarD0ToHHPi0.py
@@ -17,13 +17,11 @@ Module for D* tagged D0 -> hhpi0.
 Supersedes StrippingDstarD2hhpi0
 """
 
-from Gaudi.Configuration import *
 from Configurables import FilterDesktop, CombineParticles, OfflineVertexFitter
 from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from StandardParticles import StdAllLoosePions, StdLoosePions, StdLooseKaons, StdLooseResolvedPi0, StdLooseMergedPi0
-from Configurables import TisTosParticleTagger
 
 __all__ = ('DstarD0ToHHPi0AllLinesBuilder',
            'DstarMaker',
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCharm/StrippingDstarD2HHHH.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCharm/StrippingDstarD2HHHH.py
index 6ca6b394d1c16026937764f0eafb79c38aeb20a7..b1010c3cddbd19de46d0a5cb069929253effde94 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCharm/StrippingDstarD2HHHH.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCharm/StrippingDstarD2HHHH.py
@@ -22,16 +22,15 @@ __version__ = '$Revision: 1.0 $'
 __all__ = ('DstarD2HHHHLines',
            'default_config')
 
-from Gaudi.Configuration import *
 
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N4BodyDecays
 from StandardParticles import StdAllNoPIDsPions, StdNoPIDsPions, StdNoPIDsKaons
 
 from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
-from StrippingUtils.Utils import LineBuilder, checkConfig
+from StrippingUtils.Utils import LineBuilder
 
-from GaudiKernel.SystemOfUnits import GeV, MeV, picosecond, mm
+from GaudiKernel.SystemOfUnits import MeV, picosecond
 
 
 default_config = {
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCharm/StrippingDstarD2KSHHPi0.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCharm/StrippingDstarD2KSHHPi0.py
index 8004878d3118c47bcc681e5d6833f67148ea14fd..d717afb5cf44dedfbb8910ab49da26f35af6e033 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCharm/StrippingDstarD2KSHHPi0.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCharm/StrippingDstarD2KSHHPi0.py
@@ -22,18 +22,17 @@ __version__ = '$Revision: 1.0 $'
 __all__ = ('DstarD2KSHHPi0Lines',
            'default_config')
 
-from Gaudi.Configuration import *
 
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N4BodyDecays
 from StandardParticles import StdAllNoPIDsPions, StdNoPIDsPions, StdNoPIDsKaons, StdLooseResolvedPi0, StdLooseMergedPi0, StdLooseKsDD, StdLooseKsLL
 
 from PhysSelPython.Wrappers import Selection, MergedSelection
 from StrippingConf.StrippingLine import StrippingLine
-from StrippingUtils.Utils import LineBuilder, checkConfig
+from StrippingUtils.Utils import LineBuilder
 
 from Configurables import FilterDesktop
 
-from GaudiKernel.SystemOfUnits import GeV, MeV, picosecond, mm
+from GaudiKernel.SystemOfUnits import MeV, mm, picosecond
 
 
 default_config = {
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCharm/StrippingDstarD2KShh.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCharm/StrippingDstarD2KShh.py
index 930ba6dd1a176d45dd81cb76e4d7d90061657804..5c17fdff8e562e58b20339beef4f7dde0bf73e6d 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCharm/StrippingDstarD2KShh.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCharm/StrippingDstarD2KShh.py
@@ -34,7 +34,6 @@ __all__ = ('DstarD2KShhBuilder',
            'makeD2KShh',
            'makeDstar')
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCharm/StrippingDstarD2XGamma.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCharm/StrippingDstarD2XGamma.py
index 0b8f07c8e92fd36f253c008c58709f4b5a775f55..a162a42f57ebc8bd021e3048ba2760b0fac3ceba 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCharm/StrippingDstarD2XGamma.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCharm/StrippingDstarD2XGamma.py
@@ -24,7 +24,6 @@ __version__ = '$Revision: 0.1 $'
 __all__ = ('DstarD2XGammaLines',
            'default_config')
 
-from Gaudi.Configuration import *
 
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 from StandardParticles import StdAllNoPIDsPions, StdNoPIDsPions, StdNoPIDsKaons
@@ -32,11 +31,11 @@ from StandardParticles import StdLooseAllPhotons, StdAllLooseGammaLL, StdAllLoos
 
 from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
-from StrippingUtils.Utils import LineBuilder, checkConfig
+from StrippingUtils.Utils import LineBuilder
 
 from Configurables import FilterDesktop
 
-from GaudiKernel.SystemOfUnits import GeV, MeV, picosecond, mm
+from GaudiKernel.SystemOfUnits import GeV, MeV, picosecond
 
 default_config = {
     'NAME': 'DstarD2XGamma',
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCharm/StrippingDstarPromptWithD02HHHH.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCharm/StrippingDstarPromptWithD02HHHH.py
index ee13ea7feaf67160f5cd257bb530e6362de4b20a..5e817ce46cbfcdae8fed23c2c49713bf361e45aa 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCharm/StrippingDstarPromptWithD02HHHH.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCharm/StrippingDstarPromptWithD02HHHH.py
@@ -36,11 +36,10 @@ __version__ = '$Revision: 1.2 $'
 __all__ = ('DstarPromptWithD02HHHHConf', 'makeD02hhhh',
            'makePromptDstar', 'default_config')
 
-from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, ConjugateNeutralPID
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles, ConjugateNeutralPID
 from PhysSelPython.Wrappers import Selection, MergedSelection
 from StrippingConf.StrippingLine import StrippingLine
-from StrippingUtils.Utils import checkConfig, LineBuilder
+from StrippingUtils.Utils import LineBuilder
 from GaudiKernel.SystemOfUnits import MeV, GeV, mm
 from copy import copy
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCharm/StrippingDstarPromptWithD02HHMuMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCharm/StrippingDstarPromptWithD02HHMuMu.py
index a131e40e3acb189497c6e36da19841fbfbb4c7b1..7a1541f08f9d8fb4eec57f34b0aa5aea862483cc 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCharm/StrippingDstarPromptWithD02HHMuMu.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCharm/StrippingDstarPromptWithD02HHMuMu.py
@@ -29,11 +29,10 @@ __version__ = '$Revision: 2.0 $'
 __all__ = ('DstarPromptWithD02HHLLConf', 'makeD02hhll',
            'makePromptDstar', 'default_config')
 
-from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, ConjugateNeutralPID
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles, ConjugateNeutralPID
 from PhysSelPython.Wrappers import Selection, MergedSelection
 from StrippingConf.StrippingLine import StrippingLine
-from StrippingUtils.Utils import checkConfig, LineBuilder
+from StrippingUtils.Utils import LineBuilder
 from GaudiKernel.SystemOfUnits import MeV, GeV, mm
 from copy import copy
 
@@ -224,7 +223,6 @@ def makeD02hhll(
         _pionCuts = _pionCutsOLD + " & " + _ghostCut
         _eleCuts = _eleCutsOLD + " & " + _ghostCut
 
-    from StandardParticles import StdAllNoPIDsPions, StdAllNoPIDsKaons
     from StandardParticles import StdAllLoosePions, StdAllLooseKaons, StdAllLooseMuons
     from StandardParticles import StdAllLooseElectrons
     from StandardParticles import StdAllLooseMuPion
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCharm/StrippingExcitedDsSpectroscopy.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCharm/StrippingExcitedDsSpectroscopy.py
index 71165c716e1550d38801bcd5e537a3bbd27bac81..e210c6918c5485d5d7207bd970781eae8cce82f3 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCharm/StrippingExcitedDsSpectroscopy.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCharm/StrippingExcitedDsSpectroscopy.py
@@ -347,7 +347,6 @@ def globalEventCutFilter(name,
     if MaxTrSIZE == None:
         return None
 
-    from Configurables import LoKi__VoidFilter as VoidFilter
     from Configurables import LoKi__Hybrid__CoreFactory as CoreFactory
     modules = CoreFactory('CoreFactory').Modules
     for i in ['LoKiTracks.decorators']:
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCharm/StrippingLambdac2V03H.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCharm/StrippingLambdac2V03H.py
index d82de0a68b56a1830913cbe7af0afa398aea8f89..30b54539913afb80a16ee9630ae6091f7bc0971f 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCharm/StrippingLambdac2V03H.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCharm/StrippingLambdac2V03H.py
@@ -27,7 +27,7 @@ __all__ = (
 )
 
 from GaudiKernel.SystemOfUnits import MeV, GeV, mm, mrad
-from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop, DaVinci__N4BodyDecays
+from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays, FilterDesktop
 from StandardParticles import StdNoPIDsPions as InputPions
 from StandardParticles import StdNoPIDsKaons as InputKaons
 from StandardParticles import StdLooseLambdaLL as InputLambdasLL
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCharm/StrippingLc2L0LLpi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCharm/StrippingLc2L0LLpi.py
index 857d348c56722f0dadec5fba5036030325eb54dc..ec6a5705483856be3073dbe9b17c2c7d86bc6019 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCharm/StrippingLc2L0LLpi.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCharm/StrippingLc2L0LLpi.py
@@ -12,17 +12,10 @@
 Module for selecting Lambda_c+->Lambda pi+
 '''
 
-from StandardParticles import (StdAllLoosePions, StdLooseProtons,
-                               StdLoosePions, StdNoPIDsUpPions)
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from StandardParticles import StdLooseAllPhotons, StdVeryLooseAllPhotons
-from Configurables import LoKi__VoidFilter
-from PhysSelPython.Wrappers import MergedSelection
-from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
-from Gaudi.Configuration import *
 __author__ = ['Guiyun Ding', 'Jiesheng Yu', 'Yuehong Xie']
 __date__ = '28/11/2016'
 __version__ = '$Revision: 2.0$'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCharm/StrippingNeutralCBaryons.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCharm/StrippingNeutralCBaryons.py
index fa3250a83bd48196f87981d9d429c63cbcb63404..327a500122ff512fe20087317ec9bf1b9e3b7d5c 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCharm/StrippingNeutralCBaryons.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCharm/StrippingNeutralCBaryons.py
@@ -23,13 +23,9 @@ __version__ = '$Revision: 1.0 $'
 __all__ = ('StrippingNeutralCBaryonsConf', 'default_config')
 
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from StandardParticles import StdLoosePions, StdNoPIDsDownPions, StdLooseKaons, StdLooseDownKaons
-from StandardParticles import StdAllLoosePions, StdAllLooseKaons
 
 from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
-from PhysSelPython.Wrappers import MultiSelectionSequence
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from GaudiKernel.SystemOfUnits import MeV, mm, picosecond
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCharm/StrippingXic2HHH.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCharm/StrippingXic2HHH.py
index 4c7a528734f03b3247c265b29afbb06249a8e8df..ec6e744b6d3279f53da71850a50e53835d882fb2 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCharm/StrippingXic2HHH.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCharm/StrippingXic2HHH.py
@@ -8,18 +8,15 @@
 # granted to it by virtue of its status as an Intergovernmental Organization  #
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
-from StandardParticles import StdNoPIDsPions, StdNoPIDsKaons, StdNoPIDsProtons, StdAllNoPIDsProtons
-from Configurables import TisTosParticleTagger
+from StandardParticles import StdNoPIDsKaons, StdNoPIDsPions, StdNoPIDsProtons
 from StrippingUtils.Utils import LineBuilder
-from PhysSelPython.Wrappers import MultiSelectionSequence
-from PhysSelPython.Wrappers import Selection, DataOnDemand, AutomaticData, MergedSelection
+from PhysSelPython.Wrappers import DataOnDemand, MergedSelection, Selection
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
 from Configurables import FilterDesktop, CombineParticles
 from LHCbKernel.Configuration import *
-from GaudiKernel.SystemOfUnits import MeV, mm, ns
+from GaudiKernel.SystemOfUnits import MeV, mm
 from StrippingConf.StrippingLine import StrippingLine
 from Gaudi.Configuration import *
-import re
 all
 ''' Xic+ and Theta+ lines Designed by Yury Shcheglov, Alexey Dzyuba, Nelya Sagidova to study Xic+ and Theta+ particles '''
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCharm/StrippingXicc.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCharm/StrippingXicc.py
index 5d7a3369f392194d8c7a89132a8949ced1fbb74c..b7f50de193148881a67e0e6e9149cb5806d7efdf 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCharm/StrippingXicc.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingCharm/StrippingXicc.py
@@ -52,9 +52,6 @@ from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticle
 from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from StandardParticles import StdAllLoosePions, StdAllLooseKaons, StdAllLooseProtons
-from StandardParticles import StdLoosePions
-from CommonParticles.StdLooseLambda import StdLooseLambdaLL, StdLooseLambdaDD
 from GaudiKernel.SystemOfUnits import MeV, GeV, mm
 from Configurables import TisTosParticleTagger
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingIFT/StrippingHeavyIonD02KPiPi0.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingIFT/StrippingHeavyIonD02KPiPi0.py
index f59616873d32a3880ffa9c3cddc8ffdf12e8c49c..38d1f1cf011fb226ff77746240f5265193af1874 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingIFT/StrippingHeavyIonD02KPiPi0.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingIFT/StrippingHeavyIonD02KPiPi0.py
@@ -25,9 +25,8 @@ __all__ = ('StrippingHeavyIonD02KPiPi0Conf',
            'makeD02KPiPi0M',
            'default_config')
 
-from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from PhysSelPython.Wrappers import Selection, DataOnDemand
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
+from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from StandardParticles import StdTightPions, StdTightKaons, StdLooseMergedPi0, StdLooseResolvedPi0
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingIFT/StrippingHeavyIonDiMuon.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingIFT/StrippingHeavyIonDiMuon.py
index 460d53ed661a4cbb19f6ba5f4df6da5367efe9a7..ed6a09c84d936008a57938c9fdf6ae6eaba72d49 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingIFT/StrippingHeavyIonDiMuon.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingIFT/StrippingHeavyIonDiMuon.py
@@ -17,8 +17,7 @@ from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 from StandardParticles import StdAllLooseMuons
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand
-from Gaudi.Configuration import *
+from PhysSelPython.Wrappers import Selection
 __author__ = ['Emilie MAURICE']
 __date__ = ''
 __version__ = '$Revision: 2.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingIFT/StrippingHeavyIonDst2D0KPiForPID.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingIFT/StrippingHeavyIonDst2D0KPiForPID.py
index f65a077827fa72aa474ee1992539974419ddc652..2a6ac3e4930d2f3b5e6f9750ace051db2604f1f7 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingIFT/StrippingHeavyIonDst2D0KPiForPID.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingIFT/StrippingHeavyIonDst2D0KPiForPID.py
@@ -13,10 +13,8 @@
 from StandardParticles import StdAllNoPIDsKaons, StdAllNoPIDsPions
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from LHCbKernel.Configuration import *
-from Gaudi.Configuration import *
+from PhysSelPython.Wrappers import Selection
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 __author__ = ['Philip Xing', 'Andrew Powell']
 __date__ = '23rd August 2012'
 __version__ = '$Revision: 7.0 $'
@@ -36,7 +34,7 @@ Usage:
 __all__ = ('HeavyIonDst2D0KPiForPIDConf', 'default_config', "D0", "Dstar")
 
 
-from GaudiKernel.SystemOfUnits import mm, cm, MeV, GeV
+from GaudiKernel.SystemOfUnits import GeV, MeV
 # from Configurables import FilterDesktop, CombineParticles
 
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingIFT/StrippingHeavyIonOthercc.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingIFT/StrippingHeavyIonOthercc.py
index a915f213306583c9349e52ae26fdfb5bcbfb2cb7..64496a63a9e2dbb8187a1999a7546349858ef1cb 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingIFT/StrippingHeavyIonOthercc.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingIFT/StrippingHeavyIonOthercc.py
@@ -17,8 +17,7 @@ from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 from StandardParticles import StdNoPIDsElectrons, StdLooseProtons, StdLooseMuons
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand
-from Gaudi.Configuration import *
+from PhysSelPython.Wrappers import Selection
 __author__ = ['Emilie MAURICE']
 __date__ = ''
 __version__ = '$Revision: 1.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingIFT/StrippingHeavyIonPIDCalib.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingIFT/StrippingHeavyIonPIDCalib.py
index 16e2016d65284b12a6b6bbf80b59e400b0f28026..376c9f63f6ebba144c1c1a520bb2b065b591f9ac 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingIFT/StrippingHeavyIonPIDCalib.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingIFT/StrippingHeavyIonPIDCalib.py
@@ -37,7 +37,6 @@ from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
 from Gaudi.Configuration import *
 __author__ = ['Yanxi ZHANG']
 __date__ = '25/02/2015'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingIFT/StrippingHeavyIonTopology.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingIFT/StrippingHeavyIonTopology.py
index 79d11a44e025c9bd6fd0440e31ec56793e1086aa..5184102da8f1fda29beeb97e2770d1fc421f79cd 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingIFT/StrippingHeavyIonTopology.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingIFT/StrippingHeavyIonTopology.py
@@ -12,14 +12,9 @@
 Module for selecting specific topology
 '''
 
-from Configurables import FilterDesktop, CombineParticles
-from LoKiPhys.functions import SOURCE
-from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-from StandardParticles import StdAllLooseMuons, StdAllLoosePions, StdAllNoPIDsPions, StdLoosePhotons
+from Configurables import FilterDesktop
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand
-from Gaudi.Configuration import *
 __author__ = ['Emilie MAURICE']
 __date__ = ''
 __version__ = '$Revision: 1.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingIFT/StrippingHeavyIonTrackEffDownMuon.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingIFT/StrippingHeavyIonTrackEffDownMuon.py
index 220458ec477e1fc9756faa3bd5cbde833396b59c..36e8b7fd4e9f57816f69503d89a5147ddeb2d6fe 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingIFT/StrippingHeavyIonTrackEffDownMuon.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingIFT/StrippingHeavyIonTrackEffDownMuon.py
@@ -43,34 +43,26 @@ __all__ = ('StrippingHeavyIonTrackEffDownMuonConf',
 # FIXME Write includes in a cleaner way
 from Gaudi.Configuration import *
 from LHCbKernel.Configuration import *
-from DAQSys.DecoderClass import Decoder
 from Configurables import GaudiSequencer
 from Configurables import UnpackTrack, ChargedProtoParticleMaker, DelegatingTrackSelector, TrackSelector, BestPIDParticleMaker
-from TrackFitter.ConfiguredFitters import ConfiguredFit
 from Configurables import TrackStateInitAlg
 from StrippingConf.StrippingLine import StrippingLine
-from Configurables import ChargedProtoParticleAddMuonInfo, MuonIDAlgLite
+from Configurables import ChargedProtoParticleAddMuonInfo
 from MuonID import ConfiguredMuonIDs
 from Configurables import ChargedProtoCombineDLLsAlg, ProtoParticleMUONFilter
-from PhysSelPython.Wrappers import Selection, DataOnDemand
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
+from PhysSelPython.Wrappers import Selection
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 
 from StrippingUtils.Utils import LineBuilder
-from Configurables import LoKi__VoidFilter
-from os import environ
 from Gaudi.Configuration import *
-import GaudiKernel.ProcessJobOptions
-from GaudiKernel.SystemOfUnits import mm
 
 from GaudiConfUtils.ConfigurableGenerators import TisTosParticleTagger
 from StandardParticles import StdAllLooseMuons
 from Configurables import GaudiSequencer
 from Configurables import TrackToDST
-from Configurables import TrackSys
 from Configurables import PatSeeding, PatSeedingTool, PatLongLivedTracking
-from PhysSelPython.Wrappers import AutomaticData
 # Get the fitters
-from TrackFitter.ConfiguredFitters import ConfiguredFit, ConfiguredFitSeed, ConfiguredFitDownstream
+from TrackFitter.ConfiguredFitters import ConfiguredFitDownstream
 from PatAlgorithms import PatAlgConf
 
 from SelPy.utils import (UniquelyNamedObject,
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingIFT/StrippingHeavyIonTrackEffMuonTT.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingIFT/StrippingHeavyIonTrackEffMuonTT.py
index f3265719480a8b9ebb82b699ff56a72d7b2d31f7..3a9bfbd3eea50316ec227009b566f0e9e503caff 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingIFT/StrippingHeavyIonTrackEffMuonTT.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingIFT/StrippingHeavyIonTrackEffMuonTT.py
@@ -63,10 +63,10 @@ __all__ = ('StrippingHeavyionTrackEffMuonTTConf',
            'filterHLT2ForBJpsiK')
 
 from Gaudi.Configuration import *
-from PhysSelPython.Wrappers import Selection, DataOnDemand, ChargedProtoParticleSelection
+from PhysSelPython.Wrappers import ChargedProtoParticleSelection, Selection
 from StrippingConf.StrippingLine import StrippingLine
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from StrippingUtils.Utils import LineBuilder, checkConfig
+from StrippingUtils.Utils import LineBuilder
 from StandardParticles import StdLooseKaons, StdLooseMuons, StdAllLooseMuons
 
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingIFT/StrippingHeavyIonTrackEffVeloMuon.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingIFT/StrippingHeavyIonTrackEffVeloMuon.py
index 1a80cc9576021cda493765e0b79d92240270118f..c633585164030668df014f73204e61d2b9ef83e5 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingIFT/StrippingHeavyIonTrackEffVeloMuon.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingIFT/StrippingHeavyIonTrackEffVeloMuon.py
@@ -40,17 +40,14 @@ __all__ = ('HeavyIonTrackEffVeloMuonConf',
            )
 
 
-from Gaudi.Configuration import *
-from LHCbKernel.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 # from Configurables import CombineParticles
-from PhysSelPython.Wrappers import Selection, SelectionSequence, DataOnDemand
-from Configurables import ChargedProtoParticleMaker, NoPIDsParticleMaker, DataOnDemandSvc, DelegatingTrackSelector, TrackSelector, CombinedParticleMaker, BestPIDParticleMaker
+from PhysSelPython.Wrappers import Selection
+from Configurables import ChargedProtoParticleMaker, DataOnDemandSvc, DelegatingTrackSelector, NoPIDsParticleMaker, TrackSelector
 from Configurables import FastVeloTracking
 
 from StrippingConf.StrippingLine import StrippingLine
-from Configurables import TrackStateInitAlg, TrackEventFitter, TrackPrepareVelo, TrackContainerCopy, Tf__PatVeloSpaceTool, StandaloneMuonRec
-from Configurables import TrackCloneFinder
+from Configurables import StandaloneMuonRec, TrackPrepareVelo
 from StrippingUtils.Utils import LineBuilder
 # changed from StdLooseMuons, yanxi
 from StandardParticles import StdAllLooseMuons
@@ -59,14 +56,9 @@ from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, TisTosParticleT
 # from Configurables import TisTosParticleTagger
 
 from Configurables import GaudiSequencer
-from Configurables import TrackSys
-from PhysSelPython.Wrappers import AutomaticData
 # Get the fitters
-from TrackFitter.ConfiguredFitters import ConfiguredFit
 
-from Configurables import TrackEventCloneKiller, VeloMuonBuilder
-from Configurables import TrackEventFitter, TrackMasterFitter
-from Configurables import TrackKalmanFilter, TrackMasterExtrapolator
+from Configurables import VeloMuonBuilder
 # from TrackFitter.ConfiguredFitters import ConfiguredFastFitter
 # from Configurables import TrackCloneFinder
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingIFT/__init__.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingIFT/__init__.py
index 2e29d89a48b44d358090626c292d15edbee0ca54..ed393ad5206e05472519a2b3f9c1d20119008450 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingIFT/__init__.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingIFT/__init__.py
@@ -17,17 +17,6 @@ from StrippingUtils.Utils import getBuilderConfFromModule as _getcon
 from StrippingUtils.Utils import getLineBuildersFromModule as _getter
 __author__ = 'Juan Palacios palacios@physik.uzh.ch'
 
-import StrippingHeavyIonOpenCharm
-import StrippingHeavyIonWMuNu
-import StrippingHeavyIonConvertedPhoton
-import StrippingHeavyIonDiMuon
-import StrippingHeavyIonOthercc
-import StrippingHeavyIonTopology
-import StrippingHeavyIonGammaHadron
-import StrippingHeavyIonTrackEffMuonTT
-import StrippingHeavyIonTrackEffDownMuon
-import StrippingHeavyIonD02KPiPi0
-import StrippingHeavyIonMiniBias
 
 from sys import modules as _modules
 _this = _modules[__name__]
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingMiniBias/StrippingBadEvents.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingMiniBias/StrippingBadEvents.py
index 1c381f645303eb85fa59a276c4ffa62fa7082584..b6bfb5f29e6eaf5bcf70492429be21413809a429 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingMiniBias/StrippingBadEvents.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingMiniBias/StrippingBadEvents.py
@@ -8,7 +8,6 @@
 # granted to it by virtue of its status as an Intergovernmental Organization  #
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
-from PhysSelPython.Wrappers import Selection
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 __author__ = 'Andrea Contu'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingMiniBias/StrippingMiniBias.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingMiniBias/StrippingMiniBias.py
index da1ac5dd5328262185dd50d32ad0ff94f012315f..986b1718c7f61a525a67a5d92b3c08e9acae884f 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingMiniBias/StrippingMiniBias.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingMiniBias/StrippingMiniBias.py
@@ -8,7 +8,6 @@
 # granted to it by virtue of its status as an Intergovernmental Organization  #
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
-from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 __author__ = 'Patrick Koppenburg'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingQEE/DisplVertices_Utils.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingQEE/DisplVertices_Utils.py
index 75fad1a93b39f6a186f370b531405d43f844f563..f7ae00ee0d50e8cc1fb39c32ca1104645bf95838 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingQEE/DisplVertices_Utils.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingQEE/DisplVertices_Utils.py
@@ -14,12 +14,11 @@ Utilities for displaced vertex stripping: wrapper class around PatPV3D
 
 __all__ = ("SelectionFromAlgorithmWithTools", "SelectionPatPV3DWrapper")
 
-from GaudiConfUtils import isConfigurable
 
 from SelPy.utils import (UniquelyNamedObject, ClonableObject, SelectionBase, compatibleSequences,
-                         IncompatibleInputLocations, CloneCallable, makeOutputLocation, setOutputLocation)
+                         IncompatibleInputLocations, makeOutputLocation, setOutputLocation)
 
-from PhysSelPython.Wrappers import checkConfigurable, checkName
+from PhysSelPython.Wrappers import checkName
 
 
 def connectToRequiredSelections(selection, inputSetter):
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingQEE/StrippingA1MuMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingQEE/StrippingA1MuMu.py
old mode 100755
new mode 100644
index 2fbd096e0a2c433fdbcf8f46f10702ed72c791bd..999ae0e27f3391f4d69443ebc1dc14e9d5ab32c7
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingQEE/StrippingA1MuMu.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingQEE/StrippingA1MuMu.py
@@ -23,11 +23,9 @@ A_1 -> mu+ mu-, based on functionality from StrippingDiMuonNew by Jibo He.
 
 """
 
-from Gaudi.Configuration import *
-from LHCbKernel.Configuration import *
 
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
-from PhysSelPython.Wrappers import Selection, DataOnDemand, SimpleSelection
+from PhysSelPython.Wrappers import SimpleSelection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from GaudiKernel.SystemOfUnits import MeV
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingQEE/StrippingA2MuMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingQEE/StrippingA2MuMu.py
index 7f662d87e37979ff2018a9d0c45902b758e372c6..75edb9aa52b5263aac4a9198306b6b7532f9879b 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingQEE/StrippingA2MuMu.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingQEE/StrippingA2MuMu.py
@@ -22,7 +22,7 @@ from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from StandardParticles import StdAllLooseMuons, StdAllNoPIDsMuons
+from StandardParticles import StdAllLooseMuons
 from GaudiKernel.SystemOfUnits import GeV
 
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingQEE/StrippingA2MuMuSameSign.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingQEE/StrippingA2MuMuSameSign.py
index 1cd5ccbaad25a23eb91271e03be5627dc096b786..432c22256be7fed285ab9ea113e4cb54859226e9 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingQEE/StrippingA2MuMuSameSign.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingQEE/StrippingA2MuMuSameSign.py
@@ -22,7 +22,7 @@ from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from StandardParticles import StdAllLooseMuons, StdAllNoPIDsMuons
+from StandardParticles import StdAllLooseMuons
 from GaudiKernel.SystemOfUnits import GeV
 
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingQEE/StrippingDY2MuMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingQEE/StrippingDY2MuMu.py
index 514a5dde899eacc84ffabbe96801327228cefe0a..03356ebe07088ef87fdabc55949a790c9ee1454e 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingQEE/StrippingDY2MuMu.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingQEE/StrippingDY2MuMu.py
@@ -24,9 +24,8 @@ DY2MuMu4    (20-40GeV): StdAllLooseMuons & TrkPChi2>0.1% & P>10GeV & pT>3GeV
 
 __all__ = 'DY2MuMuConf', 'default_config'
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-from PhysSelPython.Wrappers import Selection, SimpleSelection
+from PhysSelPython.Wrappers import SimpleSelection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from StandardParticles import StdAllLooseMuons
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingQEE/StrippingDY2ee.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingQEE/StrippingDY2ee.py
index 5a03684346d4d9037fd6a54aa3ec6c86b73e5d96..fdc374106c720f9072ee7a85c8905722f8b5d819 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingQEE/StrippingDY2ee.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingQEE/StrippingDY2ee.py
@@ -18,9 +18,8 @@
 
 __all__ = ('DY2eeConf', 'default_config')
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-from PhysSelPython.Wrappers import Selection, DataOnDemand
+from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from StandardParticles import StdAllNoPIDsElectrons
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingQEE/StrippingDisplVertices.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingQEE/StrippingDisplVertices.py
index 67725bbba29c2754711a77628e07d242cdc35fe6..6ff23d235cafe02fa3652a518b05623c84ae0b5f 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingQEE/StrippingDisplVertices.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingQEE/StrippingDisplVertices.py
@@ -40,7 +40,6 @@ __all__ = ('DisplVerticesConf', 'default_config')
 
 from Gaudi.Configuration import *
 from GaudiKernel import SystemOfUnits as units
-from LHCbKernel.Configuration import DEBUG, VERBOSE
 
 import logging
 logger = logging.getLogger(__name__)
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingQEE/StrippingDitau.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingQEE/StrippingDitau.py
old mode 100755
new mode 100644
index 0ad441ea83d4a9fd162a98f97cce9d9f3820d4ca..0472121f4530889bbf3fd69d7b81817e6301682f
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingQEE/StrippingDitau.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingQEE/StrippingDitau.py
@@ -155,8 +155,7 @@ Derived from works of S.Farry & P. Ilten
 
 """
 
-import os
-from GaudiKernel.SystemOfUnits import MeV, GeV, micrometer
+from GaudiKernel.SystemOfUnits import GeV, MeV
 from PhysSelPython.Wrappers import Selection, SimpleSelection, PassThroughSelection, MergedSelection, AutomaticData
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
@@ -894,7 +893,7 @@ def Tuples():
 
     """
     import re
-    from DecayTreeTuple.Configuration import DecayTreeTuple, EventTuple
+    from DecayTreeTuple.Configuration import DecayTreeTuple
 
     seq = GaudiSequencer('TupleSeq')
     seq.ModeOR = True
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingQEE/StrippingExotica.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingQEE/StrippingExotica.py
old mode 100755
new mode 100644
index c02471267810d88c2ce0182c4548f40e6bab690d..9d041d4174b66d314fb68bf3b8336a489585f7e7
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingQEE/StrippingExotica.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingQEE/StrippingExotica.py
@@ -30,7 +30,7 @@ Hlt2ExoticaPrmptDiMuonHighMass
 from GaudiKernel.SystemOfUnits import MeV, GeV, mm, picosecond
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-from PhysSelPython.Wrappers import Selection, SimpleSelection, MergedSelection, AutomaticData
+from PhysSelPython.Wrappers import AutomaticData, SimpleSelection
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingQEE/StrippingFullDiJets.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingQEE/StrippingFullDiJets.py
index 2981965bb27d3ebfea2e058a0380a802bd3f5d1b..9d0f27dcf84c5776ada54ce0932ff9933de66595 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingQEE/StrippingFullDiJets.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingQEE/StrippingFullDiJets.py
@@ -9,14 +9,10 @@
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
 
-from Gaudi.Configuration import *
-from Configurables import FilterDesktop, CombineParticles, LoKi__VertexFitter
+from Configurables import CombineParticles, LoKi__VertexFitter
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from StandardParticles import StdJets
-from CommonParticles.Utils import *
-from Configurables import FilterJet
 from GaudiKernel.SystemOfUnits import GeV
 
 __author__ = "Xabier Cid Vidal", "Cedric Potterat", "William Barter"
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingQEE/StrippingHighPtTau.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingQEE/StrippingHighPtTau.py
index ac4b3b9c5906f1ef795681c1df8cdad05c052f9a..54239d73e2759d0101b16eabf78bd434bba79e74 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingQEE/StrippingHighPtTau.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingQEE/StrippingHighPtTau.py
@@ -24,7 +24,7 @@ from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from StandardParticles import StdAllNoPIDsPions, StdAllLoosePions, StdLooseResolvedPi0, StdLooseMergedPi0
+from StandardParticles import StdAllLoosePions, StdLooseMergedPi0, StdLooseResolvedPi0
 from GaudiKernel.SystemOfUnits import GeV
 from Configurables import FilterDesktop
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingQEE/StrippingLFVExotica.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingQEE/StrippingLFVExotica.py
old mode 100755
new mode 100644
index 59d45b25c3081e3680db2f10e9e0d1ad1ed8f0bb..1a886e3801e0322239b8183c5b0e8fe140db6ba2
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingQEE/StrippingLFVExotica.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingQEE/StrippingLFVExotica.py
@@ -106,7 +106,7 @@ def create_stdjets(strob, line_location, stdjets_name_ban):
         strob.StdJetsNoJetIDBan = [myconf1]
 
     # configure Data-On-Demand service
-    locations = updateDoD(myconf1)
+    updateDoD(myconf1)
 
 
 relInfoJetsVars = ["JETNOMU1PX", "JETNOMU1PY", "JETNOMU1PZ", "JETNOMU1PT", "JETNOMU1JETWIDTH", "JETNOMU1NNTAG", "JETNOMU1MNF", "JETNOMU2PX", "JETNOMU2PY", "JETNOMU2PZ", "JETNOMU2PT", "JETNOMU2JETWIDTH", "JETNOMU2NNTAG", "JETNOMU2MNF", "JETNOMU3PX", "JETNOMU3PY",
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingQEE/StrippingLLP2MuX.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingQEE/StrippingLLP2MuX.py
index d58edd68465d3b66d3c11cab0bbbed15edf12ed2..fe88689a415b694a3f182eeea3924fe2df393eff 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingQEE/StrippingLLP2MuX.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingQEE/StrippingLLP2MuX.py
@@ -16,7 +16,6 @@ from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import AutomaticData, Selection
 from GaudiKernel import SystemOfUnits as units
-from LHCbKernel.Configuration import *
 __author__ = "Pieter David"
 __date__ = "2014-08-28"
 __all__ = ("LLP2MuXConf", "default_config")
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingQEE/StrippingLb2dp.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingQEE/StrippingLb2dp.py
old mode 100755
new mode 100644
index 6fd0fdcc5c19ca68dd6eaf7b42ea46412da9f432..7d202e58f915b4e8cbabd5e3d94da1f41b631330
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingQEE/StrippingLb2dp.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingQEE/StrippingLb2dp.py
@@ -23,15 +23,11 @@ __all__ = ('Lb2dpConf',
            )
 
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop
-from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays
 
-from StandardParticles import StdAllNoPIDsPions, StdAllNoPIDsProtons,  StdAllNoPIDsKaons
 from PhysSelPython.Wrappers import Selection, DataOnDemand, SimpleSelection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from Configurables import LoKi__VoidFilter as VoidFilter
 
 default_config = {
     'NAME': 'Lb2dp',
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingQEE/StrippingMicroDiJets.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingQEE/StrippingMicroDiJets.py
index 111d837cba0b6e3109043e85911ad651a9771cca..01e67268d1ad2a18b20e6bec03474a5d626c5b48 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingQEE/StrippingMicroDiJets.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingQEE/StrippingMicroDiJets.py
@@ -10,13 +10,12 @@
 ###############################################################################
 
 from Gaudi.Configuration import *
-from Configurables import FilterDesktop, CombineParticles, LoKi__VertexFitter
+from Configurables import CombineParticles
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from StandardParticles import StdJets
 from CommonParticles.Utils import *
-from Configurables import FilterJet, ClearDaughters
+from Configurables import ClearDaughters
 from GaudiKernel.SystemOfUnits import GeV
 
 __author__ = "Xabier Cid Vidal", "Cedric Potterat", "William Barter"
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingQEE/StrippingMuMuSS.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingQEE/StrippingMuMuSS.py
index 1d7798298fd46ec3a7437632e49e3e77ed0f5b3d..43046078d280e4b8afa0cafd3eab5c50e3168868 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingQEE/StrippingMuMuSS.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingQEE/StrippingMuMuSS.py
@@ -26,7 +26,7 @@ __author__ = (
 )
 
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-from PhysSelPython.Wrappers import Selection, SimpleSelection
+from PhysSelPython.Wrappers import SimpleSelection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from StandardParticles import StdAllLooseMuons
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingQEE/StrippingSbarSCorrelations.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingQEE/StrippingSbarSCorrelations.py
index 249c3f9ab979883ed8a9d91337d77cefb449f848..69b3d42731dbc9ca8b3c05f7c37baecc626941f6 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingQEE/StrippingSbarSCorrelations.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingQEE/StrippingSbarSCorrelations.py
@@ -21,10 +21,8 @@ Long tracks only
 from GaudiKernel.SystemOfUnits import MeV, GeV
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
-from StandardParticles import StdAllNoPIDsPions, StdTightKaons, StdAllNoPIDsProtons
+from PhysSelPython.Wrappers import DataOnDemand, Selection
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = ['Florin MACIUC']
 __date__ = '24/08/2013'
 __version__ = '$Revision: 1.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingQEE/StrippingStrangeBaryons.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingQEE/StrippingStrangeBaryons.py
index 0b5d595c501f5f05a6cf290f848f882391e42df9..ae8735231a28354a5bc271d76afb516f034dce59 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingQEE/StrippingStrangeBaryons.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingQEE/StrippingStrangeBaryons.py
@@ -18,14 +18,10 @@ Xi -> Lambda pi,   Omega -> Lambda K
 LLL DDL DDD
 '''
 
-from GaudiKernel.SystemOfUnits import MeV
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
-from CommonParticles import StdLooseLambda
-from StandardParticles import StdLoosePions, StdNoPIDsDownPions, StdLooseKaons, StdLooseDownKaons, StdLooseProtons, StdNoPIDsDownProtons
+from PhysSelPython.Wrappers import DataOnDemand, Selection
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = ['Mihai Straticiuc', 'Florin Maciuc', 'Nguyen Thi Dung']
 __date__ = '26/06/2012'
 __version__ = '$Revision: 0.3 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingQEE/StrippingStrangeBaryonsNoPID.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingQEE/StrippingStrangeBaryonsNoPID.py
index 11d394ddb819c05116043ca7af67ee25121e7053..df33cc7953709a81da22f213b036048ee27aaa61 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingQEE/StrippingStrangeBaryonsNoPID.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingQEE/StrippingStrangeBaryonsNoPID.py
@@ -18,12 +18,10 @@ Xi -> Lambda pi,   Omega -> Lambda K
 LLL
 '''
 
-from GaudiKernel.SystemOfUnits import MeV
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
+from PhysSelPython.Wrappers import DataOnDemand, Selection
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = ['Florin Maciuc']
 __date__ = '13/01/2014'
 __version__ = '$Revision: 0.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingQEE/StrippingTaggedJets.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingQEE/StrippingTaggedJets.py
old mode 100755
new mode 100644
index aa10ffcef11e3b67c222795b627dce36ab58d9e2..421ef28a33474ba4a598a2b27634f087159d46b7
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingQEE/StrippingTaggedJets.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingQEE/StrippingTaggedJets.py
@@ -10,11 +10,10 @@
 ###############################################################################
 
 from Gaudi.Configuration import *
-from Configurables import FilterDesktop, CombineParticles, LoKi__VertexFitter
+from Configurables import CombineParticles, LoKi__VertexFitter
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from StandardParticles import StdJets
 from CommonParticles.Utils import *
 from Configurables import FilterJet
 from GaudiKernel.SystemOfUnits import GeV
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingQEE/StrippingW2nH.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingQEE/StrippingW2nH.py
index 3fbf48b1fca05211e68a169fa40c1dd93686300d..f16a508b980ce094474a1bb71301a5e339201600 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingQEE/StrippingW2nH.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingQEE/StrippingW2nH.py
@@ -26,7 +26,6 @@ from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from StandardParticles import StdAllNoPIDsPions
 from GaudiKernel.SystemOfUnits import GeV
-from GaudiKernel.SystemOfUnits import MeV
 
 
 default_config = {
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingQEE/StrippingWJets.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingQEE/StrippingWJets.py
old mode 100755
new mode 100644
index d522b8b500a9a2d429f8c8ad864cfb9783ed5b3e..3da8ccba4608ab608547abdaef921ddb169677f1
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingQEE/StrippingWJets.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingQEE/StrippingWJets.py
@@ -22,14 +22,12 @@ They are then cover a phasespace complementarily on each other.
 
 """
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
 from Configurables import CombineParticles, LoKi__VertexFitter
 from PhysSelPython.Wrappers import Selection, SimpleSelection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from StandardParticles import StdAllLooseMuons, StdAllNoPIDsElectrons, StdJets
-from CommonParticles.Utils import *
 from GaudiKernel.SystemOfUnits import GeV, MeV
 
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingQEE/StrippingWRareDecay.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingQEE/StrippingWRareDecay.py
index 7ef7290f438bd2cedb0a512af1341a965e77c38a..d3358d5224e36ab08dfa8e27b04d29642ac39da9 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingQEE/StrippingWRareDecay.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingQEE/StrippingWRareDecay.py
@@ -21,8 +21,7 @@ from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from GaudiKernel.SystemOfUnits import MeV, GeV, mm, picosecond
-from Gaudi.Configuration import *
+from GaudiKernel.SystemOfUnits import MeV, picosecond
 __author__ = ['Hang Yin', 'Qundong Han']
 __date__ = '11/29/2016'
 __version__ = '$Revision: 2.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingQEE/StrippingWe.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingQEE/StrippingWe.py
index 7cdca666d96cb142580b9b9457521d8d661ca1ba..dae887a639bb7304617d72237d4ec047fdbc41a6 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingQEE/StrippingWe.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingQEE/StrippingWe.py
@@ -21,7 +21,6 @@ We control: StdAllNoPIDsElectrons, PRS>50Mev & E_ECal/P>0.1 & E_HCal/P<0.05 & pT
 __all__ = 'WeConf', 'default_config'
 __author__ = 'S. Bifani', 'D. Ward'
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
 from PhysSelPython.Wrappers import SimpleSelection
 from StrippingConf.StrippingLine import StrippingLine
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingQEE/StrippingZ02ee.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingQEE/StrippingZ02ee.py
index 0bb2cccfd2da3efa094fe5808011f303566a0cc9..03ee6a325270a212b2b8f00000c396f090b245db 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingQEE/StrippingZ02ee.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingQEE/StrippingZ02ee.py
@@ -21,7 +21,6 @@ __all__ = (
     'default_config',
 )
 
-from Gaudi.Configuration import *
 from GaudiKernel.SystemOfUnits import GeV, MeV
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 from PhysSelPython.Wrappers import SimpleSelection
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingQEE/StrippingZ02nH.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingQEE/StrippingZ02nH.py
index f262f43a0d676efec05bdedfc744b49c71c0f89b..82fb2760e954d0f52d5f0b14942694fdecccf31f 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingQEE/StrippingZ02nH.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingQEE/StrippingZ02nH.py
@@ -26,7 +26,6 @@ from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from StandardParticles import StdAllNoPIDsPions
 from GaudiKernel.SystemOfUnits import GeV
-from GaudiKernel.SystemOfUnits import MeV
 
 
 default_config = {
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingQEE/StrippingZ0RareDecay.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingQEE/StrippingZ0RareDecay.py
index ed5c2136acfad79ba252530f3d5969c14168f261..e1a140f9359f6c1935faf0cbc0436c9110ca551b 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingQEE/StrippingZ0RareDecay.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingQEE/StrippingZ0RareDecay.py
@@ -22,8 +22,7 @@ __version__ = '$Revision: 2.0 $'
 
 __all__ = 'default_config', 'Z0RareDecayConf'
 
-from Gaudi.Configuration import *
-from GaudiKernel.SystemOfUnits import MeV, GeV, mm
+from GaudiKernel.SystemOfUnits import MeV
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
 from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
 from StrippingConf.StrippingLine import StrippingLine
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingQEE/depreciated/StrippingDijets.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingQEE/depreciated/StrippingDijets.py
index 719ab092d3f62f10ba80f27bf444a29031235662..1bd1ad77120b402bfb1c1b69dccbf62347990ae5 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingQEE/depreciated/StrippingDijets.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingQEE/depreciated/StrippingDijets.py
@@ -15,8 +15,7 @@
 __all__ = ('DijetsConf',
            'default_config')
 
-from Gaudi.Configuration import *
-from GaudiKernel.SystemOfUnits import MeV, GeV, mm
+from GaudiKernel.SystemOfUnits import GeV, MeV
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingQEE/depreciated/StrippingHighPtTopoJets.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingQEE/depreciated/StrippingHighPtTopoJets.py
index f62f8db8c1eaba8b5842b9c7345ce93002d621f2..da12c39fb111ca80169e104ec46a2a20533c7b7f 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingQEE/depreciated/StrippingHighPtTopoJets.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingQEE/depreciated/StrippingHighPtTopoJets.py
@@ -21,8 +21,6 @@ __all__ = ('default_config', 'HighPtTopoJetsConf')
 # \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\#
 
 
-from Gaudi.Configuration import *
-from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from PhysSelPython.Wrappers import EventSelection
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingQEE/depreciated/StrippingJets.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingQEE/depreciated/StrippingJets.py
index 0a37d40f9ddfcdf82460897dddfb064edca95d21..75e825eb86e2a06d3cf2de890a8a87180c3674a6 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingQEE/depreciated/StrippingJets.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingQEE/depreciated/StrippingJets.py
@@ -15,13 +15,11 @@
 __all__ = ('JetsConf',
            'default_config')
 
-from Gaudi.Configuration import *
-from GaudiKernel.SystemOfUnits import MeV, GeV, mm
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
+from GaudiKernel.SystemOfUnits import GeV, MeV
+from PhysSelPython.Wrappers import MergedSelection, Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
-from JetAccessories.JetMaker_Config import JetMakerConf
 from StandardParticles import StdJets, StdAllNoPIDsPions
 from Configurables import CombineParticles
 from Configurables import TopologicalTagging
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingRD/Beauty2Charm_LoKiCuts.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingRD/Beauty2Charm_LoKiCuts.py
index 2250a080d80f6bdda41324365b8fe5b561d1a8ac..7ed3e8ea2280ee752d6db80ce6b0241fb170b158 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingRD/Beauty2Charm_LoKiCuts.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingRD/Beauty2Charm_LoKiCuts.py
@@ -10,11 +10,6 @@
 ###############################################################################
 # \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\#
 
-from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
-from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-from PhysSelPython.Wrappers import Selection, MergedSelection
-from StandardParticles import StdNoPIDsPions, StdNoPIDsKaons
 
 # \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\#
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingRD/StrippingB02Lcmu_pKpi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingRD/StrippingB02Lcmu_pKpi.py
index c0209e4a81f00f2e5c7ad0093273ce61ffa558f3..aedb7955e9db5ad1ccdba5cded8149e794cdd800 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingRD/StrippingB02Lcmu_pKpi.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingRD/StrippingB02Lcmu_pKpi.py
@@ -14,7 +14,6 @@ from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = ['Nikita Beliy', 'Jibo He']
 __date__ = '28/11/2016'
 __version__ = '$Revision: 1.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingRD/StrippingB23MuLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingRD/StrippingB23MuLines.py
index 4d5da6cdc6121f1a926af78c8a45c7b5ebae76ad..e11f8912eb05ffba312e196ee43556ce4f70e2bb 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingRD/StrippingB23MuLines.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingRD/StrippingB23MuLines.py
@@ -55,13 +55,11 @@ __all__ = ("B23MuLinesConf",
 
 #############################################################################
 
-from Gaudi.Configuration import *
-from Configurables import FilterDesktop, CombineParticles, DaVinci__N3BodyDecays
+from Configurables import DaVinci__N3BodyDecays
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 # from StrippingSelections.Utils import checkConfig
-from GaudiKernel.PhysicalConstants import c_light
 
 #############################################################################
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingRD/StrippingB2KLLXInclusive.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingRD/StrippingB2KLLXInclusive.py
index 427dc4aa1b251d677f2db5fba16348f609968c42..695822b35f87d53f70965e5dd4f2f55a1640df7f 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingRD/StrippingB2KLLXInclusive.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingRD/StrippingB2KLLXInclusive.py
@@ -19,15 +19,12 @@ __all__ = ('B2KLLXInclusiveConf', 'default_config')
 Stripping selection for inclusively selected B->KmumuX decays.
 """
 
-from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop
+from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
 
 from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from LHCbKernel.Configuration import *  # check if needed
-from Configurables import SubstitutePID
-from Configurables import SubPIDMMFilter
 
 
 #################
@@ -373,7 +370,6 @@ class B2KLLXInclusiveConf(LineBuilder):
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         CombineDiMuon = CombineParticles()
         CombineDiMuon.DecayDescriptors = ["[B+ -> J/psi(1S) K+]cc"]
-        sel_name = "InclKLL"
         CombineDiMuon.MotherCut = self.InclKLLCut
         # choose
         leptons = self.InclLeptons
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingRD/StrippingB2KstTauTau.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingRD/StrippingB2KstTauTau.py
index b7765b8844dff9af2f3f192aafad7298a77a86ae..2ca7e7f98d5b35b857a8b5c36bc873a38ee87647 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingRD/StrippingB2KstTauTau.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingRD/StrippingB2KstTauTau.py
@@ -15,8 +15,7 @@ from StandardParticles import StdTightMuons
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, OfflineVertexFitter, DaVinci__N3BodyDecays
-from Gaudi.Configuration import *
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N3BodyDecays, FilterDesktop
 __author__ = [' G. Mancinelli, J. Serrano']
 __date__ = '15/08/2014'
 __version__ = '$Revision: 0.1 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingRD/StrippingB2LLXBDT.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingRD/StrippingB2LLXBDT.py
index 509cd9d83c968f16af46210ba7db650c5ded765e..1c05c402370ebc7d110492fb2fdb8dbde369ff8e 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingRD/StrippingB2LLXBDT.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingRD/StrippingB2LLXBDT.py
@@ -20,8 +20,6 @@ from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticle
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, MergedSelection
-from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays
-from Gaudi.Configuration import *
 __author__ = ['Jibo He']
 __date__ = '20/11/2015'
 __version__ = '$Revision: 1.0 $'
@@ -295,7 +293,7 @@ class B2LLXBDTConf(LineBuilder):
         """
         Kshort, both LL and DD
         """
-        from StandardParticles import StdLooseKsDD, StdLooseKsLL
+        from StandardParticles import StdLooseKsDD
 
         self.SelKsDD = self.createSubSel(OutputList=self.name + "SelKsDD",
                                          InputList=StdLooseKsDD,
@@ -331,7 +329,7 @@ class B2LLXBDTConf(LineBuilder):
         """
         Lambda, both LL and DD
         """
-        from StandardParticles import StdLooseLambdaDD, StdLooseLambdaLL
+        from StandardParticles import StdLooseLambdaDD
 
         self.SelLambdaDD = self.createSubSel(OutputList=self.name + "SelLambdaDD",
                                              InputList=StdLooseLambdaDD,
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingRD/StrippingB2Lambda0MuLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingRD/StrippingB2Lambda0MuLines.py
index 465f34ce3f2af7a7b564860b40d26eb58a2da883..9a6ac1b5824fb2cb3142b7af4c6b531581243697 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingRD/StrippingB2Lambda0MuLines.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingRD/StrippingB2Lambda0MuLines.py
@@ -21,7 +21,6 @@ __all__ = ('B2Lambda0MuLines',
            'default_config')
 
 from StandardParticles import StdLoosePions, StdLooseMuons, StdLooseDownMuons, StdNoPIDsDownPions
-from Configurables import TisTosParticleTagger
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingRD/StrippingB2MuMuMuMuLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingRD/StrippingB2MuMuMuMuLines.py
index 9c92c11a08153c13ae64cf1aefd911c790442d25..6e1b98b4e6982df1ef8268e5a50d76ae51f2dea4 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingRD/StrippingB2MuMuMuMuLines.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingRD/StrippingB2MuMuMuMuLines.py
@@ -19,7 +19,7 @@ from Beauty2Charm_LoKiCuts import LoKiCuts
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
-from Configurables import FilterDesktop, CombineParticles
+from Configurables import CombineParticles
 from Gaudi.Configuration import *
 __author__ = ['Diego Martinez Santos', 'Johannes Albrecht',
               'Konstantinos A. Petridis', 'Alexander Baranov']
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingRD/StrippingB2XLL.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingRD/StrippingB2XLL.py
old mode 100755
new mode 100644
index 0ec2577787f72a6ff7c13be0980a02980a6736ee..17e34358470655f02fbdd0734114189686d7c13d
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingRD/StrippingB2XLL.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingRD/StrippingB2XLL.py
@@ -10,9 +10,8 @@
 ###############################################################################
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection, AutomaticData
+from PhysSelPython.Wrappers import MergedSelection, Selection
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = 'Raja Nandakumar, Fergus Wilson, Stefania Ricciardi'
 __date__ = '04/11/2015'
 __version__ = '$Revision: 0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingRD/StrippingB2XMuMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingRD/StrippingB2XMuMu.py
index bf8f80ead17879bb5263b3f52c017408ee8bde89..5ee37324415b186663430224441bd317cb059fe2 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingRD/StrippingB2XMuMu.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingRD/StrippingB2XMuMu.py
@@ -19,7 +19,6 @@ __version__ = '$Revision: 1.2 $'
 __all__ = ('B2XMuMuConf', 'default_config')
 
 
-from Gaudi.Configuration import *
 from LHCbKernel.Configuration import *  # check if needed
 
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingRD/StrippingB2XTau.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingRD/StrippingB2XTau.py
index 8f3f40d4d2fa42fe2952d91be7ce7ed045dacd24..d2cb8108d382812e609aba7c2edc6887a533565e 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingRD/StrippingB2XTau.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingRD/StrippingB2XTau.py
@@ -9,15 +9,12 @@
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
 from StandardParticles import StdLooseKaons
-from StandardParticles import StdAllLoosePions, StdAllNoPIDsPions
-from copy import deepcopy
-from StandardParticles import StdLoosePions, StdTightPions
-from StandardParticles import StdNoPIDsKaons, StdNoPIDsPions, StdTightMuons
+from StandardParticles import StdLoosePions
+from StandardParticles import StdTightMuons
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, OfflineVertexFitter, DaVinci__N3BodyDecays
-from Gaudi.Configuration import *
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N3BodyDecays, FilterDesktop
 __author__ = ['G. Mancinelli, J. Serrano']
 __date__ = '24/05/2010,15/01/2014'
 __version__ = '$Revision: 1.2 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingRD/StrippingB2XTauMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingRD/StrippingB2XTauMu.py
index ae80a64870a0162a82b78dd1e8516c6c496ef88b..810e9a208ac175d3b476a03bf34a1a05e74c1b07 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingRD/StrippingB2XTauMu.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingRD/StrippingB2XTauMu.py
@@ -25,8 +25,6 @@ __all__ = ('B2XTauMuConf',
            'default_config')
 
 
-from Gaudi.Configuration import *
-
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
 from PhysSelPython.Wrappers import Selection, MergedSelection
 from StrippingConf.StrippingLine import StrippingLine
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingRD/StrippingBLVLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingRD/StrippingBLVLines.py
index 6dc1f3c32133491d8eb768c09eb61fd804d97848..20e7e7d7a7d5e588a64fd707c52fa17e94306ce3 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingRD/StrippingBLVLines.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingRD/StrippingBLVLines.py
@@ -95,8 +95,7 @@ __all__ = ("BLVLinesConf",
 
 ###################################################################################################
 
-from Gaudi.Configuration import *
-from Configurables import FilterDesktop, CombineParticles, DaVinci__N3BodyDecays
+from Configurables import CombineParticles, DaVinci__N3BodyDecays
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingRD/StrippingBd2eeKstarBDT.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingRD/StrippingBd2eeKstarBDT.py
index 33f47f29ceaa85059794a0f7e9de85412021f226..f56a4e55e7f7a52d2447dcf0f983f77b7f685cf6 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingRD/StrippingBd2eeKstarBDT.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingRD/StrippingBd2eeKstarBDT.py
@@ -18,7 +18,6 @@ from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = ['Marie-Helene Schune', 'Jibo He']
 __date__ = '20/01/2012'
 __version__ = '$Revision: 1.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingRD/StrippingBeauty2XGamma.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingRD/StrippingBeauty2XGamma.py
index b876ae5d9b3e6d22750998716beee8e8e96b4a18..f15067d279ab9c6a8c877716265e623bdf8d4bbd 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingRD/StrippingBeauty2XGamma.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingRD/StrippingBeauty2XGamma.py
@@ -12,7 +12,7 @@
 B-> X Gamma selections
 """
 
-from StandardParticles import StdAllNoPIDsKaons, StdAllNoPIDsPions, StdLooseAllPhotons, StdLooseMergedPi0, StdLooseResolvedPi0, StdAllLooseGammaDD, StdAllLooseGammaLL, StdAllNoPIDsProtons
+from StandardParticles import StdAllLooseGammaDD, StdAllLooseGammaLL, StdAllNoPIDsPions, StdLooseAllPhotons, StdLooseMergedPi0, StdLooseResolvedPi0
 from Configurables import TisTosParticleTagger
 from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays as Combine4Particles
 from GaudiConfUtils.ConfigurableGenerators import DaVinci__N3BodyDecays as Combine3Particles
@@ -20,7 +20,6 @@ from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = ['Violaine Bellee', 'Albert Puig']
 __date__ = '08/04/2016'
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingRD/StrippingBs2MuMuLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingRD/StrippingBs2MuMuLines.py
index 6ed0f1ff2d94fe2aa3b66f0525cb5f231048f1b0..f471cc532b70a5e28fd0828ca74b985e254c074b 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingRD/StrippingBs2MuMuLines.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingRD/StrippingBs2MuMuLines.py
@@ -25,7 +25,7 @@ Exported symbols (use python help!):
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
-from Configurables import FilterDesktop, CombineParticles
+from Configurables import CombineParticles
 from Gaudi.Configuration import *
 from JetAccessories.JetMaker_Config import JetMakerConf
 from CommonParticles.Utils import *
@@ -159,7 +159,7 @@ def create_stdjets(strob, line_location, stdjets_name_ban, stdjets_name_addb):
         strob.StdJetsNoJetIDBan = [myconf1]
 
     # configure Data-On-Demand service
-    locations = updateDoD(myconf1)
+    updateDoD(myconf1)
 
     myconf2 = JetMakerConf(stdjets_name_addb,
                            Inputs=['Phys/PFParticles/Particles', line_location],
@@ -173,7 +173,7 @@ def create_stdjets(strob, line_location, stdjets_name_ban, stdjets_name_addb):
         strob.StdJetsNoJetIDAddB = [myconf2]
 
     # configure Data-On-Demand service
-    locations = updateDoD(myconf2)
+    updateDoD(myconf2)
 
 
 ##########################################
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingRD/StrippingBs2gammagamma.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingRD/StrippingBs2gammagamma.py
index 158db5f4c8ca7edbfdce8faccbacecedb0256e3a..30dd3664829a9606d3488e160a1ff92230465960 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingRD/StrippingBs2gammagamma.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingRD/StrippingBs2gammagamma.py
@@ -21,16 +21,11 @@ Exports the following stripping lines as instance data members:
 - Bs2gammagamma_NoConvWideLine  : wide line with 0 conversions
 '''
 
-from Configurables import (DiElectronMaker, ProtoParticleCALOFilter,
-                           ParticleTransporter, BremAdder)
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop  # , CombineParticles
-from CommonParticles import StdLooseAllPhotons
-from CommonParticles import StdAllLooseGammaConversion
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
 from Configurables import CombineParticles
-from Gaudi.Configuration import *
 __author__ = ['Sean Benson']
 __date__ = '2016/04/08'
 __version__ = '1.1'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingRD/StrippingBs2st2KKMuX.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingRD/StrippingBs2st2KKMuX.py
index 53f4155191d8afc755034ab6c642404b7f75bacc..f105ed628117302c196d81973d7e945d4b5bbb1e 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingRD/StrippingBs2st2KKMuX.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingRD/StrippingBs2st2KKMuX.py
@@ -22,9 +22,8 @@ Stripping lines:
 from StandardParticles import StdLooseMuons, StdLooseKaons, StdAllLooseKaons, StdMassConstrainedJpsi2MuMu
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand
+from PhysSelPython.Wrappers import Selection
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = ['Jianchun Wang']
 __date__ = '03/22/2015'
 __version__ = '$Revision: 0.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingRD/StrippingBu2LLK.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingRD/StrippingBu2LLK.py
index 81d36d68547a4f6d3fdab29e77b03b88bffd056f..8bd9c599bc1fa5345db3bff7ac707b8ba9ce6204 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingRD/StrippingBu2LLK.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingRD/StrippingBu2LLK.py
@@ -10,9 +10,8 @@
 ###############################################################################
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection, AutomaticData
+from PhysSelPython.Wrappers import DataOnDemand, MergedSelection, Selection
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, DaVinci__N3BodyDecays
-from Gaudi.Configuration import *
 __author__ = 'Patrick Koppenburg, Alex Shires, Thomas Blake, Luca Pescatore, Simone Bifani, Yasmine Amhis, Paula Alvarez Cartelle, Harry Cliff, Rafael Silva Coutinho'
 __date__ = '16/06/2014'
 __version__ = '$Revision: 3 $'
@@ -768,7 +767,6 @@ class Bu2LLKConf(LineBuilder):
         from StandardParticles import StdLooseMuons as Muons
         # from CommonParticles import StdLooseDetachedTau
         # Taus = DataOnDemand(Location = "Phys/StdLooseDetachedTau3pi/Particles")
-        from CommonParticles import StdTightDetachedTau
         Taus = DataOnDemand(Location="Phys/StdTightDetachedTau3pi/Particles")
 
         _DecayDescriptor = "[J/psi(1S) -> mu+ tau-]cc"
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingRD/StrippingBu2MajoLep.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingRD/StrippingBu2MajoLep.py
index 961fe2a146eaab148d7183186a1be049ae53675f..c3380097f8416a348b98e69fbc89bab18848428b 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingRD/StrippingBu2MajoLep.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingRD/StrippingBu2MajoLep.py
@@ -19,12 +19,10 @@ __version__ = 'V0.9'
 __all__ = ('Bu2MajoLepConf',
            'default_config')
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
+from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from GaudiKernel.SystemOfUnits import *
 
 from StandardParticles import StdLooseMuons as Muons
 from StandardParticles import StdLoosePions as Pions
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingRD/StrippingBu2MuNu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingRD/StrippingBu2MuNu.py
index 093b37f68ae083d7fcea980f498b8d601b1e28cb..53ebfe877490fa2db9f95fcace9e4f27c1030829 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingRD/StrippingBu2MuNu.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingRD/StrippingBu2MuNu.py
@@ -25,12 +25,11 @@ __all__ = ('Bu2MuNuConf',
            'default_config')
 
 from Gaudi.Configuration import *
-from PhysSelPython.Wrappers import Selection, DataOnDemand
+from PhysSelPython.Wrappers import DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from StandardParticles import StdTightMuons, StdTightANNMuons
 from CommonParticles.Utils import *
-from Configurables import FilterDesktop, CombineParticles
+from Configurables import FilterDesktop
 from JetAccessories.JetMaker_Config import JetMakerConf
 
 default_name = 'Bu2MuNu'
@@ -72,7 +71,7 @@ def create_stdjets(strobj, line_location, stdjets_name_ban):
         strobj.StdJetsNoJetIDBan = [myconf1]
 
     # configure Data-On-Demand service
-    locations = updateDoD(myconf1)
+    updateDoD(myconf1)
 
 
 relInfoJetsVars = ["JETNOMU1PX", "JETNOMU1PY", "JETNOMU1PZ", "JETNOMU1PT", "JETNOMU1JETWIDTH", "JETNOMU1NNTAG", "JETNOMU1MNF", "JETNOMU2PX", "JETNOMU2PY", "JETNOMU2PZ", "JETNOMU2PT", "JETNOMU2JETWIDTH", "JETNOMU2NNTAG",
@@ -268,7 +267,7 @@ class Bu2MuNuConf(LineBuilder):
                                            JetIDCut=False).algorithms[0]
 
         # configure Data-On-Demand service
-        locations = updateDoD(StdJetsNoJetIDNoBan)
+        updateDoD(StdJetsNoJetIDNoBan)
 
         # add the jets with the specific banning
         create_stdjets(self, self.ControlLine.outputLocation(),
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingRD/StrippingD23MuLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingRD/StrippingD23MuLines.py
index 0725ecd798e0099828ec0b644ba1f5d6119f0551..9cac5b811b4fe683ae8ab1818ebbc34986a48f2a 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingRD/StrippingD23MuLines.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingRD/StrippingD23MuLines.py
@@ -51,12 +51,11 @@ __all__ = ("D23MuLinesConf",
 #############################################################################
 
 from Gaudi.Configuration import *
-from Configurables import FilterDesktop, CombineParticles, DaVinci__N3BodyDecays
+from Configurables import DaVinci__N3BodyDecays
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 # from StrippingSelections.Utils import checkConfig
-from GaudiKernel.PhysicalConstants import c_light
 
 #############################################################################
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingRD/StrippingDarkBoson.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingRD/StrippingDarkBoson.py
index 1e573360994477ff49301aa3b3a323f18798cf49..e42cad2ffa26db0015272fe3a37258e312b6be6a 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingRD/StrippingDarkBoson.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingRD/StrippingDarkBoson.py
@@ -17,23 +17,18 @@ Author: M. Williams
 from Configurables import DiElectronMaker, ProtoParticleCALOFilter
 from GaudiConfUtils.ConfigurableGenerators import DaVinci__N3BodyDecays
 from CommonParticles.Utils import *
-from copy import deepcopy
 from Configurables import SubstitutePID
 from StandardParticles import StdAllLooseGammaLL, StdAllLooseGammaDD, \
     StdAllLooseElectrons, StdLooseAllPhotons  # , StdDiElectronFromTracks
 from Beauty2Charm_LoKiCuts import LoKiCuts
 from StandardParticles import StdAllNoPIDsPions, StdAllNoPIDsKaons, \
-    StdAllNoPIDsProtons, StdNoPIDsUpPions, StdAllLooseMuons, \
-    StdLooseDownMuons
-from Configurables import LoKi__VoidFilter
+    StdAllLooseMuons, StdLooseDownMuons
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import EventSelection
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
+from PhysSelPython.Wrappers import DataOnDemand, Selection
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
 from Gaudi.Configuration import *
-import re
 __author__ = ['Mike Williams']
 
 moduleName = 'DarkBoson'
@@ -252,7 +247,7 @@ class DarkBosonConf(LineBuilder):
         mmDDX = makeX(
             'MuMuDD', default_config['XDD'], 'KS0 -> mu+ mu-', [muDX])
         kkX = makeX('KK', default_config['XLL'], 'KS0 -> K+ K-', [kX])
-        kkDDX = makeX('KKDD', default_config['XDD'], 'KS0 -> K+ K-', [kDX])
+        makeX('KKDD', default_config['XDD'], 'KS0 -> K+ K-', [kDX])
         pipiX = makeX(
             'PiPi', default_config['XLLhard'], 'KS0 -> pi+ pi-', [piX])
         pipiDDX = makeX(
@@ -274,7 +269,7 @@ class DarkBosonConf(LineBuilder):
             'PiPiSSDD', default_config['XDD'], '[KS0 -> pi+ pi+]cc', [piDX])
         preSS = default_config['Prescales']['SS']
 
-        preDD = default_config['Prescales']['DD']
+        default_config['Prescales']['DD']
         preKK = default_config['Prescales']['KK']
 
         j = makeJ(default_config['J'], [muJ])
@@ -391,7 +386,7 @@ class DarkBosonConf(LineBuilder):
         kst = filterKst()
         self._makeBLine('B2JKst', ['[B0 -> J/psi(1S) K*(892)0]cc'],
                         [j, kst], default_config['B2KX'])
-        rho = makeRho([piB])
+        makeRho([piB])
         # self._makeBLine('B2RhoX2MuMu',['B0 -> rho(770)0 KS0'],[rho,mmX],
         #                default_config['B2HHX'])
         # self._makeBLine('B2RhoX2MuMuDD',['B0 -> rho(770)0 KS0'],[rho,mmDDX],
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingRD/StrippingDoubleSLForRX.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingRD/StrippingDoubleSLForRX.py
index c04d6c7bc25ac04102a5ecd3d2e30878506825a4..703ec457e7bfec5cc75b90127f8b3ae580a8eb65 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingRD/StrippingDoubleSLForRX.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingRD/StrippingDoubleSLForRX.py
@@ -19,7 +19,6 @@ from GaudiConfUtils.ConfigurableGenerators import (CombineParticles,
                                                    DaVinci__N3BodyDecays)
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from Gaudi.Configuration import *
 __author__ = 'M. Kreps, T. Blake, D. Loh'
 __date__ = '10/11/2016'
 __version__ = '$Revision: 1.0$'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingRD/StrippingHypb2L0HGamma.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingRD/StrippingHypb2L0HGamma.py
index fb11a22899308c69c98379bf3153a7465645ce7e..ecbacfd2c6b212eb8f365e777f9a9448bf0d6bc9 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingRD/StrippingHypb2L0HGamma.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingRD/StrippingHypb2L0HGamma.py
@@ -16,8 +16,8 @@ __all__ = ('Hypb2L0HGammaConf',
            'default_config', )
 
 from Gaudi.Configuration import *
-from Configurables import FilterDesktop, CombineParticles, TisTosParticleTagger
-from PhysSelPython.Wrappers import Selection, MergedSelection, DataOnDemand
+from Configurables import CombineParticles, FilterDesktop
+from PhysSelPython.Wrappers import DataOnDemand, Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from StandardParticles import StdLooseAllPhotons
@@ -408,7 +408,7 @@ def tisTosSelection(sel, TISTOSdict):
 
 
 def makevelotracks(name):
-    from Configurables import FastVeloTracking, TrackPrepareVelo, DecodeVeloRawBuffer, TrackEventFitter, TrackStateInitAlg,  TrackContainerCopy
+    from Configurables import FastVeloTracking, TrackContainerCopy, TrackStateInitAlg
     from TrackFitter.ConfiguredFitters import ConfiguredEventFitter
 
     MyFastVeloTracking = FastVeloTracking(
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingRD/StrippingKshort2MuMuMuMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingRD/StrippingKshort2MuMuMuMu.py
index 0eb02eba089e401f5b8d05f25aa574d3d0998143..af71823927f8d50ad7b3bb851a6a0a0605e974ab 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingRD/StrippingKshort2MuMuMuMu.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingRD/StrippingKshort2MuMuMuMu.py
@@ -15,15 +15,12 @@ derived, in large measure, from StrippingKshort2PiPiMuMu.py
 '''
 
 from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays
-from GaudiKernel.SystemOfUnits import MeV
-from StandardParticles import StdNoPIDsDownPions, StdLooseDownMuons
-from StandardParticles import StdAllLoosePions, StdAllLooseMuons, StdAllNoPIDsPions
-from StandardParticles import StdLoosePions, StdLooseMuons, StdNoPIDsPions
+from StandardParticles import StdLooseDownMuons
+from StandardParticles import StdAllLooseMuons
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
+from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
 __author__ = ['Mike Sokoloff']
 __date__ = '07 January 2014'
 __version__ = '$Revision: 0.1 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingRD/StrippingKshort2PiPiMuMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingRD/StrippingKshort2PiPiMuMu.py
index df7f615d006d7f8b2d9e4f2b4fb21c0a63c956f2..2077734097791267b6f75fb46e6e51b2ea45444d 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingRD/StrippingKshort2PiPiMuMu.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingRD/StrippingKshort2PiPiMuMu.py
@@ -10,15 +10,12 @@
 ###############################################################################
 
 from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays
-from GaudiKernel.SystemOfUnits import MeV
 from StandardParticles import StdNoPIDsDownPions, StdLooseDownMuons
-from StandardParticles import StdAllLoosePions, StdAllLooseMuons, StdAllNoPIDsPions
-from StandardParticles import StdLoosePions, StdLooseMuons, StdNoPIDsPions
+from StandardParticles import StdAllLooseMuons, StdAllLoosePions
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
+from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
 __author__ = ['Mike Sokoloff']
 __date__ = '25/10/2012'
 __version__ = '$Revision: 0.1 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingRD/StrippingKshort2eePiPi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingRD/StrippingKshort2eePiPi.py
index da78ba561a995d50ca08f28c7180c2d376edc373..f1c66b71d8bca485a8da728e91f430b40a8f727d 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingRD/StrippingKshort2eePiPi.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingRD/StrippingKshort2eePiPi.py
@@ -16,7 +16,6 @@ from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection
 from GaudiConfUtils.ConfigurableGenerators import DaVinci__N3BodyDecays as Combine3Particles
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
-from Gaudi.Configuration import *
 __author__ = ['Carla Marin']
 __date__ = '23/11/2016'
 __version__ = '$1.1 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingRD/StrippingLFVLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingRD/StrippingLFVLines.py
index dff1703008dbd91cf449348ac2dbb57ad32ca23e..1a3aa2f9456cc88f392c0cc4d3a794052cc263ee 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingRD/StrippingLFVLines.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingRD/StrippingLFVLines.py
@@ -23,14 +23,12 @@ __all__ = ('LFVLinesConf',
            'default_config',
            )
 
-from Gaudi.Configuration import *
 # from Configurables import FilterDesktop, CombineParticles
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, DaVinci__N3BodyDecays
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N3BodyDecays
 from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from GaudiKernel.PhysicalConstants import c_light
-from GaudiKernel.SystemOfUnits import GeV, MeV, mm
+from GaudiKernel.SystemOfUnits import MeV, mm
 from copy import deepcopy
 #
 # Configure related info tools
@@ -1181,7 +1179,7 @@ class LFVLinesConf(LineBuilder):
         hemu_name = name+'B2heMu'
         pmu_name = name+'B2hMu'
         bu_name = name+'Bu2KJPsiee'
-        taumu_name = name+'B2TauMu'
+        name+'B2TauMu'
         htaumu_name = name+'B2hTauMu'
         muetap_gamma_name = name+'Tau2MuEtaP2pipig'
         muetap_pi_name = name+'Tau2MuEtaP2pipipi'
@@ -1675,7 +1673,6 @@ def makeB2TauMu(name):
         "& (BPVVDCHI2> 225)"\
         "& (BPVIPCHI2()< 25) "
 
-    from CommonParticles import StdLooseDetachedTau, StdLooseDipion
     _stdLooseMuons = DataOnDemand(Location="Phys/StdLooseMuons/Particles")
     _stdLooseDetachedTaus = DataOnDemand(
         Location="Phys/StdLooseDetachedTau3pi/Particles")
@@ -2314,7 +2311,6 @@ def makeB2hTauMu(name):
                           "& (BPVVDCHI2> 225)"\
                           "& (BPVIPCHI2()< 16) "  # maybe 16
 
-    from CommonParticles import StdLooseDetachedTau, StdLooseDipion
     _stdLooseMuons = DataOnDemand(Location="Phys/StdLooseMuons/Particles")
     _stdLooseDetachedTaus = DataOnDemand(
         Location="Phys/StdLooseDetachedTau3pi/Particles")
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingRD/StrippingLb2L0Gamma.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingRD/StrippingLb2L0Gamma.py
index 048e24b93a02626bd3b5b98e17e081330ef91c75..698e0dbb30bb3876bc5a609bc7b3716a923898e6 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingRD/StrippingLb2L0Gamma.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingRD/StrippingLb2L0Gamma.py
@@ -25,9 +25,6 @@ __date__ = "14.11.2016"
 __version__ = "2.0"
 __all__ = ("default_config", "StrippingLb2L0GammaConf")
 
-import os
-
-from Gaudi.Configuration import *
 
 from Configurables import CombineParticles
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
@@ -36,9 +33,7 @@ from PhysSelPython.Wrappers import Selection, MergedSelection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 
-from StandardParticles import StdAllNoPIDsPions, StdAllNoPIDsProtons
 from StandardParticles import StdLooseAllPhotons, StdAllLooseGammaDD, StdAllLooseGammaLL
-from StandardParticles import StdVeryLooseDetachedKst2Kpi
 from StandardParticles import StdLooseJpsi2MuMu
 
 default_config = {'NAME': 'Lb2L0Gamma',
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingRD/StrippingLc23MuLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingRD/StrippingLc23MuLines.py
index 4d0e65fd68afc24ab3e895df75533234dbff67f7..e57d2f0f1b089113abb2f0b33c8af7186c88f792 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingRD/StrippingLc23MuLines.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingRD/StrippingLc23MuLines.py
@@ -66,11 +66,10 @@ __all__ = ("Lc23MuLinesConf",
 ###################################################################################################
 
 from Gaudi.Configuration import *
-from Configurables import FilterDesktop, CombineParticles, DaVinci__N3BodyDecays
+from Configurables import DaVinci__N3BodyDecays
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from GaudiKernel.PhysicalConstants import c_light
 
 ###################################################################################################
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingRD/StrippingPhiToKSKS.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingRD/StrippingPhiToKSKS.py
index ff5893ed3c6e324c43ffa0d57bf6dafae4304e21..3a3bda0062db28d5b2687378589719ba90ee3660 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingRD/StrippingPhiToKSKS.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingRD/StrippingPhiToKSKS.py
@@ -23,8 +23,7 @@ from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from StandardParticles import StdAllLooseKaons, StdAllLooseMuons
-from Configurables import FitDecayTrees
-from PhysSelPython.Wrappers import AutomaticData, MergedSelection
+from PhysSelPython.Wrappers import MergedSelection
 
 __all__ = ('PhiToKSKSAllLinesConf',
            'TOSFilter',
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingRD/StrippingRareNStrange.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingRD/StrippingRareNStrange.py
index 45ebc9b804dc6280194074ac2c29d7eb2abd3648..96da26c9feb2c65e7046fe94c3d8a2b41e31ef0e 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingRD/StrippingRareNStrange.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingRD/StrippingRareNStrange.py
@@ -10,9 +10,8 @@
 ###############################################################################
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection, AutomaticData
+from PhysSelPython.Wrappers import Selection
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = 'Diego Martinez Santos, Carlos Vazquez, Xabier Cid, Jessica Prisciandaro'
 __date__ = '08/05/2015'
 __version__ = '$Revision: Not sure $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingRD/StrippingRareStrange.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingRD/StrippingRareStrange.py
index 59b26f2a269c2ed4a56fa90aba360dffc5e3432e..5a42379b69a5ff8994442a06480cc3afc7ceb662 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingRD/StrippingRareStrange.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingRD/StrippingRareStrange.py
@@ -51,15 +51,11 @@ __all__ = ('RareStrangeLinesConf',
 from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 from GaudiConfUtils.ConfigurableGenerators import DaVinci__N3BodyDecays as Combine3Particles
-from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays as Combine4Particles
-from CommonParticles import StdNoPIDsDownElectrons
 from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from GaudiKernel.PhysicalConstants import c_light
-from StandardParticles import (StdAllNoPIDsPions, StdNoPIDsDownPions,
-                               StdLoosePions, StdLooseDownMuons,
-                               StdLooseMergedPi0, StdLooseResolvedPi0, StdLooseDalitzPi0)
+from StandardParticles import (StdLooseMergedPi0, StdLooseResolvedPi0,
+                               StdLooseDalitzPi0)
 
 # from CommonParticles.StdLooseDalitzPi0 import (StdLoosePi02gee, StdLoosePi024e)
 
@@ -2150,7 +2146,7 @@ def makeLambdaPPiEE(name, config, inputs):
 
 
 def makevelotracks(name):
-    from Configurables import FastVeloTracking, TrackPrepareVelo, DecodeVeloRawBuffer, TrackEventFitter, TrackStateInitAlg,  TrackContainerCopy
+    from Configurables import FastVeloTracking, TrackContainerCopy, TrackStateInitAlg
     from TrackFitter.ConfiguredFitters import ConfiguredEventFitter
 
     MyFastVeloTracking = FastVeloTracking(
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingRD/StrippingTau23MuLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingRD/StrippingTau23MuLines.py
index d9cca6b4abd4adfc85706bc020d4c9d6bb00bbc1..efcddadd2c0c53eae31d65b7c110a301ad4317fa 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingRD/StrippingTau23MuLines.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingRD/StrippingTau23MuLines.py
@@ -35,7 +35,6 @@ from GaudiConfUtils.ConfigurableGenerators import DaVinci__N5BodyDecays as Combi
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from GaudiKernel.PhysicalConstants import c_light
 
 default_config = {
     'NAME': 'Tau23Mu',
@@ -70,7 +69,7 @@ class Tau23MuLinesConf(LineBuilder):
         # checkConfig(Bs2MuMuLinesConf.__configuration_keys__,config)
 
         tau_name = name+'Tau23Mu'
-        ds23PiTIS_name = name+'Ds23PiTIS'
+        name+'Ds23PiTIS'
         ds23Pi_name = name+'Ds23Pi'
         ds2PhiPi_name = name+'Ds2PhiPi'
         tau25_name = name+'Tau25Mu'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingRD/StrippingTau2LambdaMuLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingRD/StrippingTau2LambdaMuLines.py
index 8cd7c6388ff4ba895478a3cfeed968afa1a66ac5..bf1088a9316ebde507658a198795658fff5e954b 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingRD/StrippingTau2LambdaMuLines.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingRD/StrippingTau2LambdaMuLines.py
@@ -16,12 +16,10 @@ Exported symbols (use python help!):
    - 
 '''
 
-from GaudiKernel.PhysicalConstants import c_light
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
-from Configurables import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
+from Configurables import CombineParticles
 __author__ = ['Marcin Chrzaszcz']
 __date__ = '14/12/2012'
 __version__ = '$Revision: 1.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingRD/StrippingZVTOP.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingRD/StrippingZVTOP.py
index ea1f9b6208c57e34dfbe76c664ccab3384f31986..307ea9bc346fb872b84790dd9d88d1116d33d9ad 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingRD/StrippingZVTOP.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingRD/StrippingZVTOP.py
@@ -9,14 +9,12 @@
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
 from Configurables import TopoTauAlg, TopoVertexTool
-from StandardParticles import StdLooseKaons
-from StandardParticles import StdLoosePions, StdTightPions
-from StandardParticles import StdNoPIDsKaons, StdNoPIDsPions
+from StandardParticles import StdLoosePions
+from StandardParticles import StdNoPIDsPions
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, OfflineVertexFitter
-from Gaudi.Configuration import *
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop
 old__author__ = ['G. Mancinelli, J Cogan']
 __date__ = '14/01/2014'
 __version__ = '$Revision: 1.2 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingSL/StrippingB23MuNu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingSL/StrippingB23MuNu.py
index 5f1edbaaaac7ff2b810161a6accc4d35fe5b2590..cb73631db49326f0330f231f9d0bbcbe9652a3b2 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingSL/StrippingB23MuNu.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingSL/StrippingB23MuNu.py
@@ -19,15 +19,12 @@ __all__ = ('B23MuNuConf')
 Stripping selection for B to three muons and a neutrino.
 """
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop
 
-from PhysSelPython.Wrappers import Selection, AutomaticData, MergedSelection
+from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from LHCbKernel.Configuration import *  # check if needed
-from Configurables import SubstitutePID
-from Configurables import SubPIDMMFilter
 
 
 #################
@@ -189,15 +186,13 @@ class B23MuNuConf(LineBuilder):
         """
         Creates Jpsi as proxy for dimuon
         """
-        from PhysSelPython.Wrappers import AutomaticData, Selection, SelectionSequence, DataOnDemand, MergedSelection
+        from PhysSelPython.Wrappers import Selection
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         # from Configurables import CombineParticles
 
         CombineJpsi = CombineParticles(DecayDescriptors=["J/psi(1S) -> mu+ mu-", "[J/psi(1S) -> mu+ mu+]cc"],
                                        MotherCut="ALL")
 
-        sel_name = "Jpsi"
-
         from PhysSelPython.Wrappers import Selection
         SelJpsi = Selection("Sel_" + self.name + "_Jpsi", Algorithm=CombineJpsi,
                             RequiredSelections=[self.Muons])
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingSL/StrippingB2DMuForTauMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingSL/StrippingB2DMuForTauMu.py
index 24bd5252aa63ad2bd7e72f001e4bf7d92164b192..12dee166b3de78360c21d960e89150de48cebd46 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingSL/StrippingB2DMuForTauMu.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingSL/StrippingB2DMuForTauMu.py
@@ -18,12 +18,10 @@ __version__ = '$Revision: 2.0 $'
 
 from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from PhysSelPython.Wrappers import Selection, DataOnDemand
+from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from StandardParticles import StdLoosePions, StdAllLooseMuons, StdLooseKaons, StdLooseProtons, StdAllLoosePions, StdLooseMergedPi0, StdLooseResolvedPi0, StdAllNoPIDsMuons, StdLooseANNUpPions
-from Configurables import ConjugateNeutralPID
-from PhysSelPython.Wrappers import MergedSelection
+from StandardParticles import StdAllLooseMuons, StdAllNoPIDsMuons, StdLooseKaons, StdLoosePions, StdLooseProtons
 
 __all__ = ('B2DMuForTauMuconf',
            # 'makeb2DMuX',
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingSL/StrippingB2DMuNuX.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingSL/StrippingB2DMuNuX.py
index 17cd5b71dd5db077b2c2fbed4adfe216fa2128e8..be298e6b623e98c491c6fb9e112f98311749074e 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingSL/StrippingB2DMuNuX.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingSL/StrippingB2DMuNuX.py
@@ -13,14 +13,13 @@ __date__ = '23/07/2010'
 __version__ = '$Revision: 5.0 $'
 
 from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
+from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
 from PhysSelPython.Wrappers import Selection
-from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from StandardParticles import StdLoosePions, StdLooseMuons, StdLooseKaons, StdLooseProtons, StdLooseElectrons
 from StandardParticles import StdNoPIDsPions, StdNoPIDsKaons, StdNoPIDsProtons, StdNoPIDsMuons
 from StrippingB2DMuNuXUtils import *
-from GaudiKernel.SystemOfUnits import MeV, GeV, cm, mm
+from GaudiKernel.SystemOfUnits import GeV, MeV, mm
 
 __all__ = ('B2DMuNuXAllLinesConf',
            'default_config')
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingSL/StrippingB2DMuNuXUtils.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingSL/StrippingB2DMuNuXUtils.py
index 4c6dd348fed7388392b98366954d2b1dc0fbbe27..7bce3fa7f24650a21814814917551403af57f85c 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingSL/StrippingB2DMuNuXUtils.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingSL/StrippingB2DMuNuXUtils.py
@@ -13,11 +13,9 @@ __date__ = '06/03/2015'
 __version__ = '$Revision: 0.0 $'
 
 from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
-from StrippingUtils.Utils import LineBuilder
-from StandardParticles import StdLoosePions, StdLooseMuons, StdLooseKaons, StdLooseProtons, StdNoPIDsPions, StdLooseElectrons, StdNoPIDsMuons
 
 
 def BtoDlnuLine(module_name,
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingSL/StrippingB2Dlnu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingSL/StrippingB2Dlnu.py
index 314d6e309550b6649edc4e0deda1b41a781ac788..d9b1a081f6ec6651b558b666e7576c54a2581b3e 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingSL/StrippingB2Dlnu.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingSL/StrippingB2Dlnu.py
@@ -17,12 +17,10 @@ __version__ = '$Revision: 1.0 $'
 
 from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from PhysSelPython.Wrappers import Selection, DataOnDemand
+from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from StandardParticles import StdLoosePions, StdLooseMuons, StdLooseKaons, StdLooseProtons, StdAllLoosePions, StdLooseMergedPi0, StdLooseResolvedPi0, StdAllNoPIDsMuons, StdLooseANNUpPions, StdLooseElectrons
-from Configurables import ConjugateNeutralPID
-from PhysSelPython.Wrappers import MergedSelection
+from StandardParticles import StdAllNoPIDsMuons, StdLooseElectrons, StdLooseKaons, StdLooseMuons, StdLoosePions
 
 __all__ = ('B2DMuForLNuconf',
            # 'makeb2DMuX',
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingSL/StrippingB2DstMuNuIncl.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingSL/StrippingB2DstMuNuIncl.py
index 2deca338b3c3e54fbefa7fd0858949d287ad4315..1cc8f434534b20edd10910569fb0c5884c783bad 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingSL/StrippingB2DstMuNuIncl.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingSL/StrippingB2DstMuNuIncl.py
@@ -12,9 +12,8 @@ __author__ = ['Mika Vesterinen']
 __date__ = '04/04/2015'
 __version__ = '$Revision: 0.0 $'
 
-from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from PhysSelPython.Wrappers import Selection, DataOnDemand
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
+from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from StandardParticles import StdLoosePions, StdLooseMuons, StdLooseKaons, StdAllLoosePions
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingSL/StrippingB2PPbarMuForTauMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingSL/StrippingB2PPbarMuForTauMu.py
index bbf2f30af50a4d032dcbc3d8bd45d439db3c1f39..04dfcfdefa47c1de292fecc8a0d346b598e38f79 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingSL/StrippingB2PPbarMuForTauMu.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingSL/StrippingB2PPbarMuForTauMu.py
@@ -9,9 +9,7 @@
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
 
-import logging
 from StrippingUtils.Utils import LineBuilder
-from Gaudi.Configuration import *
 __author__ = ['Mark Smith']
 __date__ = '17/10/2016'
 __version__ = '$Revision: 1.0 $'
@@ -110,8 +108,6 @@ class B2PPbarMuForTauMuBuilder(LineBuilder):
     def __init__(self, name, config):
         LineBuilder.__init__(self, name, config)
 
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
-
         self.GECs = {"Code": "( recSummary(LHCb.RecSummary.nSPDhits,'Raw/Spd/Digits') < %(GEC_nSPDHits)s )" % config,
                      "Preambulo": ["from LoKiTracks.decorators import *"]}
 
@@ -420,7 +416,7 @@ class B2PPbarMuForTauMuBuilder(LineBuilder):
     ###### B->ppMuNu Signal ######
     def _bhad2PMuX_B(self):
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-        from PhysSelPython.Wrappers import Selection, MergedSelection
+        from PhysSelPython.Wrappers import Selection
 
         _pMu = CombineParticles(
             DecayDescriptors=self._config["DECAYS"], ReFitPVs=True)
@@ -437,7 +433,7 @@ class B2PPbarMuForTauMuBuilder(LineBuilder):
     ###### B->ppMuNu Signal for Topo Line ######
     def _bhad2PMuX_BTopo(self):
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-        from PhysSelPython.Wrappers import Selection, MergedSelection
+        from PhysSelPython.Wrappers import Selection
 
         _pMu = CombineParticles(
             DecayDescriptors=self._config["DECAYS"], ReFitPVs=True)
@@ -454,7 +450,7 @@ class B2PPbarMuForTauMuBuilder(LineBuilder):
     ###### B->ppMuNu Same-Sign protons ######
     def _bhad2PMuX_B_SS(self):
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-        from PhysSelPython.Wrappers import Selection, MergedSelection
+        from PhysSelPython.Wrappers import Selection
 
         _pMu = CombineParticles(
             DecayDescriptors=self._config["SSDECAYS"], ReFitPVs=True)
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingSL/StrippingB2XTauNu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingSL/StrippingB2XTauNu.py
index 8efb67709ccc4939a7afd4730bb973234c008b74..fcbc8d4cc08bc4620c7d772cbeb082e28c89109d 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingSL/StrippingB2XTauNu.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingSL/StrippingB2XTauNu.py
@@ -608,7 +608,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         self.__MakeB0d2DdoubleStarTauNuNonPhysTau__()
 
         from StrippingConf.StrippingLine import StrippingLine
-        from PhysSelPython.Wrappers import SelectionSequence
 
         # TisTos filter
         def filterTisTos(name, Input, myTisTosSpecs):
@@ -1126,7 +1125,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
 
         from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseJpsi2MuMu
 
         JpsiForBc = FilterDesktop(
             Code=self.totalJpsiCut
@@ -1145,7 +1143,7 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
 
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
+        from PhysSelPython.Wrappers import Selection
         from StandardParticles import StdLoosePions
 
         CombDdoubleStar2DstarPi = CombineParticles(
@@ -1167,7 +1165,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3pi/Particles')
@@ -1191,7 +1188,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3pi/Particles')
@@ -1215,7 +1211,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTauNonPhys
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3piNonPhys/Particles')
@@ -1239,7 +1234,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3pi/Particles')
@@ -1264,7 +1258,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3pi/Particles')
@@ -1289,7 +1282,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTauNonPhys
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3piNonPhys/Particles')
@@ -1313,7 +1305,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3pi/Particles')
@@ -1338,7 +1329,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3pi/Particles')
@@ -1363,7 +1353,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTauNonPhys
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3piNonPhys/Particles')
@@ -1388,7 +1377,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3pi/Particles')
@@ -1412,7 +1400,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTauNonPhys
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3piNonPhys/Particles')
@@ -1436,7 +1423,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3pi/Particles')
@@ -1461,7 +1447,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3pi/Particles')
@@ -1486,7 +1471,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTauNonPhys
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3piNonPhys/Particles')
@@ -1511,7 +1495,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3pi/Particles')
@@ -1537,7 +1520,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3pi/Particles')
@@ -1561,7 +1543,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3pi/Particles')
@@ -1587,7 +1568,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3pi/Particles')
@@ -1612,7 +1592,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTauNonPhys
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3piNonPhys/Particles')
@@ -1638,7 +1617,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3pi/Particles')
@@ -1662,7 +1640,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3pi/Particles')
@@ -1686,7 +1663,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3pi/Particles')
@@ -1711,7 +1687,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3pi/Particles')
@@ -1737,7 +1712,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTauNonPhys
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3piNonPhys/Particles')
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingSL/StrippingB2XuMuNu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingSL/StrippingB2XuMuNu.py
index 200bd7771aa4cf41977bcd119043ca3b1f036a1e..26632da6719ba79a45f0ca97230622d6e21c2285 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingSL/StrippingB2XuMuNu.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingSL/StrippingB2XuMuNu.py
@@ -9,9 +9,7 @@
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
 
-import logging
 from StrippingUtils.Utils import LineBuilder
-from Gaudi.Configuration import *
 __author__ = ['Phillip Urquijo, Alessandra Borgia']
 __date__ = '08/05/2010'
 __version__ = '$Revision: 1.6 $'
@@ -227,7 +225,7 @@ class B2XuMuNuBuilder(LineBuilder):
     def __init__(self, name, config):
         LineBuilder.__init__(self, name, config)
         self.config = config
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
+        from PhysSelPython.Wrappers import DataOnDemand
         self._stdLooseKsLL = DataOnDemand("Phys/StdLooseKsLL/Particles")
         self._stdLooseKsLD = DataOnDemand("Phys/StdLooseKsLD/Particles")
         self._stdLooseKsDD = DataOnDemand("Phys/StdLooseKsDD/Particles")
@@ -633,8 +631,8 @@ class B2XuMuNuBuilder(LineBuilder):
         if self._KSSel is not None:
             return self._KSSel
 
-        from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
+        from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
+        from PhysSelPython.Wrappers import Selection
 
         _code = FilterDesktop(Code=self._NominalKsSelection() % self._config)
 
@@ -754,7 +752,7 @@ class B2XuMuNuBuilder(LineBuilder):
 
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection
-        from StandardParticles import StdLoosePions, StdLooseMuons
+        from StandardParticles import StdLoosePions
 
         _Ksh = CombineParticles(
             DecayDescriptor="KS0 -> mu- pi+",
@@ -782,7 +780,7 @@ class B2XuMuNuBuilder(LineBuilder):
 
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection
-        from StandardParticles import StdLoosePions, StdLooseMuons
+        from StandardParticles import StdLoosePions
 
         _Ksh = CombineParticles(
             DecayDescriptor="KS0 -> mu+ pi-",
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingSL/StrippingCharmFromBSemiForHadronAsy.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingSL/StrippingCharmFromBSemiForHadronAsy.py
index ae6916ee10975107d80bf873fb0cf514d0ae100d..50c775a9989778091e07c14a177f345664ef901d 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingSL/StrippingCharmFromBSemiForHadronAsy.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingSL/StrippingCharmFromBSemiForHadronAsy.py
@@ -25,8 +25,7 @@ from Configurables import FilterDesktop, CombineParticles
 from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from StandardParticles import StdAllLoosePions, StdLoosePions, StdLooseMuons, StdLooseKaons, StdLooseProtons
-from Configurables import TisTosParticleTagger
+from StandardParticles import StdLooseKaons, StdLooseMuons, StdLoosePions
 
 __all__ = ('CharmFromBSemiForHadronAsyAllLinesConf',
            'TOSFilter',
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingSL/StrippingLb2pMuNuVub.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingSL/StrippingLb2pMuNuVub.py
index e10913eb9590d30fc0624576ebbc5a089ebecfc9..233c320a48e2e1db5dcc41254759cc48a4896b7b 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingSL/StrippingLb2pMuNuVub.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingSL/StrippingLb2pMuNuVub.py
@@ -9,9 +9,7 @@
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
 
-import logging
 from StrippingUtils.Utils import LineBuilder
-from Gaudi.Configuration import *
 __author__ = ['William Sutcliffe']
 __date__ = '19/01/2014'
 __version__ = '$Revision: 1.0 $'
@@ -137,8 +135,6 @@ class Lb2pMuNuVubBuilder(LineBuilder):
     def __init__(self, name, config):
         LineBuilder.__init__(self, name, config)
 
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
-
         self.GECs = {"Code": "( recSummaryTrack(LHCb.RecSummary.nLongTracks, TrLONG) < %(GEC_nLongTrk)s )" % config,
                      "Preambulo": ["from LoKiTracks.decorators import *"]}
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingSL/Strippingbhad2PMuX.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingSL/Strippingbhad2PMuX.py
index 3ba91114e26c7abd9eedb69152926b96d6fc5064..00920929d0c157380e67827dd082ac96b04c48e2 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingSL/Strippingbhad2PMuX.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping31r2/StrippingSL/Strippingbhad2PMuX.py
@@ -9,9 +9,7 @@
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
 
-import logging
 from StrippingUtils.Utils import LineBuilder
-from Gaudi.Configuration import *
 __author__ = ['William Sutcliffe', 'Patrick Owen']
 __date__ = '02/12/2015'
 __version__ = '$Revision: 2.0 $'
@@ -135,8 +133,6 @@ class bhad2PMuXBuilder(LineBuilder):
     def __init__(self, name, config):
         LineBuilder.__init__(self, name, config)
 
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
-
         self.GECs = {"Code": "( recSummaryTrack(LHCb.RecSummary.nLongTracks, TrLONG) < %(GEC_nLongTrk)s )" % config,
                      "Preambulo": ["from LoKiTracks.decorators import *"]}
 
@@ -458,7 +454,7 @@ class bhad2PMuXBuilder(LineBuilder):
     ###### Lb->pMuNu High M_corr Opposite Sign ######
     def _bhad2PMuX_Lb(self):
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-        from PhysSelPython.Wrappers import Selection, MergedSelection
+        from PhysSelPython.Wrappers import Selection
 
         _pMu = CombineParticles(
             DecayDescriptors=self._config["DECAYS"], ReFitPVs=True)
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingB2CC/StrippingB2JpsiHH.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingB2CC/StrippingB2JpsiHH.py
index 426a15a03fdb410fd33fba1d83ccac165f4c345b..ea80a2693083b0dd305af119c0794a0a03dd0088 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingB2CC/StrippingB2JpsiHH.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingB2CC/StrippingB2JpsiHH.py
@@ -20,18 +20,10 @@ __date__ = '10/11/2016'
 
 __all__ = ('B2JpsiHHConf', 'default_config')
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from CommonParticles.Utils import updateDoD
-from StandardParticles import StdLoosePions
-from StandardParticles import StdLooseKaons
-from StandardParticles import StdLooseProtons
-from StandardParticles import StdAllLooseKaons
-from StandardParticles import StdAllLooseProtons
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
+from PhysSelPython.Wrappers import DataOnDemand, Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from GaudiKernel.SystemOfUnits import MeV
 
 default_config = {
     'NAME': 'B2JpsiHH',
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingB2CC/StrippingB2JpsiPi0.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingB2CC/StrippingB2JpsiPi0.py
index 90740f80b4fbe5d7cdd945fc3fb2a4331ac1e49d..170baf2fb63c5dbaab6735a4dbe697c61ed379a3 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingB2CC/StrippingB2JpsiPi0.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingB2CC/StrippingB2JpsiPi0.py
@@ -14,15 +14,10 @@ __version__ = '$Revision: 1.1$'
 
 __all__ = ('B2JpsiPi0Conf', 'default_config')
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from CommonParticles.Utils import updateDoD
-from StandardParticles import StdLooseResolvedPi0
-from StandardParticles import StdLooseMergedPi0
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
+from PhysSelPython.Wrappers import DataOnDemand, Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from GaudiKernel.SystemOfUnits import MeV
 
 default_config = {
     # The real name of the lines is BetaS, this is a reference this for the Settings.
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingB2CC/StrippingB2JpsiPi0_Run1.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingB2CC/StrippingB2JpsiPi0_Run1.py
index 3f5f0443aa9132ab2494cbb48813c4ad8991fc1b..1bf462e0083a2da3704b1f804d03b10239ecd920 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingB2CC/StrippingB2JpsiPi0_Run1.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingB2CC/StrippingB2JpsiPi0_Run1.py
@@ -14,15 +14,10 @@ __version__ = '$Revision: 1.2$'
 
 __all__ = ('B2JpsiPi0Conf_RI', 'default_config')
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from CommonParticles.Utils import updateDoD
-from StandardParticles import StdLooseResolvedPi0
-from StandardParticles import StdLooseMergedPi0
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
+from PhysSelPython.Wrappers import DataOnDemand, Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from GaudiKernel.SystemOfUnits import MeV
 
 default_config = {
     # The real name of the lines is BetaS, this is a reference this for the Settings.
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingB2CC/StrippingB2JpsiX0.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingB2CC/StrippingB2JpsiX0.py
index d93a42cce82d84a0ed23627a007cbaad6d469573..e15a04497fca1b721a890552c1359e732098a2be 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingB2CC/StrippingB2JpsiX0.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingB2CC/StrippingB2JpsiX0.py
@@ -20,18 +20,10 @@ __date__ = '22/01/2018'
 
 __all__ = ('B2JpsiX0Conf', 'default_config')
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from CommonParticles.Utils import updateDoD
-from StandardParticles import StdLoosePions
-from StandardParticles import StdLooseKaons
-from StandardParticles import StdLooseProtons
-from StandardParticles import StdAllLooseKaons
-from StandardParticles import StdAllLooseProtons
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
+from PhysSelPython.Wrappers import DataOnDemand, Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from GaudiKernel.SystemOfUnits import MeV
 
 default_config = {
     'NAME': 'B2JpsiX0',
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingB2CC/StrippingB2JpsiXforBeta_s.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingB2CC/StrippingB2JpsiXforBeta_s.py
index f249942b6e70534073a342298d7e41c294d2ac84..83cfcf7fbfeca7d7da85f9148f6fff86360c328b 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingB2CC/StrippingB2JpsiXforBeta_s.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingB2CC/StrippingB2JpsiXforBeta_s.py
@@ -26,16 +26,12 @@ __version__ = '$Revision: 4.0$'
 
 __all__ = ('B2JpsiXforBeta_sConf', 'default_config')
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from CommonParticles.Utils import updateDoD
 from StandardParticles import StdLoosePions
 from StandardParticles import StdLooseKaons
-from StandardParticles import StdAllLooseKaons
 from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from GaudiKernel.SystemOfUnits import MeV
 
 default_config = {
     'NAME': 'BetaS',
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingB2CC/StrippingBd2JpsieeKS.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingB2CC/StrippingBd2JpsieeKS.py
index 447acfd66a8a888ea16f056888b1b5a41ccee167..ccac3244d5f71227250f84d9c5d0c485845ab5b3 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingB2CC/StrippingBd2JpsieeKS.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingB2CC/StrippingBd2JpsieeKS.py
@@ -8,16 +8,10 @@
 # granted to it by virtue of its status as an Intergovernmental Organization  #
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
-from GaudiKernel.SystemOfUnits import MeV
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
-from StandardParticles import StdAllLooseKaons
-from StandardParticles import StdLooseKaons
-from StandardParticles import StdLoosePions
-from CommonParticles.Utils import updateDoD
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = 'Ramon Niet'
 __date__ = '2014/10/23'
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingB2CC/StrippingBd2JpsieeKstar.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingB2CC/StrippingBd2JpsieeKstar.py
index 2f212b3648b3a956f93594588b6f5fd1a345b725..8ce24bba33857f9f52e405dfb33b6f4cfbc72be8 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingB2CC/StrippingBd2JpsieeKstar.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingB2CC/StrippingBd2JpsieeKstar.py
@@ -12,7 +12,6 @@ from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from Configurables import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = 'Artur Ukleja, Jibo He, Konrad Klimaszewski, Varvara Batozskaya'
 __date__ = '2019/01/22'
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingB2CC/StrippingBs2EtacPhiBDT.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingB2CC/StrippingBs2EtacPhiBDT.py
index b6e256eaa1235a84cbf3b68362eea9bf7f387897..30d69a2c110a19ab5a45303854da636781997f4f 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingB2CC/StrippingBs2EtacPhiBDT.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingB2CC/StrippingBs2EtacPhiBDT.py
@@ -17,7 +17,6 @@ from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
-from Gaudi.Configuration import *
 __author__ = ['Morgan Martin, Jibo He']
 __date__ = '20/08/2014'
 __version__ = '$Revision: 1.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingB2CC/StrippingBs2JpsieePhi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingB2CC/StrippingBs2JpsieePhi.py
index 933c2f46f93196ffa448a855cea7a82e5fca3652..ee8bf0cf2aad66cd3771f048a336fffb0ed8165d 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingB2CC/StrippingBs2JpsieePhi.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingB2CC/StrippingBs2JpsieePhi.py
@@ -12,7 +12,6 @@ from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from Configurables import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = 'Artur Ukleja, Jibo He, Konrad Klimaszewski'
 __date__ = '2011/03/01'
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingB2OC/Beauty2Charm_B2DXBuilder.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingB2OC/Beauty2Charm_B2DXBuilder.py
index 2d1c9d69a292481caadad4c128dc90547777bf58..d86ed2e85c6a4d8cd4220bde92edd4e1f99e0d84 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingB2OC/Beauty2Charm_B2DXBuilder.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingB2OC/Beauty2Charm_B2DXBuilder.py
@@ -12,11 +12,7 @@
 
 from copy import deepcopy
 from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-from PhysSelPython.Wrappers import Selection
-from Beauty2Charm_LoKiCuts import LoKiCuts
 from Beauty2Charm_Utils import *
-from Configurables import SubstitutePID
 
 # \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\#
 
@@ -1090,7 +1086,7 @@ class B2DXBuilder(object):
                                     "B- -> D*_2(2460)0 D0 K-"],
                   'B2D0st2460D0Pi': ["B+ -> D*_2(2460)0 D0 pi+",
                                      "B- -> D*_2(2460)0 D0 pi-"]}
-        input = self.dst.dpi_2460_pid+self.d.kpi_pid+self.topoKaons_PID
+        self.dst.dpi_2460_pid+self.d.kpi_pid+self.topoKaons_PID
         inputs = {'B2D0st2460D0K': self.dst.dpi_2460_pid+self.d.kpi_pid+self.topoKaons_PID,
                   'B2D0st2460D0Pi': self.dst.dpi_2460_pid+self.d.kpi_pid+self.topoPions_PID}
         rs = makeB2XSels(decays, '', inputs, self.config)
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingB2OC/Beauty2Charm_Bc2BXBuilder.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingB2OC/Beauty2Charm_Bc2BXBuilder.py
index 63ecc854364bae2f29d64ea2b95c3484988c7016..5bb9297a5c69f56bc7b9761489bf517623df7d3c 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingB2OC/Beauty2Charm_Bc2BXBuilder.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingB2OC/Beauty2Charm_Bc2BXBuilder.py
@@ -8,11 +8,9 @@
 # granted to it by virtue of its status as an Intergovernmental Organization  #
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
-from copy import deepcopy
 from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 from PhysSelPython.Wrappers import Selection, MergedSelection
-from Beauty2Charm_LoKiCuts import LoKiCuts
 from Beauty2Charm_Utils import *
 
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingB2OC/Beauty2Charm_Bc2DDBuilder.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingB2OC/Beauty2Charm_Bc2DDBuilder.py
index 17eda4547110606bb00b589ef9a9081a7ab985e7..44526bcd78bbc48eb6f8c6416c9eabdc38313ac4 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingB2OC/Beauty2Charm_Bc2DDBuilder.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingB2OC/Beauty2Charm_Bc2DDBuilder.py
@@ -11,10 +11,8 @@
 
 # \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\#
 
-from copy import deepcopy
 from Gaudi.Configuration import *
-from PhysSelPython.Wrappers import Selection, MergedSelection
-from Beauty2Charm_LoKiCuts import LoKiCuts
+from PhysSelPython.Wrappers import MergedSelection
 from Beauty2Charm_Utils import *
 # from Configurables import SubstitutePID
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingB2OC/Beauty2Charm_Bc2DXBuilder.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingB2OC/Beauty2Charm_Bc2DXBuilder.py
index 6f6b41a5a8d8e6494ece3c8a144bcc57574870b7..4965e7a83f1b9871f219ab719abb3e950ee03bbd 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingB2OC/Beauty2Charm_Bc2DXBuilder.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingB2OC/Beauty2Charm_Bc2DXBuilder.py
@@ -10,9 +10,6 @@
 ###############################################################################
 from copy import deepcopy
 from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-from PhysSelPython.Wrappers import Selection, MergedSelection
-from Beauty2Charm_LoKiCuts import LoKiCuts
 from Beauty2Charm_Utils import *
 
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingB2OC/Beauty2Charm_DBuilder.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingB2OC/Beauty2Charm_DBuilder.py
index d4740efb1cda30fc3ac5cdfb96c40d12fe5606f3..c4e957ea4c19356392178500bc0038fb77f701cb 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingB2OC/Beauty2Charm_DBuilder.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingB2OC/Beauty2Charm_DBuilder.py
@@ -321,7 +321,6 @@ class DBuilder(object):
         # self.k3pi_ddx_pid = [filterSelection('D2k3pi_for_DDX',LoKiCuts(['VCHI2DOF','BPVVDCHI2'],config_for_ddx).code(),self.k3pi_pid)]
 
         # use this below
-        d_cf_noMassWin = d_cf
         d_cf = LoKiCuts.combine([d_cf, "in_range(%s,MM,%s)" % (d_min, d_max)])
         ds_cf = LoKiCuts.combine(
             [ds_cf, "in_range(%s,MM,%s)" % (ds_min, ds_max)])
@@ -1820,9 +1819,6 @@ class DBuilder(object):
 
     def _makeD2PhiMuNu(self, up=False):
         '''makes Ds->phi mu nu'''
-        decays = [['phi(1020)', 'mu+']]
-        min = '1125.13*MeV'
-        max = '2168.49*MeV'
         cpkk = CombineParticles(CombinationCut="ADAMASS('phi(1020)') < 150*MeV",  # ( hasTopoChild() )
                                 MotherCut='(VFASPF(VCHI2/VDOF) < 10)',
                                 DaughtersCuts={'K+': '(PIDK>-10)'},
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingB2OC/Beauty2Charm_HHBuilder.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingB2OC/Beauty2Charm_HHBuilder.py
index ac91c76ab1a16bdd9e6da4a8f26964aba8913d00..2a73dd8afc3d6f2f1e9b68b60ae7b3dd4bb6654c 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingB2OC/Beauty2Charm_HHBuilder.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingB2OC/Beauty2Charm_HHBuilder.py
@@ -10,7 +10,6 @@
 ###############################################################################
 # \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\#
 
-from copy import deepcopy
 from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 from PhysSelPython.Wrappers import Selection
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingB2OC/Beauty2Charm_HHHBuilder.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingB2OC/Beauty2Charm_HHHBuilder.py
index 4ca95e738689e28e73bea3eb642ac88f607712a1..28ca931f76590f11cdabcf62760db4c23769a749 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingB2OC/Beauty2Charm_HHHBuilder.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingB2OC/Beauty2Charm_HHHBuilder.py
@@ -10,9 +10,8 @@
 ###############################################################################
 # \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\#
 
-from copy import deepcopy
 from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N3BodyDecays
+from GaudiConfUtils.ConfigurableGenerators import DaVinci__N3BodyDecays
 from PhysSelPython.Wrappers import Selection
 from Beauty2Charm_LoKiCuts import LoKiCuts
 from Beauty2Charm_Utils import *
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingB2OC/Beauty2Charm_Lb2XBuilder.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingB2OC/Beauty2Charm_Lb2XBuilder.py
index b7be9235f35813eff39c035e1cb6714db9d90ca1..45e5b0dd4789b8e7ff6c046e70b87ec2e5b19c66 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingB2OC/Beauty2Charm_Lb2XBuilder.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingB2OC/Beauty2Charm_Lb2XBuilder.py
@@ -1333,7 +1333,7 @@ class Lb2XBuilder(object):
 
     def _makeX2LcKPiPiPi(self):
         '''Makes RS + WS Xib -> Lc HH + c.c.'''
-        pions = self.pions
+        self.pions
         kaons = self.kaons
         pipipi = self.hhh.pipipi
         config = deepcopy(self.config)
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingB2OC/Beauty2Charm_LoKiCuts.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingB2OC/Beauty2Charm_LoKiCuts.py
index 54540ea2a223d554a751b02cf83000df4f3aa076..0fd327f8d32075591c9ca0e2d4dd434636c0ab35 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingB2OC/Beauty2Charm_LoKiCuts.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingB2OC/Beauty2Charm_LoKiCuts.py
@@ -10,11 +10,6 @@
 ###############################################################################
 # \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\#
 
-from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
-from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-from PhysSelPython.Wrappers import Selection, MergedSelection
-from StandardParticles import StdNoPIDsPions, StdNoPIDsKaons
 
 # \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\#
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingB2OC/Beauty2Charm_Utils.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingB2OC/Beauty2Charm_Utils.py
index 1fe78df7c079a95de0d4ea880934703d735084c0..4a7f7a1c5fd4d4c38087b77dfd87eb04fa363095 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingB2OC/Beauty2Charm_Utils.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingB2OC/Beauty2Charm_Utils.py
@@ -10,13 +10,11 @@
 ###############################################################################
 # \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\#
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-from PhysSelPython.Wrappers import DataOnDemand, Selection, MergedSelection, VoidEventSelection
+from PhysSelPython.Wrappers import DataOnDemand, Selection, VoidEventSelection
 from Beauty2Charm_LoKiCuts import LoKiCuts
 from Configurables import SubstitutePID
-from Configurables import ConeJetProxyFilter
 
 # \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\#
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingB2OC/StrippingB2DDphi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingB2OC/StrippingB2DDphi.py
index b0f8982f1efb389032da5f7becb2881e3c005379..92ca95c2ea3f7c46766aedbc04dbbc34c9c0b8ef 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingB2OC/StrippingB2DDphi.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingB2OC/StrippingB2DDphi.py
@@ -15,8 +15,7 @@ Author: M. Martinelli
 Notes: Excited states are included by placing the line in FULL.DST
 '''
 from PhysSelPython.Wrappers import Selection, DataOnDemand
-from Configurables import FilterDesktop, CombineParticles, DaVinci__N4BodyDecays
-from GaudiConfUtils.ConfigurableGenerators import CombineParticles
+from Configurables import DaVinci__N4BodyDecays, FilterDesktop
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 __author__ = ['Maurizio Martinelli']
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingB2OC/StrippingB2DXD2HMuNu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingB2OC/StrippingB2DXD2HMuNu.py
index 0c33c7610ceda08cc07fbbc35c72e2186d8d5d81..d01564ec9dde10135fe1fc2b84e567d131876e4c 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingB2OC/StrippingB2DXD2HMuNu.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingB2OC/StrippingB2DXD2HMuNu.py
@@ -12,13 +12,11 @@ __author__ = ['Wenbin Qian']
 __date__ = '09/11/2015'
 __version__ = '$Revision: 0.01 $'
 
-from Gaudi.Configuration import *
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, DaVinci__N4BodyDecays, DaVinci__N3BodyDecays
-from PhysSelPython.Wrappers import Selection, DataOnDemand
+from PhysSelPython.Wrappers import Selection
 from StandardParticles import StdLooseMuons, StdLoosePions, StdLooseKaons
-from GaudiKernel.SystemOfUnits import MeV, GeV, cm, mm
 
 __all__ = ('B2DXD2HMuNuBuilder',
            'default_config')
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingB2OC/StrippingB2nbody.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingB2OC/StrippingB2nbody.py
index 663bdbbf855c3d8d19dad3a29b6be667edaeedb9..04c84fc2dc39eb4b3d3d954f3c0083396e0c84fa 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingB2OC/StrippingB2nbody.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingB2OC/StrippingB2nbody.py
@@ -16,7 +16,6 @@ from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, MergedSelection, DataOnDemand, VoidEventSelection
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = ['Rudolf Oldeman']
 __date__ = '08/02/2011'
 __version__ = '$Revision: 1.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingB2OC/StrippingBeauty2Charm.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingB2OC/StrippingBeauty2Charm.py
index 4d5f2c9be463ca2124ea2f2d0afc00614c46a995..3742d441c292d70cce6002696220883629d7fe34 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingB2OC/StrippingBeauty2Charm.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingB2OC/StrippingBeauty2Charm.py
@@ -28,11 +28,9 @@ from Beauty2Charm_HHHBuilder import *
 from Beauty2Charm_HHBuilder import *
 from Beauty2Charm_DBuilder import *
 from StandardParticles import StdLooseAllPhotons, StdVeryLooseAllPhotons
-from Configurables import LoKi__VoidFilter
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import EventSelection
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
+from PhysSelPython.Wrappers import MergedSelection, Selection
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
 from Gaudi.Configuration import *
 import re
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBandQ/StrippingB2Chic0KPi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBandQ/StrippingB2Chic0KPi.py
index 69e18721b3c6b45435046eaac0c9a79d5818b6da..030871800dfb7d9f6c18c93c207febaf3fad5cf8 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBandQ/StrippingB2Chic0KPi.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBandQ/StrippingB2Chic0KPi.py
@@ -17,7 +17,6 @@ from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
-from Gaudi.Configuration import *
 __author__ = ['Andrii Usachov']
 __date__ = '13/03/2018'
 __version__ = '$Revision: 1.2$'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBandQ/StrippingB2JpsiXforEM_s.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBandQ/StrippingB2JpsiXforEM_s.py
index d3aeeef75411f9cecca87053ee0faa991e8c7fd8..394fd7c3171d61beb9b93f762a890a248f2b190f 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBandQ/StrippingB2JpsiXforEM_s.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBandQ/StrippingB2JpsiXforEM_s.py
@@ -20,21 +20,11 @@ __version__ = '$Revision: 0.0 $'
 
 __all__ = ('B2JpsiXforEM_sConf', 'default_config')
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
 from Configurables import LoKi__PVReFitter, CombineParticles
-from CommonParticles.Utils import updateDoD
-from StandardParticles import StdLoosePions
-from StandardParticles import StdLooseKaons
-from StandardParticles import StdAllLooseKaons
-from StandardParticles import StdLooseResolvedPi0
-from StandardParticles import StdLooseMergedPi0
-from StandardParticles import StdNoPIDsPions
-from StandardParticles import StdLooseProtons
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
+from PhysSelPython.Wrappers import DataOnDemand, Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from GaudiKernel.SystemOfUnits import MeV
 
 default_config = {
     'NAME': 'B2JpsiXforEM',
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBandQ/StrippingBbbar2PhiPhi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBandQ/StrippingBbbar2PhiPhi.py
index 2c308991a8d9592619777fb7aad4c619a4a40437..fd4e526f5796889d5eb13efd1f1fca7adfbf4a97 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBandQ/StrippingBbbar2PhiPhi.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBandQ/StrippingBbbar2PhiPhi.py
@@ -21,12 +21,10 @@ confBbbar2PhiPhi = Bbbar2PhiPhiConf( name = 'Bbbar2PhiPhi', config = config_Bbba
 stream.appendLines( confBbbar2PhiPhi.lines() )
 '''
 
-from StandardParticles import StdNoPIDsProtons, StdNoPIDsPions, StdNoPIDsDownPions
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
+from PhysSelPython.Wrappers import DataOnDemand, Selection
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = ['Simone Stracka']
 __date__ = '10/03/2015'
 __all__ = (
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBandQ/StrippingBc2JpsiHBDT.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBandQ/StrippingBc2JpsiHBDT.py
index d973f13d2bc8b32c5045776e5b5d3f96bc618e74..7b5a84a9de9b55f09a9ef0da7469b5cc113c4602 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBandQ/StrippingBc2JpsiHBDT.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBandQ/StrippingBc2JpsiHBDT.py
@@ -18,7 +18,6 @@ from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = ['Jibo He']
 __date__ = '02/11/2013'
 __version__ = '$Revision: 2.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBandQ/StrippingBc2JpsiMuXNew.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBandQ/StrippingBc2JpsiMuXNew.py
index 946bad8366ac6019498b9d14e89f0a8899cf70d4..bd156feb81f0deaaf2a07b14df76bcbbcdd03d5c 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBandQ/StrippingBc2JpsiMuXNew.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBandQ/StrippingBc2JpsiMuXNew.py
@@ -18,7 +18,6 @@ from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = ['Jibo He']
 __date__ = '02/09/2010'
 __version__ = '$Revision: 2.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBandQ/StrippingCC2DD.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBandQ/StrippingCC2DD.py
index 58f89513ddb6f5ae23ad89c616deb7d8f0c6f719..39a30438368c27a6a42f57688de187a8b1135e72 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBandQ/StrippingCC2DD.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBandQ/StrippingCC2DD.py
@@ -22,8 +22,7 @@ Module for construction of CC->D D, where CC is a particle decaying to D D
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 __author__ = ['Lucio Anderlini', 'Andrea Bizzeti']
 __date__ = '2015-12-01'
 __version__ = '$Revision: 0.4 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBandQ/StrippingCcbar2Baryons.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBandQ/StrippingCcbar2Baryons.py
index e5a87f652fa30a90026cc6172bb112eb157c1e0f..3e235742a82cc6b6eef181ba5871e7096a9e965d 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBandQ/StrippingCcbar2Baryons.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBandQ/StrippingCcbar2Baryons.py
@@ -20,7 +20,6 @@ stream.appendLines( [
 ])
 '''
 
-from StandardParticles import StdNoPIDsProtons, StdNoPIDsPions, StdNoPIDsDownPions
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBandQ/StrippingCcbar2LambdaLambda.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBandQ/StrippingCcbar2LambdaLambda.py
index 627203da22f81a94eda9c6247ea6c2a1fb128927..283be918e66c410e5d5d0c9fd13effb397d4b70b 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBandQ/StrippingCcbar2LambdaLambda.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBandQ/StrippingCcbar2LambdaLambda.py
@@ -12,14 +12,10 @@
 Module for selecting Ccbar->LambdaLambda detached line, with loose PT, PID cuts. 
 '''
 
-from StandardParticles import StdAllLoosePions
-from StandardParticles import StdLoosePions, StdNoPIDsDownPions
-from StandardParticles import StdNoPIDsProtons
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = ['Andrii Usachov']
 __date__ = '27/01/2019'
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBandQ/StrippingCcbar2LstLambda.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBandQ/StrippingCcbar2LstLambda.py
index 0c317712061ae5a153e89bd41b8390a4fc74e187..4937ef3626431e3998bb3086fe7c656fa4ec9e57 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBandQ/StrippingCcbar2LstLambda.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBandQ/StrippingCcbar2LstLambda.py
@@ -12,14 +12,10 @@
 Module for selecting Ccbar->LstLambda detached line, with loose PT, PID cuts. 
 '''
 
-from StandardParticles import StdAllLoosePions, StdAllLooseKaons
-from StandardParticles import StdLoosePions, StdNoPIDsDownPions, StdLooseKaons, StdLooseDownKaons
-from StandardParticles import StdNoPIDsProtons, StdNoPIDsKaons
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = ['Andrii Usachov']
 __date__ = '23/11/2017'
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBandQ/StrippingCcbar2LstLst.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBandQ/StrippingCcbar2LstLst.py
index cf2d3319f4c8d473c85741f08945e6d15bd1722b..fb7af606490052a513bd2a8433237fcbfca14aa4 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBandQ/StrippingCcbar2LstLst.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBandQ/StrippingCcbar2LstLst.py
@@ -12,12 +12,10 @@
 Module for selecting Ccbar->LstLst detached line, with loose PT, PID cuts. 
 '''
 
-from StandardParticles import StdNoPIDsProtons, StdNoPIDsKaons
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
+from PhysSelPython.Wrappers import DataOnDemand, Selection
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = ['Andrii Usachov']
 __date__ = '12/01/2017'
 
@@ -58,19 +56,19 @@ class Ccbar2LstLstConf(LineBuilder):
         self.name = name
         self.config = config
 
-        TRCHI2DOF = config['TRCHI2DOF']
-        KaonProbNNk = config['KaonProbNNk']
-        KaonPTSec = config['KaonPTSec']
-        ProtonProbNNp = config['ProtonProbNNp']
-        ProtonP = config['ProtonP']
-        ProtonPTSec = config['ProtonPTSec']
-        LstVtxChi2 = config['LstVtxChi2']
-        LstMinMass = config['LstMinMass']
-        LstMaxMass = config['LstMaxMass']
-        CombMaxMass = config['CombMaxMass']
-        CombMinMass = config['CombMinMass']
-        MaxMass = config['MaxMass']
-        MinMass = config['MinMass']
+        config['TRCHI2DOF']
+        config['KaonProbNNk']
+        config['KaonPTSec']
+        config['ProtonProbNNp']
+        config['ProtonP']
+        config['ProtonPTSec']
+        config['LstVtxChi2']
+        config['LstMinMass']
+        config['LstMaxMass']
+        config['CombMaxMass']
+        config['CombMinMass']
+        config['MaxMass']
+        config['MinMass']
 
         self.DetachedProtonForLst = self.createSubSel(OutputList="DetachedProtonForLst" + self.name,
                                                       InputList=DataOnDemand(
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBandQ/StrippingCcbar2PPPiPi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBandQ/StrippingCcbar2PPPiPi.py
index 28b6a56f5499cd8ecbce8b1d1e366f216f123073..91e5c78c655288eb933c6478d1eafcaee3904f84 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBandQ/StrippingCcbar2PPPiPi.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBandQ/StrippingCcbar2PPPiPi.py
@@ -12,12 +12,11 @@
 Module for selecting charmonium -> p pbar pi pi 
 '''
 
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
+from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
 from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
-from Gaudi.Configuration import *
 __author__ = ['Jibo He']
 __date__ = '12/11/2015'
 __version__ = '$Revision: 1.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBandQ/StrippingCcbar2PhiPhi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBandQ/StrippingCcbar2PhiPhi.py
index c21b9fa874a5dccb0d9c373c28e255bbe309ea95..101a8e21ba087c6c991fe35e18471728a0abe2e3 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBandQ/StrippingCcbar2PhiPhi.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBandQ/StrippingCcbar2PhiPhi.py
@@ -21,12 +21,10 @@ confCcbar2PhiPhi = Ccbar2PhiPhiConf( name = 'Ccbar2PhiPhi', config = config_Ccba
 stream.appendLines( confCcbar2PhiPhi.lines() )
 '''
 
-from StandardParticles import StdNoPIDsProtons, StdNoPIDsPions, StdNoPIDsDownPions
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
+from PhysSelPython.Wrappers import DataOnDemand, Selection
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = ['Jibo He']
 __date__ = '20/01/2012'
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBandQ/StrippingCcbar2PhiPhiDetached.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBandQ/StrippingCcbar2PhiPhiDetached.py
index 9cece8aa8a316b6c48d7062407ae3c5e4a4703e3..8d48d19f4b11b35402f710baec49d8b99bec7f11 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBandQ/StrippingCcbar2PhiPhiDetached.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBandQ/StrippingCcbar2PhiPhiDetached.py
@@ -15,12 +15,10 @@ Inherited from StrippingCcbar2PhiPhi.py; moved To FullDST
 
 '''
 
-from StandardParticles import StdNoPIDsProtons, StdNoPIDsPions, StdNoPIDsDownPions
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
+from PhysSelPython.Wrappers import DataOnDemand, Selection
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = ['Jibo He, Liupan An']
 __date__ = '11/01/2017'
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBandQ/StrippingCcbar2PhiPhiPiPi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBandQ/StrippingCcbar2PhiPhiPiPi.py
index 3255f0fb24ce2bf3d5dedf3d48901b1a3b7fdf4c..8ded03963ceb90126c111e3d53772e2529b17348 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBandQ/StrippingCcbar2PhiPhiPiPi.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBandQ/StrippingCcbar2PhiPhiPiPi.py
@@ -12,12 +12,11 @@
 Module for selecting charmonium -> phi phi pi pi 
 '''
 
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
+from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
 from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
-from Gaudi.Configuration import *
 __author__ = ['Andrii Usachov']
 __date__ = '10/04/2017'
 __version__ = '$Revision: 1.1 $'
@@ -60,12 +59,12 @@ class Ccbar2PhiPhiPiPiConf(LineBuilder):
         self.name = name
         self.config = config
 
-        PhiVtxChi2 = config['PhiVtxChi2']
-        PhiMassW = config['PhiMassW']
-        KaonPT = config['KaonPT']
-        TRCHI2DOF = config['TRCHI2DOF']
-        KaonProbNNk = config['KaonProbNNk']
-        KaonIPCHI2 = config['KaonIPCHI2']
+        config['PhiVtxChi2']
+        config['PhiMassW']
+        config['KaonPT']
+        config['TRCHI2DOF']
+        config['KaonProbNNk']
+        config['KaonIPCHI2']
 
         self.SelPions = self.createSubSel(OutputList=self.name + "SelPions",
                                           InputList=DataOnDemand(
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBandQ/StrippingCcbar2PpbarNew.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBandQ/StrippingCcbar2PpbarNew.py
index ee8963df34aa184b52ef4e748c679800cc8ef52e..85282982e0396ca96b5935ba315d5b23bee0ba45 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBandQ/StrippingCcbar2PpbarNew.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBandQ/StrippingCcbar2PpbarNew.py
@@ -18,9 +18,8 @@ Module for Charmonium->p pbar, including three lines
 
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
+from PhysSelPython.Wrappers import Selection
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 __author__ = ['Jibo He']
 __date__ = '03/10/2010'
 __version__ = '$Revision: 1.2 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBandQ/StrippingChiCJPsiGammaConv.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBandQ/StrippingChiCJPsiGammaConv.py
index 0974ad33bc785e6c21ccfbd8abd76c1de3c8330d..13c82277579b4165c559b3e45a8dc8a26f329028 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBandQ/StrippingChiCJPsiGammaConv.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBandQ/StrippingChiCJPsiGammaConv.py
@@ -11,8 +11,7 @@
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
-from Configurables import FilterDesktop, CombineParticles, OfflineVertexFitter
-from Gaudi.Configuration import *
+from Configurables import CombineParticles, FilterDesktop
 __author__ = 'Edwige Tournefier'
 __date__ = '08/06/2012'
 __version__ = '$ 1.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBandQ/StrippingDiMuonForXsection.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBandQ/StrippingDiMuonForXsection.py
index 99d45c194f644de10f8a90371ed1079dcd2e147e..7ceb214bd70cc59ffa52391a7a3321cce9dba642 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBandQ/StrippingDiMuonForXsection.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBandQ/StrippingDiMuonForXsection.py
@@ -16,7 +16,6 @@ from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
-from Gaudi.Configuration import *
 __author__ = ['Jibo He']
 __date__ = '28/03/2012'
 __version__ = '$Revision: 1.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBandQ/StrippingDiMuonNew.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBandQ/StrippingDiMuonNew.py
index 7c60c2e0a15b0e700724dae73d54a428fd669c7a..dd539e9d69fb0fa229c32fd245d281db456c4fed 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBandQ/StrippingDiMuonNew.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBandQ/StrippingDiMuonNew.py
@@ -60,7 +60,6 @@ from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand, EventSelection
 from Configurables import LoKi__VoidFilter
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
-from Gaudi.Configuration import *
 __author__ = ['Jibo He']
 __date__ = '30/09/2010'
 __version__ = '$Revision: 1.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBandQ/StrippingEtap2pipimumu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBandQ/StrippingEtap2pipimumu.py
index d3d1d1ace791be2cf505fc6059dff04cd92af55b..af48f7c83025956348c7d9b1611c8e902321aa5f 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBandQ/StrippingEtap2pipimumu.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBandQ/StrippingEtap2pipimumu.py
@@ -13,9 +13,7 @@ from StandardParticles import StdAllLooseMuons, StdAllLoosePions, StdAllLooseKao
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, OfflineVertexFitter
-from Gaudi.Configuration import *
-from copy import copy
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop
 __author__ = ['Xabier Cid Vidal']
 # inspired by StrippingD2XMuMuSSConf, from Malcolm John, B. Viaud and O. Kochebina
 __date__ = '25/1/2019'
@@ -149,10 +147,10 @@ class StrippingEtap2pipimumuConf(LineBuilder):
 
         LineBuilder.__init__(self, name, config)
 
-        Ds2EtapLine_name = name+"_Ds2Etap"
-        Bu2EtapLine_name = name+"_Bu2Etap"
-        Ds2Phi3PiLine_name = name+"_Ds2Phi3Pi"
-        Bu2JPsiKLine_name = name+"_Bu2JPsiK"
+        name+"_Ds2Etap"
+        name+"_Bu2Etap"
+        name+"_Ds2Phi3Pi"
+        name+"_Bu2JPsiK"
 
         # 1 : Make pions and kaons
         selPionsEta = makeDaughters(
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBandQ/StrippingHeavyBaryons.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBandQ/StrippingHeavyBaryons.py
index fdc48e45e9d8cddbdbd0c89c4f67663a329603f3..500f8829198f1352b6129c8bf22fff77d3f04e68 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBandQ/StrippingHeavyBaryons.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBandQ/StrippingHeavyBaryons.py
@@ -12,14 +12,10 @@
 Stripping line for HeavyBaryons studies : Xi_b-, Xi_b0 and Omega_b-
 Author: Yasmine Amhis
 '''
-from GaudiKernel.SystemOfUnits import MeV
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
-from StandardParticles import StdAllLoosePions, StdAllLooseKaons
-from StandardParticles import StdLoosePions, StdNoPIDsDownPions, StdLooseKaons, StdLooseDownKaons
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = ['Yasmine Amhis']
 __date__ = '19/05/2011'
 __version__ = '$Revision: 1.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBandQ/StrippingInclusiveCharmBaryons.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBandQ/StrippingInclusiveCharmBaryons.py
index 201c096247b241236a2ac4156fecd55babf00dd3..5b13bff30a6f8279c85e884ed961904aa89e38d3 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBandQ/StrippingInclusiveCharmBaryons.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBandQ/StrippingInclusiveCharmBaryons.py
@@ -17,13 +17,10 @@ Author: M. Stahl
 Notes: Be creative!
 '''
 from PhysSelPython.Wrappers import Selection, AutomaticData
-import math
 from LoKiProtoParticles.decorators import *
 from LoKiArrayFunctors.decorators import *
 from LoKiPhys.decorators import *
-from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-from Configurables import FilterDesktop
-from PhysConf.Selections import FilterSelection, CombineSelection, Combine4BodySelection, Combine3BodySelection, LimitSelection, MergedSelection
+from PhysConf.Selections import Combine3BodySelection, Combine4BodySelection, FilterSelection, MergedSelection
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 __author__ = ['Marian Stahl']
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBandQ/StrippingInclusiveDoubleD.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBandQ/StrippingInclusiveDoubleD.py
index a06a38a50584fac39714125ffd40ab9e15ade044..6feefa7e6c9dc9308b80bba2c991944f64e4fafb 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBandQ/StrippingInclusiveDoubleD.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBandQ/StrippingInclusiveDoubleD.py
@@ -18,13 +18,10 @@ Author: M. Stahl
 Notes: Be creative!
 '''
 from PhysSelPython.Wrappers import Selection, AutomaticData
-import math
 from LoKiProtoParticles.decorators import *
 from LoKiArrayFunctors.decorators import *
 from LoKiPhys.decorators import *
-from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-from Configurables import FilterDesktop
-from PhysConf.Selections import FilterSelection, CombineSelection, Combine4BodySelection, Combine3BodySelection, LimitSelection, MergedSelection
+from PhysConf.Selections import Combine3BodySelection, Combine4BodySelection, CombineSelection, FilterSelection, MergedSelection
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 __author__ = ['Marian Stahl']
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBandQ/StrippingLb2EtacKp.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBandQ/StrippingLb2EtacKp.py
index 55d3c83ddc36e31f40d92545ba06d3c99b11dcce..860ca3a5a0957521bcd7a48d6e0a5073d1e24017 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBandQ/StrippingLb2EtacKp.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBandQ/StrippingLb2EtacKp.py
@@ -17,7 +17,6 @@ from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
-from Gaudi.Configuration import *
 __author__ = ['Liming Zhang', 'Xuesong Liu']
 __date__ = '23/11/2016'
 __version__ = '$Revision: 2.0$'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBandQ/StrippingOmegabDecays.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBandQ/StrippingOmegabDecays.py
index 10321ae5335297f63b4b8b2f71c70f7293172c1a..4002bd8ca389c38c15dddd1c90f1046ac80538f9 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBandQ/StrippingOmegabDecays.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBandQ/StrippingOmegabDecays.py
@@ -32,8 +32,7 @@ __all__ = ('OmegabDecaysConf',
            'makeOmegab2Omegacgammapi',
            'default_config')
 
-from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBandQ/StrippingPPMuMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBandQ/StrippingPPMuMu.py
index cfa93241546b8cb1958f0c080bce3ed3974eb196..1e28adc9f8419151808afa067316d7a0f98387fb 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBandQ/StrippingPPMuMu.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBandQ/StrippingPPMuMu.py
@@ -12,12 +12,11 @@
 Module for selecting Hc -> p pbar mu mu
 '''
 
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
+from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
 from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
-from Gaudi.Configuration import *
 __author__ = ['Liupan An']
 __date__ = '18/05/2017'
 __version__ = '$Revision: 1.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBandQ/StrippingXibc.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBandQ/StrippingXibc.py
index ed73d91a4d03fe2ff6427b7cd54ccc7ed18aeaa7..d0446cddfd42feba526eaf11c9d8cf13a4160779 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBandQ/StrippingXibc.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBandQ/StrippingXibc.py
@@ -47,17 +47,11 @@ __all__ = ('XibcBuilder'  # LineBuilder class specialization
            )
 
 
-from Gaudi.Configuration import *
-
 from Configurables import FilterDesktop, CombineParticles
 from PhysSelPython.Wrappers import Selection, AutomaticData, MergedSelection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 
-from CommonParticles.StdLooseLambda import StdLooseLambdaLL, StdLooseLambdaDD
-from GaudiKernel.SystemOfUnits import MeV, GeV, mm
-from Configurables import TisTosParticleTagger
-
 
 default_name = "Xibc"
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBandQ/StrippingXibcBDT.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBandQ/StrippingXibcBDT.py
index 5520ac91aac71eded5064eb9daf551c6b35891fe..28b1ca4c2d5b6567ed207d4b3cd2e8dcd52a9324 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBandQ/StrippingXibcBDT.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBandQ/StrippingXibcBDT.py
@@ -33,8 +33,6 @@ from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticle
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, MergedSelection, DataOnDemand
-from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays
-from Gaudi.Configuration import *
 __author__ = ['Jibo He']
 __date__ = '20/11/2016'
 __version__ = '$Revision: 1.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBandQ/StrippingXiccBDT.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBandQ/StrippingXiccBDT.py
index 0fda677dfb8d63acd803c2278c95da8b32d22700..7dde23cf7ee6e3329158f6ed2ef36ed1b1c5655c 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBandQ/StrippingXiccBDT.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBandQ/StrippingXiccBDT.py
@@ -30,9 +30,7 @@ Xicc+  -> D+ p+ K-
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, MergedSelection, DataOnDemand
-from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays
-from Gaudi.Configuration import *
+from PhysSelPython.Wrappers import DataOnDemand, Selection
 __author__ = ['Jibo He']
 __date__ = '20/11/2016'
 __version__ = '$Revision: 1.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBnoC/StrippingB24pLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBnoC/StrippingB24pLines.py
index fed91323554dd309e9a4137174eba46ba8676d87..2c744f40e0299eacf7acf157af33557db0eec23d 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBnoC/StrippingB24pLines.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBnoC/StrippingB24pLines.py
@@ -54,12 +54,10 @@ Exported symbols (use python help!):
    - 
 """
 
-from GaudiKernel.PhysicalConstants import c_light
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
-from Configurables import FilterDesktop, CombineParticles, DaVinci__N4BodyDecays
-from Gaudi.Configuration import *
+from Configurables import DaVinci__N4BodyDecays
 __author__ = ["Pietro Marino", "Oliver Gruenberg"]
 __date__ = "13.10.2017"
 __version__ = "$Revision: 3.0 $"
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBnoC/StrippingB2CharmlessInclusive.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBnoC/StrippingB2CharmlessInclusive.py
index 056df1189d8c6e124a4dcb4201ec68d8ac1fc40d..8ae9f04166a6ba66089d684f07c4dfc79cbbc333 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBnoC/StrippingB2CharmlessInclusive.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBnoC/StrippingB2CharmlessInclusive.py
@@ -16,9 +16,8 @@ from StandardParticles import StdLooseKsDD, StdLooseKsLL
 from StandardParticles import StdNoPIDsPions, StdLooseAllPhotons, StdLooseMergedPi0, StdLooseResolvedPi0
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand, SimpleSelection, MergedSelection
+from PhysSelPython.Wrappers import MergedSelection, Selection, SimpleSelection
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = ['Fred Blanc', 'Luca Pescatore']
 __date__ = '23/01/2019'
 __version__ = '$Revision: 3.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBnoC/StrippingB2HHBDT.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBnoC/StrippingB2HHBDT.py
index 58ec12b040a0d920e656286d4bfc1dda9cf9a73f..e6d9ba6ae39bf426ebdfb99b036c32ac4554915e 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBnoC/StrippingB2HHBDT.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBnoC/StrippingB2HHBDT.py
@@ -24,16 +24,13 @@ __all__ = ('B2HHBDTLines',
            'applyBDT',
            'default_config')
 
-from Gaudi.Configuration import *
 
-from GaudiKernel.SystemOfUnits import *
-
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 from StandardParticles import StdNoPIDsPions
 
 from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
-from StrippingUtils.Utils import LineBuilder, checkConfig
+from StrippingUtils.Utils import LineBuilder
 
 
 default_config = {
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBnoC/StrippingB2HHPi0.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBnoC/StrippingB2HHPi0.py
index bb255a96ff5e37e3059e4fd6df5cfadc8cfb0b7a..f8813f46fcbbc60b4f1ff068547e0ee3c7d07454 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBnoC/StrippingB2HHPi0.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBnoC/StrippingB2HHPi0.py
@@ -27,9 +27,8 @@ __all__ = ('StrippingB2HHPi0Conf',
            'makeB2HHPi0M',
            'default_config')
 
-from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from PhysSelPython.Wrappers import Selection, DataOnDemand
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
+from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from StandardParticles import StdNoPIDsPions, StdLooseMergedPi0, StdLooseResolvedPi0
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBnoC/StrippingB2KShh.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBnoC/StrippingB2KShh.py
index f404e2a87328dc23eb64929a9a9f3cd002ddadcf..2dcd40aee03deb0e241de124f68de39f1abe783b 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBnoC/StrippingB2KShh.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBnoC/StrippingB2KShh.py
@@ -25,7 +25,6 @@ __version__ = 'Stripping24r1/Stripping26r1'
 __all__ = {'B2KShhConf',
            'default_config'}
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, DaVinci__N3BodyDecays
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBnoC/StrippingB2KShhh.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBnoC/StrippingB2KShhh.py
index f95cf109667b3401f5eb904c78285279c34d00b5..07d236ac77af02d637424d32f3f4e637192ba3e1 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBnoC/StrippingB2KShhh.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBnoC/StrippingB2KShhh.py
@@ -27,13 +27,13 @@ __all__ = ('B2KShhhConf',
 
 from Gaudi.Configuration import *
 
-from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N4BodyDecays
+from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays
 from StandardParticles import StdNoPIDsPions, StdNoPIDsKaons  # ipchi2 cut
 from StandardParticles import StdLooseKsDD, StdLooseKsLL
 
-from PhysSelPython.Wrappers import Selection, MergedSelection
+from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
-from StrippingUtils.Utils import LineBuilder, checkConfig
+from StrippingUtils.Utils import LineBuilder
 
 from Configurables import FilterDesktop
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBnoC/StrippingB2Ksthh.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBnoC/StrippingB2Ksthh.py
index 94a25a2714e9626cb22e6966b9ad7a1955d78eb9..a39998cb04eef71b62a1bf9337b6fb914d58a917 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBnoC/StrippingB2Ksthh.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBnoC/StrippingB2Ksthh.py
@@ -22,7 +22,6 @@ __version__ = 'Stripping26'
 __all__ = {'B2KsthhConf',
            'default_config'}
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
@@ -176,7 +175,7 @@ class B2KsthhConf(LineBuilder):
         _massCutHigh = "(AM<(5279+%s)*MeV)" % config['B_Mhigh']
         _aptCut = "(APT>%s*MeV)" % config['B_APTmin']
         _daugMedPtCut = "(ANUM(PT>%s*MeV)>=2)" % config['BDaug_MedPT_PT']
-        _daugMaxPtIPCut = "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['BDaug_MaxPT_IP']
+        "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['BDaug_MaxPT_IP']
         _daugPtSumCut = "((APT1+APT2+APT3)>%s*MeV)" % config['BDaug_PTsum']
 
         _combCuts = _aptCut
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBnoC/StrippingB2TwoBaryons.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBnoC/StrippingB2TwoBaryons.py
index 8911a3d3bdc4a0add9f550c63095470ab59d4fef..93fef262a5bd7d8cd0abd1063e287bef85404e66 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBnoC/StrippingB2TwoBaryons.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBnoC/StrippingB2TwoBaryons.py
@@ -31,11 +31,10 @@ from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
 from StandardParticles import StdLooseProtons
 from StandardParticles import StdNoPIDsPions as Pions
-from CommonParticles.StdLooseLambda import StdLooseLambdaLL, StdLooseLambdaDD
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
-from StrippingUtils.Utils import LineBuilder, checkConfig
-from GaudiKernel.SystemOfUnits import MeV, GeV, mm, ns
+from StrippingUtils.Utils import LineBuilder
+from GaudiKernel.SystemOfUnits import GeV, MeV, mm
 
 default_config = {'NAME': 'B2TwoBaryons',
                   'WGs': ['BnoC'],
@@ -157,7 +156,7 @@ class B2TwoBaryonLines(LineBuilder):
 
         B2PPbarName = name + "B2PPbar"
 
-        B2PPSameSignName = name + "B2PPSameSign"
+        name + "B2PPSameSign"
 
         B2Lp_dd_name = name+'B2PLambdabarDD'
         B2Lp_ll_name = name+'B2PLambdabarLL'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBnoC/StrippingB2XEta.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBnoC/StrippingB2XEta.py
index e1adec50004bf9392e263cc5cb3ba465d4e08bf7..95fbd42162ff7cf67819bcb2ccbe2b4f88c30155 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBnoC/StrippingB2XEta.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBnoC/StrippingB2XEta.py
@@ -25,9 +25,7 @@ from StandardParticles import StdLoosePions as Pions
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, DaVinci__N3BodyDecays
-from PhysSelPython.Wrappers import DataOnDemand, Selection, SelectionSequence, MergedSelection
-from GaudiKernel import SystemOfUnits as Units
-from Gaudi.Configuration import *
+from PhysSelPython.Wrappers import DataOnDemand, MergedSelection, Selection
 __author__ = ['Timothy Williams']
 __date__ = '1/12/2016'
 __version__ = 'Stripping26r1'
@@ -564,7 +562,7 @@ class B2XEtaConf(LineBuilder):
         _trackCuts = _track_PT+'&'+_track_Chi2+'&'+_track_GPCut+'&'+_track_PIDCut
         _combCuts = _massCut+'&'+_docaCut
         _combCut12Doca = "ACHI2DOCA(1,2)<%s" % config['eta_DOCA']
-        _combCut12Vtx = "(VFASPF(VCHI2/VDOF)<%s)" % config['eta_vtxChi2']
+        "(VFASPF(VCHI2/VDOF)<%s)" % config['eta_vtxChi2']
         _combCut12 = _combCut12Doca
 
         # _eta3Pi=CombineParticles("eta3Pi",
@@ -592,7 +590,7 @@ class B2XEtaConf(LineBuilder):
         _trackCuts = _track_PT+'&'+_track_Chi2+'&'+_track_GPCut+'&'+_track_PIDCut
         _combCuts = _massCut+'&'+_docaCut
         _combCut12Doca = "ACHI2DOCA(1,2)<%s" % config['eta_prime_DOCA']
-        _combCut12Vtx = "(VFASPF(VCHI2/VDOF)<%s)" % config['eta_prime_vtxChi2']
+        "(VFASPF(VCHI2/VDOF)<%s)" % config['eta_prime_vtxChi2']
         _combCut12 = _combCut12Doca
 
         # _etap=CombineParticles("etap",
@@ -883,7 +881,7 @@ class B2XEtaConf(LineBuilder):
         _combCuts = _massCut+'&'+_docaCut
         _allCuts = _PTCut+'&'+_vtxCut+'&'+_diraCut+'&'+_IPChi2Cut
         _combCut12Doca = "ACHI2DOCA(1,2)<%s" % config['LbDaug_LL_maxDocaChi2']
-        _combCut12Vtx = "(VFASPF(VCHI2/VDOF)<%s)" % config['Lb_VtxChi2']
+        "(VFASPF(VCHI2/VDOF)<%s)" % config['Lb_VtxChi2']
         _combCut12 = _combCut12Doca
 
         _Lb2pKetap = DaVinci__N3BodyDecays(DecayDescriptor="[Lambda_b0 -> p+ K- eta_prime]cc",
@@ -921,7 +919,7 @@ class B2XEtaConf(LineBuilder):
         _combCuts = _massCut
         _allCuts = _PTCut+'&'+_IPChi2Cut+'&'+_vtxCut+'&'+_diraCut
         _combCut12Doca = "ACHI2DOCA(1,2)<%s" % config['LbDaug_LL_maxDocaChi2']
-        _combCut12Vtx = "(VFASPF(VCHI2/VDOF)<%s)" % config['Lb_VtxChi2']
+        "(VFASPF(VCHI2/VDOF)<%s)" % config['Lb_VtxChi2']
         _combCut12 = _combCut12Doca
 
         _Lb2pKeta3Pi = DaVinci__N3BodyDecays(DecayDescriptor="[Lambda_b0 -> p+ K- eta]cc",
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBnoC/StrippingB2a1Pi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBnoC/StrippingB2a1Pi.py
index 29c0766744b242c4ed1be4817cca727495bcb265..9f701cc986294843a275fb204128fb9f3c88fb1d 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBnoC/StrippingB2a1Pi.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBnoC/StrippingB2a1Pi.py
@@ -17,7 +17,6 @@ from Configurables import DaVinci__N4BodyDecays
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
-from Gaudi.Configuration import *
 __author__ = ['Daniel Vieira, Jibo He']
 __date__ = '01/12/2016'
 __version__ = '$Revision: 1.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBnoC/StrippingB2hhpipiPhsSpcCut.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBnoC/StrippingB2hhpipiPhsSpcCut.py
index 08e1d2943eafcfa9ad7d1764a6d5aab6ce3c9526..9fe5c82af0b14937c33c30fd9627961fa0731c0a 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBnoC/StrippingB2hhpipiPhsSpcCut.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBnoC/StrippingB2hhpipiPhsSpcCut.py
@@ -17,7 +17,6 @@ from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = ['Daniel Vieira']
 __date__ = '29/11/2018'
 __version__ = '$Revision: 1.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBnoC/StrippingB2pphh.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBnoC/StrippingB2pphh.py
old mode 100755
new mode 100644
index 782d89e7466f93f490e15dd1095ac153359b502b..99d5b7265b684f2c69cc962f37bc4fe0b20ac220
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBnoC/StrippingB2pphh.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBnoC/StrippingB2pphh.py
@@ -25,16 +25,13 @@ __all__ = ('B2pphhConf',
            )
 
 
-from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop
+from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
 # from Configurables import DaVinci__N4BodyDecays
 from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays
 
-from StandardParticles import StdAllNoPIDsKaons, StdAllNoPIDsPions, StdAllNoPIDsProtons
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from Configurables import LoKi__VoidFilter as VoidFilter
 
 default_config = {
     'NAME': 'B2pphh',
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBnoC/StrippingBc2hhh_BnoC.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBnoC/StrippingBc2hhh_BnoC.py
index cc0952e7ed4c72dc5b618028ac8bc563928c126d..21b92fa5aab68df4d68f10c50e59c126b546bd31 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBnoC/StrippingBc2hhh_BnoC.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBnoC/StrippingBc2hhh_BnoC.py
@@ -23,13 +23,11 @@ Exported symbols (use python help!):
    - makeppK_excl  
 '''
 
-from Configurables import LoKi__VoidFilter as VoidFilter
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection
 import StandardParticles
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 __author__ = ['Alvaro Gomes', 'Adlene Hicheur']
 __date__ = '31/08/2014'
 __version__ = '$Revision: 1.5 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBnoC/StrippingBs2KKhh.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBnoC/StrippingBs2KKhh.py
index c9b61ca022f83746560bd95dce95d56ab056c7d1..03011c3e32fb079bbbaa6b9d424d8c8b718c76bb 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBnoC/StrippingBs2KKhh.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBnoC/StrippingBs2KKhh.py
@@ -30,7 +30,6 @@ from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop
-from Gaudi.Configuration import *
 __author__ = ['Sean Benson', 'Adam Morris', 'Laurence Carson',
               'Emmy Pauline Maria Gabriel' 'Markus Roehrken']
 __date__ = '22/11/2016'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBnoC/StrippingBs2KSKS_Run2.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBnoC/StrippingBs2KSKS_Run2.py
index 629ca8140bd72d6380100393e840bf791f2f2cd9..6afaa37fab4f411e76010a848c09d7d72e5a05d9 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBnoC/StrippingBs2KSKS_Run2.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBnoC/StrippingBs2KSKS_Run2.py
@@ -22,15 +22,11 @@ __date__ = '13/09/2016'
 __version__ = 'Run2'
 __all__ = {'Bs2KSKSConf', 'default_config'}
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
+from PhysSelPython.Wrappers import DataOnDemand, Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 
-from StandardParticles import StdNoPIDsPions as Pions
-from StandardParticles import StdNoPIDsDownPions as DownPions
-
 
 default_config = {
     'NAME': 'Bs2KSKS',
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBnoC/StrippingBs2Kst_0Kst_0.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBnoC/StrippingBs2Kst_0Kst_0.py
index 6179c70e7f0f16586cd5a958eb2131e9f13bf1ad..7345868ade6e0cebd873ec58d7ea07808efe59f9 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBnoC/StrippingBs2Kst_0Kst_0.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBnoC/StrippingBs2Kst_0Kst_0.py
@@ -22,11 +22,8 @@ Rate estimated on 100K events using a 2017 data sample is: 0.027%
 
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, SelectionSequence, DataOnDemand
+from PhysSelPython.Wrappers import DataOnDemand, Selection
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-from CommonParticles.Utils import *
-from LHCbKernel.Configuration import *
-from Gaudi.Configuration import *
 __author__ = ['Brais Sanmartin Sedes']
 __date__ = '12/11/2015'
 __version__ = '5.1'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBnoC/StrippingBs2PhiKst0.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBnoC/StrippingBs2PhiKst0.py
index ceb8daa24373fc0cd210ec42fdbc56fd456f51e4..0c1ff7d620f2ef3058536bb8bbba7bedc35b168a 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBnoC/StrippingBs2PhiKst0.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBnoC/StrippingBs2PhiKst0.py
@@ -20,11 +20,8 @@ Exported symbols (use python help!):
 
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, SelectionSequence, DataOnDemand
+from PhysSelPython.Wrappers import DataOnDemand, Selection
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-from CommonParticles.Utils import *
-from LHCbKernel.Configuration import *
-from Gaudi.Configuration import *
 __author__ = ['Brais Sanmartin Sedes']
 __date__ = '01/12/2015'
 __version__ = '5.0'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBnoC/StrippingBs2PhiPhi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBnoC/StrippingBs2PhiPhi.py
index 0f280a3a06ba478759dc6e19bf80e278c15e5d40..1124dcdfd432c594fe79f1bc1e0b70fc24f9d21f 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBnoC/StrippingBs2PhiPhi.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBnoC/StrippingBs2PhiPhi.py
@@ -23,13 +23,10 @@ Exports the following stripping lines as instance data members:
 '''
 
 from StandardParticles import StdAllLooseANNKaons as MyLooseKaons
-from StandardParticles import StdLooseANNUpKaons as MyLooseUpKaons
-import StandardParticles
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
+from PhysSelPython.Wrappers import Selection
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 __author__ = ['Sean Benson']
 __date__ = '2013/08/15'
 __version__ = '3.0'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBnoC/StrippingBu2Ksthh.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBnoC/StrippingBu2Ksthh.py
index 5a06d1502605fd2037a6b16043d5efb150ce86d5..032717bced65040c1e6edaf12520110a1398cd1d 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBnoC/StrippingBu2Ksthh.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBnoC/StrippingBu2Ksthh.py
@@ -23,7 +23,6 @@ __version__ = 'Stripping26'
 __all__ = {'Bu2KsthhConf',
            'default_config'}
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
@@ -302,7 +301,7 @@ class Bu2KsthhConf(LineBuilder):
         _massCutHigh = "(AM<(5279+%s)*MeV)" % config['B_Mhigh']
         _aptCut = "(APT>%s*MeV)" % config['B_APTmin']
         _daugMedPtCut = "(ANUM(PT>%s*MeV)>=2)" % config['BDaug_MedPT_PT']
-        _daugMaxPtIPCut = "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['BDaug_MaxPT_IP']
+        "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['BDaug_MaxPT_IP']
         _maxDocaChi2Cut = "(ACUTDOCACHI2(%s,''))" % config['BDaug_DD_maxDocaChi2']
         _daugPtSumCut = "((APT1+APT2+APT3)>%s*MeV)" % config['BDaug_DD_PTsum']
 
@@ -359,7 +358,7 @@ class Bu2KsthhConf(LineBuilder):
         _massCutHigh = "(AM<(5279+%s)*MeV)" % config['B_Mhigh']
         _aptCut = "(APT>%s*MeV)" % config['B_APTmin']
         _daugMedPtCut = "(ANUM(PT>%s*MeV)>=2)" % config['BDaug_MedPT_PT']
-        _daugMaxPtIPCut = "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['BDaug_MaxPT_IP']
+        "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['BDaug_MaxPT_IP']
         _maxDocaChi2Cut = "(ACUTDOCACHI2(%s,''))" % config['BDaug_LL_maxDocaChi2']
         _daugPtSumCut = "((APT1+APT2+APT3)>%s*MeV)" % config['BDaug_LL_PTsum']
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBnoC/StrippingBu2hhh.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBnoC/StrippingBu2hhh.py
index 890eba4692dbe06517c0d7aee8f51d320cca8a64..62ede4129b7f2bd6ff173b27d26ebf7e47e4e6ea 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBnoC/StrippingBu2hhh.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBnoC/StrippingBu2hhh.py
@@ -22,13 +22,11 @@ Exported symbols (use python help!):
    - makepph_incl
 '''
 
-from Configurables import LoKi__VoidFilter as VoidFilter
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection
 import StandardParticles
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 __author__ = ['Irina Nasteva', 'Jussara Miranda', 'Alvaro Gomes']
 __date__ = '19/05/2017'
 __version__ = 'Stripping29'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBnoC/StrippingBu2rho0rhoPlus.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBnoC/StrippingBu2rho0rhoPlus.py
index 6ff36ce6304e5d819eb96fe6ca06587bb1baa6cc..51df1d5067b9100ee67537610b0005b048a5d51f 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBnoC/StrippingBu2rho0rhoPlus.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBnoC/StrippingBu2rho0rhoPlus.py
@@ -21,7 +21,6 @@ from StrippingUtils.Utils import LineBuilder, checkConfig
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = "Jason E Andrews"
 __date__ = "26/11/2016"
 __version__ = "4.0"
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBnoC/StrippingButo5h.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBnoC/StrippingButo5h.py
index be4eeb8a2dc0617afde7aab5929540d3bc8d05c7..65e1b29f0dde00492a6a5432e53292b9bc4c81a7 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBnoC/StrippingButo5h.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBnoC/StrippingButo5h.py
@@ -23,13 +23,11 @@ Exported symbols (use python help!):
    - makeppKpipi_excl
 '''
 
-from Configurables import LoKi__VoidFilter as VoidFilter
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection
 import StandardParticles
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 __author__ = ['Luiz Gustavo de Oliveira',
               'Alvaro Gomes', 'Bruno Souza de Paula']
 __date__ = '22/Aug/2014'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBnoC/StrippingD2HHBDT.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBnoC/StrippingD2HHBDT.py
index 6bee345112d54e258044f31f0e7d809849b112f7..98ef43000bc5732a81fe2e10bace645263334787 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBnoC/StrippingD2HHBDT.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBnoC/StrippingD2HHBDT.py
@@ -23,14 +23,13 @@ __all__ = ('D2HHBDTLines',
            'makeD2HHBDT',
            'default_config')
 
-from Gaudi.Configuration import *
 
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
 from StandardParticles import StdNoPIDsKaons, StdAllNoPIDsPions
 
 from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
-from StrippingUtils.Utils import LineBuilder, checkConfig
+from StrippingUtils.Utils import LineBuilder
 
 
 default_config = {
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBnoC/StrippingHb2Charged2Body.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBnoC/StrippingHb2Charged2Body.py
index 11da99218434ae71c894fa73b708dca4ee60de5d..3b3424d2fb6688333e151f52793701a7a2c00dbe 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBnoC/StrippingHb2Charged2Body.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBnoC/StrippingHb2Charged2Body.py
@@ -23,14 +23,13 @@ __all__ = ('Hb2Charged2BodyLines',
            'makeB2Charged2Body',
            'default_config')
 
-from Gaudi.Configuration import *
 
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-from StandardParticles import StdNoPIDsPions, StdLooseProtons, StdLooseKaons
+from StandardParticles import StdNoPIDsPions
 
 from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
-from StrippingUtils.Utils import LineBuilder, checkConfig
+from StrippingUtils.Utils import LineBuilder
 
 
 default_config = {
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBnoC/StrippingHb2V0V0h.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBnoC/StrippingHb2V0V0h.py
index 6b1c9eb94b261dbc185e979f0314ffe2bd69f930..f3104c9b58e73817c70f7fa7e3d68a0b9ecf0860 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBnoC/StrippingHb2V0V0h.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBnoC/StrippingHb2V0V0h.py
@@ -22,7 +22,6 @@ __date__ = '10/02/2017'
 __version__ = 'Stripping28'
 __all__ = 'Hb2V0V0hConf'
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBnoC/StrippingLb2V0hh.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBnoC/StrippingLb2V0hh.py
index f63034e02f45426009146384bed4036d16056a26..e896944db6cf521ad12d86186f9bda930b5bfd87 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBnoC/StrippingLb2V0hh.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBnoC/StrippingLb2V0hh.py
@@ -25,7 +25,6 @@ __date__ = '11/01/2017'
 __version__ = 'Stripping28'
 __all__ = 'Lb2V0hhConf'
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
@@ -211,8 +210,8 @@ class Lb2V0hhConf(LineBuilder):
         _vtxCut = "(VFASPF(VCHI2)<%s)   " % config['Lambda_DD_VtxChi2']
         _fdChi2Cut = "(BPVVDCHI2>%s)" % config['Lambda_DD_FDChi2']
         _momCut = "(P>%s*MeV)" % config['Lambda_DD_Pmin']
-        _trkGhostProbCut1 = "(CHILDCUT((TRGHOSTPROB<%s),1))" % config['Trk_GhostProb']
-        _trkGhostProbCut2 = "(CHILDCUT((TRGHOSTPROB<%s),2))" % config['Trk_GhostProb']
+        "(CHILDCUT((TRGHOSTPROB<%s),1))" % config['Trk_GhostProb']
+        "(CHILDCUT((TRGHOSTPROB<%s),2))" % config['Trk_GhostProb']
 
         _allCuts = _momCut
         _allCuts += '&'+_massCut
@@ -268,8 +267,8 @@ class Lb2V0hhConf(LineBuilder):
         _vtxCut = "(VFASPF(VCHI2)<%s)   " % config['Lambda_DD_VtxChi2']
         _fdChi2Cut = "(BPVVDCHI2>%s)" % config['Lambda_DD_FDChi2']
         _momCut = "(P>%s*MeV)" % config['Lambda_DD_Pmin']
-        _trkGhostProbCut1 = "(CHILDCUT((TRGHOSTPROB<%s),1))" % config['Trk_GhostProb']
-        _trkGhostProbCut2 = "(CHILDCUT((TRGHOSTPROB<%s),2))" % config['Trk_GhostProb']
+        "(CHILDCUT((TRGHOSTPROB<%s),1))" % config['Trk_GhostProb']
+        "(CHILDCUT((TRGHOSTPROB<%s),2))" % config['Trk_GhostProb']
 
         _allCuts = _momCut
         _allCuts += '&'+_massCut
@@ -302,7 +301,7 @@ class Lb2V0hhConf(LineBuilder):
         _massCutHigh = "(AM<(5619+%s)*MeV)" % config['Lb_2bodyMhigh']
         _aptCut = "(APT>%s*MeV)" % config['Lb_APTmin']
         _daugMedPtCut = "(ANUM(PT>%s*MeV)>=2)" % config['LbDaug_MedPT_PT']
-        _daugMaxPtIPCut = "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP']
+        "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP']
         _maxDocaChi2Cut = "(ACUTDOCACHI2(%s,''))" % config['LbDaug_DD_maxDocaChi2']
         _daugPtSumCut = "(APT1>%s*MeV)" % config['Lbh_DD_PTMin']
 
@@ -353,7 +352,7 @@ class Lb2V0hhConf(LineBuilder):
         _massCutHigh = "(AM<(5619+%s)*MeV)" % config['Lb_Mhigh']
         _aptCut = "(APT>%s*MeV)" % config['Lb_APTmin']
         _daugMedPtCut = "(ANUM(PT>%s*MeV)>=2)" % config['LbDaug_MedPT_PT']
-        _daugMaxPtIPCut = "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP']
+        "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP']
         _maxDocaChi2Cut = "(ACUTDOCACHI2(%s,''))" % config['LbDaug_DD_maxDocaChi2']
         _daugPtSumCut = "((APT1+APT2+APT3)>%s*MeV)" % config['LbDaug_DD_PTsum']
 
@@ -369,7 +368,7 @@ class Lb2V0hhConf(LineBuilder):
         _vtxChi2Cut = "(VFASPF(VCHI2)<%s)" % config['Lb_VtxChi2']
         _diraCut = "(BPVDIRA>%s)" % config['Lb_DD_Dira']
         _ipChi2Cut = "(MIPCHI2DV(PRIMARY)<%s)" % config['Lb_DD_IPCHI2wrtPV']
-        _fdCut = "(VFASPF(VMINVDDV(PRIMARY))>%s)" % config['Lb_FDwrtPV']
+        "(VFASPF(VMINVDDV(PRIMARY))>%s)" % config['Lb_FDwrtPV']
         _fdChi2Cut = "(BPVVDCHI2>%s)" % config['Lb_DD_FDChi2']
 
         _motherCuts = _ptCut
@@ -541,7 +540,7 @@ class Lb2V0hhConf(LineBuilder):
         _massCutHigh = "(AM<(5619+%s)*MeV)" % config['Lb_2bodyMhigh']
         _aptCut = "(APT>%s*MeV)" % config['Lb_APTmin']
         _daugMedPtCut = "(ANUM(PT>%s*MeV)>=2)" % config['LbDaug_MedPT_PT']
-        _daugMaxPtIPCut = "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP']
+        "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP']
         _maxDocaChi2Cut = "(ACUTDOCACHI2(%s,''))" % config['LbDaug_LD_maxDocaChi2']
         _daugPtSumCut = "(APT1>%s*MeV)" % config['Lbh_LD_PTMin']
 
@@ -592,7 +591,7 @@ class Lb2V0hhConf(LineBuilder):
         _massCutHigh = "(AM<(5619+%s)*MeV)" % config['Lb_Mhigh']
         _aptCut = "(APT>%s*MeV)" % config['Lb_APTmin']
         _daugMedPtCut = "(ANUM(PT>%s*MeV)>=2)" % config['LbDaug_MedPT_PT']
-        _daugMaxPtIPCut = "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP']
+        "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP']
         _maxDocaChi2Cut = "(ACUTDOCACHI2(%s,''))" % config['LbDaug_LD_maxDocaChi2']
         _daugPtSumCut = "((APT1+APT2+APT3)>%s*MeV)" % config['LbDaug_LD_PTsum']
 
@@ -608,7 +607,7 @@ class Lb2V0hhConf(LineBuilder):
         _vtxChi2Cut = "(VFASPF(VCHI2)<%s)" % config['Lb_VtxChi2']
         _diraCut = "(BPVDIRA>%s)" % config['Lb_LD_Dira']
         _ipChi2Cut = "(MIPCHI2DV(PRIMARY)<%s)" % config['Lb_LD_IPCHI2wrtPV']
-        _fdCut = "(VFASPF(VMINVDDV(PRIMARY))>%s)" % config['Lb_FDwrtPV']
+        "(VFASPF(VMINVDDV(PRIMARY))>%s)" % config['Lb_FDwrtPV']
         _fdChi2Cut = "(BPVVDCHI2>%s)" % config['Lb_LD_FDChi2']
 
         _motherCuts = _ptCut
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBnoC/StrippingLb2V0pp.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBnoC/StrippingLb2V0pp.py
index 23c63deba0a566efad08463be4f9e9577abecd08..77385a7d77c2a03b1678f32801ca31cd7356be5c 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBnoC/StrippingLb2V0pp.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBnoC/StrippingLb2V0pp.py
@@ -24,7 +24,6 @@ __date__ = '06/01/2019'
 __version__ = 'Stripping34'
 __all__ = 'Lb2V0ppConf'
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
@@ -210,8 +209,8 @@ class Lb2V0ppConf(LineBuilder):
         _vtxCut = "(VFASPF(VCHI2)<%s)   " % config['Lambda_DD_VtxChi2']
         _fdChi2Cut = "(BPVVDCHI2>%s)" % config['Lambda_DD_FDChi2']
         _momCut = "(P>%s*MeV)" % config['Lambda_DD_Pmin']
-        _trkGhostProbCut1 = "(CHILDCUT((TRGHOSTPROB<%s),1))" % config['Trk_GhostProb']
-        _trkGhostProbCut2 = "(CHILDCUT((TRGHOSTPROB<%s),2))" % config['Trk_GhostProb']
+        "(CHILDCUT((TRGHOSTPROB<%s),1))" % config['Trk_GhostProb']
+        "(CHILDCUT((TRGHOSTPROB<%s),2))" % config['Trk_GhostProb']
 
         _allCuts = _momCut
         _allCuts += '&'+_massCut
@@ -266,8 +265,8 @@ class Lb2V0ppConf(LineBuilder):
         _vtxCut = "(VFASPF(VCHI2)<%s)   " % config['Lambda_DD_VtxChi2']
         _fdChi2Cut = "(BPVVDCHI2>%s)" % config['Lambda_DD_FDChi2']
         _momCut = "(P>%s*MeV)" % config['Lambda_DD_Pmin']
-        _trkGhostProbCut1 = "(CHILDCUT((TRGHOSTPROB<%s),1))" % config['Trk_GhostProb']
-        _trkGhostProbCut2 = "(CHILDCUT((TRGHOSTPROB<%s),2))" % config['Trk_GhostProb']
+        "(CHILDCUT((TRGHOSTPROB<%s),1))" % config['Trk_GhostProb']
+        "(CHILDCUT((TRGHOSTPROB<%s),2))" % config['Trk_GhostProb']
 
         _allCuts = _momCut
         _allCuts += '&'+_massCut
@@ -300,7 +299,7 @@ class Lb2V0ppConf(LineBuilder):
         _massCutHigh = "(AM<(5619+%s)*MeV)" % config['Lb_2bodyMhigh']
         _aptCut = "(APT>%s*MeV)" % config['Lb_APTmin']
         _daugMedPtCut = "(ANUM(PT>%s*MeV)>=2)" % config['LbDaug_MedPT_PT']
-        _daugMaxPtIPCut = "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP']
+        "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP']
         _maxDocaChi2Cut = "(ACUTDOCACHI2(%s,''))" % config['LbDaug_DD_maxDocaChi2']
         _daugPtSumCut = "(APT1>%s*MeV)" % config['Lbh_DD_PTMin']
 
@@ -351,7 +350,7 @@ class Lb2V0ppConf(LineBuilder):
         _massCutHigh = "(AM<(5619+%s)*MeV)" % config['Lb_Mhigh']
         _aptCut = "(APT>%s*MeV)" % config['Lb_APTmin']
         _daugMedPtCut = "(ANUM(PT>%s*MeV)>=2)" % config['LbDaug_MedPT_PT']
-        _daugMaxPtIPCut = "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP']
+        "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP']
         _maxDocaChi2Cut = "(ACUTDOCACHI2(%s,''))" % config['LbDaug_DD_maxDocaChi2']
         _daugPtSumCut = "((APT1+APT2+APT3)>%s*MeV)" % config['LbDaug_DD_PTsum']
 
@@ -540,7 +539,7 @@ class Lb2V0ppConf(LineBuilder):
         _massCutHigh = "(AM<(5619+%s)*MeV)" % config['Lb_2bodyMhigh']
         _aptCut = "(APT>%s*MeV)" % config['Lb_APTmin']
         _daugMedPtCut = "(ANUM(PT>%s*MeV)>=2)" % config['LbDaug_MedPT_PT']
-        _daugMaxPtIPCut = "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP']
+        "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP']
         _maxDocaChi2Cut = "(ACUTDOCACHI2(%s,''))" % config['LbDaug_LD_maxDocaChi2']
         _daugPtSumCut = "(APT1>%s*MeV)" % config['Lbh_LD_PTMin']
 
@@ -591,7 +590,7 @@ class Lb2V0ppConf(LineBuilder):
         _massCutHigh = "(AM<(5619+%s)*MeV)" % config['Lb_Mhigh']
         _aptCut = "(APT>%s*MeV)" % config['Lb_APTmin']
         _daugMedPtCut = "(ANUM(PT>%s*MeV)>=2)" % config['LbDaug_MedPT_PT']
-        _daugMaxPtIPCut = "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP']
+        "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP']
         _maxDocaChi2Cut = "(ACUTDOCACHI2(%s,''))" % config['LbDaug_LD_maxDocaChi2']
         _daugPtSumCut = "((APT1+APT2+APT3)>%s*MeV)" % config['LbDaug_LD_PTsum']
 
@@ -607,7 +606,7 @@ class Lb2V0ppConf(LineBuilder):
         _vtxChi2Cut = "(VFASPF(VCHI2)<%s)" % config['Lb_VtxChi2']
         _diraCut = "(BPVDIRA>%s)" % config['Lb_LD_Dira']
         _ipChi2Cut = "(MIPCHI2DV(PRIMARY)<%s)" % config['Lb_LD_IPCHI2wrtPV']
-        _fdCut = "(VFASPF(VMINVDDV(PRIMARY))>%s)" % config['Lb_FDwrtPV']
+        "(VFASPF(VMINVDDV(PRIMARY))>%s)" % config['Lb_FDwrtPV']
         _fdChi2Cut = "(BPVVDCHI2>%s)" % config['Lb_LD_FDChi2']
 
         _motherCuts = _ptCut
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBnoC/StrippingXb23ph.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBnoC/StrippingXb23ph.py
index 44ba838d436b418c4eaef7372eccd95c28426134..ef24837631cfc50b46aabe0cc7dba0c8cdeb66fd 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBnoC/StrippingXb23ph.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBnoC/StrippingXb23ph.py
@@ -22,7 +22,6 @@ from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, DaVinci__N4Body
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection
-from Gaudi.Configuration import *
 __author__ = ['Jinlin Fu', 'Maurizio Martinelli', 'Andrea Merli']
 __date__ = '12/11/2015'
 __version__ = 'v1r0'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBnoC/StrippingXb2p3h.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBnoC/StrippingXb2p3h.py
index d07d7e52c17b8a01201968b3a1b929751c31bc9d..2c10d1f20bf15892c5e8ef6a5861130250a0a8ae 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBnoC/StrippingXb2p3h.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBnoC/StrippingXb2p3h.py
@@ -22,7 +22,6 @@ from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, DaVinci__N4Body
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection
-from Gaudi.Configuration import *
 __author__ = ['Jan Mickelle V. Maratas', 'Stephane Monteil', 'Andrea Merli']
 __date__ = '01/04/2016'
 __version__ = 'v1r0'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBnoC/StrippingXb2phh.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBnoC/StrippingXb2phh.py
index ae62ac803dcda11696229820fa7bcb3737c75114..35432dcb4a93cdbf47f1ec738735037534d82c07 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBnoC/StrippingXb2phh.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingBnoC/StrippingXb2phh.py
@@ -22,7 +22,6 @@ from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, DaVinci__N3Body
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection
-from Gaudi.Configuration import *
 __author__ = ['Jan Mickelle V. Maratas', 'Stephane Monteil', 'Thomas Latham']
 __date__ = '24/11/2016'
 __version__ = 'v1r0'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCalib/StrippingCharmFromBSemiForHadronAsy.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCalib/StrippingCharmFromBSemiForHadronAsy.py
index 08e7ce501b97c255a5b8e5a3de8395e4cbcf3cb6..6156fdca33abf5ffff5cbf8a3a9368f977dbcd6f 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCalib/StrippingCharmFromBSemiForHadronAsy.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCalib/StrippingCharmFromBSemiForHadronAsy.py
@@ -19,14 +19,12 @@ __author__ = ['Mika Vesterinen']
 __date__ = '10/03/2013'
 __version__ = '$Revision: 0.0 $'
 
-from Gaudi.Configuration import *
 
 from Configurables import FilterDesktop, CombineParticles
 from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from StandardParticles import StdAllLoosePions, StdLoosePions, StdLooseMuons, StdLooseKaons, StdLooseProtons
-from Configurables import TisTosParticleTagger
+from StandardParticles import StdLooseKaons, StdLooseMuons, StdLoosePions
 
 __all__ = ('CharmFromBSemiForHadronAsyAllLinesConf',
            'TOSFilter',
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCalib/StrippingCharmFromBSemiForProtonPID.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCalib/StrippingCharmFromBSemiForProtonPID.py
index 331ebd34b3e7842bbf2e94a73977d8b0cc10b450..a1e805b96edf80f3f08a3ba0f447e47d13b203c2 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCalib/StrippingCharmFromBSemiForProtonPID.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCalib/StrippingCharmFromBSemiForProtonPID.py
@@ -18,12 +18,11 @@ __author__ = ['Mika Vesterinen']
 __date__ = '19/03/2013'
 __version__ = '$Revision: 0.0 $'
 
-from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from StandardParticles import StdLoosePions, StdLooseMuons, StdLooseKaons, StdLooseProtons, StdNoPIDsProtons
+from StandardParticles import StdLooseKaons, StdLooseMuons, StdLoosePions, StdNoPIDsProtons
 
 __all__ = ('CharmFromBSemiForProtonPIDAllLinesConf',
            'default_config')
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCalib/StrippingD02KPiPi0.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCalib/StrippingD02KPiPi0.py
index b0efbccbb69d5ac6209e0a251edf9943a222afe9..a431e7b970041f35d68bc9a765db0757832a6fdd 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCalib/StrippingD02KPiPi0.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCalib/StrippingD02KPiPi0.py
@@ -25,9 +25,8 @@ __all__ = ('StrippingD02KPiPi0Conf',
            'makeD02KPiPi0M',
            'default_config')
 
-from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from PhysSelPython.Wrappers import Selection, DataOnDemand
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
+from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from StandardParticles import StdTightPions, StdTightKaons, StdLooseMergedPi0, StdLooseResolvedPi0
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCalib/StrippingD02KPiPi0DalitzPartReco.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCalib/StrippingD02KPiPi0DalitzPartReco.py
index caaa8b1b857ec7efb302c62895c9b7a334961cbf..7a1c97e88520fb73f140818146de685e254df9f7 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCalib/StrippingD02KPiPi0DalitzPartReco.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCalib/StrippingD02KPiPi0DalitzPartReco.py
@@ -8,9 +8,7 @@
 # granted to it by virtue of its status as an Intergovernmental Organization  #
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
-import logging
 from StrippingUtils.Utils import LineBuilder
-from Gaudi.Configuration import *
 __author__ = ['Greg Ciezarek', 'Liang Sun', 'Adam Davis']
 __date__ = '18/05/2017'
 __version__ = '$Revision: 0.01 $'
@@ -75,7 +73,6 @@ class D2KPiPi0_PartRecoBuilder(LineBuilder):
     def __init__(self, name, config):
         LineBuilder.__init__(self, name, config)
         self._config = config
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
 
         # self.GECs = { "Code":"( recSummaryTrack(LHCb.RecSummary.nLongTracks, TrLONG) < %(GEC_nLongTrk)s )" % config,
         #              "Preambulo": ["from LoKiTracks.decorators import *"]}
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCalib/StrippingD0ForBXX.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCalib/StrippingD0ForBXX.py
index 836cb251bf6bed5dcdba32758964e9950e666b07..d9859abdb5e61ecd488fc22f98c91f6df28e248f 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCalib/StrippingD0ForBXX.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCalib/StrippingD0ForBXX.py
@@ -20,7 +20,7 @@ from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from StandardParticles import StdLoosePions, StdLooseKaons, StdLooseProtons, StdAllLoosePions
+from StandardParticles import StdAllLoosePions, StdLooseKaons, StdLoosePions
 
 
 name = 'confD0forBXX'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCalib/StrippingDstarD02hhPi0PartRecoForPhotonCalib.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCalib/StrippingDstarD02hhPi0PartRecoForPhotonCalib.py
index ee8e553744feb3138a51e275635fb7d6e5f04f18..5e9f1e9a8d8aaff44060d1c66e8f15e033d7db22 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCalib/StrippingDstarD02hhPi0PartRecoForPhotonCalib.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCalib/StrippingDstarD02hhPi0PartRecoForPhotonCalib.py
@@ -31,15 +31,15 @@ from Gaudi.Configuration import *
 
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 from StandardParticles import StdAllNoPIDsPions, StdNoPIDsPions, StdNoPIDsKaons
-from StandardParticles import StdLooseAllPhotons, StdLooseResolvedPi0, StdLooseMergedPi0
+from StandardParticles import StdLooseAllPhotons
 
 from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
-from StrippingUtils.Utils import LineBuilder, checkConfig
+from StrippingUtils.Utils import LineBuilder
 
 from Configurables import FilterDesktop
 
-from GaudiKernel.SystemOfUnits import GeV, MeV, picosecond, mm
+from GaudiKernel.SystemOfUnits import GeV, MeV, picosecond
 
 default_config = {
     'NAME': 'DstarD2hhGammaCalib',
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCalib/StrippingElectronID.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCalib/StrippingElectronID.py
index f8385e403a664f2d870608e8c28ac1032d182cc0..1b5dd98b23444069027c372e85ae7f6f3318a423 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCalib/StrippingElectronID.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCalib/StrippingElectronID.py
@@ -23,9 +23,8 @@ stream.appendLines( [
 
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand
+from PhysSelPython.Wrappers import Selection
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = ['Jibo He']
 __date__ = '03/10/2010'
 __version__ = '$Revision: 1.2 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCalib/StrippingElectronRecoEff.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCalib/StrippingElectronRecoEff.py
index c19ff961c1db5ef3bfbfb03a4d9133a4c8888bdf..bdb2892004f5f8e6c93bb551bb939895eca5eb63 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCalib/StrippingElectronRecoEff.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCalib/StrippingElectronRecoEff.py
@@ -17,17 +17,15 @@ from StandardParticles import StdAllLoosePions as Hlt2Pions
 from StandardParticles import StdAllLooseKaons as Hlt2Kaons
 from StandardParticles import StdNoPIDsElectrons as Hlt2Electrons
 from StandardParticles import StdNoPIDsMuons as Hlt2Muons
-from TrackFitter.ConfiguredFitters import (ConfiguredEventFitter,
-                                           ConfiguredForwardStraightLineEventFitter)
+from TrackFitter.ConfiguredFitters import ConfiguredEventFitter
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import DataOnDemand, MergedSelection
 from PhysConf.Selections import L0TOSSelection
 from PhysConf.Selections import Hlt1TOSSelection
 from PhysConf.Selections import Hlt2TOSSelection
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 from StrippingUtils.Utils import LineBuilder
-from GaudiKernel.SystemOfUnits import GeV, MeV, mm
+from GaudiKernel.SystemOfUnits import MeV, mm
 from Gaudi.Configuration import *
 __author__ = ['Adam Davis', 'Laurent Dufour', 'V. V. Gligorov']
 __date__ = '14/1/2018'
@@ -45,10 +43,9 @@ from PhysSelPython.Wrappers import Selection, Hlt1Selection, Hlt2Selection, L0Se
 from SelPy.utils import (UniquelyNamedObject,
                          ClonableObject,
                          SelectionBase)
-from Configurables import (DecodeVeloRawBuffer, FastVeloTracking, TrackPrepareVelo,
-                           NoPIDsParticleMaker, DataOnDemandSvc, ChargedProtoParticleMaker,
-                           PrTrackAssociator, DelegatingTrackSelector, TrackContainerCopy, TrackAssociator,
-                           TrackStateInitAlg, TrackStateInitTool)
+from Configurables import (FastVeloTracking, NoPIDsParticleMaker, DataOnDemandSvc,
+                           ChargedProtoParticleMaker, DelegatingTrackSelector, TrackContainerCopy,
+                           TrackStateInitAlg)
 
 default_config = {'NAME': 'ElectronRecoEff',
                   'WGs': ['Calib'],
@@ -287,7 +284,6 @@ class StrippingElectronRecoEffLines(LineBuilder):
     def __init__(self, name, config):
         LineBuilder.__init__(self, name, config)
 
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
         self._config = config
         self.name = name
 
@@ -571,7 +567,7 @@ class StrippingElectronRecoEffLines(LineBuilder):
         )
 
     def DetachedEEKPair(self, _name):
-        configuration = self._config["DetachedEEK"]
+        self._config["DetachedEEK"]
 
         _DetachedEEKPair = self.getCPForEEK("DetachedEEK")
         _DetachedEEKPair_Sel = Selection("SelEEK_for_"+_name,
@@ -591,7 +587,7 @@ class StrippingElectronRecoEffLines(LineBuilder):
         return line
 
     def DetachedEEKstarPair(self, _name):
-        configuration = self._config["DetachedEEKstar"]
+        self._config["DetachedEEKstar"]
 
         _DetachedEEKstarPair = self.getCPForEEK("DetachedEEKstar")
         _DetachedEEKstarPair_Sel = Selection("SelEEKstar_for_"+_name,
@@ -611,7 +607,7 @@ class StrippingElectronRecoEffLines(LineBuilder):
         return line
 
     def DetachedEEPhiPair(self, _name):
-        configuration = self._config["DetachedEEPhi"]
+        self._config["DetachedEEPhi"]
 
         _DetachedEEPhiPair = self.getCPForEEK("DetachedEEPhi")
         _DetachedEEPhiPair_Sel = Selection("SelEEPhi_for_"+_name,
@@ -882,7 +878,6 @@ class StrippingElectronRecoEffLines(LineBuilder):
     def MakeVeloTracks(self, prefilter):
         if self._config["DoVeloDecoding"]:
             from DAQSys.Decoders import DecoderDB
-            from DAQSys.DecoderClass import decodersForBank
             decs = []
             vdec = DecoderDB["DecodeVeloRawBuffer/createBothVeloClusters"]
             vdec.Active = True
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCalib/StrippingJPsiForSL.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCalib/StrippingJPsiForSL.py
index 66d3cf569e7e3d642fb1e90689c09009970a9f91..f83a469f0d79f559f3b8f1ce7fa0a29617c07287 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCalib/StrippingJPsiForSL.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCalib/StrippingJPsiForSL.py
@@ -20,11 +20,10 @@ __version__ = '$Revision: 0.1 $'
 
 from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from PhysSelPython.Wrappers import Selection, DataOnDemand
+from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from StandardParticles import StdLoosePions, StdLooseMuons, StdLooseKaons, StdLooseProtons, StdNoPIDsPions, StdNoPIDsMuons, StdLooseMergedPi0, StdLooseResolvedPi0, StdLooseElectrons, StdNoPIDsKaons
-from Configurables import TisTosParticleTagger
+from StandardParticles import StdNoPIDsKaons, StdNoPIDsMuons
 
 __all__ = ('JPsiForSLAllLinesConf',
            'confdict')
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCalib/StrippingK23PiForDownstreamTrackEff.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCalib/StrippingK23PiForDownstreamTrackEff.py
index 5e95ecb40bf4a7b0d570152c6cb5a85c2e157431..9ea071dc760c1a4d2e8adb1bd47ddd464f85a7d1 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCalib/StrippingK23PiForDownstreamTrackEff.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCalib/StrippingK23PiForDownstreamTrackEff.py
@@ -14,10 +14,6 @@ one missing pion, using the corrected mass
 '''
 
 from StrippingUtils.Utils import LineBuilder
-from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = ['Michel De Cian']
 __date__ = '19/12/2018'
 __version__ = '$Revision: 1.0 $'
@@ -269,8 +265,8 @@ class K23PiForDownstreamTrackEffConf(LineBuilder):
         if self._dipionSelSSNarrowDownstream is not None:
             return self._dipionSelSSNarrowDownstream
 
-        from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
+        from GaudiConfUtils.ConfigurableGenerators import CombineParticles
+        from PhysSelPython.Wrappers import Selection
 
         _k2pipi = CombineParticles(
             DecayDescriptors=["[phi(1020) -> pi+ pi+]cc"],
@@ -293,8 +289,8 @@ class K23PiForDownstreamTrackEffConf(LineBuilder):
         if self._dipionSelSSNarrowLong is not None:
             return self._dipionSelSSNarrowLong
 
-        from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
+        from GaudiConfUtils.ConfigurableGenerators import CombineParticles
+        from PhysSelPython.Wrappers import Selection
 
         _k2pipi = CombineParticles(
             DecayDescriptors=["[phi(1020) -> pi+ pi+]cc"],
@@ -317,8 +313,8 @@ class K23PiForDownstreamTrackEffConf(LineBuilder):
         if self._dipionSelSSWide is not None:
             return self._dipionSelSSWide
 
-        from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
+        from GaudiConfUtils.ConfigurableGenerators import CombineParticles
+        from PhysSelPython.Wrappers import Selection
 
         _k2pipi = CombineParticles(
             DecayDescriptors=["[phi(1020) -> pi+ pi+]cc"],
@@ -342,8 +338,8 @@ class K23PiForDownstreamTrackEffConf(LineBuilder):
         if self._dipionSelOSNarrowDownstream is not None:
             return self._dipionSelOSNarrowDownstream
 
-        from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
+        from GaudiConfUtils.ConfigurableGenerators import CombineParticles
+        from PhysSelPython.Wrappers import Selection
 
         # Cut out the Kshort
         mCut = self._dipionSelectionNarrow() + " & (ADMASS('KS0') > 40)"
@@ -370,8 +366,8 @@ class K23PiForDownstreamTrackEffConf(LineBuilder):
         if self._dipionSelOSNarrowLong is not None:
             return self._dipionSelOSNarrowLong
 
-        from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
+        from GaudiConfUtils.ConfigurableGenerators import CombineParticles
+        from PhysSelPython.Wrappers import Selection
 
         # Cut out the Kshort
         mCut = self._dipionSelectionNarrow() + " & (ADMASS('KS0') > 40)"
@@ -398,8 +394,8 @@ class K23PiForDownstreamTrackEffConf(LineBuilder):
         if self._dipionSelOSWide is not None:
             return self._dipionSelOSWide
 
-        from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
+        from GaudiConfUtils.ConfigurableGenerators import CombineParticles
+        from PhysSelPython.Wrappers import Selection
 
         # Cut out the Kshort
         mCut = self._dipionSelectionWide() + " & (ADMASS('KS0') > 40)"
@@ -427,8 +423,8 @@ class K23PiForDownstreamTrackEffConf(LineBuilder):
         # if self._tripionSelDipionSS is not None:
         #   return self._tripionSelDipionSS
 
-        from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
+        from GaudiConfUtils.ConfigurableGenerators import CombineParticles
+        from PhysSelPython.Wrappers import Selection
 
         _k2pipipi = CombineParticles(
             DecayDescriptors=["[K+ -> phi(1020) pi-]cc"],
@@ -449,8 +445,8 @@ class K23PiForDownstreamTrackEffConf(LineBuilder):
         # if self._tripionSelDipionOS is not None:
         #   return self._tripionSelDipionOS
 
-        from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
+        from GaudiConfUtils.ConfigurableGenerators import CombineParticles
+        from PhysSelPython.Wrappers import Selection
 
         _k2pipipi = CombineParticles(
             DecayDescriptors=["[K+ -> phi(1020) pi+]cc"],
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCalib/StrippingLowPtMuID.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCalib/StrippingLowPtMuID.py
index c938bbfa4f325120436121227b8c9ba66d1420d7..96d9c592351659e6d677d1fb083266fb9f80f738 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCalib/StrippingLowPtMuID.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCalib/StrippingLowPtMuID.py
@@ -19,12 +19,9 @@ largely cloned from line written by 'S.Furcas', 'G.Lanfranchi', 'M.Palutan', 'A.
 
 from StandardParticles import StdAllNoPIDsMuons
 from StrippingUtils.Utils import LineBuilder
-from Configurables import LoKi__Hybrid__CoreFactory as CoreFactory
-from Configurables import LoKi__VoidFilter as VoidFilter
-from PhysSelPython.Wrappers import DataOnDemand, Selection, SelectionSequence, MergedSelection
+from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 __author__ = ['G.Ciezarek', ]
 __date__ = '03/12/2015'
 __version__ = '$Revision: 1.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCalib/StrippingMuIDCalib.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCalib/StrippingMuIDCalib.py
index 48473756334933bd76098e1f169f2fcac058f2d2..9647c11e74493f1b68f480afc92080ecc6f1c325 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCalib/StrippingMuIDCalib.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCalib/StrippingMuIDCalib.py
@@ -22,15 +22,12 @@ lb = builder( 'MuIDCalib', config_params )
 
 '''
 
-from StandardParticles import StdAllNoPIDsKaons, StdAllNoPIDsMuons, StdAllNoPIDsPions, StdAllNoPIDsProtons
+from StandardParticles import StdAllNoPIDsMuons
 from StandardParticles import StdNoPIDsKaons, StdNoPIDsMuons, StdNoPIDsPions, StdNoPIDsProtons
 from StrippingUtils.Utils import LineBuilder
-from Configurables import LoKi__Hybrid__CoreFactory as CoreFactory
-from Configurables import LoKi__VoidFilter as VoidFilter
-from PhysSelPython.Wrappers import DataOnDemand, Selection, SelectionSequence, MergedSelection
+from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 __author__ = ['S.Furcas', 'G.Lanfranchi',
               'M.Palutan', 'A.Sarti', 'D.Milanes', 'MuID Team']
 __date__ = '23/08/2011'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCalib/StrippingNoPIDDstarWithD02RSKPi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCalib/StrippingNoPIDDstarWithD02RSKPi.py
index 914c4a47cd048e3cd64e662985a9b4f35d9be508..5969dfaafb882830e2b62086af2a6274bffd846b 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCalib/StrippingNoPIDDstarWithD02RSKPi.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCalib/StrippingNoPIDDstarWithD02RSKPi.py
@@ -13,10 +13,8 @@
 from StandardParticles import StdAllNoPIDsKaons, StdAllNoPIDsPions
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from LHCbKernel.Configuration import *
-from Gaudi.Configuration import *
+from PhysSelPython.Wrappers import Selection
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 __author__ = ['Philip Xing', 'Andrew Powell']
 __date__ = '23rd August 2012'
 __version__ = '$Revision: 7.0 $'
@@ -42,7 +40,7 @@ StrippingReport                                                INFO Event 100000
 __all__ = ('NoPIDDstarWithD02RSKPiConf', 'default_config')
 
 
-from GaudiKernel.SystemOfUnits import mm, cm, MeV, GeV
+from GaudiKernel.SystemOfUnits import GeV, MeV
 # from Configurables import FilterDesktop, CombineParticles
 
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCalib/StrippingPIDCalib.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCalib/StrippingPIDCalib.py
index f3872175c1963791b4ef11e27dece0c57f983c05..65099ba3209f82b019bfdda36cf17bc93d0b54e0 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCalib/StrippingPIDCalib.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCalib/StrippingPIDCalib.py
@@ -35,9 +35,7 @@ from Configurables import DaVinci__N3BodyDecays
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
 from Configurables import CombineParticles
-from Gaudi.Configuration import *
 __author__ = ['Lucio Anderlini']
 __date__ = '25/02/2015'
 __version__ = '$Revision: 1.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCalib/StrippingTrackEffD0ToKPi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCalib/StrippingTrackEffD0ToKPi.py
index b93a420e3f50b2e4f8f1d92b1881f55e362e1bcf..1a0ca1d608bbe19c5586681674ba9a975871571b 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCalib/StrippingTrackEffD0ToKPi.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCalib/StrippingTrackEffD0ToKPi.py
@@ -17,7 +17,7 @@ from Configurables import FilterDesktop, CombineParticles
 from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from StandardParticles import StdLooseKaons, StdLoosePions, StdAllLoosePions, StdAllNoPIDsPions
+from StandardParticles import StdAllLoosePions, StdLooseKaons, StdLoosePions
 from SelPy.utils import (UniquelyNamedObject,
                          ClonableObject,
                          SelectionBase)
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCalib/StrippingTrackEffDownMuon.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCalib/StrippingTrackEffDownMuon.py
old mode 100755
new mode 100644
index 21183c23cb96bfab39ffdcc6bd7c4179aa95fcb1..c1b3a3d27fbe6ff6795e43bbb378b51ecdd2211d
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCalib/StrippingTrackEffDownMuon.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCalib/StrippingTrackEffDownMuon.py
@@ -48,35 +48,27 @@ __all__ = ('StrippingTrackEffDownMuonConf',
 # FIXME Write includes in a cleaner way
 from Gaudi.Configuration import *
 from LHCbKernel.Configuration import *
-from DAQSys.DecoderClass import Decoder
 from Configurables import GaudiSequencer
 from Configurables import UnpackTrack, ChargedProtoParticleMaker, DelegatingTrackSelector, TrackSelector, BestPIDParticleMaker
-from TrackFitter.ConfiguredFitters import ConfiguredFit
 from Configurables import TrackStateInitAlg
 from StrippingConf.StrippingLine import StrippingLine
-from Configurables import ChargedProtoParticleAddMuonInfo, MuonIDAlgLite
+from Configurables import ChargedProtoParticleAddMuonInfo
 from MuonID import ConfiguredMuonIDs
 from Configurables import ChargedProtoCombineDLLsAlg, ProtoParticleMUONFilter
-from PhysSelPython.Wrappers import Selection, DataOnDemand
+from PhysSelPython.Wrappers import Selection
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
 from StandardParticles import StdLooseMuons
 
 from StrippingUtils.Utils import LineBuilder
-from Configurables import LoKi__VoidFilter
-from os import environ
 from Gaudi.Configuration import *
-import GaudiKernel.ProcessJobOptions
-from GaudiKernel.SystemOfUnits import mm
 
 from GaudiConfUtils.ConfigurableGenerators import TisTosParticleTagger
 from StandardParticles import StdAllLooseMuons
 from Configurables import GaudiSequencer
 from Configurables import TrackToDST
-from Configurables import TrackSys
 from Configurables import PatSeeding, PatSeedingTool, PatLongLivedTracking
-from PhysSelPython.Wrappers import AutomaticData
 # Get the fitters
-from TrackFitter.ConfiguredFitters import ConfiguredFit, ConfiguredFitSeed, ConfiguredFitDownstream
+from TrackFitter.ConfiguredFitters import ConfiguredFitDownstream
 from PatAlgorithms import PatAlgConf
 
 from SelPy.utils import (UniquelyNamedObject,
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCalib/StrippingTrackEffMuonTT.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCalib/StrippingTrackEffMuonTT.py
index e4b5dcdd3e9e45e78514419f33215ba0c11c8214..2813f15a2bd11c522ce8fa41d62c8cba8c67b48f 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCalib/StrippingTrackEffMuonTT.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCalib/StrippingTrackEffMuonTT.py
@@ -64,11 +64,10 @@ __all__ = ('StrippingTrackEffMuonTTConf',
            'makeBJpsiKTrackEff',
            'filterHLT2ForBJpsiK')
 
-from Gaudi.Configuration import *
-from PhysSelPython.Wrappers import Selection, DataOnDemand, ChargedProtoParticleSelection
+from PhysSelPython.Wrappers import ChargedProtoParticleSelection, Selection
 from StrippingConf.StrippingLine import StrippingLine
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from StrippingUtils.Utils import LineBuilder, checkConfig
+from StrippingUtils.Utils import LineBuilder
 from StandardParticles import StdLooseKaons, StdLooseMuons, StdAllLooseMuons
 
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCalib/StrippingTrackEffVeloMuon.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCalib/StrippingTrackEffVeloMuon.py
index c7da7abeddda6483ce8d3b57a6b3083ee07bdafe..3f821c02445e084449fcec8a684ab687eb7dca9a 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCalib/StrippingTrackEffVeloMuon.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCalib/StrippingTrackEffVeloMuon.py
@@ -29,25 +29,17 @@
 from SelPy.utils import (UniquelyNamedObject,
                          ClonableObject,
                          SelectionBase)
-from Configurables import TrackEventCloneKiller, VeloMuonBuilder
-from Configurables import TrackStateInitAlg, TrackEventFitter, TrackPrepareVelo, TrackContainerCopy, Tf__PatVeloSpaceTool, StandaloneMuonRec
+from Configurables import VeloMuonBuilder
+from Configurables import StandaloneMuonRec, TrackPrepareVelo
 from Configurables import CombineParticles
-from Configurables import TrackKalmanFilter, TrackMasterExtrapolator
-from Configurables import TrackEventFitter, TrackMasterFitter
-from TrackFitter.ConfiguredFitters import ConfiguredFit
-from PhysSelPython.Wrappers import AutomaticData
-from Configurables import TrackSys
 from Configurables import GaudiSequencer
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, TisTosParticleTagger
 from StandardParticles import StdLooseMuons
 from StrippingUtils.Utils import LineBuilder
-from Configurables import TrackCloneFinder
 from StrippingConf.StrippingLine import StrippingLine
 from Configurables import FastVeloTracking
-from Configurables import ChargedProtoParticleMaker, NoPIDsParticleMaker, DataOnDemandSvc, DelegatingTrackSelector, TrackSelector, CombinedParticleMaker, BestPIDParticleMaker
-from PhysSelPython.Wrappers import Selection, SelectionSequence, DataOnDemand
-from LHCbKernel.Configuration import *
-from Gaudi.Configuration import *
+from Configurables import ChargedProtoParticleMaker, DataOnDemandSvc, DelegatingTrackSelector, NoPIDsParticleMaker, TrackSelector
+from PhysSelPython.Wrappers import Selection
 __author__ = ['Flavio Archilli']
 __date__ = '30/10/2019'
 __version__ = '$Revision: 0.1 $'
@@ -159,8 +151,6 @@ class StrippingTrackEffVeloMuonConf(LineBuilder):
 
         _config = self.config[confLine]
 
-        _pchargeCut = None
-        _tchargeCut = None
         _tagCharge = None
         _probeCharge = None
         _chargename = None
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCharm/StrippingB2ppipiSigmacmm_Lcpi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCharm/StrippingB2ppipiSigmacmm_Lcpi.py
index 1932ea73632bfc335a5d650d07d5b01c5d455fa9..397b76425631bddc729ad4ce8bbb2a99c6f92bf2 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCharm/StrippingB2ppipiSigmacmm_Lcpi.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCharm/StrippingB2ppipiSigmacmm_Lcpi.py
@@ -31,12 +31,11 @@ __all__ = ('StrippingB2ppipiSigmacmm_Lcpi_Conf', 'makeLc2pKpi', 'makepifromSigma
            )
 
 from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, ConjugateNeutralPID, DaVinci__N3BodyDecays
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N3BodyDecays, FilterDesktop
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
-from StrippingUtils.Utils import checkConfig, LineBuilder
+from StrippingUtils.Utils import LineBuilder
 from GaudiKernel.SystemOfUnits import MeV, GeV, mm
-from copy import copy
 
 name = 'StrippingB2ppipiSigmacmm_Lcpi'
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCharm/StrippingChargedHyperons.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCharm/StrippingChargedHyperons.py
index 920c9faefc12697a4686bb708606c7aefce7c812..1e9ecbdf32eac322732659ae13423893f4c17ced 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCharm/StrippingChargedHyperons.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCharm/StrippingChargedHyperons.py
@@ -21,13 +21,9 @@ __version__ = '$Revision: 1.0 $'
 __all__ = ('StrippingChargedHyperonsConf', 'default_config')
 
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from StandardParticles import StdLoosePions, StdNoPIDsDownPions, StdLooseKaons, StdLooseDownKaons
-from StandardParticles import StdAllLoosePions, StdAllLooseKaons
 
 from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
-from PhysSelPython.Wrappers import MultiSelectionSequence
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from GaudiKernel.SystemOfUnits import MeV, mm, picosecond
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCharm/StrippingCharm2PPX.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCharm/StrippingCharm2PPX.py
index 8f420ab23681879eda33d3f11a9c1854083e6f5d..1776621bc50d11dd212c17cc7c967c25e7570f68 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCharm/StrippingCharm2PPX.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCharm/StrippingCharm2PPX.py
@@ -26,7 +26,7 @@ __all__ = (
     'StrippingCharm2PPXConf'  # ???
 )
 
-from GaudiKernel.SystemOfUnits import MeV, GeV, mm, mrad
+from GaudiKernel.SystemOfUnits import GeV, MeV, mm
 from Configurables import CombineParticles, FilterDesktop
 # from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop, DaVinci__N3BodyDecays
 from StandardParticles import (
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCharm/StrippingCharmForVub.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCharm/StrippingCharmForVub.py
index addb5112d833323e807d80a2fcd5d1c6ef104d89..196b7aca8b732e4ce87cfa408c9240c9d4ca9fe8 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCharm/StrippingCharmForVub.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCharm/StrippingCharmForVub.py
@@ -31,9 +31,8 @@ __all__ = ('CharmForVubConf',
            'makeDstarD02HMuNu')
 
 from Gaudi.Configuration import *
-from Configurables import SubstitutePID
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
+from PhysSelPython.Wrappers import MergedSelection, Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from StandardParticles import StdLooseMuons, StdLooseKaons, StdAllLoosePions, StdLoosePions
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCharm/StrippingCharmWeakDecays.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCharm/StrippingCharmWeakDecays.py
index 62cf538da90f04787baab5c812393440f86c3b23..72c36178501074aeada4d5d7f91bd305c974ec78 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCharm/StrippingCharmWeakDecays.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCharm/StrippingCharmWeakDecays.py
@@ -28,7 +28,7 @@ __all__ = ('CharmWeakDecaysConf',
            'default_config')
 
 from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCharm/StrippingD02KSKS.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCharm/StrippingD02KSKS.py
index 048a0f735673d789716920a6b813f3734a817158..2e831b063d5dd66449d672d2c0c14659bb9d9210 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCharm/StrippingD02KSKS.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCharm/StrippingD02KSKS.py
@@ -25,9 +25,8 @@ __date__ = '15/05/2014'
 __version__ = 'Stripping23'
 __all__ = 'D02KSKSConf'
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
+from PhysSelPython.Wrappers import DataOnDemand, Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 
@@ -556,7 +555,7 @@ class D02KSKSConf(LineBuilder):
         _daughterCuts = "(TRGHOSTPROB <=%s )" % config['slowPi_LLL_TRGHOSTPROB']
 
         # 40
-        _vertexChi2_cut = "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_LL']
+        "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_LL']
 
         # 200
         _combCuts = "(ADAMASS('D*(2010)+') < %s*MeV)" % config['Dst_mass_LL']
@@ -593,7 +592,7 @@ class D02KSKSConf(LineBuilder):
         _daughterCuts = "(TRGHOSTPROB <=%s )" % config['slowPi_LLU_TRGHOSTPROB']
 
         # 40
-        _vertexChi2_cut = "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_LL']
+        "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_LL']
 
         # 200
         _combCuts = "(ADAMASS('D*(2010)+') < %s*MeV)" % config['Dst_mass_LL']
@@ -630,7 +629,7 @@ class D02KSKSConf(LineBuilder):
         _daughterCuts = "(TRGHOSTPROB <=%s )" % config['slowPi_LDL_TRGHOSTPROB']
 
         # 40
-        _vertexChi2_cut = "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_LD']
+        "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_LD']
 
         # 200
         _combCuts = "(ADAMASS('D*(2010)+') < %s*MeV)" % config['Dst_mass_LD']
@@ -667,7 +666,7 @@ class D02KSKSConf(LineBuilder):
         _daughterCuts = "(TRGHOSTPROB <=%s )" % config['slowPi_LDU_TRGHOSTPROB']
 
         # 40
-        _vertexChi2_cut = "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_LD']
+        "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_LD']
 
         # 200
         _combCuts = "(ADAMASS('D*(2010)+') < %s*MeV)" % config['Dst_mass_LD']
@@ -704,7 +703,7 @@ class D02KSKSConf(LineBuilder):
         _daughterCuts = "(TRGHOSTPROB <=%s )" % config['slowPi_DDL_TRGHOSTPROB']
 
         # 40
-        _vertexChi2_cut = "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_DD']
+        "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_DD']
 
         # 200
         _combCuts = "(ADAMASS('D*(2010)+') < %s*MeV)" % config['Dst_mass_DD']
@@ -741,7 +740,7 @@ class D02KSKSConf(LineBuilder):
         _daughterCuts = "(TRGHOSTPROB <=%s )" % config['slowPi_DDU_TRGHOSTPROB']
 
         # 40
-        _vertexChi2_cut = "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_DD']
+        "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_DD']
 
         # 200
         _combCuts = "(ADAMASS('D*(2010)+') < %s*MeV)" % config['Dst_mass_DD']
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCharm/StrippingD2HHHGamma.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCharm/StrippingD2HHHGamma.py
index f493f6bd9021f7c482ad4f11110b31209e277d1e..e0da6bf833dec41ba4733267992c2593b1e66642 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCharm/StrippingD2HHHGamma.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCharm/StrippingD2HHHGamma.py
@@ -22,19 +22,18 @@ __version__ = '$Revision: 0.1 $'
 __all__ = ('D2HHHGammaLines',
            'default_config')
 
-from Gaudi.Configuration import *
 
-from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N4BodyDecays
+from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays
 from StandardParticles import StdNoPIDsPions, StdNoPIDsKaons
 from StandardParticles import StdLooseAllPhotons, StdAllLooseGammaLL, StdAllLooseGammaDD
 
 from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
-from StrippingUtils.Utils import LineBuilder, checkConfig
+from StrippingUtils.Utils import LineBuilder
 
 from Configurables import FilterDesktop
 
-from GaudiKernel.SystemOfUnits import GeV, MeV, picosecond, mm
+from GaudiKernel.SystemOfUnits import GeV, MeV, picosecond
 
 
 default_config = {
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCharm/StrippingD2HHHKs.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCharm/StrippingD2HHHKs.py
index e5639b90812290f4e2226c3b0c140285aa788b00..8b56f2ae08f0d364c45bed96aa90657daee77a7d 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCharm/StrippingD2HHHKs.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCharm/StrippingD2HHHKs.py
@@ -22,19 +22,18 @@ __version__ = '$Revision: 0.1 $'
 __all__ = ('D2HHHKsLines',
            'default_config')
 
-from Gaudi.Configuration import *
 
-from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N4BodyDecays
+from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays
 from StandardParticles import StdNoPIDsPions, StdNoPIDsKaons
 from StandardParticles import StdLooseKsDD, StdLooseKsLL
 
 from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
-from StrippingUtils.Utils import LineBuilder, checkConfig
+from StrippingUtils.Utils import LineBuilder
 
 from Configurables import FilterDesktop
 
-from GaudiKernel.SystemOfUnits import GeV, MeV, picosecond, mm
+from GaudiKernel.SystemOfUnits import MeV, mm, picosecond
 
 
 default_config = {
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCharm/StrippingD2HHHPi0.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCharm/StrippingD2HHHPi0.py
index 6083359069ac88d66ad4d2d0c3f6c4a785962da6..8557b0ed7b6ea3312ecd34ede82d7cbd720f6775 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCharm/StrippingD2HHHPi0.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCharm/StrippingD2HHHPi0.py
@@ -22,19 +22,18 @@ __version__ = '$Revision: 0.1 $'
 __all__ = ('D2HHHPi0Lines',
            'default_config')
 
-from Gaudi.Configuration import *
 
-from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N4BodyDecays
+from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays
 from StandardParticles import StdNoPIDsPions, StdNoPIDsKaons
 from StandardParticles import StdLooseResolvedPi0, StdLooseMergedPi0
 
 from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
-from StrippingUtils.Utils import LineBuilder, checkConfig
+from StrippingUtils.Utils import LineBuilder
 
 from Configurables import FilterDesktop
 
-from GaudiKernel.SystemOfUnits import GeV, MeV, picosecond, mm
+from GaudiKernel.SystemOfUnits import GeV, MeV, picosecond
 
 
 default_config = {
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCharm/StrippingD2HMuNu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCharm/StrippingD2HMuNu.py
index 2ceba3956453266f579b29b43ab66b82c4dc906a..0b1aa8422f7bb32ab3d194b98dead0e474772019 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCharm/StrippingD2HMuNu.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCharm/StrippingD2HMuNu.py
@@ -9,9 +9,7 @@
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
 
-import logging
 from StrippingUtils.Utils import LineBuilder
-from Gaudi.Configuration import *
 __author__ = ['Liang Sun', 'Adam Davis']
 __date__ = '09/11/2015'
 __version__ = '$Revision: 0.01 $'
@@ -98,7 +96,6 @@ class D2HLepNuBuilder(LineBuilder):
     def __init__(self, name, config):
         LineBuilder.__init__(self, name, config)
         self._config = config
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
 
         self.GECs = {"Code": "( recSummaryTrack(LHCb.RecSummary.nLongTracks, TrLONG) < %(GEC_nLongTrk)s )" % config,
                      "Preambulo": ["from LoKiTracks.decorators import *"]}
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCharm/StrippingD2KS0H_conf.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCharm/StrippingD2KS0H_conf.py
index d58964475590bc2e6571bcd929685425e3694bc1..e5b9f6c8683eaaab3109aca8686f163c2f08aef0 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCharm/StrippingD2KS0H_conf.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCharm/StrippingD2KS0H_conf.py
@@ -44,9 +44,9 @@ from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticle
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StandardParticles import StdLoosePions, StdLooseKaons
 from StrippingConf.StrippingLine import StrippingLine
-from StrippingUtils.Utils import LineBuilder, checkConfig
+from StrippingUtils.Utils import LineBuilder
 from Configurables import TisTosParticleTagger
-from GaudiKernel.SystemOfUnits import GeV, MeV, picosecond, mm
+from GaudiKernel.SystemOfUnits import MeV, mm, picosecond
 
 default_name = 'D2KS0H'
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCharm/StrippingD2PiPi0.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCharm/StrippingD2PiPi0.py
index 2cf2e1f2dfcc01187fa87b6b497e55c580034ef2..3593748cd50e6ab84496cfb7045a1b29f0016504 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCharm/StrippingD2PiPi0.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCharm/StrippingD2PiPi0.py
@@ -33,7 +33,7 @@ __all__ = (
 
 )
 
-from GaudiKernel.SystemOfUnits import MeV, GeV, mrad, picosecond
+from GaudiKernel.SystemOfUnits import MeV, picosecond
 
 from StandardParticles import (
     StdAllNoPIDsKaons,
@@ -51,7 +51,7 @@ from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 
 # from Configurables import CombineParticles, FilterDesktop
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, ConjugateNeutralPID, DaVinci__N3BodyDecays
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N3BodyDecays
 
 default_config = {
     'D2Pi0H': {
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCharm/StrippingD2XMuMuSS.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCharm/StrippingD2XMuMuSS.py
index 6cb43802872df951b5676b3b0a91f42091655f73..f2ecc06f375c01960838df612bae449a097161ea 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCharm/StrippingD2XMuMuSS.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCharm/StrippingD2XMuMuSS.py
@@ -9,14 +9,13 @@
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
 
-from StandardParticles import StdAllLooseElectrons, StdAllNoPIDsElectrons
+from StandardParticles import StdAllLooseElectrons
 from StandardParticles import StdAllLooseKaons, StdAllLoosePions, StdAllLooseMuons, StdAllNoPIDsPions, StdAllNoPIDsKaons
-from StandardParticles import StdLooseKaons, StdLoosePions, StdLooseMuons, StdNoPIDsPions, StdNoPIDsKaons, StdLooseProtons, StdAllNoPIDsProtons
+from StandardParticles import StdAllNoPIDsProtons, StdLooseKaons, StdLooseMuons, StdLoosePions, StdLooseProtons
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, OfflineVertexFitter
-from Gaudi.Configuration import *
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop
 import copy
 __author__ = ['Malcolm John', 'B. Viaud', 'O. Kochebina']
 __date__ = '25/6/2012'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCharm/StrippingD2hh.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCharm/StrippingD2hh.py
index 51c213ed2d3c259435dcd6aef0631877156b6bb0..a370c49abb16101fe062f7fa9fd7c27efecb37e3 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCharm/StrippingD2hh.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCharm/StrippingD2hh.py
@@ -24,7 +24,6 @@ __all__ = ('D2hhBuilder',
 '''
 This file contains stripping lines for time-dependent two-body charm analyses of mixing, yCP, and A_Gamma
 '''
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
@@ -129,7 +128,7 @@ class D2hhBuilder(LineBuilder):
         stdNoPIDsPions = StdAllNoPIDsPions
 
         d2kpi_name = name+'PromptD2KPi'
-        d0RS_name = name+'PromptD0RS'
+        name+'PromptD0RS'
         d0WS_name = name+'PromptD0WS'
         d2kk_name = name+'PromptD2KK'
         d2pipi_name = name+'PromptD2PiPi'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCharm/StrippingD2hhh_FTcalib.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCharm/StrippingD2hhh_FTcalib.py
index 1ec2a52397a24a0cbc076e1b808944bfc5bf21da..eb622bead0fbe08c7b00587f38e94c60ed0a8ade 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCharm/StrippingD2hhh_FTcalib.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCharm/StrippingD2hhh_FTcalib.py
@@ -29,13 +29,10 @@ __version__ = '$Revision: 0.0 $'
 __all__ = ('D2hhhFTCalibConf',
            'makeStdD2hhhFT')
 
-from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
+from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from StandardParticles import (StdNoPIDsPions,
-                               StdTightKaons)
 
 name = "D2hhhFTCalib"
 # Cuts to be implemented vy the Stripping team in Stripping Settings
@@ -254,7 +251,6 @@ def globalEventCutFilter(name,
     if MaxTrSIZE == None:
         return None
 
-    from Configurables import LoKi__VoidFilter as VoidFilter
     from Configurables import LoKi__Hybrid__CoreFactory as CoreFactory
     modules = CoreFactory('CoreFactory').Modules
     for i in ['LoKiTracks.decorators']:
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCharm/StrippingD2hhh_conf.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCharm/StrippingD2hhh_conf.py
index 436d8a20ebfa69a07273b9fc952667e306a823fd..49374bf7789c8403fcf3e4660b179452634cef16 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCharm/StrippingD2hhh_conf.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCharm/StrippingD2hhh_conf.py
@@ -38,8 +38,7 @@ from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticle
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from StandardParticles import (StdNoPIDsPions,
-                               StdTightKaons)
+from StandardParticles import StdNoPIDsPions
 
 name = "D2hhh"
 # Cuts to be implemented vy the Stripping team in Stripping Settings
@@ -717,7 +716,6 @@ def globalEventCutFilter(name,
     if MaxTrSIZE == None:
         return None
 
-    from Configurables import LoKi__VoidFilter as VoidFilter
     from Configurables import LoKi__Hybrid__CoreFactory as CoreFactory
     modules = CoreFactory('CoreFactory').Modules
     for i in ['LoKiTracks.decorators']:
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCharm/StrippingDstarD02xx.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCharm/StrippingDstarD02xx.py
index ce2ac8d8facde4ad7816e78bcb9fd402160bb81a..e052e20eec4a83a6f489851d64e937c3ee00b05f 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCharm/StrippingDstarD02xx.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCharm/StrippingDstarD02xx.py
@@ -22,8 +22,7 @@ __all__ = ('StrippingDstarD02xxConf', 'combinetwobody', 'combineDstar', 'default
             where xx = {mu mu, pi pi, pi mu, k mu, ... }
             
 '''
-from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCharm/StrippingDstarD0ToHHPi0.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCharm/StrippingDstarD0ToHHPi0.py
index fd5188441bc83f651edf601e0fc081e5761b90a2..9f366f1a65e17dac9704f2cda14ac7c90073bb1d 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCharm/StrippingDstarD0ToHHPi0.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCharm/StrippingDstarD0ToHHPi0.py
@@ -17,13 +17,11 @@ Module for D* tagged D0 -> hhpi0.
 Supersedes StrippingDstarD2hhpi0
 """
 
-from Gaudi.Configuration import *
 from Configurables import FilterDesktop, CombineParticles, OfflineVertexFitter
 from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from StandardParticles import StdAllLoosePions, StdLoosePions, StdLooseKaons, StdLooseResolvedPi0, StdLooseMergedPi0
-from Configurables import TisTosParticleTagger
 
 __all__ = ('DstarD0ToHHPi0AllLinesBuilder',
            'DstarMaker',
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCharm/StrippingDstarD2HHHH.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCharm/StrippingDstarD2HHHH.py
index 79b905d65e08f76846da8aeebd29e1bd52022454..15c8bc47e0445328a0083162a53a4335865cca1b 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCharm/StrippingDstarD2HHHH.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCharm/StrippingDstarD2HHHH.py
@@ -22,16 +22,15 @@ __version__ = '$Revision: 1.0 $'
 __all__ = ('DstarD2HHHHLines',
            'default_config')
 
-from Gaudi.Configuration import *
 
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N4BodyDecays
 from StandardParticles import StdAllNoPIDsPions, StdNoPIDsPions, StdNoPIDsKaons
 
 from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
-from StrippingUtils.Utils import LineBuilder, checkConfig
+from StrippingUtils.Utils import LineBuilder
 
-from GaudiKernel.SystemOfUnits import GeV, MeV, picosecond, mm
+from GaudiKernel.SystemOfUnits import MeV, picosecond
 
 
 default_config = {
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCharm/StrippingDstarD2KSHHPi0.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCharm/StrippingDstarD2KSHHPi0.py
index 1a1c91b788986c0a547216e92ee30ee234979f5e..2cf7967d07c7867df16b8b2cfa45c3c0ddd24ac4 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCharm/StrippingDstarD2KSHHPi0.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCharm/StrippingDstarD2KSHHPi0.py
@@ -22,18 +22,17 @@ __version__ = '$Revision: 1.0 $'
 __all__ = ('DstarD2KSHHPi0Lines',
            'default_config')
 
-from Gaudi.Configuration import *
 
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N4BodyDecays
 from StandardParticles import StdAllNoPIDsPions, StdNoPIDsPions, StdNoPIDsKaons, StdLooseResolvedPi0, StdLooseMergedPi0, StdLooseKsDD, StdLooseKsLL
 
 from PhysSelPython.Wrappers import Selection, MergedSelection
 from StrippingConf.StrippingLine import StrippingLine
-from StrippingUtils.Utils import LineBuilder, checkConfig
+from StrippingUtils.Utils import LineBuilder
 
 from Configurables import FilterDesktop
 
-from GaudiKernel.SystemOfUnits import GeV, MeV, picosecond, mm
+from GaudiKernel.SystemOfUnits import MeV, mm, picosecond
 
 
 default_config = {
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCharm/StrippingDstarD2KShh.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCharm/StrippingDstarD2KShh.py
index 0446a490bf8b78aaa6a090c0170ee5d84241b931..8bb88c690db0782705ee07f1579b03266ff72d96 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCharm/StrippingDstarD2KShh.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCharm/StrippingDstarD2KShh.py
@@ -34,7 +34,6 @@ __all__ = ('DstarD2KShhBuilder',
            'makeD2KShh',
            'makeDstar')
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCharm/StrippingDstarD2XGamma.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCharm/StrippingDstarD2XGamma.py
index 59e1a9cc73eb63cebf8d359be22611bfea10a6f4..4bebda09363078aa7f375ea30e19d74cba44a31c 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCharm/StrippingDstarD2XGamma.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCharm/StrippingDstarD2XGamma.py
@@ -26,7 +26,6 @@ __version__ = '$Revision: 0.2 $'
 __all__ = ('DstarD2XGammaLines',
            'default_config')
 
-from Gaudi.Configuration import *
 
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 from StandardParticles import StdAllNoPIDsPions, StdNoPIDsPions, StdNoPIDsKaons
@@ -34,11 +33,11 @@ from StandardParticles import StdLooseAllPhotons, StdAllLooseGammaLL, StdAllLoos
 
 from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
-from StrippingUtils.Utils import LineBuilder, checkConfig
+from StrippingUtils.Utils import LineBuilder
 
 from Configurables import FilterDesktop
 
-from GaudiKernel.SystemOfUnits import GeV, MeV, picosecond, mm
+from GaudiKernel.SystemOfUnits import GeV, MeV, picosecond
 
 default_config = {
     'NAME': 'DstarD2XGamma',
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCharm/StrippingDstarPromptWithD02HHHH.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCharm/StrippingDstarPromptWithD02HHHH.py
index 13343e4031d3c9fe7ad9b92cfb6f3c3fff754d98..22e9ffd46fd5a0b8ab4623cae0293fe3c10c129d 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCharm/StrippingDstarPromptWithD02HHHH.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCharm/StrippingDstarPromptWithD02HHHH.py
@@ -36,11 +36,10 @@ __version__ = '$Revision: 1.2 $'
 __all__ = ('DstarPromptWithD02HHHHConf', 'makeD02hhhh',
            'makePromptDstar', 'default_config')
 
-from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, ConjugateNeutralPID
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles, ConjugateNeutralPID
 from PhysSelPython.Wrappers import Selection, MergedSelection
 from StrippingConf.StrippingLine import StrippingLine
-from StrippingUtils.Utils import checkConfig, LineBuilder
+from StrippingUtils.Utils import LineBuilder
 from GaudiKernel.SystemOfUnits import MeV, GeV, mm
 from copy import copy
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCharm/StrippingDstarPromptWithD02HHMuMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCharm/StrippingDstarPromptWithD02HHMuMu.py
index e83ad60bb1ff3c30f6cfd21e7ea0e2fb6ead7646..a1c41727aab9df91366ea29963944e783d29f676 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCharm/StrippingDstarPromptWithD02HHMuMu.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCharm/StrippingDstarPromptWithD02HHMuMu.py
@@ -29,11 +29,10 @@ __version__ = '$Revision: 2.0 $'
 __all__ = ('DstarPromptWithD02HHLLConf', 'makeD02hhll',
            'makePromptDstar', 'default_config')
 
-from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, ConjugateNeutralPID
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles, ConjugateNeutralPID
 from PhysSelPython.Wrappers import Selection, MergedSelection
 from StrippingConf.StrippingLine import StrippingLine
-from StrippingUtils.Utils import checkConfig, LineBuilder
+from StrippingUtils.Utils import LineBuilder
 from GaudiKernel.SystemOfUnits import MeV, GeV, mm
 from copy import copy
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCharm/StrippingExcitedDsSpectroscopy.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCharm/StrippingExcitedDsSpectroscopy.py
index 6b08898929e9ee290d51640d43d073b4a548a98b..dadd6c5c25c094fb4e5dfdef695cd98af0384ee1 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCharm/StrippingExcitedDsSpectroscopy.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCharm/StrippingExcitedDsSpectroscopy.py
@@ -321,7 +321,6 @@ def globalEventCutFilter(name,
     if MaxTrSIZE == None:
         return None
 
-    from Configurables import LoKi__VoidFilter as VoidFilter
     from Configurables import LoKi__Hybrid__CoreFactory as CoreFactory
     modules = CoreFactory('CoreFactory').Modules
     for i in ['LoKiTracks.decorators']:
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCharm/StrippingHc2V02H.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCharm/StrippingHc2V02H.py
index 5f63de83baa118d330a0b95e541553d6a8e4581f..ca96215521b00ad6379d0a82538d3ada0714a5a3 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCharm/StrippingHc2V02H.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCharm/StrippingHc2V02H.py
@@ -27,11 +27,9 @@ __all__ = (
 )
 
 from GaudiKernel.SystemOfUnits import MeV, GeV, mm, mrad
-from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop, DaVinci__N3BodyDecays
+from GaudiConfUtils.ConfigurableGenerators import DaVinci__N3BodyDecays, FilterDesktop
 from StandardParticles import StdNoPIDsPions as InputPions
 from StandardParticles import StdNoPIDsKaons as InputKaons
-from StandardParticles import StdLooseLambdaLL as InputLambdasLL
-from StandardParticles import StdLooseLambdaDD as InputLambdasDD
 
 from PhysSelPython.Wrappers import Selection, MergedSelection, DataOnDemand
 from StrippingUtils.Utils import LineBuilder
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCharm/StrippingHc2V03H.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCharm/StrippingHc2V03H.py
index 77f8f1aecfa7a04b18d5642386d1c094392b96cd..84c4dbd802a10fae27a11a4440538bce29b36ffc 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCharm/StrippingHc2V03H.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCharm/StrippingHc2V03H.py
@@ -27,11 +27,9 @@ __all__ = (
 )
 
 from GaudiKernel.SystemOfUnits import MeV, GeV, mm, mrad
-from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop, DaVinci__N4BodyDecays
+from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays, FilterDesktop
 from StandardParticles import StdNoPIDsPions as InputPions
 from StandardParticles import StdNoPIDsKaons as InputKaons
-from StandardParticles import StdLooseLambdaLL as InputLambdasLL
-from StandardParticles import StdLooseLambdaDD as InputLambdasDD
 
 from PhysSelPython.Wrappers import Selection, MergedSelection, DataOnDemand
 from StrippingUtils.Utils import LineBuilder
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCharm/StrippingHc2V2H.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCharm/StrippingHc2V2H.py
index 1cc1e18bb59332589773894f931054575d3bd57d..62f83f01a95c995d84514559ea3eb725d34e7335 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCharm/StrippingHc2V2H.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCharm/StrippingHc2V2H.py
@@ -29,8 +29,6 @@ from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDeskto
 from StandardParticles import StdNoPIDsDownPions as InputDownPions
 from StandardParticles import StdNoPIDsPions as InputPions
 from StandardParticles import StdNoPIDsKaons as InputKaons
-from StandardParticles import StdLooseLambdaLL as InputLambdasLL
-from StandardParticles import StdLooseLambdaDD as InputLambdasDD
 
 from PhysSelPython.Wrappers import Selection, MergedSelection, DataOnDemand
 from StrippingUtils.Utils import LineBuilder
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCharm/StrippingHc2V3H.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCharm/StrippingHc2V3H.py
index 8860909e6ec1c8f2862b43d64f75e5158a1c67e3..05d0ef19028d88f3cf40161b0e7b207226c117e3 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCharm/StrippingHc2V3H.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCharm/StrippingHc2V3H.py
@@ -31,8 +31,6 @@ from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDeskto
 from StandardParticles import StdNoPIDsDownPions as InputDownPions
 from StandardParticles import StdNoPIDsPions as InputPions
 from StandardParticles import StdNoPIDsKaons as InputKaons
-from StandardParticles import StdLooseLambdaLL as InputLambdasLL
-from StandardParticles import StdLooseLambdaDD as InputLambdasDD
 
 from PhysSelPython.Wrappers import Selection, MergedSelection, DataOnDemand
 from StrippingUtils.Utils import LineBuilder
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCharm/StrippingKKPiPi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCharm/StrippingKKPiPi.py
index cedaab2089da1034f1207a1c958ba82c6e694ba7..767a1fdbf50445fb204987a0cc70c2f97dfb5421 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCharm/StrippingKKPiPi.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCharm/StrippingKKPiPi.py
@@ -12,12 +12,11 @@
 Module for selecting [cs][ubar dbar] -> K+ K+ pi- pi-
 '''
 
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
+from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
 from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
-from Gaudi.Configuration import *
 __author__ = ['Mengzhen Wang']
 __date__ = '10/10/2017'
 __version__ = '$Revision: 1.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCharm/StrippingLambdac2V03H.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCharm/StrippingLambdac2V03H.py
index 8c19d9d3aeebd29855bd2d76b366fe9611b08aaf..9689bee39c9e7d84a61e56605ba3bb5f443ec5d1 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCharm/StrippingLambdac2V03H.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCharm/StrippingLambdac2V03H.py
@@ -27,7 +27,7 @@ __all__ = (
 )
 
 from GaudiKernel.SystemOfUnits import MeV, GeV, mm, mrad
-from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop, DaVinci__N4BodyDecays
+from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays, FilterDesktop
 from StandardParticles import StdNoPIDsPions as InputPions
 from StandardParticles import StdNoPIDsKaons as InputKaons
 from StandardParticles import StdLooseLambdaLL as InputLambdasLL
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCharm/StrippingLc2L0LLpi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCharm/StrippingLc2L0LLpi.py
index 0165e116e9da33c044fd297b7fa4c1090c6cbf39..0a027afeb1d2d303ea6a37758bc2b3bf4bb5f79d 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCharm/StrippingLc2L0LLpi.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCharm/StrippingLc2L0LLpi.py
@@ -12,17 +12,10 @@
 Module for selecting Lambda_c+->Lambda pi+
 '''
 
-from StandardParticles import (StdAllLoosePions, StdLooseProtons,
-                               StdLoosePions, StdNoPIDsUpPions)
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from StandardParticles import StdLooseAllPhotons, StdVeryLooseAllPhotons
-from Configurables import LoKi__VoidFilter
-from PhysSelPython.Wrappers import MergedSelection
-from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
-from Gaudi.Configuration import *
 __author__ = ['Guiyun Ding', 'Jiesheng Yu', 'Yuehong Xie']
 __date__ = '28/11/2016'
 __version__ = '$Revision: 2.0$'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCharm/StrippingNeutralCBaryons.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCharm/StrippingNeutralCBaryons.py
index bf6d1603296752d86c0e7c13ec03b037aa4b7dd0..165e0fbf71ca71084e7f0b7ac538d4257975d87f 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCharm/StrippingNeutralCBaryons.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCharm/StrippingNeutralCBaryons.py
@@ -23,13 +23,9 @@ __version__ = '$Revision: 1.0 $'
 __all__ = ('StrippingNeutralCBaryonsConf', 'default_config')
 
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from StandardParticles import StdLoosePions, StdNoPIDsDownPions, StdLooseKaons, StdLooseDownKaons
-from StandardParticles import StdAllLoosePions, StdAllLooseKaons
 
 from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
-from PhysSelPython.Wrappers import MultiSelectionSequence
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from GaudiKernel.SystemOfUnits import MeV, mm, picosecond
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCharm/StrippingXic2HHH.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCharm/StrippingXic2HHH.py
index e34807cd11d54a2a33e0a1189dffe5a4b8d17475..32300611aa84de3bdf0390670c07b3849c390e20 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCharm/StrippingXic2HHH.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCharm/StrippingXic2HHH.py
@@ -8,18 +8,15 @@
 # granted to it by virtue of its status as an Intergovernmental Organization  #
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
-from StandardParticles import StdNoPIDsPions, StdNoPIDsKaons, StdNoPIDsProtons, StdAllNoPIDsProtons
-from Configurables import TisTosParticleTagger
+from StandardParticles import StdNoPIDsKaons, StdNoPIDsPions, StdNoPIDsProtons
 from StrippingUtils.Utils import LineBuilder
-from PhysSelPython.Wrappers import MultiSelectionSequence
-from PhysSelPython.Wrappers import Selection, DataOnDemand, AutomaticData, MergedSelection
+from PhysSelPython.Wrappers import DataOnDemand, MergedSelection, Selection
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
 from Configurables import FilterDesktop, CombineParticles
 from LHCbKernel.Configuration import *
-from GaudiKernel.SystemOfUnits import MeV, mm, ns
+from GaudiKernel.SystemOfUnits import MeV, mm
 from StrippingConf.StrippingLine import StrippingLine
 from Gaudi.Configuration import *
-import re
 all
 ''' Xic+ and Theta+ lines Designed by Yury Shcheglov, Alexey Dzyuba, Nelya Sagidova to study Xic+ and Theta+ particles '''
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCharm/StrippingXicc.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCharm/StrippingXicc.py
index 2468c2d79739511bfdefe170463aa125124d506e..45478d9be226dbd5e3fdd09b0ff769294d99d064 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCharm/StrippingXicc.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingCharm/StrippingXicc.py
@@ -52,9 +52,6 @@ from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticle
 from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from StandardParticles import StdAllLoosePions, StdAllLooseKaons, StdAllLooseProtons
-from StandardParticles import StdLoosePions
-from CommonParticles.StdLooseLambda import StdLooseLambdaLL, StdLooseLambdaDD
 from GaudiKernel.SystemOfUnits import MeV, GeV, mm
 from Configurables import TisTosParticleTagger
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingIFT/StrippingHeavyIonD02KPiPi0.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingIFT/StrippingHeavyIonD02KPiPi0.py
index 72cca837017ef7bf472aaa4d20b3d5e7182beff9..6a64eaaf43af491bc11e753e4b3f64c438d5cffa 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingIFT/StrippingHeavyIonD02KPiPi0.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingIFT/StrippingHeavyIonD02KPiPi0.py
@@ -26,9 +26,8 @@ __all__ = ('StrippingHeavyIonD02KPiPi0Conf',
            'makeD02KPiPi0M',
            'default_config')
 
-from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from PhysSelPython.Wrappers import Selection, DataOnDemand
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
+from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from StandardParticles import StdTightPions, StdTightKaons, StdLooseMergedPi0, StdLooseResolvedPi0
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingIFT/StrippingHeavyIonDiMuon.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingIFT/StrippingHeavyIonDiMuon.py
index a12003022ff5261b92a3fd50b930fb2034dde6a4..30062540e2c8c12e54c988ed32f945c8f97a995d 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingIFT/StrippingHeavyIonDiMuon.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingIFT/StrippingHeavyIonDiMuon.py
@@ -18,8 +18,7 @@ from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 from StandardParticles import StdAllLooseMuons
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand
-from Gaudi.Configuration import *
+from PhysSelPython.Wrappers import Selection
 __author__ = ['Emilie MAURICE']
 __date__ = ''
 __version__ = '$Revision: 2.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingIFT/StrippingHeavyIonDst2D0KPiForPID.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingIFT/StrippingHeavyIonDst2D0KPiForPID.py
index 3e9938914369f1fc1324814d5b24dc38755ca7a9..1ee8e4e5f1170a5a3d531403c251ab257fbc2932 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingIFT/StrippingHeavyIonDst2D0KPiForPID.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingIFT/StrippingHeavyIonDst2D0KPiForPID.py
@@ -14,10 +14,8 @@
 from StandardParticles import StdAllNoPIDsKaons, StdAllNoPIDsPions
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from LHCbKernel.Configuration import *
-from Gaudi.Configuration import *
+from PhysSelPython.Wrappers import Selection
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 __author__ = ['Philip Xing', 'Andrew Powell']
 __date__ = '23rd August 2012'
 __version__ = '$Revision: 7.0 $'
@@ -37,7 +35,7 @@ Usage:
 __all__ = ('HeavyIonDst2D0KPiForPIDConf', 'default_config', "D0", "Dstar")
 
 
-from GaudiKernel.SystemOfUnits import mm, cm, MeV, GeV
+from GaudiKernel.SystemOfUnits import GeV, MeV
 # from Configurables import FilterDesktop, CombineParticles
 
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingIFT/StrippingHeavyIonOthercc.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingIFT/StrippingHeavyIonOthercc.py
index 9c9f7e8b8a2a99edd6519def1f93472555302144..2cbcb83cf9d27264b28808d7f4b20a2fd44eefec 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingIFT/StrippingHeavyIonOthercc.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingIFT/StrippingHeavyIonOthercc.py
@@ -18,8 +18,7 @@ from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 from StandardParticles import StdNoPIDsElectrons, StdLooseProtons, StdLooseMuons
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand
-from Gaudi.Configuration import *
+from PhysSelPython.Wrappers import Selection
 __author__ = ['Emilie MAURICE']
 __date__ = ''
 __version__ = '$Revision: 1.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingIFT/StrippingHeavyIonPIDCalib.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingIFT/StrippingHeavyIonPIDCalib.py
index 2f680aef7898fd3e2de1fd443bb3340e35a58c83..d5f91430bf8ff7412aec1d4823fec14c666e3694 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingIFT/StrippingHeavyIonPIDCalib.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingIFT/StrippingHeavyIonPIDCalib.py
@@ -38,7 +38,6 @@ from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
 from Gaudi.Configuration import *
 __author__ = ['Yanxi ZHANG']
 __date__ = '25/02/2015'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingIFT/StrippingHeavyIonTopology.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingIFT/StrippingHeavyIonTopology.py
index a6d5c96af7bb823fad1b1ea4249a1b8c0da55cca..17a979d3fb048c74d07ff4d9bd397ddf340f275d 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingIFT/StrippingHeavyIonTopology.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingIFT/StrippingHeavyIonTopology.py
@@ -13,13 +13,9 @@
 Module for selecting specific topology
 '''
 
-from Configurables import FilterDesktop, CombineParticles
-from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-from StandardParticles import StdAllLooseMuons, StdAllLoosePions, StdAllNoPIDsPions, StdLoosePhotons
+from Configurables import FilterDesktop
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand
-from Gaudi.Configuration import *
 __author__ = ['Emilie MAURICE']
 __date__ = ''
 __version__ = '$Revision: 1.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingIFT/StrippingHeavyIonTrackEffDownMuon.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingIFT/StrippingHeavyIonTrackEffDownMuon.py
index c29bc2f38788e8cdba57ed1681e8711454528a74..fdb6e9f0e905a3fff0402bc2df59fd5f427a6bb2 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingIFT/StrippingHeavyIonTrackEffDownMuon.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingIFT/StrippingHeavyIonTrackEffDownMuon.py
@@ -44,34 +44,26 @@ __all__ = ('HeavyIonTrackEffDownMuonConf',
 # FIXME Write includes in a cleaner way
 from Gaudi.Configuration import *
 from LHCbKernel.Configuration import *
-from DAQSys.DecoderClass import Decoder
 from Configurables import GaudiSequencer
 from Configurables import UnpackTrack, ChargedProtoParticleMaker, DelegatingTrackSelector, TrackSelector, BestPIDParticleMaker
-from TrackFitter.ConfiguredFitters import ConfiguredFit
 from Configurables import TrackStateInitAlg
 from StrippingConf.StrippingLine import StrippingLine
-from Configurables import ChargedProtoParticleAddMuonInfo, MuonIDAlgLite
+from Configurables import ChargedProtoParticleAddMuonInfo
 from MuonID import ConfiguredMuonIDs
 from Configurables import ChargedProtoCombineDLLsAlg, ProtoParticleMUONFilter
-from PhysSelPython.Wrappers import Selection, DataOnDemand
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
+from PhysSelPython.Wrappers import Selection
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 
 from StrippingUtils.Utils import LineBuilder
-from Configurables import LoKi__VoidFilter
-from os import environ
 from Gaudi.Configuration import *
-import GaudiKernel.ProcessJobOptions
-from GaudiKernel.SystemOfUnits import mm
 
 from GaudiConfUtils.ConfigurableGenerators import TisTosParticleTagger
 from StandardParticles import StdAllLooseMuons
 from Configurables import GaudiSequencer
 from Configurables import TrackToDST
-from Configurables import TrackSys
 from Configurables import PatSeeding, PatSeedingTool, PatLongLivedTracking
-from PhysSelPython.Wrappers import AutomaticData
 # Get the fitters
-from TrackFitter.ConfiguredFitters import ConfiguredFit, ConfiguredFitSeed, ConfiguredFitDownstream
+from TrackFitter.ConfiguredFitters import ConfiguredFitDownstream
 from PatAlgorithms import PatAlgConf
 
 from SelPy.utils import (UniquelyNamedObject,
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingIFT/StrippingHeavyIonTrackEffMuonTT.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingIFT/StrippingHeavyIonTrackEffMuonTT.py
index e0f6c33d1978451545a65ae69a8a85ffa359a0cc..62c1c335cd8cc55c2a620bdb33d47792cfd1356d 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingIFT/StrippingHeavyIonTrackEffMuonTT.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingIFT/StrippingHeavyIonTrackEffMuonTT.py
@@ -63,12 +63,11 @@ __all__ = ('HeavyIonTrackEffMuonTTConf',
            'makeBJpsiKTrackEff',
            'filterHLT2ForBJpsiK')
 
-from Gaudi.Configuration import *
-from PhysSelPython.Wrappers import Selection, DataOnDemand, ChargedProtoParticleSelection
+from PhysSelPython.Wrappers import ChargedProtoParticleSelection, Selection
 from StrippingConf.StrippingLine import StrippingLine
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from StrippingUtils.Utils import LineBuilder, checkConfig
-from StandardParticles import StdLooseKaons, StdLooseMuons, StdAllLooseMuons
+from StrippingUtils.Utils import LineBuilder
+from StandardParticles import StdAllLooseMuons, StdLooseKaons
 
 
 from Configurables import (MuonCombRec,
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingIFT/StrippingHeavyIonTrackEffVeloMuon.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingIFT/StrippingHeavyIonTrackEffVeloMuon.py
index c6fe44cbca243d44e91832a3ed60d283dbe203ff..f86ec243682403d048ed5fea8ea36281a13c7f7c 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingIFT/StrippingHeavyIonTrackEffVeloMuon.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingIFT/StrippingHeavyIonTrackEffVeloMuon.py
@@ -41,17 +41,14 @@ __all__ = ('HeavyIonTrackEffVeloMuonConf',
            )
 
 
-from Gaudi.Configuration import *
-from LHCbKernel.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 # from Configurables import CombineParticles
-from PhysSelPython.Wrappers import Selection, SelectionSequence, DataOnDemand
-from Configurables import ChargedProtoParticleMaker, NoPIDsParticleMaker, DataOnDemandSvc, DelegatingTrackSelector, TrackSelector, CombinedParticleMaker, BestPIDParticleMaker
+from PhysSelPython.Wrappers import Selection
+from Configurables import ChargedProtoParticleMaker, DataOnDemandSvc, DelegatingTrackSelector, NoPIDsParticleMaker, TrackSelector
 from Configurables import FastVeloTracking
 
 from StrippingConf.StrippingLine import StrippingLine
-from Configurables import TrackStateInitAlg, TrackEventFitter, TrackPrepareVelo, TrackContainerCopy, Tf__PatVeloSpaceTool, StandaloneMuonRec
-from Configurables import TrackCloneFinder
+from Configurables import StandaloneMuonRec, TrackPrepareVelo
 from StrippingUtils.Utils import LineBuilder
 # changed from StdLooseMuons, yanxi
 from StandardParticles import StdAllLooseMuons
@@ -60,14 +57,9 @@ from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, TisTosParticleT
 # from Configurables import TisTosParticleTagger
 
 from Configurables import GaudiSequencer
-from Configurables import TrackSys
-from PhysSelPython.Wrappers import AutomaticData
 # Get the fitters
-from TrackFitter.ConfiguredFitters import ConfiguredFit
 
-from Configurables import TrackEventCloneKiller, VeloMuonBuilder
-from Configurables import TrackEventFitter, TrackMasterFitter
-from Configurables import TrackKalmanFilter, TrackMasterExtrapolator
+from Configurables import VeloMuonBuilder
 # from TrackFitter.ConfiguredFitters import ConfiguredFastFitter
 # from Configurables import TrackCloneFinder
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingMiniBias/StrippingBadEvents.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingMiniBias/StrippingBadEvents.py
index 4d837a2f722d72d1c7683e8f61d6316db037f332..460036843530f41526b7139b73c204dba3cf9160 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingMiniBias/StrippingBadEvents.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingMiniBias/StrippingBadEvents.py
@@ -8,7 +8,6 @@
 # granted to it by virtue of its status as an Intergovernmental Organization  #
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
-from PhysSelPython.Wrappers import Selection
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 __author__ = 'Andrea Contu'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingMiniBias/StrippingMiniBias.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingMiniBias/StrippingMiniBias.py
index 7ba890fe41b117c0dcaaac7777296c741c397754..f791c6cd1cfac775c9b2357307a4044a5100eb87 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingMiniBias/StrippingMiniBias.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingMiniBias/StrippingMiniBias.py
@@ -8,7 +8,6 @@
 # granted to it by virtue of its status as an Intergovernmental Organization  #
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
-from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 __author__ = 'Patrick Koppenburg'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingQEE/DisplVertices_Utils.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingQEE/DisplVertices_Utils.py
index f9e3c9136e46dcf7697209e381ff7735b840ed2e..bcd9752464adf9657cb3a290918226a7d0f05341 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingQEE/DisplVertices_Utils.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingQEE/DisplVertices_Utils.py
@@ -14,12 +14,11 @@ Utilities for displaced vertex stripping: wrapper class around PatPV3D
 
 __all__ = ("SelectionFromAlgorithmWithTools", "SelectionPatPV3DWrapper")
 
-from GaudiConfUtils import isConfigurable
 
 from SelPy.utils import (UniquelyNamedObject, ClonableObject, SelectionBase, compatibleSequences,
-                         IncompatibleInputLocations, CloneCallable, makeOutputLocation, setOutputLocation)
+                         IncompatibleInputLocations, makeOutputLocation, setOutputLocation)
 
-from PhysSelPython.Wrappers import checkConfigurable, checkName
+from PhysSelPython.Wrappers import checkName
 
 
 def connectToRequiredSelections(selection, inputSetter):
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingQEE/StrippingA1MuMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingQEE/StrippingA1MuMu.py
old mode 100755
new mode 100644
index 91e62b0b649d88ac57d91a3cf24db5351e7b19de..281aebf4be79ceaf5c90e7533eb04d49847e5185
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingQEE/StrippingA1MuMu.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingQEE/StrippingA1MuMu.py
@@ -23,11 +23,9 @@ A_1 -> mu+ mu-, based on functionality from StrippingDiMuonNew by Jibo He.
 
 """
 
-from Gaudi.Configuration import *
-from LHCbKernel.Configuration import *
 
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
-from PhysSelPython.Wrappers import Selection, DataOnDemand, SimpleSelection
+from PhysSelPython.Wrappers import SimpleSelection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from GaudiKernel.SystemOfUnits import MeV
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingQEE/StrippingA2MuMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingQEE/StrippingA2MuMu.py
index 64c106858ef1dd3206b2083b5ea5e630aec55ae8..cd47529d168278a387e79f1f772ca7cf3b1d8040 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingQEE/StrippingA2MuMu.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingQEE/StrippingA2MuMu.py
@@ -22,7 +22,7 @@ from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from StandardParticles import StdAllLooseMuons, StdAllNoPIDsMuons
+from StandardParticles import StdAllLooseMuons
 from GaudiKernel.SystemOfUnits import GeV
 
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingQEE/StrippingA2MuMuSameSign.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingQEE/StrippingA2MuMuSameSign.py
index 5911c40e36b1e66721231826c818abbc79aed758..a89a6a8b5ff2bf6571b4fe0fcaeb93088567f2a5 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingQEE/StrippingA2MuMuSameSign.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingQEE/StrippingA2MuMuSameSign.py
@@ -22,7 +22,7 @@ from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from StandardParticles import StdAllLooseMuons, StdAllNoPIDsMuons
+from StandardParticles import StdAllLooseMuons
 from GaudiKernel.SystemOfUnits import GeV
 
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingQEE/StrippingB2LLP2HH.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingQEE/StrippingB2LLP2HH.py
index 073c098c3a38cbbfb2655b777880011ad219247a..179fe2f52ea095317c5a39508a99a578c806ae3a 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingQEE/StrippingB2LLP2HH.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingQEE/StrippingB2LLP2HH.py
@@ -18,13 +18,11 @@ __date__ = '25/01/2019'
 
 __all__ = ('B2LLPV0_sConf', 'default_config')
 
-from Gaudi.Configuration import *
 from StandardParticles import StdAllNoPIDsPions
 from PhysSelPython.Wrappers import CombineSelection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from GaudiKernel.SystemOfUnits import GeV
-from LoKiPhys.functions import SOURCE, SIZE
 
 default_config = {
     'NAME': 'B2LLPV0',
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingQEE/StrippingConvertedPhoton.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingQEE/StrippingConvertedPhoton.py
index 75d6970b1df2c63c192f20d524128d15f914343b..6a24e6a634b2578b9537332d82053d30b73013fd 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingQEE/StrippingConvertedPhoton.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingQEE/StrippingConvertedPhoton.py
@@ -23,7 +23,7 @@ __all__ = (
 
 from Gaudi.Configuration import *
 from CommonParticles.Utils import *
-from GaudiKernel.SystemOfUnits import MeV, GeV, mm
+from GaudiKernel.SystemOfUnits import MeV, mm
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
 from Configurables import (DiElectronMaker,
                            ProtoParticleCALOFilter,
@@ -31,9 +31,7 @@ from Configurables import (DiElectronMaker,
                            LoKi__VertexFitter,
                            )
 from PhysSelPython.Wrappers import (Selection,
-                                    SimpleSelection,
-                                    MergedSelection,
-                                    AutomaticData)
+                                    MergedSelection)
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingQEE/StrippingDY2MuMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingQEE/StrippingDY2MuMu.py
index 9c7c8a7706d666e3fac7a8f8316de58468cc8b74..6a28183b934ae8110dbdef65c4d96d44dd261b82 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingQEE/StrippingDY2MuMu.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingQEE/StrippingDY2MuMu.py
@@ -26,9 +26,8 @@ __author__ = ['J. Anderson']
 
 __all__ = 'DY2MuMuConf', 'default_config'
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-from PhysSelPython.Wrappers import Selection, SimpleSelection
+from PhysSelPython.Wrappers import SimpleSelection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from StandardParticles import StdAllLooseMuons
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingQEE/StrippingDY2ee.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingQEE/StrippingDY2ee.py
index a80a06710257e4a747b068f38b65eda9b6b0de8c..3a4d7395f7894461a94f0c47d79c1d2bc20d648e 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingQEE/StrippingDY2ee.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingQEE/StrippingDY2ee.py
@@ -20,9 +20,8 @@ __author__ = ['S.Bifani', 'D.Ward']
 
 __all__ = ('DY2eeConf', 'default_config')
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-from PhysSelPython.Wrappers import Selection, DataOnDemand
+from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from StandardParticles import StdAllNoPIDsElectrons
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingQEE/StrippingDisplJets.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingQEE/StrippingDisplJets.py
index 5fef3562a7eba983dc7ba2e37ee9b5a47fc6bebf..28c1bab64dafcce7d73fff3cdfe6a61833456218 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingQEE/StrippingDisplJets.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingQEE/StrippingDisplJets.py
@@ -9,8 +9,6 @@
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
 
-from Gaudi.Configuration import *
-from CommonParticles.Utils import *
 # from Configurables import FilterDesktop
 # from PhysSelPython.Wrappers import Selection, DataOnDemand, FilterSelection
 from StrippingConf.StrippingLine import StrippingLine
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingQEE/StrippingDisplVertices.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingQEE/StrippingDisplVertices.py
index 1ceed257a457950890e0fc33aaf7abc06342b70a..66be8a1f8712b367d96e50ebeb3d82892c0f2c1b 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingQEE/StrippingDisplVertices.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingQEE/StrippingDisplVertices.py
@@ -40,7 +40,6 @@ __all__ = ('DisplVerticesConf', 'default_config')
 
 from Gaudi.Configuration import *
 from GaudiKernel import SystemOfUnits as units
-from LHCbKernel.Configuration import DEBUG, VERBOSE
 
 import logging
 logger = logging.getLogger(__name__)
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingQEE/StrippingDitau.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingQEE/StrippingDitau.py
old mode 100755
new mode 100644
index fa049324f79a44e720a641aa2ed2cdc857f4435e..3e2dd3df509a4ead7bb1a73e4cccd6e5f2e99c0f
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingQEE/StrippingDitau.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingQEE/StrippingDitau.py
@@ -155,8 +155,7 @@ Derived from works of S.Farry & P. Ilten
 
 """
 
-import os
-from GaudiKernel.SystemOfUnits import MeV, GeV, micrometer
+from GaudiKernel.SystemOfUnits import GeV, MeV
 from PhysSelPython.Wrappers import Selection, SimpleSelection, PassThroughSelection, MergedSelection, AutomaticData
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
@@ -894,7 +893,7 @@ def Tuples():
 
     """
     import re
-    from DecayTreeTuple.Configuration import DecayTreeTuple, EventTuple
+    from DecayTreeTuple.Configuration import DecayTreeTuple
 
     seq = GaudiSequencer('TupleSeq')
     seq.ModeOR = True
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingQEE/StrippingExotica.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingQEE/StrippingExotica.py
old mode 100755
new mode 100644
index 6bc342e6673e7b1e6203b8260039fdde1761206c..6bb564d6b7bbd36c36350f55b005a51272e6ab12
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingQEE/StrippingExotica.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingQEE/StrippingExotica.py
@@ -34,7 +34,7 @@ Hlt2ExoticaEtaToDiEGamma
 from GaudiKernel.SystemOfUnits import MeV, GeV, mm, picosecond
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-from PhysSelPython.Wrappers import Selection, SimpleSelection, MergedSelection, AutomaticData
+from PhysSelPython.Wrappers import AutomaticData, SimpleSelection
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingQEE/StrippingFullDiJets.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingQEE/StrippingFullDiJets.py
index 0e20ce2d9fcbfbea2ea7828e4bd1f9db7eed9790..b2931713d0c65ae7ee7dfa387b7b5473c635eba4 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingQEE/StrippingFullDiJets.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingQEE/StrippingFullDiJets.py
@@ -9,14 +9,10 @@
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
 
-from Gaudi.Configuration import *
-from Configurables import FilterDesktop, CombineParticles, LoKi__VertexFitter
+from Configurables import CombineParticles, LoKi__VertexFitter
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from StandardParticles import StdJets
-from CommonParticles.Utils import *
-from Configurables import FilterJet
 from GaudiKernel.SystemOfUnits import GeV
 
 __author__ = "Xabier Cid Vidal", "Cedric Potterat", "William Barter"
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingQEE/StrippingGluinos.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingQEE/StrippingGluinos.py
index 0867cc3c369e7f5b06dfb5d1909d7eeda820e3f0..8070b81f174dd132e7ec9c150bbe87dc5befc9b9 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingQEE/StrippingGluinos.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingQEE/StrippingGluinos.py
@@ -10,11 +10,10 @@
 ###############################################################################
 from Configurables import FilterDesktop, JetVertexAlg
 from CommonParticles.Utils import *
-from LoKiPhys.functions import SOURCE, SIZE
 from GaudiKernel.SystemOfUnits import GeV
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import FilterSelection, PassThroughSelection, DataOnDemand
+from PhysSelPython.Wrappers import FilterSelection, PassThroughSelection
 from StandardParticles import StdJets
 from Gaudi.Configuration import *
 __author__ = ['Xabier Cid Vidal', 'Carlos Vazquez Sierra', 'Igor Kostiuk']
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingQEE/StrippingLFVExotica.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingQEE/StrippingLFVExotica.py
old mode 100755
new mode 100644
index 88da9dcd829a1905c1264408cac8e2e94c89b89f..fef9c145f071f0ab2fe36aeab16fc22bc5d9a283
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingQEE/StrippingLFVExotica.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingQEE/StrippingLFVExotica.py
@@ -174,7 +174,7 @@ def create_stdjets(strob, line_location, stdjets_name_ban):
         strob.StdJetsNoJetIDBan = [myconf1]
 
     # configure Data-On-Demand service
-    locations = updateDoD(myconf1)
+    updateDoD(myconf1)
 
 
 relInfoJetsVars = ["JETNOMU1PX", "JETNOMU1PY", "JETNOMU1PZ", "JETNOMU1PT", "JETNOMU1JETWIDTH", "JETNOMU1NNTAG", "JETNOMU1MNF", "JETNOMU2PX", "JETNOMU2PY", "JETNOMU2PZ", "JETNOMU2PT", "JETNOMU2JETWIDTH", "JETNOMU2NNTAG", "JETNOMU2MNF", "JETNOMU3PX", "JETNOMU3PY",
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingQEE/StrippingLLP2HH.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingQEE/StrippingLLP2HH.py
index a44e21b9d685dfdf71578f4a8c9db734abf73c01..b2b088c7863a076933f8b5770260224a4ca2b483 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingQEE/StrippingLLP2HH.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingQEE/StrippingLLP2HH.py
@@ -18,13 +18,11 @@ __date__ = '24/01/2019'
 
 __all__ = ('LLPV0_sConf', 'default_config')
 
-from Gaudi.Configuration import *
 from StandardParticles import StdAllNoPIDsPions
 from PhysSelPython.Wrappers import CombineSelection, PassThroughSelection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from GaudiKernel.SystemOfUnits import GeV
-from LoKiPhys.functions import SOURCE, SIZE
 
 default_config = {
     'NAME': 'LLPV0',
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingQEE/StrippingLLP2Jets.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingQEE/StrippingLLP2Jets.py
index 8619ba15a78cfb147e8f2c955611f8cdd44bd2ba..9c25c3202184e96ffba87e12971ec43ac9362246 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingQEE/StrippingLLP2Jets.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingQEE/StrippingLLP2Jets.py
@@ -18,7 +18,6 @@ __date__ = '25/01/2019'
 
 __all__ = ('LLP2Jets_sConf', 'default_config')
 
-from Gaudi.Configuration import *
 from Configurables import JetVertexAlg
 from StandardParticles import StdJets
 from CommonParticles.Utils import updateDoD
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingQEE/StrippingLLP2MuX.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingQEE/StrippingLLP2MuX.py
index 16654f3c9d1acc1925968a5d39f0087bea5086a7..f93bc4732424f6eaeb1951cb1a244ef0de7e8b5e 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingQEE/StrippingLLP2MuX.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingQEE/StrippingLLP2MuX.py
@@ -16,7 +16,6 @@ from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import AutomaticData, Selection
 from GaudiKernel import SystemOfUnits as units
-from LHCbKernel.Configuration import *
 __author__ = "Pieter David"
 __date__ = "2014-08-28"
 __all__ = ("LLP2MuXConf", "default_config")
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingQEE/StrippingLb2dp.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingQEE/StrippingLb2dp.py
old mode 100755
new mode 100644
index cf2bf7494c36f78187f495fe46a2fcfe068338e0..cbd7593f597ef30b0f56f7070b78fe66905549e5
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingQEE/StrippingLb2dp.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingQEE/StrippingLb2dp.py
@@ -23,15 +23,11 @@ __all__ = ('Lb2dpConf',
            )
 
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop
-from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays
 
-from StandardParticles import StdAllNoPIDsPions, StdAllNoPIDsProtons,  StdAllNoPIDsKaons
 from PhysSelPython.Wrappers import Selection, DataOnDemand, SimpleSelection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from Configurables import LoKi__VoidFilter as VoidFilter
 
 default_config = {
     'NAME': 'Lb2dp',
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingQEE/StrippingMicroDiJets.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingQEE/StrippingMicroDiJets.py
index 60a35abe10febcab0dcf2d24628e23b510f946b5..db8af2aecfab54badd7fd3305d3d0716cbe4802b 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingQEE/StrippingMicroDiJets.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingQEE/StrippingMicroDiJets.py
@@ -10,13 +10,12 @@
 ###############################################################################
 
 from Gaudi.Configuration import *
-from Configurables import FilterDesktop, CombineParticles, LoKi__VertexFitter
+from Configurables import CombineParticles
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from StandardParticles import StdJets
 from CommonParticles.Utils import *
-from Configurables import FilterJet, ClearDaughters
+from Configurables import ClearDaughters
 from GaudiKernel.SystemOfUnits import GeV
 
 __author__ = "Xabier Cid Vidal", "Cedric Potterat", "William Barter"
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingQEE/StrippingMuMuSS.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingQEE/StrippingMuMuSS.py
index 46e50bf48c5974152d914b654bd5b1fd74bb2b6e..130bda526520d302d34046bd7d905f2bb8920adf 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingQEE/StrippingMuMuSS.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingQEE/StrippingMuMuSS.py
@@ -26,7 +26,7 @@ __author__ = (
 )
 
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-from PhysSelPython.Wrappers import Selection, SimpleSelection
+from PhysSelPython.Wrappers import SimpleSelection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from StandardParticles import StdAllLooseMuons
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingQEE/StrippingSbarSCorrelations.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingQEE/StrippingSbarSCorrelations.py
index 63378eabc81bb7a2995cb94f8b8e7faad734f19d..33589834379b334e6b432982e264803ceb8d8308 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingQEE/StrippingSbarSCorrelations.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingQEE/StrippingSbarSCorrelations.py
@@ -21,10 +21,8 @@ Long tracks only
 from GaudiKernel.SystemOfUnits import MeV, GeV
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
-from StandardParticles import StdAllNoPIDsPions, StdTightKaons, StdAllNoPIDsProtons
+from PhysSelPython.Wrappers import DataOnDemand, Selection
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = ['Florin MACIUC']
 __date__ = '24/08/2013'
 __version__ = '$Revision: 1.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingQEE/StrippingStrangeBaryons.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingQEE/StrippingStrangeBaryons.py
index f3dd8ebdec4e50abd2bed892959740435ac5d9b5..2405f0e9c6f1695dd9f652d6aae992473b3135a2 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingQEE/StrippingStrangeBaryons.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingQEE/StrippingStrangeBaryons.py
@@ -18,14 +18,10 @@ Xi -> Lambda pi,   Omega -> Lambda K
 LLL DDL DDD
 '''
 
-from GaudiKernel.SystemOfUnits import MeV
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
-from CommonParticles import StdLooseLambda
-from StandardParticles import StdLoosePions, StdNoPIDsDownPions, StdLooseKaons, StdLooseDownKaons, StdLooseProtons, StdNoPIDsDownProtons
+from PhysSelPython.Wrappers import DataOnDemand, Selection
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = ['Mihai Straticiuc', 'Florin Maciuc', 'Nguyen Thi Dung']
 __date__ = '26/06/2012'
 __version__ = '$Revision: 0.3 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingQEE/StrippingStrangeBaryonsNoPID.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingQEE/StrippingStrangeBaryonsNoPID.py
index 668986b834d39169c5ae15803bf5d5fb33cff67b..208ab8bad23a5e36e2a0a609a82dd6ca2fc9d012 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingQEE/StrippingStrangeBaryonsNoPID.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingQEE/StrippingStrangeBaryonsNoPID.py
@@ -18,12 +18,10 @@ Xi -> Lambda pi,   Omega -> Lambda K
 LLL
 '''
 
-from GaudiKernel.SystemOfUnits import MeV
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
+from PhysSelPython.Wrappers import DataOnDemand, Selection
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = ['Florin Maciuc']
 __date__ = '13/01/2014'
 __version__ = '$Revision: 0.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingQEE/StrippingTaggedJets.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingQEE/StrippingTaggedJets.py
old mode 100755
new mode 100644
index 2205ce56dd85643e92bc55ab369b85378152951c..4927224c3710ed4cad5cd3baa918ec4b163f34f2
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingQEE/StrippingTaggedJets.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingQEE/StrippingTaggedJets.py
@@ -10,11 +10,10 @@
 ###############################################################################
 
 from Gaudi.Configuration import *
-from Configurables import FilterDesktop, CombineParticles, LoKi__VertexFitter
+from Configurables import CombineParticles, LoKi__VertexFitter
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from StandardParticles import StdJets
 from CommonParticles.Utils import *
 from Configurables import FilterJet
 from GaudiKernel.SystemOfUnits import GeV
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingQEE/StrippingW2nH.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingQEE/StrippingW2nH.py
index cc373f666cb49309b9f3e2efe0dae8e52ac260a4..22eacc1d77ba55838726dc481db0fa8f76e6bf1d 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingQEE/StrippingW2nH.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingQEE/StrippingW2nH.py
@@ -26,7 +26,6 @@ from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from StandardParticles import StdAllNoPIDsPions
 from GaudiKernel.SystemOfUnits import GeV
-from GaudiKernel.SystemOfUnits import MeV
 
 
 default_config = {
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingQEE/StrippingWJets.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingQEE/StrippingWJets.py
old mode 100755
new mode 100644
index 69b6940c49ad110ace21f32d3dbb3e2904580aed..a8dd17366932d60f3bf41f7c5c6503ba39ea6532
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingQEE/StrippingWJets.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingQEE/StrippingWJets.py
@@ -22,14 +22,12 @@ They are then cover a phasespace complementarily on each other.
 
 """
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
 from Configurables import CombineParticles, LoKi__VertexFitter
 from PhysSelPython.Wrappers import Selection, SimpleSelection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from StandardParticles import StdAllLooseMuons, StdAllNoPIDsElectrons, StdJets
-from CommonParticles.Utils import *
 from GaudiKernel.SystemOfUnits import GeV, MeV
 
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingQEE/StrippingWRareDecay.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingQEE/StrippingWRareDecay.py
index de1eaf98e07a599774f9667406768492a892a465..f599f543313af3af803cfd1ae503077a399fbebb 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingQEE/StrippingWRareDecay.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingQEE/StrippingWRareDecay.py
@@ -21,8 +21,7 @@ from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from GaudiKernel.SystemOfUnits import MeV, GeV, mm, picosecond
-from Gaudi.Configuration import *
+from GaudiKernel.SystemOfUnits import MeV, picosecond
 __author__ = ['Hang Yin', 'Qundong Han']
 __date__ = '11/29/2016'
 __version__ = '$Revision: 2.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingQEE/StrippingWe.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingQEE/StrippingWe.py
index 0820e8b431f0bb8891ac3f88f980c3fcbe0a181c..3e509fb26655db393ee396f8d85f74a24b0c62d7 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingQEE/StrippingWe.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingQEE/StrippingWe.py
@@ -21,7 +21,6 @@ We control: StdAllNoPIDsElectrons, PRS>50Mev & E_ECal/P>0.1 & E_HCal/P<0.05 & pT
 __all__ = 'WeConf', 'default_config'
 __author__ = 'S. Bifani', 'D. Ward'
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
 from PhysSelPython.Wrappers import SimpleSelection
 from StrippingConf.StrippingLine import StrippingLine
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingQEE/StrippingZ02ee.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingQEE/StrippingZ02ee.py
index e797011998c7d9201276f70cdabaa1b30ae4d70f..f6977308a75475dc2fd7e695d713190194177820 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingQEE/StrippingZ02ee.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingQEE/StrippingZ02ee.py
@@ -23,7 +23,6 @@ __all__ = (
     'default_config',
 )
 
-from Gaudi.Configuration import *
 from GaudiKernel.SystemOfUnits import GeV, MeV
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 from PhysSelPython.Wrappers import SimpleSelection
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingQEE/StrippingZ02nH.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingQEE/StrippingZ02nH.py
index 2f8d8eb612b1c353cf08c5e72ca77ae205eb7a72..35de5f4d789850497ba9aa5b71430ef065284077 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingQEE/StrippingZ02nH.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingQEE/StrippingZ02nH.py
@@ -26,7 +26,6 @@ from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from StandardParticles import StdAllNoPIDsPions
 from GaudiKernel.SystemOfUnits import GeV
-from GaudiKernel.SystemOfUnits import MeV
 
 
 default_config = {
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingQEE/StrippingZ0RareDecay.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingQEE/StrippingZ0RareDecay.py
index 57c2091f2ac6a4efcb43bd28c4251acba348f513..e181b28533d1769723804e5ccc2d55ce3dfbccea 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingQEE/StrippingZ0RareDecay.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingQEE/StrippingZ0RareDecay.py
@@ -22,8 +22,7 @@ __version__ = '$Revision: 2.0 $'
 
 __all__ = 'default_config', 'Z0RareDecayConf'
 
-from Gaudi.Configuration import *
-from GaudiKernel.SystemOfUnits import MeV, GeV, mm
+from GaudiKernel.SystemOfUnits import MeV
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
 from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
 from StrippingConf.StrippingLine import StrippingLine
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingQEE/depreciated/StrippingDijets.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingQEE/depreciated/StrippingDijets.py
index f0793d3411791797729ad540397e458f4646f78b..975321a6b30b00b6f80aee11878eb20ba9d16b84 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingQEE/depreciated/StrippingDijets.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingQEE/depreciated/StrippingDijets.py
@@ -15,8 +15,7 @@
 __all__ = ('DijetsConf',
            'default_config')
 
-from Gaudi.Configuration import *
-from GaudiKernel.SystemOfUnits import MeV, GeV, mm
+from GaudiKernel.SystemOfUnits import GeV, MeV
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingQEE/depreciated/StrippingHighPtTopoJets.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingQEE/depreciated/StrippingHighPtTopoJets.py
index 73ca61d9e7e0914a21b65e40361131e8f38c026d..6078cdec364615de35d547f813533d0a763afeef 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingQEE/depreciated/StrippingHighPtTopoJets.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingQEE/depreciated/StrippingHighPtTopoJets.py
@@ -21,8 +21,6 @@ __all__ = ('default_config', 'HighPtTopoJetsConf')
 # \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\#
 
 
-from Gaudi.Configuration import *
-from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from PhysSelPython.Wrappers import EventSelection
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingQEE/depreciated/StrippingJets.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingQEE/depreciated/StrippingJets.py
index 02e5fc43080729f2f38d0bc0bde65232a21f0202..55abf24d99577dcb8f10b30fda8803015b0c09f0 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingQEE/depreciated/StrippingJets.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingQEE/depreciated/StrippingJets.py
@@ -15,13 +15,11 @@
 __all__ = ('JetsConf',
            'default_config')
 
-from Gaudi.Configuration import *
-from GaudiKernel.SystemOfUnits import MeV, GeV, mm
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
+from GaudiKernel.SystemOfUnits import GeV, MeV
+from PhysSelPython.Wrappers import MergedSelection, Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
-from JetAccessories.JetMaker_Config import JetMakerConf
 from StandardParticles import StdJets, StdAllNoPIDsPions
 from Configurables import CombineParticles
 from Configurables import TopologicalTagging
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/Beauty2Charm_LoKiCuts.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/Beauty2Charm_LoKiCuts.py
index ce5265655cf518aa12121d3a5728d84c36da26cd..666cef80aacee423a071365fe7281c63e506e27d 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/Beauty2Charm_LoKiCuts.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/Beauty2Charm_LoKiCuts.py
@@ -10,11 +10,6 @@
 ###############################################################################
 # \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\#
 
-from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
-from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-from PhysSelPython.Wrappers import Selection, MergedSelection
-from StandardParticles import StdNoPIDsPions, StdNoPIDsKaons
 
 # \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\#
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingB02Lcmu_pKpi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingB02Lcmu_pKpi.py
index 3d6992fd337683bf5bcf97e994e4fd64705add4f..93bd54fbf8871329e8e7bcb95f7722d9913e1cff 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingB02Lcmu_pKpi.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingB02Lcmu_pKpi.py
@@ -14,7 +14,6 @@ from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = ['Nikita Beliy', 'Jibo He']
 __date__ = '28/11/2016'
 __version__ = '$Revision: 1.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingB23MuLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingB23MuLines.py
index a6e53abda621d1f1b0efe6185553c1b46aae67e6..15ea2076dcaea1a75c4fec8295e895be19887b4a 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingB23MuLines.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingB23MuLines.py
@@ -55,13 +55,11 @@ __all__ = ("B23MuLinesConf",
 
 #############################################################################
 
-from Gaudi.Configuration import *
-from Configurables import FilterDesktop, CombineParticles, DaVinci__N3BodyDecays
+from Configurables import DaVinci__N3BodyDecays
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 # from StrippingSelections.Utils import checkConfig
-from GaudiKernel.PhysicalConstants import c_light
 
 #############################################################################
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingB2EtaMuMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingB2EtaMuMu.py
index 121398b271451a2ef53c96b9cde3d79a68bd4d2e..9c2efbbacf4dc368cb7c6d742a93721b60444611 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingB2EtaMuMu.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingB2EtaMuMu.py
@@ -12,13 +12,12 @@
 B->etamumuselection
 '''
 
-from StandardParticles import StdAllNoPIDsMuons, StdAllLooseMuons
+from StandardParticles import StdAllNoPIDsMuons
 from StandardParticles import StdNoPIDsPions, StdLooseAllPhotons, StdLooseMergedPi0, StdLooseResolvedPi0
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand, SimpleSelection, MergedSelection
+from PhysSelPython.Wrappers import MergedSelection, Selection, SimpleSelection
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = ['Fred Blanc']
 __date__ = '26/01/2019'
 __version__ = '$Revision: 1.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingB2KLLXInclusive.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingB2KLLXInclusive.py
index a9d2ffd4e4d8d6444da6c3df3731248c13fce6e7..61a740d6b5d3d92a7f2015b59a5021738a7a2958 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingB2KLLXInclusive.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingB2KLLXInclusive.py
@@ -19,15 +19,12 @@ __all__ = ('B2KLLXInclusiveConf', 'default_config')
 Stripping selection for inclusively selected B->KmumuX decays.
 """
 
-from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop
+from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
 
 from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from LHCbKernel.Configuration import *  # check if needed
-from Configurables import SubstitutePID
-from Configurables import SubPIDMMFilter
 
 
 #################
@@ -333,7 +330,6 @@ class B2KLLXInclusiveConf(LineBuilder):
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         CombineDiMuon = CombineParticles()
         CombineDiMuon.DecayDescriptors = ["[B+ -> J/psi(1S) K+]cc"]
-        sel_name = "InclKLL"
         CombineDiMuon.MotherCut = self.InclKLLCut
         # choose
         leptons = self.InclLeptons
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingB2KstTauTau.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingB2KstTauTau.py
index 0e62fb1a13ae5f9586b34995cc3f4f00d8de7dee..a236059c8ca69aa4aaf625cf6925165cda17c83a 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingB2KstTauTau.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingB2KstTauTau.py
@@ -15,8 +15,7 @@ from StandardParticles import StdTightMuons
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, OfflineVertexFitter, DaVinci__N3BodyDecays
-from Gaudi.Configuration import *
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N3BodyDecays, FilterDesktop
 __author__ = [' G. Mancinelli, J. Serrano']
 __date__ = '15/08/2014'
 __version__ = '$Revision: 0.1 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingB2LLXBDT.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingB2LLXBDT.py
index 33ad8193f48b0db42c11b2b0fdb770bc37fa1794..b45675d8906a352a37b4bdd5ca92e02e5c6279bf 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingB2LLXBDT.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingB2LLXBDT.py
@@ -20,8 +20,6 @@ from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticle
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, MergedSelection
-from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays
-from Gaudi.Configuration import *
 __author__ = ['Jibo He']
 __date__ = '20/11/2015'
 __version__ = '$Revision: 1.0 $'
@@ -261,7 +259,7 @@ class B2LLXBDTConf(LineBuilder):
         """
         Kshort, both LL and DD
         """
-        from StandardParticles import StdLooseKsDD, StdLooseKsLL
+        from StandardParticles import StdLooseKsDD
 
         self.SelKsDD = self.createSubSel(OutputList=self.name + "SelKsDD",
                                          InputList=StdLooseKsDD,
@@ -297,7 +295,7 @@ class B2LLXBDTConf(LineBuilder):
         """
         Lambda, both LL and DD
         """
-        from StandardParticles import StdLooseLambdaDD, StdLooseLambdaLL
+        from StandardParticles import StdLooseLambdaDD
 
         self.SelLambdaDD = self.createSubSel(OutputList=self.name + "SelLambdaDD",
                                              InputList=StdLooseLambdaDD,
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingB2Lambda0ELines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingB2Lambda0ELines.py
index dcb376b6317e21a82d05511d6642d51a9139b1e0..beaae1e2b2d8fdb3ab6922b0b597f4f3735074b1 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingB2Lambda0ELines.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingB2Lambda0ELines.py
@@ -21,7 +21,6 @@ __all__ = ('B2Lambda0ELines',
            'default_config')
 
 from StandardParticles import StdLoosePions, StdLooseElectrons, StdNoPIDsDownElectrons, StdNoPIDsDownPions
-from Configurables import TisTosParticleTagger
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingB2Lambda0MuLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingB2Lambda0MuLines.py
index e758feafbbaf38bbf2c16b62697aeccc5044b5c0..8c8ebee90e957bb0642c7fb649a57f03d93eef97 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingB2Lambda0MuLines.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingB2Lambda0MuLines.py
@@ -21,7 +21,6 @@ __all__ = ('B2Lambda0MuLines',
            'default_config')
 
 from StandardParticles import StdLoosePions, StdLooseMuons, StdLooseDownMuons, StdNoPIDsDownPions
-from Configurables import TisTosParticleTagger
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingB2Lambda0MuOSLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingB2Lambda0MuOSLines.py
index 389b9bf695c2932c173a4ee768404acc14c2b153..4186a8554984cb039f3d149cda4700f95f9a9753 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingB2Lambda0MuOSLines.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingB2Lambda0MuOSLines.py
@@ -21,7 +21,6 @@ __all__ = ('B2Lambda0MuOSLines',
            'default_config')
 
 from StandardParticles import StdLoosePions, StdLooseMuons, StdLooseDownMuons, StdNoPIDsDownPions
-from Configurables import TisTosParticleTagger
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingB2Lambda0SSMuMu3PiLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingB2Lambda0SSMuMu3PiLines.py
index b829fcd48cd4d244f39b998208c83dfea4c65343..f47c81735abc7cb47558594658aaf83f1ca7bc36 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingB2Lambda0SSMuMu3PiLines.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingB2Lambda0SSMuMu3PiLines.py
@@ -21,7 +21,6 @@ __all__ = ('B2Lambda0SSMuMu3PiLines',
            'default_config')
 
 from StandardParticles import StdLoosePions, StdLooseMuons, StdLooseDownMuons, StdNoPIDsDownPions
-from Configurables import TisTosParticleTagger
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingB2MuMuMuMuLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingB2MuMuMuMuLines.py
index e8be535494b2f042b5e0ac87439ef9f4f7c4bd9d..e6a830521e3233715c6896a50d0ffe4616617755 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingB2MuMuMuMuLines.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingB2MuMuMuMuLines.py
@@ -19,7 +19,7 @@ from Beauty2Charm_LoKiCuts import LoKiCuts
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
-from Configurables import FilterDesktop, CombineParticles
+from Configurables import CombineParticles
 from Gaudi.Configuration import *
 __author__ = ['Diego Martinez Santos', 'Johannes Albrecht',
               'Konstantinos A. Petridis', 'Alexander Baranov']
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingB2XLL.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingB2XLL.py
old mode 100755
new mode 100644
index 893c8f7d24822aaf5128c145a0ea679b0efd25cc..54c9d8dbdf1774215b4f2574855ce20420b67924
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingB2XLL.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingB2XLL.py
@@ -10,9 +10,8 @@
 ###############################################################################
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection, AutomaticData
+from PhysSelPython.Wrappers import MergedSelection, Selection
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = 'Raja Nandakumar, Fergus Wilson, Stefania Ricciardi'
 __date__ = '04/11/2015'
 __version__ = '$Revision: 0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingB2XMuMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingB2XMuMu.py
index 9025207d02fbeeac1ba75e61e29706ad4d96e0d2..b89aef24e7a93c79addc371ccdea665995446fb7 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingB2XMuMu.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingB2XMuMu.py
@@ -19,7 +19,6 @@ __version__ = '$Revision: 1.2 $'
 __all__ = ('B2XMuMuConf', 'default_config')
 
 
-from Gaudi.Configuration import *
 from LHCbKernel.Configuration import *  # check if needed
 
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingB2XTau.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingB2XTau.py
index 89967ffc1bd10cb56544c7233004d1b229731f9c..9050443393da5af1c9abb3eee3ba2e1eda76009d 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingB2XTau.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingB2XTau.py
@@ -8,16 +8,13 @@
 # granted to it by virtue of its status as an Intergovernmental Organization  #
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
-from StandardParticles import StdAllLoosePions, StdAllNoPIDsPions
-from copy import deepcopy
 from StandardParticles import StdLooseKaons
-from StandardParticles import StdLoosePions, StdTightPions
-from StandardParticles import StdNoPIDsKaons, StdNoPIDsPions, StdTightMuons
+from StandardParticles import StdLoosePions
+from StandardParticles import StdNoPIDsPions, StdTightMuons
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, OfflineVertexFitter, DaVinci__N3BodyDecays
-from Gaudi.Configuration import *
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N3BodyDecays, FilterDesktop
 __author__ = ['G. Dujany, G. Mancinelli, J. Serrano']
 __date__ = '24/05/2010,15/01/2014, 19/10/2017'
 __version__ = '$Revision: 1.3 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingB2XTauMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingB2XTauMu.py
index 1539daf38aad3280d179e42101b30c7b9367dc90..3bf392ac2eb839b14fbb1f75d9e94e760e94edd9 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingB2XTauMu.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingB2XTauMu.py
@@ -25,8 +25,6 @@ __all__ = ('B2XTauMuConf',
            'default_config')
 
 
-from Gaudi.Configuration import *
-
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
 from PhysSelPython.Wrappers import Selection, MergedSelection
 from StrippingConf.StrippingLine import StrippingLine
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingB2XTauTau.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingB2XTauTau.py
index 4fcaf356c2071cae8a3b6be504e35eab73cf10ce..d2ac23a901190aa51d99a2548c6383a01f998521 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingB2XTauTau.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingB2XTauTau.py
@@ -14,8 +14,7 @@ from StandardParticles import StdNoPIDsPions, StdLoosePions
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand, SimpleSelection
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, OfflineVertexFitter, DaVinci__N3BodyDecays
-from Gaudi.Configuration import *
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N3BodyDecays, FilterDesktop
 __author__ = [' L. Pescatore', 'F. Blanc']
 __date__ = '28/09/2018'
 __version__ = '$Revision: 0.1$'
@@ -23,7 +22,6 @@ __version__ = '$Revision: 0.1$'
 # Stripping line for B->Htautau
 
 from GaudiKernel.SystemOfUnits import MeV
-from GaudiKernel.SystemOfUnits import mm
 
 """
   B->KstarTauTau, B->KTauTau, B->PhiTauTau, B->Eta'TauTau
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingBLVLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingBLVLines.py
index 8bf68933cf866f19e4931849021862745276afe7..a5196ce34b14f3f32b717e3c7fcb254e2f21f2fa 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingBLVLines.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingBLVLines.py
@@ -95,8 +95,7 @@ __all__ = ("BLVLinesConf",
 
 ###################################################################################################
 
-from Gaudi.Configuration import *
-from Configurables import FilterDesktop, CombineParticles, DaVinci__N3BodyDecays
+from Configurables import CombineParticles, DaVinci__N3BodyDecays
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingBd2KSLLX.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingBd2KSLLX.py
index 419b0f7505b9bb8f7a0008bd6bd040167c12c60a..54c987ef8b72fd7e148a11fb44cebadb12188639 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingBd2KSLLX.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingBd2KSLLX.py
@@ -10,9 +10,8 @@
 ###############################################################################
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection, AutomaticData
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, DaVinci__N3BodyDecays
-from Gaudi.Configuration import *
+from PhysSelPython.Wrappers import MergedSelection, Selection
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop
 __author__ = 'SB'
 __date__ = '08/10/2017'
 __version__ = '$Revision: 1 $'
@@ -47,15 +46,8 @@ class Bd2KSLLXConf(LineBuilder):
         mmXLine_name = name + "_mm"
         eeXLine_name = name + "_ee"
 
-        from StandardParticles import StdLoosePions as Pions
-        from StandardParticles import StdLooseKaons as Kaons
-        from StandardParticles import StdLooseKstar2Kpi as Kstars
-        from StandardParticles import StdLoosePhi2KK as Phis
         from StandardParticles import StdLooseKsLL as KshortsLL
         from StandardParticles import StdLooseKsDD as KshortsDD
-        from StandardParticles import StdLooseLambdaLL as LambdasLL
-        from StandardParticles import StdLooseLambdaDD as LambdasDD
-        from StandardParticles import StdLooseLambdastar2pK as Lambdastars
 
         SelKshortsLL = self._filterHadron(name="KshortsLLFor" + self._name,
                                           sel=KshortsLL,
@@ -64,12 +56,10 @@ class Bd2KSLLXConf(LineBuilder):
                                           sel=KshortsDD,
                                           params=config)
 
-        from StandardParticles import StdDiElectronFromTracks as DiElectronsFromTracks
         from StandardParticles import StdLooseDiElectron as DiElectrons
         from StandardParticles import StdLooseDiMuon as DiMuons
 
-        ElecID = "(PIDe > %(PIDe)s)" % config
-        MuonID = "(HASMUON)&(ISMUON)"
+        "(PIDe > %(PIDe)s)" % config
 
         DiElectronID = "(2 == NINTREE((ABSID==11)&(PIDe > %(PIDe)s)))" % config
         DiMuonID = "(2 == NINTREE((ABSID==13)&(HASMUON)&(ISMUON)))"
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingBd2eeKstarBDT.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingBd2eeKstarBDT.py
index 1a6b3547113e58f48bff1e36952cfc3fb4d30295..6776dcdf27807a56103010584c7a22734b4a8a3f 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingBd2eeKstarBDT.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingBd2eeKstarBDT.py
@@ -18,7 +18,6 @@ from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = ['Marie-Helene Schune', 'Jibo He']
 __date__ = '20/01/2012'
 __version__ = '$Revision: 1.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingBeauty2XGamma.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingBeauty2XGamma.py
index d21b9a25bc2714ed14237d6218c1dad601dc1240..05e9c9cf0af28c167f2cc98f655c56f432f3ea6b 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingBeauty2XGamma.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingBeauty2XGamma.py
@@ -12,7 +12,7 @@
 B-> X Gamma selections
 '''
 
-from StandardParticles import StdAllNoPIDsKaons, StdAllNoPIDsPions, StdLooseAllPhotons, StdLooseMergedPi0, StdLooseResolvedPi0, StdAllLooseGammaDD, StdAllLooseGammaLL, StdAllNoPIDsProtons
+from StandardParticles import StdAllLooseGammaDD, StdAllLooseGammaLL, StdAllNoPIDsPions, StdLooseAllPhotons, StdLooseMergedPi0, StdLooseResolvedPi0
 from Configurables import TisTosParticleTagger
 from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays as Combine4Particles
 from GaudiConfUtils.ConfigurableGenerators import DaVinci__N3BodyDecays as Combine3Particles
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingBs2MuMuGamma.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingBs2MuMuGamma.py
index 0cfb5425d7a51fe618e72a66a2e6e2062510e41d..f1f37c46035071eccb7cf880d283aafb532e0b8f 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingBs2MuMuGamma.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingBs2MuMuGamma.py
@@ -15,7 +15,7 @@ Authors: Meril Reboud, Jean-Francois Marchand
 """
 
 ########################################################################
-from StrippingUtils.Utils import LineBuilder, checkConfig
+from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Combine3BodySelection
 from StandardParticles import StdLooseMuons, StdLooseAllPhotons
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingBs2MuMuLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingBs2MuMuLines.py
index 28fab868cccc6d58e46553f2585cd743326a977c..8bf0a80a0ffc3aa0267bf6dfb6cc948d4a90331a 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingBs2MuMuLines.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingBs2MuMuLines.py
@@ -26,7 +26,7 @@ from Gaudi.Configuration import *
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
-from Configurables import FilterDesktop, CombineParticles
+from Configurables import CombineParticles
 from JetAccessories.JetMaker_Config import JetMakerConf
 from CommonParticles.Utils import *
 from Gaudi.Configuration import *
@@ -159,7 +159,7 @@ def create_stdjets(strob, line_location, stdjets_name_ban, stdjets_name_addb):
         strob.StdJetsNoJetIDBan = [myconf1]
 
     # configure Data-On-Demand service
-    locations = updateDoD(myconf1)
+    updateDoD(myconf1)
 
     myconf2 = JetMakerConf(stdjets_name_addb,
                            Inputs=['Phys/PFParticles/Particles', line_location],
@@ -173,7 +173,7 @@ def create_stdjets(strob, line_location, stdjets_name_ban, stdjets_name_addb):
         strob.StdJetsNoJetIDAddB = [myconf2]
 
     # configure Data-On-Demand service
-    locations = updateDoD(myconf2)
+    updateDoD(myconf2)
 
 ##########################################
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingBs2gammagamma.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingBs2gammagamma.py
index a19590514ce1912b186311ffed8d51783a633f9c..5dd7a2cdce789ca4b9dbc99b6ec9ffef3e98e01e 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingBs2gammagamma.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingBs2gammagamma.py
@@ -21,16 +21,11 @@ Exports the following stripping lines as instance data members:
 - Bs2gammagamma_NoConvWideLine  : wide line with 0 conversions
 '''
 
-from Configurables import (DiElectronMaker, ProtoParticleCALOFilter,
-                           ParticleTransporter, BremAdder)
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop  # , CombineParticles
-from CommonParticles import StdLooseAllPhotons
-from CommonParticles import StdAllLooseGammaConversion
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
 from Configurables import CombineParticles
-from Gaudi.Configuration import *
 __author__ = ['Sean Benson']
 __date__ = '2016/04/08'
 __version__ = '1.2'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingBs2st2KKMuX.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingBs2st2KKMuX.py
index 86d2fbe036d44821a158f2fba4fe7e558c1d3d55..22e9c5c994936c1db65ca0b5c70f9d8f5601bd3b 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingBs2st2KKMuX.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingBs2st2KKMuX.py
@@ -22,9 +22,8 @@ Stripping lines:
 from StandardParticles import StdLooseMuons, StdLooseKaons, StdAllLooseKaons, StdMassConstrainedJpsi2MuMu
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand
+from PhysSelPython.Wrappers import Selection
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = ['Jianchun Wang']
 __date__ = '03/22/2015'
 __version__ = '$Revision: 0.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingBu2LLK.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingBu2LLK.py
index ccdadc65103f0ad7d64540f186d2928a622eb079..c8fca833f5d7ccca659cabf968c9051df1adff6b 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingBu2LLK.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingBu2LLK.py
@@ -10,7 +10,7 @@
 ###############################################################################
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection, AutomaticData
+from PhysSelPython.Wrappers import DataOnDemand, MergedSelection, Selection
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, DaVinci__N3BodyDecays
 from Gaudi.Configuration import *
 __author__ = 'Patrick Koppenburg, Alex Shires, Thomas Blake, Luca Pescatore, Simone Bifani, Yasmine Amhis, Paula Alvarez Cartelle, Harry Cliff, Rafael Silva Coutinho, Guido Andreassi, Mick Mulder, Maarten van Veghel, John Smeaton, Vitalii Lisovskyi'
@@ -297,7 +297,6 @@ class Bu2LLKConf(LineBuilder):
         from StandardParticles import StdLoosePions as Pions
         from StandardParticles import StdLooseKaons as Kaons
         from StandardParticles import StdLooseProtons as Protons
-        from StandardParticles import StdAllLoosePions as AllPions
         from StandardParticles import StdAllLooseKaons as AllKaons
         from StandardParticles import StdAllLooseProtons as AllProtons
         from StandardParticles import StdLooseKstar2Kpi as Kstars
@@ -1520,7 +1519,6 @@ class Bu2LLKConf(LineBuilder):
         from StandardParticles import StdLooseMuons as Muons
         # from CommonParticles import StdLooseDetachedTau
         # Taus = DataOnDemand(Location = "Phys/StdLooseDetachedTau3pi/Particles")
-        from CommonParticles import StdTightDetachedTau
         Taus = DataOnDemand(Location="Phys/StdTightDetachedTau3pi/Particles")
 
         _DecayDescriptor = "[J/psi(1S) -> mu+ tau-]cc"
@@ -1675,7 +1673,6 @@ class Bu2LLKConf(LineBuilder):
 #####################################################
 
     def _storeInputBremPhotons(self, linename, outputlocprefix="Leptonic/Phys/", photonloc="Phys/StdVeryLooseAllPhotons/Particles"):
-        from PhysSelPython.Wrappers import FilterSelection, DataOnDemand, SelectionSequence
         from Configurables import (CopyParticles, ParticleCloner,
                                    ProtoParticleCloner, CaloHypoCloner,
                                    CaloClusterCloner)
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingBu2MajoLep.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingBu2MajoLep.py
index 5a96cdedd562ea723f6b2b20d6b2cf30f98f517f..850c2f87ccfaddc8f68a9b6e087f3f6d41cebbb1 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingBu2MajoLep.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingBu2MajoLep.py
@@ -19,12 +19,10 @@ __version__ = 'V0.9'
 __all__ = ('Bu2MajoLepConf',
            'default_config')
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
+from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from GaudiKernel.SystemOfUnits import *
 
 from StandardParticles import StdLooseMuons as Muons
 from StandardParticles import StdLoosePions as Pions
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingBu2MuNu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingBu2MuNu.py
index 19ce21e90e54ca7bc0f65d55187d37c95520c6d9..4163901dd65f50c70f659de9c335932f2c9649fa 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingBu2MuNu.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingBu2MuNu.py
@@ -25,12 +25,11 @@ __all__ = ('Bu2MuNuConf',
            'default_config')
 
 from Gaudi.Configuration import *
-from PhysSelPython.Wrappers import Selection, DataOnDemand
+from PhysSelPython.Wrappers import DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from StandardParticles import StdTightMuons, StdTightANNMuons
 from CommonParticles.Utils import *
-from Configurables import FilterDesktop, CombineParticles
+from Configurables import FilterDesktop
 from JetAccessories.JetMaker_Config import JetMakerConf
 
 default_name = 'Bu2MuNu'
@@ -72,7 +71,7 @@ def create_stdjets(strobj, line_location, stdjets_name_ban):
         strobj.StdJetsNoJetIDBan = [myconf1]
 
     # configure Data-On-Demand service
-    locations = updateDoD(myconf1)
+    updateDoD(myconf1)
 
 
 relInfoJetsVars = ["JETNOMU1PX", "JETNOMU1PY", "JETNOMU1PZ", "JETNOMU1PT", "JETNOMU1JETWIDTH", "JETNOMU1NNTAG", "JETNOMU1MNF", "JETNOMU2PX", "JETNOMU2PY", "JETNOMU2PZ", "JETNOMU2PT", "JETNOMU2JETWIDTH", "JETNOMU2NNTAG",
@@ -255,7 +254,7 @@ class Bu2MuNuConf(LineBuilder):
                                            JetIDCut=False).algorithms[0]
 
         # configure Data-On-Demand service
-        locations = updateDoD(StdJetsNoJetIDNoBan)
+        updateDoD(StdJetsNoJetIDNoBan)
 
         # add the jets with the specific banning
         create_stdjets(self, self.ControlLine.outputLocation(),
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingD23MuLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingD23MuLines.py
index 9d9153bde02604dd6518511524323b953c58b810..a119c6aadabeb6405ae23f48d28004723f035a3b 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingD23MuLines.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingD23MuLines.py
@@ -51,12 +51,11 @@ __all__ = ("D23MuLinesConf",
 #############################################################################
 
 from Gaudi.Configuration import *
-from Configurables import FilterDesktop, CombineParticles, DaVinci__N3BodyDecays
+from Configurables import DaVinci__N3BodyDecays
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 # from StrippingSelections.Utils import checkConfig
-from GaudiKernel.PhysicalConstants import c_light
 
 #############################################################################
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingDarkBoson.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingDarkBoson.py
index 754d0f38050b7a4694b6c0d51d824b1e808d61c3..e79bed1bf4d9ba4dcb692145cb4e20d25fe0063e 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingDarkBoson.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingDarkBoson.py
@@ -17,23 +17,18 @@ Author: M. Williams, D. Craik
 from Configurables import DiElectronMaker, ProtoParticleCALOFilter
 from GaudiConfUtils.ConfigurableGenerators import DaVinci__N3BodyDecays
 from CommonParticles.Utils import *
-from copy import deepcopy
 from Configurables import SubstitutePID
 from StandardParticles import StdAllLooseGammaLL, StdAllLooseGammaDD, \
     StdAllLooseElectrons, StdLooseAllPhotons  # , StdDiElectronFromTracks
 from Beauty2Charm_LoKiCuts import LoKiCuts
 from StandardParticles import StdAllNoPIDsPions, StdAllNoPIDsKaons, \
-    StdAllNoPIDsProtons, StdNoPIDsUpPions, StdAllLooseMuons, \
-    StdLooseDownMuons
-from Configurables import LoKi__VoidFilter
+    StdAllLooseMuons, StdLooseDownMuons
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import EventSelection
 from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
 from Gaudi.Configuration import *
-import re
 __author__ = ['Mike Williams', 'Dan Craik']
 
 moduleName = 'DarkBoson'
@@ -364,7 +359,7 @@ class DarkBosonConf(LineBuilder):
         mmDDX = makeX(
             'MuMuDD', default_config['XDD'], 'KS0 -> mu+ mu-', [muDX])
         kkX = makeX('KK', default_config['XLL'], 'KS0 -> K+ K-', [kX])
-        kkDDX = makeX('KKDD', default_config['XDD'], 'KS0 -> K+ K-', [kDX])
+        makeX('KKDD', default_config['XDD'], 'KS0 -> K+ K-', [kDX])
         pipiX = makeX(
             'PiPi', default_config['XLLhard'], 'KS0 -> pi+ pi-', [piX])
         pipiDDX = makeX(
@@ -419,7 +414,7 @@ class DarkBosonConf(LineBuilder):
             'PiPiSSDD', default_config['XDD'], '[KS0 -> pi+ pi+]cc', [piDX])
         preSS = default_config['Prescales']['SS']
 
-        preDD = default_config['Prescales']['DD']
+        default_config['Prescales']['DD']
         preKK = default_config['Prescales']['KK']
 
         j = makeJ(default_config['J'], [muJ])
@@ -630,7 +625,7 @@ class DarkBosonConf(LineBuilder):
         kst = filterKst()
         self._makeBLine('B2JKst', ['[B0 -> J/psi(1S) K*(892)0]cc'],
                         [j, kst], default_config['B2KX'])
-        rho = makeRho([piB])
+        makeRho([piB])
         # self._makeBLine('B2RhoX2MuMu',['B0 -> rho(770)0 KS0'],[rho,mmX],
         #                default_config['B2HHX'])
         # self._makeBLine('B2RhoX2MuMuDD',['B0 -> rho(770)0 KS0'],[rho,mmDDX],
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingDoubleSLForRX.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingDoubleSLForRX.py
index f7e5ccc228e7525247584f38f94bf53502f3cdea..3116bd40e9e8d6da906924d79ac8c85fabf37565 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingDoubleSLForRX.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingDoubleSLForRX.py
@@ -19,7 +19,6 @@ from GaudiConfUtils.ConfigurableGenerators import (CombineParticles,
                                                    DaVinci__N3BodyDecays)
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from Gaudi.Configuration import *
 __author__ = 'M. Kreps, T. Blake, D. Loh'
 __date__ = '10/11/2016'
 __version__ = '$Revision: 1.0$'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingHypb2L0HGamma.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingHypb2L0HGamma.py
index 83e2745fd58ace3d154d5c84e17588243850ee63..e33667deb325d3bc47009996d2c37915a3a42fd3 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingHypb2L0HGamma.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingHypb2L0HGamma.py
@@ -16,8 +16,8 @@ __all__ = ('Hypb2L0HGammaConf',
            'default_config', )
 
 from Gaudi.Configuration import *
-from Configurables import FilterDesktop, CombineParticles, TisTosParticleTagger
-from PhysSelPython.Wrappers import Selection, MergedSelection, DataOnDemand
+from Configurables import CombineParticles, FilterDesktop
+from PhysSelPython.Wrappers import DataOnDemand, Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from StandardParticles import StdLooseAllPhotons
@@ -495,7 +495,7 @@ def tisTosSelection(sel, TISTOSdict):
 
 
 def makevelotracks(name):
-    from Configurables import FastVeloTracking, TrackPrepareVelo, DecodeVeloRawBuffer, TrackEventFitter, TrackStateInitAlg,  TrackContainerCopy
+    from Configurables import FastVeloTracking, TrackContainerCopy, TrackStateInitAlg
     from TrackFitter.ConfiguredFitters import ConfiguredEventFitter
 
     MyFastVeloTracking = FastVeloTracking(
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingK0s2XXMuMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingK0s2XXMuMu.py
index 454c44356bf363573cfae8fad85f13e9b83e92ea..dc8a94331712da6fda2d902eeaadf4a4c7f30f0f 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingK0s2XXMuMu.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingK0s2XXMuMu.py
@@ -19,9 +19,7 @@ from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection
 from StandardParticles import StdAllLoosePions, StdAllLooseMuons
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-from GaudiKernel.PhysicalConstants import c_light
-from GaudiKernel.SystemOfUnits import MeV, m, mm, picosecond
-from Gaudi.Configuration import *
+from GaudiKernel.SystemOfUnits import MeV, mm, picosecond
 __author__ = ['Miguel Ramos Pernas']
 __date__ = '10/10/2017'
 __version__ = '$Revision: 0.00 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingKshort2Leptons.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingKshort2Leptons.py
index 67d107ee83706c36aa632cb5fa02a0f94c867573..22bd7388a2a3885597300244554f814dc453b243 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingKshort2Leptons.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingKshort2Leptons.py
@@ -20,7 +20,6 @@ from StandardParticles import StdAllNoPIDsElectrons
 from StandardParticles import StdNoPIDsUpPions
 from StandardParticles import StdAllNoPIDsPions
 from StandardParticles import StdAllLooseMuons
-from StandardParticles import StdAllNoPIDsMuons
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingKshort2MuMuMuMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingKshort2MuMuMuMu.py
index 86a943e5a6fb41852c6a9f29c92389947b9c890f..81ef82f2043ed504638103a44bd0a0e915d41771 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingKshort2MuMuMuMu.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingKshort2MuMuMuMu.py
@@ -15,15 +15,12 @@ derived, in large measure, from StrippingKshort2PiPiMuMu.py
 '''
 
 from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays
-from GaudiKernel.SystemOfUnits import MeV
-from StandardParticles import StdNoPIDsDownPions, StdLooseDownMuons
-from StandardParticles import StdAllLoosePions, StdAllLooseMuons, StdAllNoPIDsPions
-from StandardParticles import StdLoosePions, StdLooseMuons, StdNoPIDsPions
+from StandardParticles import StdLooseDownMuons
+from StandardParticles import StdAllLooseMuons
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
+from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
 __author__ = ['Mike Sokoloff']
 __date__ = '07 January 2014'
 __version__ = '$Revision: 0.1 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingKshort2PiPiMuMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingKshort2PiPiMuMu.py
index 0955f65fa0e2efdcb575b1c11a7ad439f53a1944..07b134c737342e2921702f4d74fa30eda7121cf9 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingKshort2PiPiMuMu.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingKshort2PiPiMuMu.py
@@ -10,15 +10,12 @@
 ###############################################################################
 
 from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays
-from GaudiKernel.SystemOfUnits import MeV
 from StandardParticles import StdNoPIDsDownPions, StdLooseDownMuons
-from StandardParticles import StdAllLoosePions, StdAllLooseMuons, StdAllNoPIDsPions
-from StandardParticles import StdLoosePions, StdLooseMuons, StdNoPIDsPions
+from StandardParticles import StdAllLooseMuons, StdAllLoosePions
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
+from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
 __author__ = ['Mike Sokoloff']
 __date__ = '25/10/2012'
 __version__ = '$Revision: 0.1 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingKshort2eePiPi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingKshort2eePiPi.py
index 5ac8f83630db4b9cf4e5a235dd3ceeb48b0a2a95..d8b95bcb790eaafc5b7c90a8f83fe5663eee0c11 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingKshort2eePiPi.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingKshort2eePiPi.py
@@ -23,7 +23,6 @@ from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection
 from GaudiConfUtils.ConfigurableGenerators import DaVinci__N3BodyDecays as Combine3Particles
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
-from Gaudi.Configuration import *
 __author__ = ['Carla Marin', 'Xabier Cid Vidal',  'Adrian Casais Vidal']
 __date__ = '23/02/2018'
 __version__ = '$2.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingLFVLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingLFVLines.py
index c3458781eb83744dc2820565a0f47b37b5fc2d0a..2e36db58ca9de1003ed6876cdfe53d8f1ccd6f4d 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingLFVLines.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingLFVLines.py
@@ -23,14 +23,12 @@ __all__ = ('LFVLinesConf',
            'default_config',
            )
 
-from Gaudi.Configuration import *
 # from Configurables import FilterDesktop, CombineParticles
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, DaVinci__N3BodyDecays
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N3BodyDecays
 from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from GaudiKernel.PhysicalConstants import c_light
-from GaudiKernel.SystemOfUnits import GeV, MeV, mm
+from GaudiKernel.SystemOfUnits import MeV, mm
 from copy import deepcopy
 #
 # Configure related info tools
@@ -1223,7 +1221,7 @@ class LFVLinesConf(LineBuilder):
         hemu_name = name+'B2heMu'
         pmu_name = name+'B2hMu'
         bu_name = name+'Bu2KJPsiee'
-        taumu_name = name+'B2TauMu'
+        name+'B2TauMu'
         htaumu_name = name+'B2hTauMu'
         muetap_gamma_name = name+'Tau2MuEtaP2pipig'
         muetap_pi_name = name+'Tau2MuEtaP2pipipi'
@@ -1716,7 +1714,6 @@ def makeB2TauMu(name):
         "& (BPVVDCHI2> 225)"\
         "& (BPVIPCHI2()< 25) "
 
-    from CommonParticles import StdLooseDetachedTau, StdLooseDipion
     _stdLooseMuons = DataOnDemand(Location="Phys/StdLooseMuons/Particles")
     _stdLooseDetachedTaus = DataOnDemand(
         Location="Phys/StdLooseDetachedTau3pi/Particles")
@@ -2356,7 +2353,6 @@ def makeB2hTauMu(name):
                           "& (BPVVDCHI2> 225)"\
                           "& (BPVIPCHI2()< 16) "  # maybe 16
 
-    from CommonParticles import StdLooseDetachedTau, StdLooseDipion
     _stdLooseMuons = DataOnDemand(Location="Phys/StdLooseMuons/Particles")
     _stdLooseDetachedTaus = DataOnDemand(
         Location="Phys/StdLooseDetachedTau3pi/Particles")
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingLb2L0Gamma.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingLb2L0Gamma.py
index 802119884510c53e5cf00d3e4788223b09ab5a71..bfcf8336af14cb0e5ff39ae2da6502181e9066d9 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingLb2L0Gamma.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingLb2L0Gamma.py
@@ -25,9 +25,6 @@ __date__ = "14.11.2016"
 __version__ = "2.0"
 __all__ = ("default_config", "StrippingLb2L0GammaConf")
 
-import os
-
-from Gaudi.Configuration import *
 
 from Configurables import CombineParticles
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
@@ -36,9 +33,7 @@ from PhysSelPython.Wrappers import Selection, MergedSelection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 
-from StandardParticles import StdAllNoPIDsPions, StdAllNoPIDsProtons
 from StandardParticles import StdLooseAllPhotons, StdAllLooseGammaDD, StdAllLooseGammaLL
-from StandardParticles import StdVeryLooseDetachedKst2Kpi
 from StandardParticles import StdLooseJpsi2MuMu
 
 default_config = {'NAME': 'Lb2L0Gamma',
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingLc23MuLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingLc23MuLines.py
index b2244bd7aa9f116d9783ce03a8fc1944cde17b39..3d97e939f7633e3e700dd756976cae1b815955f7 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingLc23MuLines.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingLc23MuLines.py
@@ -68,12 +68,11 @@ __all__ = ("Lc23MuLinesConf",
 ###################################################################################################
 
 from Gaudi.Configuration import *
-from Configurables import FilterDesktop, CombineParticles, DaVinci__N3BodyDecays, DaVinci__N4BodyDecays
+from Configurables import CombineParticles, DaVinci__N3BodyDecays, DaVinci__N4BodyDecays
 # from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from GaudiKernel.PhysicalConstants import c_light
 
 ###################################################################################################
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingPhiToKSKS.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingPhiToKSKS.py
index ff157859dd3877ab38f9cad234fb49a80418e50d..1a62ef5db16a204dc0a3d66d1fd1d1f75d4a04d4 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingPhiToKSKS.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingPhiToKSKS.py
@@ -23,8 +23,7 @@ from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from StandardParticles import StdAllLooseKaons, StdAllLooseMuons
-from Configurables import FitDecayTrees
-from PhysSelPython.Wrappers import AutomaticData, MergedSelection
+from PhysSelPython.Wrappers import MergedSelection
 
 __all__ = ('PhiToKSKSAllLinesConf',
            'TOSFilter',
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingRareNStrange.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingRareNStrange.py
index 95f70d0b641829f0a44259b730566f4c68fa1093..98b3814df4bee7388e334a0c9969c741474a9f63 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingRareNStrange.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingRareNStrange.py
@@ -10,9 +10,8 @@
 ###############################################################################
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection, AutomaticData
+from PhysSelPython.Wrappers import Selection
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = 'Diego Martinez Santos, Carlos Vazquez, Xabier Cid, Jessica Prisciandaro, Miguel Ramos Pernas'
 __date__ = '08/05/2015'
 __version__ = '$Revision: Not sure $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingRareStrange.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingRareStrange.py
index 6f7264e1db8f4045b2b139a11daa3e90056e3c44..bba73d994ee42cf94a9237f00597a4d7be7cc54d 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingRareStrange.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingRareStrange.py
@@ -59,15 +59,11 @@ __all__ = ('RareStrangeLinesConf',
 from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 from GaudiConfUtils.ConfigurableGenerators import DaVinci__N3BodyDecays as Combine3Particles
-from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays as Combine4Particles
-from CommonParticles import StdNoPIDsDownElectrons
 from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from GaudiKernel.PhysicalConstants import c_light
-from StandardParticles import (StdAllNoPIDsPions, StdNoPIDsDownPions,
-                               StdLoosePions, StdLooseDownMuons,
-                               StdLooseMergedPi0, StdLooseResolvedPi0, StdLooseDalitzPi0)
+from StandardParticles import (StdLooseMergedPi0, StdLooseResolvedPi0,
+                               StdLooseDalitzPi0)
 
 # from CommonParticles.StdLooseDalitzPi0 import (StdLoosePi02gee, StdLoosePi024e)
 
@@ -2786,7 +2782,7 @@ def makeLambdaPPiEE(name, config, inputs):
 
 
 def makevelotracks(name):
-    from Configurables import FastVeloTracking, TrackPrepareVelo, DecodeVeloRawBuffer, TrackEventFitter, TrackStateInitAlg,  TrackContainerCopy
+    from Configurables import FastVeloTracking, TrackContainerCopy, TrackStateInitAlg
     from TrackFitter.ConfiguredFitters import ConfiguredEventFitter
 
     MyFastVeloTracking = FastVeloTracking(
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingStrangeHadrons.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingStrangeHadrons.py
index 5c16fb7fd63ec1f15df76e17b03a96af7c5a4c61..e2488a937f3c160c5d1dc0bbb81310ee8ff58466 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingStrangeHadrons.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingStrangeHadrons.py
@@ -35,23 +35,12 @@ __all__ = ('default_config',
            'StrangeHadronsConf',
            )
 
-import os
 
-from Gaudi.Configuration import *
-
-from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-
-from GaudiConfUtils.ConfigurableGenerators import DaVinci__N3BodyDecays as Combine3Particles
-from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays as Combine4Particles
-from CommonParticles import StdNoPIDsDownElectrons
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
+from PhysSelPython.Wrappers import DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from GaudiKernel.PhysicalConstants import c_light
 from GaudiKernel.SystemOfUnits import MeV
 
-from StandardParticles import StdAllNoPIDsPions, StdLoosePions, StdLooseProtons, StdAllLoosePions, StdAllLooseMuons
-from StandardParticles import StdLooseAllPhotons
 ##
 from PhysConf.Selections import CombineSelection
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingStrangeSL.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingStrangeSL.py
index 5134ef5434ea3f244733fc6ac26485b868c228fb..26590be4ba73ad6710f007e7e831cea2a4a4b23a 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingStrangeSL.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingStrangeSL.py
@@ -36,23 +36,12 @@ __all__ = ('default_config',
            'StrangeSLConf',
            )
 
-import os
 
-from Gaudi.Configuration import *
-
-from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-
-from GaudiConfUtils.ConfigurableGenerators import DaVinci__N3BodyDecays as Combine3Particles
-from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays as Combine4Particles
-from CommonParticles import StdNoPIDsDownElectrons
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
+from PhysSelPython.Wrappers import DataOnDemand, Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from GaudiKernel.PhysicalConstants import c_light
 from GaudiKernel.SystemOfUnits import MeV
 
-from StandardParticles import StdAllNoPIDsPions, StdLoosePions, StdLooseProtons, StdAllLoosePions, StdAllLooseMuons, StdAllLooseElectrons
-from StandardParticles import StdLooseMergedPi0, StdLooseResolvedPi0, StdLooseDalitzPi0
 from PhysConf.Selections import CombineSelection
 
 default_config = {
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingTau23MuLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingTau23MuLines.py
index 6adb37dd06aeeb58dcd798447fe8b5ee90fa6e99..b2fa9b13c2441549d3939f19589727c3e261e09d 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingTau23MuLines.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingTau23MuLines.py
@@ -35,7 +35,6 @@ from GaudiConfUtils.ConfigurableGenerators import DaVinci__N5BodyDecays as Combi
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from GaudiKernel.PhysicalConstants import c_light
 
 default_config = {
     'NAME': 'Tau23Mu',
@@ -70,7 +69,7 @@ class Tau23MuLinesConf(LineBuilder):
         # checkConfig(Bs2MuMuLinesConf.__configuration_keys__,config)
 
         tau_name = name+'Tau23Mu'
-        ds23PiTIS_name = name+'Ds23PiTIS'
+        name+'Ds23PiTIS'
         ds23Pi_name = name+'Ds23Pi'
         ds2PhiPi_name = name+'Ds2PhiPi'
         tau25_name = name+'Tau25Mu'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingTau2LambdaMuLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingTau2LambdaMuLines.py
index 6f7caa01d008433cca4a3184d6bdfeb2a9bcd909..2e5401740f914b698345c335bfe29788f1e7ed2e 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingTau2LambdaMuLines.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingTau2LambdaMuLines.py
@@ -16,12 +16,10 @@ Exported symbols (use python help!):
    - 
 '''
 
-from GaudiKernel.PhysicalConstants import c_light
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
-from Configurables import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
+from Configurables import CombineParticles
 __author__ = ['Marcin Chrzaszcz']
 __date__ = '14/12/2012'
 __version__ = '$Revision: 1.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingZVTOP.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingZVTOP.py
index f4ee63f69c4320486335e4fa797004ccb36ecca4..6b5cbfa74e249908ea9e854e9c0f238ebdd2d9cf 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingZVTOP.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingRD/StrippingZVTOP.py
@@ -9,14 +9,12 @@
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
 from Configurables import TopoTauAlg, TopoVertexTool
-from StandardParticles import StdLooseKaons
-from StandardParticles import StdLoosePions, StdTightPions
-from StandardParticles import StdNoPIDsKaons, StdNoPIDsPions
+from StandardParticles import StdLoosePions
+from StandardParticles import StdNoPIDsPions
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, OfflineVertexFitter
-from Gaudi.Configuration import *
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop
 __author__ = ['Giampi Mancinelli', 'Julien Cogan', 'Justine Serrano']
 
 __date__ = '14/01/2014'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingSL/StrippingB23MuNu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingSL/StrippingB23MuNu.py
index 11d81c34fb0178677727235bc3bd636b83427207..97c4220c4e62f1a00d3c320d5f76806aba8c4c4a 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingSL/StrippingB23MuNu.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingSL/StrippingB23MuNu.py
@@ -19,15 +19,12 @@ __all__ = ('B23MuNuConf')
 Stripping selection for B to three muons and a neutrino.
 """
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop
 
-from PhysSelPython.Wrappers import Selection, AutomaticData, MergedSelection
+from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from LHCbKernel.Configuration import *  # check if needed
-from Configurables import SubstitutePID
-from Configurables import SubPIDMMFilter
 
 
 #################
@@ -161,15 +158,13 @@ class B23MuNuConf(LineBuilder):
         """
         Creates Jpsi as proxy for dimuon
         """
-        from PhysSelPython.Wrappers import AutomaticData, Selection, SelectionSequence, DataOnDemand, MergedSelection
+        from PhysSelPython.Wrappers import Selection
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         # from Configurables import CombineParticles
 
         CombineJpsi = CombineParticles(DecayDescriptors=["J/psi(1S) -> mu+ mu-", "[J/psi(1S) -> mu+ mu+]cc"],
                                        MotherCut="ALL")
 
-        sel_name = "Jpsi"
-
         from PhysSelPython.Wrappers import Selection
         SelJpsi = Selection("Sel_" + self.name + "_Jpsi", Algorithm=CombineJpsi,
                             RequiredSelections=[self.Muons])
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingSL/StrippingB2DMuForTauMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingSL/StrippingB2DMuForTauMu.py
index bbb6591f636c547192b1c9759ebfeedf27b88e2b..8bd9a436ea3d941e0b4ec5b3610d262206579753 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingSL/StrippingB2DMuForTauMu.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingSL/StrippingB2DMuForTauMu.py
@@ -18,12 +18,10 @@ __version__ = '$Revision: 2.0 $'
 
 from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from PhysSelPython.Wrappers import Selection, DataOnDemand
+from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from StandardParticles import StdLoosePions, StdAllLooseMuons, StdLooseKaons, StdLooseProtons, StdAllLoosePions, StdLooseMergedPi0, StdLooseResolvedPi0, StdAllNoPIDsMuons, StdLooseANNUpPions
-from Configurables import ConjugateNeutralPID
-from PhysSelPython.Wrappers import MergedSelection
+from StandardParticles import StdAllLooseMuons, StdAllNoPIDsMuons, StdLooseKaons, StdLoosePions, StdLooseProtons
 
 __all__ = ('B2DMuForTauMuconf',
            # 'makeb2DMuX',
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingSL/StrippingB2DMuNuX.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingSL/StrippingB2DMuNuX.py
index 5336bea5bd5d1a8013b026a62b999e808bf61eab..3736f86309ec24b62f81a2c483ee5e5d23d7fad9 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingSL/StrippingB2DMuNuX.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingSL/StrippingB2DMuNuX.py
@@ -13,14 +13,13 @@ __date__ = '23/07/2010'
 __version__ = '$Revision: 5.0 $'
 
 from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
+from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
 from PhysSelPython.Wrappers import Selection
-from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from StandardParticles import StdLoosePions, StdLooseMuons, StdLooseKaons, StdLooseProtons, StdLooseElectrons
 from StandardParticles import StdNoPIDsPions, StdNoPIDsKaons, StdNoPIDsProtons, StdNoPIDsMuons
 from StrippingB2DMuNuXUtils import *
-from GaudiKernel.SystemOfUnits import MeV, GeV, cm, mm
+from GaudiKernel.SystemOfUnits import GeV, MeV, mm
 
 __all__ = ('B2DMuNuXAllLinesConf',
            'default_config')
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingSL/StrippingB2DMuNuXUtils.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingSL/StrippingB2DMuNuXUtils.py
index 6130e13de2c5b9fe72cd44d5967aeceaa4452074..e91f29e3fa36cef61e702f06f89eb4418ddf4695 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingSL/StrippingB2DMuNuXUtils.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingSL/StrippingB2DMuNuXUtils.py
@@ -13,11 +13,9 @@ __date__ = '06/03/2015'
 __version__ = '$Revision: 0.0 $'
 
 from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
-from StrippingUtils.Utils import LineBuilder
-from StandardParticles import StdLoosePions, StdLooseMuons, StdLooseKaons, StdLooseProtons, StdNoPIDsPions, StdLooseElectrons, StdNoPIDsMuons
 
 
 def BtoDlnuLine(module_name,
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingSL/StrippingB2Dlnu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingSL/StrippingB2Dlnu.py
index 0c8d00bd94717af821926626f5446a85cb20a902..b05a05c95319c31661cfe61524eca70e234905c3 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingSL/StrippingB2Dlnu.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingSL/StrippingB2Dlnu.py
@@ -17,12 +17,10 @@ __version__ = '$Revision: 1.0 $'
 
 from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from PhysSelPython.Wrappers import Selection, DataOnDemand
+from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from StandardParticles import StdLoosePions, StdLooseMuons, StdLooseKaons, StdLooseProtons, StdAllLoosePions, StdLooseMergedPi0, StdLooseResolvedPi0, StdAllNoPIDsMuons, StdLooseANNUpPions, StdLooseElectrons
-from Configurables import ConjugateNeutralPID
-from PhysSelPython.Wrappers import MergedSelection
+from StandardParticles import StdAllNoPIDsMuons, StdLooseElectrons, StdLooseKaons, StdLooseMuons, StdLoosePions
 
 __all__ = ('B2DMuForLNuconf',
            # 'makeb2DMuX',
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingSL/StrippingB2Dst0MuNu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingSL/StrippingB2Dst0MuNu.py
index 3f6fd96ade4433b51152a37ee46ccbd072892fbe..e98d2b4850975113ec77abeed5a53c59a6ba950c 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingSL/StrippingB2Dst0MuNu.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingSL/StrippingB2Dst0MuNu.py
@@ -12,12 +12,11 @@ __author__ = ['Michel De Cian']
 __date__ = '12/12/2018'
 __version__ = '$Revision: 0.0 $'
 
-from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from PhysSelPython.Wrappers import Selection, DataOnDemand
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
+from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from StandardParticles import StdLoosePions, StdLooseMuons, StdLooseKaons, StdAllLoosePions, StdAllLooseElectrons, StdLooseResolvedPi0, StdLooseMergedPi0, StdLooseDalitzPi0
+from StandardParticles import StdAllLooseElectrons, StdLooseDalitzPi0, StdLooseKaons, StdLooseMergedPi0, StdLooseMuons, StdLoosePions, StdLooseResolvedPi0
 
 __all__ = ('B2Dst0MuNuAllLinesConf',
            'TOSFilter',
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingSL/StrippingB2DstMuNuIncl.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingSL/StrippingB2DstMuNuIncl.py
index 6abd041bf344194b0ad86747d5d5622ae5fdddf9..3a91f70e613b554c2c0d5b7095d89a8eb3c67f3d 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingSL/StrippingB2DstMuNuIncl.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingSL/StrippingB2DstMuNuIncl.py
@@ -12,9 +12,8 @@ __author__ = ['Mika Vesterinen']
 __date__ = '04/04/2015'
 __version__ = '$Revision: 0.0 $'
 
-from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from PhysSelPython.Wrappers import Selection, DataOnDemand
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
+from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from StandardParticles import StdLoosePions, StdLooseMuons, StdLooseKaons, StdAllLoosePions
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingSL/StrippingB2PPbarMuForTauMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingSL/StrippingB2PPbarMuForTauMu.py
index 1d97e42a98b40f8bef4d02281e5fd0b77ab45300..5eaa8cff0ccedf2007a0fc0b82bdb43f18bff30a 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingSL/StrippingB2PPbarMuForTauMu.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingSL/StrippingB2PPbarMuForTauMu.py
@@ -9,9 +9,7 @@
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
 
-import logging
 from StrippingUtils.Utils import LineBuilder
-from Gaudi.Configuration import *
 __author__ = ['Mark Smith']
 __date__ = '17/10/2016'
 __version__ = '$Revision: 1.0 $'
@@ -107,8 +105,6 @@ class B2PPbarMuForTauMuBuilder(LineBuilder):
     def __init__(self, name, config):
         LineBuilder.__init__(self, name, config)
 
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
-
         self.GECs = {"Code": "( recSummary(LHCb.RecSummary.nSPDhits,'Raw/Spd/Digits') < %(GEC_nSPDHits)s )" % config,
                      "Preambulo": ["from LoKiTracks.decorators import *"]}
 
@@ -437,7 +433,7 @@ class B2PPbarMuForTauMuBuilder(LineBuilder):
     ###### B->ppMuNu Signal ######
     def _bhad2PMuX_B(self):
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-        from PhysSelPython.Wrappers import Selection, MergedSelection
+        from PhysSelPython.Wrappers import Selection
 
         _pMu = CombineParticles(
             DecayDescriptors=self._config["DECAYS"], ReFitPVs=True)
@@ -454,7 +450,7 @@ class B2PPbarMuForTauMuBuilder(LineBuilder):
     ###### B->ppMuNu Signal for Topo Line ######
     def _bhad2PMuX_BTopo(self):
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-        from PhysSelPython.Wrappers import Selection, MergedSelection
+        from PhysSelPython.Wrappers import Selection
 
         _pMu = CombineParticles(
             DecayDescriptors=self._config["DECAYS"], ReFitPVs=True)
@@ -471,7 +467,7 @@ class B2PPbarMuForTauMuBuilder(LineBuilder):
     ###### B->ppMuNu Same-Sign protons ######
     def _bhad2PMuX_B_SS(self):
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-        from PhysSelPython.Wrappers import Selection, MergedSelection
+        from PhysSelPython.Wrappers import Selection
 
         _pMu = CombineParticles(
             DecayDescriptors=self._config["DECAYS"], ReFitPVs=True)
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingSL/StrippingB2XTauNu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingSL/StrippingB2XTauNu.py
index 7e086d88664dbe28a77ab80ac882b7a7014366c9..6ace30c6ea487c9ee422ba92f199da4e11ac0085 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingSL/StrippingB2XTauNu.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingSL/StrippingB2XTauNu.py
@@ -610,7 +610,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         self.__MakeB0d2DdoubleStar2PiDstar02GammaD0TauNuNonPhysTau__()
 
         from StrippingConf.StrippingLine import StrippingLine
-        from PhysSelPython.Wrappers import SelectionSequence
 
         # TisTos filter
         def filterTisTos(name, Input, myTisTosSpecs):
@@ -1365,7 +1364,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
 
         from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseJpsi2MuMu
 
         JpsiForBc = FilterDesktop(
             Code=self.totalJpsiCut
@@ -1384,7 +1382,7 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
 
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
+        from PhysSelPython.Wrappers import Selection
         from StandardParticles import StdLoosePions
 
         CombDdoubleStar02DstarPi = CombineParticles(
@@ -1405,7 +1403,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3pi/Particles')
@@ -1428,7 +1425,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3pi/Particles')
@@ -1453,7 +1449,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3pi/Particles')
@@ -1477,7 +1472,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTauNonPhys
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3piNonPhys/Particles')
@@ -1501,7 +1495,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3pi/Particles')
@@ -1526,7 +1519,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3pi/Particles')
@@ -1551,7 +1543,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTauNonPhys
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3piNonPhys/Particles')
@@ -1575,7 +1566,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3pi/Particles')
@@ -1600,7 +1590,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3pi/Particles')
@@ -1625,7 +1614,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTauNonPhys
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3piNonPhys/Particles')
@@ -1650,7 +1638,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3pi/Particles')
@@ -1674,7 +1661,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTauNonPhys
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3piNonPhys/Particles')
@@ -1698,7 +1684,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3pi/Particles')
@@ -1723,7 +1708,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3pi/Particles')
@@ -1748,7 +1732,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTauNonPhys
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3piNonPhys/Particles')
@@ -1773,7 +1756,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3pi/Particles')
@@ -1799,7 +1781,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3pi/Particles')
@@ -1823,7 +1804,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3pi/Particles')
@@ -1849,7 +1829,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3pi/Particles')
@@ -1874,7 +1853,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTauNonPhys
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3piNonPhys/Particles')
@@ -1900,7 +1878,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3pi/Particles')
@@ -1924,7 +1901,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3pi/Particles')
@@ -1947,7 +1923,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3pi/Particles')
@@ -1971,7 +1946,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3pi/Particles')
@@ -1995,7 +1969,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTauNonPhys
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3piNonPhys/Particles')
@@ -2019,7 +1992,7 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
 
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
+        from PhysSelPython.Wrappers import Selection
         from StandardParticles import StdLooseResolvedPi0
 
         CombDStar02Pi0D0 = CombineParticles(
@@ -2039,7 +2012,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3pi/Particles')
@@ -2062,7 +2034,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3pi/Particles')
@@ -2085,7 +2056,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3piNonPhys/Particles')
@@ -2108,7 +2078,7 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
 
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
+        from PhysSelPython.Wrappers import Selection
         from StandardParticles import StdLooseAllPhotons
 
         CombDStar02GammaD0 = CombineParticles(
@@ -2128,7 +2098,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3pi/Particles')
@@ -2151,7 +2120,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3pi/Particles')
@@ -2174,7 +2142,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3piNonPhys/Particles')
@@ -2196,7 +2163,7 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
 
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
+        from PhysSelPython.Wrappers import Selection
         from StandardParticles import StdLoosePions
 
         CombDdoubleStar2PiDstar02Pi0D0 = CombineParticles(
@@ -2216,7 +2183,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3pi/Particles')
@@ -2239,7 +2205,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3pi/Particles')
@@ -2262,7 +2227,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3piNonPhys/Particles')
@@ -2284,7 +2248,7 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
 
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
+        from PhysSelPython.Wrappers import Selection
         from StandardParticles import StdLoosePions
 
         CombDdoubleStar2PiDstar02GammaD0 = CombineParticles(
@@ -2304,7 +2268,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3pi/Particles')
@@ -2327,7 +2290,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3pi/Particles')
@@ -2350,7 +2312,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3piNonPhys/Particles')
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingSL/StrippingB2XuENu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingSL/StrippingB2XuENu.py
index 73ab1a2a4e2c0a0a1016fb4040cc2e6b7b36c884..b59084d7969d22b0c34cc4c7c11b62ae657ce530 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingSL/StrippingB2XuENu.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingSL/StrippingB2XuENu.py
@@ -9,9 +9,7 @@
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
 
-import logging
 from StrippingUtils.Utils import LineBuilder
-from Gaudi.Configuration import *
 __author__ = ['Phillip Urquijo, Alessandra Borgia', 'Michel De Cian']
 __date__ = '11/01/2019'
 __version__ = '$Revision: 1.6 $'
@@ -243,7 +241,7 @@ class B2XuENuBuilder(LineBuilder):
     def __init__(self, name, config):
         LineBuilder.__init__(self, name, config)
         self.config = config
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
+        from PhysSelPython.Wrappers import DataOnDemand
         self._stdVeryLooseKsLL = DataOnDemand(
             "Phys/StdVeryLooseKsLL/Particles")
         self._stdLooseKsLD = DataOnDemand("Phys/StdLooseKsLD/Particles")
@@ -734,7 +732,7 @@ class B2XuENuBuilder(LineBuilder):
 
     # Bs -> K*/Kspi e nu lines
     def _Kstar_line(self):
-        NoPS = self.config['NoPrescales']
+        self.config['NoPrescales']
         from StrippingConf.StrippingLine import StrippingLine
         return StrippingLine(self._name+'Bs2Kstar_Line', prescale=1.0,
                              FILTER=self.GECs,
@@ -1055,8 +1053,8 @@ class B2XuENuBuilder(LineBuilder):
         if self._KSSel is not None:
             return self._KSSel
 
-        from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
+        from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
+        from PhysSelPython.Wrappers import Selection
 
         _code = FilterDesktop(Code=self._NominalKsSelection() % self._config)
 
@@ -1141,7 +1139,6 @@ class B2XuENuBuilder(LineBuilder):
 
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection
-        from StandardParticles import StdLoosePions
 
         _rho770 = CombineParticles(
             DecayDescriptors=["rho(770)0 -> pi- pi+"],
@@ -1171,7 +1168,6 @@ class B2XuENuBuilder(LineBuilder):
 
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection
-        from StandardParticles import StdLoosePions
 
         _rho770NoPID = CombineParticles(
             DecayDescriptors=["rho(770)0 -> pi- pi+"],
@@ -1201,7 +1197,6 @@ class B2XuENuBuilder(LineBuilder):
 
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection
-        from StandardParticles import StdLoosePions
 
         _rho770WS = CombineParticles(
             DecayDescriptors=["[rho(770)0 -> pi+ pi+]cc"],
@@ -1229,7 +1224,6 @@ class B2XuENuBuilder(LineBuilder):
 
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection
-        from StandardParticles import StdLoosePions
 
         _rho770SB = CombineParticles(
             DecayDescriptors=["rho(770)0 -> pi+ pi-"],
@@ -1341,7 +1335,7 @@ class B2XuENuBuilder(LineBuilder):
 
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection
-        from StandardParticles import StdLoosePions, StdLooseElectrons
+        from StandardParticles import StdLoosePions
 
         _Ksh = CombineParticles(
             DecayDescriptor="KS0 -> e- pi+",
@@ -1369,7 +1363,7 @@ class B2XuENuBuilder(LineBuilder):
 
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection
-        from StandardParticles import StdLoosePions, StdLooseElectrons
+        from StandardParticles import StdLoosePions
 
         _Ksh = CombineParticles(
             DecayDescriptor="KS0 -> e+ pi-",
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingSL/StrippingB2XuMuNu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingSL/StrippingB2XuMuNu.py
index e990a0f5fca381288d278a31edfe8c4be451c2d9..7dbf8f670c004436033f2172b635cf83469f0692 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingSL/StrippingB2XuMuNu.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingSL/StrippingB2XuMuNu.py
@@ -9,9 +9,7 @@
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
 
-import logging
 from StrippingUtils.Utils import LineBuilder
-from Gaudi.Configuration import *
 __author__ = ['Phillip Urquijo, Alessandra Borgia', 'Michel De Cian']
 __date__ = '11/01/2019'
 __version__ = '$Revision: 1.6 $'
@@ -238,7 +236,7 @@ class B2XuMuNuBuilder(LineBuilder):
     def __init__(self, name, config):
         LineBuilder.__init__(self, name, config)
         self.config = config
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
+        from PhysSelPython.Wrappers import DataOnDemand
         self._stdVeryLooseKsLL = DataOnDemand(
             "Phys/StdVeryLooseKsLL/Particles")
         self._stdLooseKsLD = DataOnDemand("Phys/StdLooseKsLD/Particles")
@@ -733,7 +731,7 @@ class B2XuMuNuBuilder(LineBuilder):
 
     # Bs -> K*/Kspi mu nu lines
     def _Kstar_line(self):
-        NoPS = self.config['NoPrescales']
+        self.config['NoPrescales']
         from StrippingConf.StrippingLine import StrippingLine
         return StrippingLine(self._name+'Bs2Kstar_Line', prescale=1.0,
                              FILTER=self.GECs,
@@ -1052,8 +1050,8 @@ class B2XuMuNuBuilder(LineBuilder):
         if self._KSSel is not None:
             return self._KSSel
 
-        from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
+        from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
+        from PhysSelPython.Wrappers import Selection
 
         _code = FilterDesktop(Code=self._NominalKsSelection() % self._config)
 
@@ -1138,7 +1136,6 @@ class B2XuMuNuBuilder(LineBuilder):
 
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection
-        from StandardParticles import StdLoosePions
 
         _rho770 = CombineParticles(
             DecayDescriptors=["rho(770)0 -> pi- pi+"],
@@ -1168,7 +1165,6 @@ class B2XuMuNuBuilder(LineBuilder):
 
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection
-        from StandardParticles import StdLoosePions
 
         _rho770NoPID = CombineParticles(
             DecayDescriptors=["rho(770)0 -> pi- pi+"],
@@ -1198,7 +1194,6 @@ class B2XuMuNuBuilder(LineBuilder):
 
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection
-        from StandardParticles import StdLoosePions
 
         _rho770WS = CombineParticles(
             DecayDescriptors=["[rho(770)0 -> pi+ pi+]cc"],
@@ -1226,7 +1221,6 @@ class B2XuMuNuBuilder(LineBuilder):
 
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection
-        from StandardParticles import StdLoosePions
 
         _rho770SB = CombineParticles(
             DecayDescriptors=["rho(770)0 -> pi+ pi-"],
@@ -1338,7 +1332,7 @@ class B2XuMuNuBuilder(LineBuilder):
 
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection
-        from StandardParticles import StdLoosePions, StdLooseMuons
+        from StandardParticles import StdLoosePions
 
         _Ksh = CombineParticles(
             DecayDescriptor="KS0 -> mu- pi+",
@@ -1366,7 +1360,7 @@ class B2XuMuNuBuilder(LineBuilder):
 
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection
-        from StandardParticles import StdLoosePions, StdLooseMuons
+        from StandardParticles import StdLoosePions
 
         _Ksh = CombineParticles(
             DecayDescriptor="KS0 -> mu+ pi-",
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingSL/StrippingCharmFromBSemiForHadronAsy.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingSL/StrippingCharmFromBSemiForHadronAsy.py
index a80fcb301fa6917bd97160506a3b0a679ff40777..ddaec2925512363daba54947938f97bdafffeb41 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingSL/StrippingCharmFromBSemiForHadronAsy.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingSL/StrippingCharmFromBSemiForHadronAsy.py
@@ -25,8 +25,7 @@ from Configurables import FilterDesktop, CombineParticles
 from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from StandardParticles import StdAllLoosePions, StdLoosePions, StdLooseMuons, StdLooseKaons, StdLooseProtons
-from Configurables import TisTosParticleTagger
+from StandardParticles import StdLooseKaons, StdLooseMuons, StdLoosePions
 
 __all__ = ('CharmFromBSemiForHadronAsyAllLinesConf',
            'TOSFilter',
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingSL/StrippingLb2LcMuNuX_Lc2L0Pi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingSL/StrippingLb2LcMuNuX_Lc2L0Pi.py
index 074ba01a451ce4cf74c483e687d7a71c404d4adb..729f75ac3c69725569c584dc08bdd9610f2b693a 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingSL/StrippingLb2LcMuNuX_Lc2L0Pi.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingSL/StrippingLb2LcMuNuX_Lc2L0Pi.py
@@ -16,14 +16,13 @@ __author__ = ['Scott Ely']
 __date__ = '23/01/2019'
 __version__ = '$Revision: 1.0 $'
 
-from Gaudi.Configuration import *
 from Configurables import FilterDesktop, CombineParticles
-from PhysSelPython.Wrappers import Selection, DataOnDemand
+from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from StandardParticles import StdLoosePions, StdLooseMuons, StdLooseKaons, StdLooseProtons, StdLooseElectrons, StdVeryLooseLambdaLL
-from StandardParticles import StdNoPIDsPions, StdNoPIDsKaons, StdNoPIDsProtons, StdNoPIDsMuons
-from GaudiKernel.SystemOfUnits import MeV, GeV, cm, mm
+from StandardParticles import StdLooseMuons, StdLoosePions, StdVeryLooseLambdaLL
+from StandardParticles import StdNoPIDsMuons
+from GaudiKernel.SystemOfUnits import GeV, MeV, mm
 
 __all__ = ('Lb2LcMuNuX_Lc2L0PiConf', 'default_config')
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingSL/StrippingLb2pMuNuVub.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingSL/StrippingLb2pMuNuVub.py
index cd969d689449a9dc069bd745b4acbc62f683dfda..e74c7de20e90982142bcf10f66be4a6cb90689e6 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingSL/StrippingLb2pMuNuVub.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingSL/StrippingLb2pMuNuVub.py
@@ -9,9 +9,7 @@
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
 
-import logging
 from StrippingUtils.Utils import LineBuilder
-from Gaudi.Configuration import *
 __author__ = ['William Sutcliffe']
 __date__ = '19/01/2014'
 __version__ = '$Revision: 1.0 $'
@@ -137,8 +135,6 @@ class Lb2pMuNuVubBuilder(LineBuilder):
     def __init__(self, name, config):
         LineBuilder.__init__(self, name, config)
 
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
-
         self.GECs = {"Code": "( recSummaryTrack(LHCb.RecSummary.nLongTracks, TrLONG) < %(GEC_nLongTrk)s )" % config,
                      "Preambulo": ["from LoKiTracks.decorators import *"]}
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingSL/Strippingbhad2PMuX.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingSL/Strippingbhad2PMuX.py
index e89305332152e8ebc4ee1e72a7f10cd8d9d2dfae..f46738721f8dbfce869e840a1aa8cbb13c6fdd2f 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingSL/Strippingbhad2PMuX.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping33r2/StrippingSL/Strippingbhad2PMuX.py
@@ -9,9 +9,7 @@
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
 
-import logging
 from StrippingUtils.Utils import LineBuilder
-from Gaudi.Configuration import *
 __author__ = ['William Sutcliffe', 'Patrick Owen']
 __date__ = '02/12/2015'
 __version__ = '$Revision: 2.0 $'
@@ -132,8 +130,6 @@ class bhad2PMuXBuilder(LineBuilder):
     def __init__(self, name, config):
         LineBuilder.__init__(self, name, config)
 
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
-
         self.GECs = {"Code": "( recSummaryTrack(LHCb.RecSummary.nLongTracks, TrLONG) < %(GEC_nLongTrk)s )" % config,
                      "Preambulo": ["from LoKiTracks.decorators import *"]}
 
@@ -455,7 +451,7 @@ class bhad2PMuXBuilder(LineBuilder):
     ###### Lb->pMuNu High M_corr Opposite Sign ######
     def _bhad2PMuX_Lb(self):
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-        from PhysSelPython.Wrappers import Selection, MergedSelection
+        from PhysSelPython.Wrappers import Selection
 
         _pMu = CombineParticles(
             DecayDescriptors=self._config["DECAYS"], ReFitPVs=True)
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingB2CC/StrippingB2JpsiHH.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingB2CC/StrippingB2JpsiHH.py
index 426a15a03fdb410fd33fba1d83ccac165f4c345b..ea80a2693083b0dd305af119c0794a0a03dd0088 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingB2CC/StrippingB2JpsiHH.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingB2CC/StrippingB2JpsiHH.py
@@ -20,18 +20,10 @@ __date__ = '10/11/2016'
 
 __all__ = ('B2JpsiHHConf', 'default_config')
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from CommonParticles.Utils import updateDoD
-from StandardParticles import StdLoosePions
-from StandardParticles import StdLooseKaons
-from StandardParticles import StdLooseProtons
-from StandardParticles import StdAllLooseKaons
-from StandardParticles import StdAllLooseProtons
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
+from PhysSelPython.Wrappers import DataOnDemand, Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from GaudiKernel.SystemOfUnits import MeV
 
 default_config = {
     'NAME': 'B2JpsiHH',
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingB2CC/StrippingB2JpsiPi0.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingB2CC/StrippingB2JpsiPi0.py
index 90740f80b4fbe5d7cdd945fc3fb2a4331ac1e49d..170baf2fb63c5dbaab6735a4dbe697c61ed379a3 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingB2CC/StrippingB2JpsiPi0.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingB2CC/StrippingB2JpsiPi0.py
@@ -14,15 +14,10 @@ __version__ = '$Revision: 1.1$'
 
 __all__ = ('B2JpsiPi0Conf', 'default_config')
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from CommonParticles.Utils import updateDoD
-from StandardParticles import StdLooseResolvedPi0
-from StandardParticles import StdLooseMergedPi0
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
+from PhysSelPython.Wrappers import DataOnDemand, Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from GaudiKernel.SystemOfUnits import MeV
 
 default_config = {
     # The real name of the lines is BetaS, this is a reference this for the Settings.
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingB2CC/StrippingB2JpsiPi0_Run1.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingB2CC/StrippingB2JpsiPi0_Run1.py
index 3f5f0443aa9132ab2494cbb48813c4ad8991fc1b..1bf462e0083a2da3704b1f804d03b10239ecd920 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingB2CC/StrippingB2JpsiPi0_Run1.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingB2CC/StrippingB2JpsiPi0_Run1.py
@@ -14,15 +14,10 @@ __version__ = '$Revision: 1.2$'
 
 __all__ = ('B2JpsiPi0Conf_RI', 'default_config')
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from CommonParticles.Utils import updateDoD
-from StandardParticles import StdLooseResolvedPi0
-from StandardParticles import StdLooseMergedPi0
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
+from PhysSelPython.Wrappers import DataOnDemand, Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from GaudiKernel.SystemOfUnits import MeV
 
 default_config = {
     # The real name of the lines is BetaS, this is a reference this for the Settings.
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingB2CC/StrippingB2JpsiXforBeta_s.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingB2CC/StrippingB2JpsiXforBeta_s.py
index f249942b6e70534073a342298d7e41c294d2ac84..83cfcf7fbfeca7d7da85f9148f6fff86360c328b 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingB2CC/StrippingB2JpsiXforBeta_s.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingB2CC/StrippingB2JpsiXforBeta_s.py
@@ -26,16 +26,12 @@ __version__ = '$Revision: 4.0$'
 
 __all__ = ('B2JpsiXforBeta_sConf', 'default_config')
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from CommonParticles.Utils import updateDoD
 from StandardParticles import StdLoosePions
 from StandardParticles import StdLooseKaons
-from StandardParticles import StdAllLooseKaons
 from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from GaudiKernel.SystemOfUnits import MeV
 
 default_config = {
     'NAME': 'BetaS',
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingB2CC/StrippingBd2JpsieeKS.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingB2CC/StrippingBd2JpsieeKS.py
index 447acfd66a8a888ea16f056888b1b5a41ccee167..ccac3244d5f71227250f84d9c5d0c485845ab5b3 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingB2CC/StrippingBd2JpsieeKS.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingB2CC/StrippingBd2JpsieeKS.py
@@ -8,16 +8,10 @@
 # granted to it by virtue of its status as an Intergovernmental Organization  #
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
-from GaudiKernel.SystemOfUnits import MeV
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
-from StandardParticles import StdAllLooseKaons
-from StandardParticles import StdLooseKaons
-from StandardParticles import StdLoosePions
-from CommonParticles.Utils import updateDoD
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = 'Ramon Niet'
 __date__ = '2014/10/23'
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingB2CC/StrippingBs2EtacPhiBDT.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingB2CC/StrippingBs2EtacPhiBDT.py
index b6e256eaa1235a84cbf3b68362eea9bf7f387897..30d69a2c110a19ab5a45303854da636781997f4f 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingB2CC/StrippingBs2EtacPhiBDT.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingB2CC/StrippingBs2EtacPhiBDT.py
@@ -17,7 +17,6 @@ from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
-from Gaudi.Configuration import *
 __author__ = ['Morgan Martin, Jibo He']
 __date__ = '20/08/2014'
 __version__ = '$Revision: 1.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingB2CC/StrippingBs2JpsieePhi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingB2CC/StrippingBs2JpsieePhi.py
index 933c2f46f93196ffa448a855cea7a82e5fca3652..ee8bf0cf2aad66cd3771f048a336fffb0ed8165d 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingB2CC/StrippingBs2JpsieePhi.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingB2CC/StrippingBs2JpsieePhi.py
@@ -12,7 +12,6 @@ from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from Configurables import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = 'Artur Ukleja, Jibo He, Konrad Klimaszewski'
 __date__ = '2011/03/01'
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingB2OC/Beauty2Charm_B2DXBuilder.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingB2OC/Beauty2Charm_B2DXBuilder.py
index fe0a253f87aef1ee8525c3787319e9a0eb08f710..ffae2129283047bbe6f465563ff4df3b0d6e6953 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingB2OC/Beauty2Charm_B2DXBuilder.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingB2OC/Beauty2Charm_B2DXBuilder.py
@@ -12,11 +12,7 @@
 
 from copy import deepcopy
 from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-from PhysSelPython.Wrappers import Selection
-from Beauty2Charm_LoKiCuts import LoKiCuts
 from Beauty2Charm_Utils import *
-from Configurables import SubstitutePID
 
 # \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\#
 
@@ -1086,7 +1082,7 @@ class B2DXBuilder(object):
                                     "B- -> D*_2(2460)0 D0 K-"],
                   'B2D0st2460D0Pi': ["B+ -> D*_2(2460)0 D0 pi+",
                                      "B- -> D*_2(2460)0 D0 pi-"]}
-        input = self.dst.dpi_2460_pid+self.d.kpi_pid+self.topoKaons_PID
+        self.dst.dpi_2460_pid+self.d.kpi_pid+self.topoKaons_PID
         inputs = {'B2D0st2460D0K': self.dst.dpi_2460_pid+self.d.kpi_pid+self.topoKaons_PID,
                   'B2D0st2460D0Pi': self.dst.dpi_2460_pid+self.d.kpi_pid+self.topoPions_PID}
         rs = makeB2XSels(decays, '', inputs, self.config)
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingB2OC/Beauty2Charm_Bc2BXBuilder.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingB2OC/Beauty2Charm_Bc2BXBuilder.py
index 63ecc854364bae2f29d64ea2b95c3484988c7016..5bb9297a5c69f56bc7b9761489bf517623df7d3c 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingB2OC/Beauty2Charm_Bc2BXBuilder.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingB2OC/Beauty2Charm_Bc2BXBuilder.py
@@ -8,11 +8,9 @@
 # granted to it by virtue of its status as an Intergovernmental Organization  #
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
-from copy import deepcopy
 from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 from PhysSelPython.Wrappers import Selection, MergedSelection
-from Beauty2Charm_LoKiCuts import LoKiCuts
 from Beauty2Charm_Utils import *
 
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingB2OC/Beauty2Charm_Bc2DDBuilder.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingB2OC/Beauty2Charm_Bc2DDBuilder.py
index 17eda4547110606bb00b589ef9a9081a7ab985e7..44526bcd78bbc48eb6f8c6416c9eabdc38313ac4 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingB2OC/Beauty2Charm_Bc2DDBuilder.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingB2OC/Beauty2Charm_Bc2DDBuilder.py
@@ -11,10 +11,8 @@
 
 # \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\#
 
-from copy import deepcopy
 from Gaudi.Configuration import *
-from PhysSelPython.Wrappers import Selection, MergedSelection
-from Beauty2Charm_LoKiCuts import LoKiCuts
+from PhysSelPython.Wrappers import MergedSelection
 from Beauty2Charm_Utils import *
 # from Configurables import SubstitutePID
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingB2OC/Beauty2Charm_Bc2DXBuilder.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingB2OC/Beauty2Charm_Bc2DXBuilder.py
index 6f6b41a5a8d8e6494ece3c8a144bcc57574870b7..4965e7a83f1b9871f219ab719abb3e950ee03bbd 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingB2OC/Beauty2Charm_Bc2DXBuilder.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingB2OC/Beauty2Charm_Bc2DXBuilder.py
@@ -10,9 +10,6 @@
 ###############################################################################
 from copy import deepcopy
 from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-from PhysSelPython.Wrappers import Selection, MergedSelection
-from Beauty2Charm_LoKiCuts import LoKiCuts
 from Beauty2Charm_Utils import *
 
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingB2OC/Beauty2Charm_DBuilder.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingB2OC/Beauty2Charm_DBuilder.py
index d4740efb1cda30fc3ac5cdfb96c40d12fe5606f3..c4e957ea4c19356392178500bc0038fb77f701cb 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingB2OC/Beauty2Charm_DBuilder.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingB2OC/Beauty2Charm_DBuilder.py
@@ -321,7 +321,6 @@ class DBuilder(object):
         # self.k3pi_ddx_pid = [filterSelection('D2k3pi_for_DDX',LoKiCuts(['VCHI2DOF','BPVVDCHI2'],config_for_ddx).code(),self.k3pi_pid)]
 
         # use this below
-        d_cf_noMassWin = d_cf
         d_cf = LoKiCuts.combine([d_cf, "in_range(%s,MM,%s)" % (d_min, d_max)])
         ds_cf = LoKiCuts.combine(
             [ds_cf, "in_range(%s,MM,%s)" % (ds_min, ds_max)])
@@ -1820,9 +1819,6 @@ class DBuilder(object):
 
     def _makeD2PhiMuNu(self, up=False):
         '''makes Ds->phi mu nu'''
-        decays = [['phi(1020)', 'mu+']]
-        min = '1125.13*MeV'
-        max = '2168.49*MeV'
         cpkk = CombineParticles(CombinationCut="ADAMASS('phi(1020)') < 150*MeV",  # ( hasTopoChild() )
                                 MotherCut='(VFASPF(VCHI2/VDOF) < 10)',
                                 DaughtersCuts={'K+': '(PIDK>-10)'},
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingB2OC/Beauty2Charm_HHBuilder.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingB2OC/Beauty2Charm_HHBuilder.py
index dc43b16320d9b91fe1ea58026fbfada07066d05e..f42a406d06f872917773e2a24722884a46a634a1 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingB2OC/Beauty2Charm_HHBuilder.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingB2OC/Beauty2Charm_HHBuilder.py
@@ -10,7 +10,6 @@
 ###############################################################################
 # \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\#
 
-from copy import deepcopy
 from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 from PhysSelPython.Wrappers import Selection
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingB2OC/Beauty2Charm_HHHBuilder.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingB2OC/Beauty2Charm_HHHBuilder.py
index 9dfd8470c793a410f1c57634f28ac964fe9fd590..304f50b8672c3ac17e8f9cc65e4a6dbbf21f8269 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingB2OC/Beauty2Charm_HHHBuilder.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingB2OC/Beauty2Charm_HHHBuilder.py
@@ -10,9 +10,8 @@
 ###############################################################################
 # \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\#
 
-from copy import deepcopy
 from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N3BodyDecays
+from GaudiConfUtils.ConfigurableGenerators import DaVinci__N3BodyDecays
 from PhysSelPython.Wrappers import Selection
 from Beauty2Charm_LoKiCuts import LoKiCuts
 from Beauty2Charm_Utils import *
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingB2OC/Beauty2Charm_Lb2XBuilder.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingB2OC/Beauty2Charm_Lb2XBuilder.py
index 8547d13a60ee861a1464f77f0417fd3a190b99dd..ca6aa38dbdcd4cdb905be5222c8c58e4ff982a4b 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingB2OC/Beauty2Charm_Lb2XBuilder.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingB2OC/Beauty2Charm_Lb2XBuilder.py
@@ -1229,7 +1229,7 @@ class Lb2XBuilder(object):
 
     def _makeX2LcKPiPiPi(self):
         '''Makes RS + WS Xib -> Lc HH + c.c.'''
-        pions = self.pions
+        self.pions
         kaons = self.kaons
         pipipi = self.hhh.pipipi
         config = deepcopy(self.config)
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingB2OC/Beauty2Charm_LoKiCuts.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingB2OC/Beauty2Charm_LoKiCuts.py
index 54540ea2a223d554a751b02cf83000df4f3aa076..0fd327f8d32075591c9ca0e2d4dd434636c0ab35 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingB2OC/Beauty2Charm_LoKiCuts.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingB2OC/Beauty2Charm_LoKiCuts.py
@@ -10,11 +10,6 @@
 ###############################################################################
 # \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\#
 
-from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
-from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-from PhysSelPython.Wrappers import Selection, MergedSelection
-from StandardParticles import StdNoPIDsPions, StdNoPIDsKaons
 
 # \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\#
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingB2OC/Beauty2Charm_Utils.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingB2OC/Beauty2Charm_Utils.py
index 74b42e7c68d02463345365cb4e564f5a562e4fb4..f05790e87561498db16609e1dc66d2385b0fda8f 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingB2OC/Beauty2Charm_Utils.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingB2OC/Beauty2Charm_Utils.py
@@ -10,13 +10,11 @@
 ###############################################################################
 # \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\#
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-from PhysSelPython.Wrappers import DataOnDemand, Selection, MergedSelection, VoidEventSelection
+from PhysSelPython.Wrappers import DataOnDemand, Selection, VoidEventSelection
 from Beauty2Charm_LoKiCuts import LoKiCuts
 from Configurables import SubstitutePID
-from Configurables import ConeJetProxyFilter
 
 # \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\#
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingB2OC/StrippingB2DDphi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingB2OC/StrippingB2DDphi.py
index b0f8982f1efb389032da5f7becb2881e3c005379..92ca95c2ea3f7c46766aedbc04dbbc34c9c0b8ef 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingB2OC/StrippingB2DDphi.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingB2OC/StrippingB2DDphi.py
@@ -15,8 +15,7 @@ Author: M. Martinelli
 Notes: Excited states are included by placing the line in FULL.DST
 '''
 from PhysSelPython.Wrappers import Selection, DataOnDemand
-from Configurables import FilterDesktop, CombineParticles, DaVinci__N4BodyDecays
-from GaudiConfUtils.ConfigurableGenerators import CombineParticles
+from Configurables import DaVinci__N4BodyDecays, FilterDesktop
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 __author__ = ['Maurizio Martinelli']
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingB2OC/StrippingB2DXD2HMuNu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingB2OC/StrippingB2DXD2HMuNu.py
index 0c33c7610ceda08cc07fbbc35c72e2186d8d5d81..d01564ec9dde10135fe1fc2b84e567d131876e4c 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingB2OC/StrippingB2DXD2HMuNu.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingB2OC/StrippingB2DXD2HMuNu.py
@@ -12,13 +12,11 @@ __author__ = ['Wenbin Qian']
 __date__ = '09/11/2015'
 __version__ = '$Revision: 0.01 $'
 
-from Gaudi.Configuration import *
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, DaVinci__N4BodyDecays, DaVinci__N3BodyDecays
-from PhysSelPython.Wrappers import Selection, DataOnDemand
+from PhysSelPython.Wrappers import Selection
 from StandardParticles import StdLooseMuons, StdLoosePions, StdLooseKaons
-from GaudiKernel.SystemOfUnits import MeV, GeV, cm, mm
 
 __all__ = ('B2DXD2HMuNuBuilder',
            'default_config')
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingB2OC/StrippingB2nbody.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingB2OC/StrippingB2nbody.py
index 663bdbbf855c3d8d19dad3a29b6be667edaeedb9..04c84fc2dc39eb4b3d3d954f3c0083396e0c84fa 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingB2OC/StrippingB2nbody.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingB2OC/StrippingB2nbody.py
@@ -16,7 +16,6 @@ from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, MergedSelection, DataOnDemand, VoidEventSelection
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = ['Rudolf Oldeman']
 __date__ = '08/02/2011'
 __version__ = '$Revision: 1.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingB2OC/StrippingBeauty2Charm.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingB2OC/StrippingBeauty2Charm.py
index 0a3cd69c1beb69f5e1dccc873a4058c8ec72fe16..a71764e5db2802a0b1877352add4cfdbc5a10118 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingB2OC/StrippingBeauty2Charm.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingB2OC/StrippingBeauty2Charm.py
@@ -28,11 +28,9 @@ from Beauty2Charm_HHHBuilder import *
 from Beauty2Charm_HHBuilder import *
 from Beauty2Charm_DBuilder import *
 from StandardParticles import StdLooseAllPhotons, StdVeryLooseAllPhotons
-from Configurables import LoKi__VoidFilter
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import EventSelection
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
+from PhysSelPython.Wrappers import MergedSelection, Selection
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
 from Gaudi.Configuration import *
 import re
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBandQ/StrippingB2Chic0KPi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBandQ/StrippingB2Chic0KPi.py
index 4e325a9079568de7caadd50f65ba1bfad95493c3..8a9c6f281390cbc78e67561f2a02044b5e03cc08 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBandQ/StrippingB2Chic0KPi.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBandQ/StrippingB2Chic0KPi.py
@@ -17,7 +17,6 @@ from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
-from Gaudi.Configuration import *
 __author__ = ['Andrii Usachov']
 __date__ = '13/03/2018'
 __version__ = '$Revision: 1.2$'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBandQ/StrippingB2JpsiXforEM_s.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBandQ/StrippingB2JpsiXforEM_s.py
index d3aeeef75411f9cecca87053ee0faa991e8c7fd8..394fd7c3171d61beb9b93f762a890a248f2b190f 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBandQ/StrippingB2JpsiXforEM_s.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBandQ/StrippingB2JpsiXforEM_s.py
@@ -20,21 +20,11 @@ __version__ = '$Revision: 0.0 $'
 
 __all__ = ('B2JpsiXforEM_sConf', 'default_config')
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
 from Configurables import LoKi__PVReFitter, CombineParticles
-from CommonParticles.Utils import updateDoD
-from StandardParticles import StdLoosePions
-from StandardParticles import StdLooseKaons
-from StandardParticles import StdAllLooseKaons
-from StandardParticles import StdLooseResolvedPi0
-from StandardParticles import StdLooseMergedPi0
-from StandardParticles import StdNoPIDsPions
-from StandardParticles import StdLooseProtons
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
+from PhysSelPython.Wrappers import DataOnDemand, Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from GaudiKernel.SystemOfUnits import MeV
 
 default_config = {
     'NAME': 'B2JpsiXforEM',
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBandQ/StrippingBbbar2PhiPhi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBandQ/StrippingBbbar2PhiPhi.py
index 2c308991a8d9592619777fb7aad4c619a4a40437..fd4e526f5796889d5eb13efd1f1fca7adfbf4a97 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBandQ/StrippingBbbar2PhiPhi.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBandQ/StrippingBbbar2PhiPhi.py
@@ -21,12 +21,10 @@ confBbbar2PhiPhi = Bbbar2PhiPhiConf( name = 'Bbbar2PhiPhi', config = config_Bbba
 stream.appendLines( confBbbar2PhiPhi.lines() )
 '''
 
-from StandardParticles import StdNoPIDsProtons, StdNoPIDsPions, StdNoPIDsDownPions
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
+from PhysSelPython.Wrappers import DataOnDemand, Selection
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = ['Simone Stracka']
 __date__ = '10/03/2015'
 __all__ = (
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBandQ/StrippingBc2JpsiHBDT.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBandQ/StrippingBc2JpsiHBDT.py
index d973f13d2bc8b32c5045776e5b5d3f96bc618e74..7b5a84a9de9b55f09a9ef0da7469b5cc113c4602 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBandQ/StrippingBc2JpsiHBDT.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBandQ/StrippingBc2JpsiHBDT.py
@@ -18,7 +18,6 @@ from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = ['Jibo He']
 __date__ = '02/11/2013'
 __version__ = '$Revision: 2.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBandQ/StrippingBc2JpsiMuXNew.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBandQ/StrippingBc2JpsiMuXNew.py
index 946bad8366ac6019498b9d14e89f0a8899cf70d4..bd156feb81f0deaaf2a07b14df76bcbbcdd03d5c 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBandQ/StrippingBc2JpsiMuXNew.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBandQ/StrippingBc2JpsiMuXNew.py
@@ -18,7 +18,6 @@ from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = ['Jibo He']
 __date__ = '02/09/2010'
 __version__ = '$Revision: 2.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBandQ/StrippingCC2DD.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBandQ/StrippingCC2DD.py
index 58f89513ddb6f5ae23ad89c616deb7d8f0c6f719..39a30438368c27a6a42f57688de187a8b1135e72 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBandQ/StrippingCC2DD.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBandQ/StrippingCC2DD.py
@@ -22,8 +22,7 @@ Module for construction of CC->D D, where CC is a particle decaying to D D
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 __author__ = ['Lucio Anderlini', 'Andrea Bizzeti']
 __date__ = '2015-12-01'
 __version__ = '$Revision: 0.4 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBandQ/StrippingCcbar2Baryons.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBandQ/StrippingCcbar2Baryons.py
index e5a87f652fa30a90026cc6172bb112eb157c1e0f..3e235742a82cc6b6eef181ba5871e7096a9e965d 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBandQ/StrippingCcbar2Baryons.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBandQ/StrippingCcbar2Baryons.py
@@ -20,7 +20,6 @@ stream.appendLines( [
 ])
 '''
 
-from StandardParticles import StdNoPIDsProtons, StdNoPIDsPions, StdNoPIDsDownPions
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBandQ/StrippingCcbar2LstLambda.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBandQ/StrippingCcbar2LstLambda.py
index 0c317712061ae5a153e89bd41b8390a4fc74e187..4937ef3626431e3998bb3086fe7c656fa4ec9e57 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBandQ/StrippingCcbar2LstLambda.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBandQ/StrippingCcbar2LstLambda.py
@@ -12,14 +12,10 @@
 Module for selecting Ccbar->LstLambda detached line, with loose PT, PID cuts. 
 '''
 
-from StandardParticles import StdAllLoosePions, StdAllLooseKaons
-from StandardParticles import StdLoosePions, StdNoPIDsDownPions, StdLooseKaons, StdLooseDownKaons
-from StandardParticles import StdNoPIDsProtons, StdNoPIDsKaons
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = ['Andrii Usachov']
 __date__ = '23/11/2017'
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBandQ/StrippingCcbar2LstLst.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBandQ/StrippingCcbar2LstLst.py
index cf2d3319f4c8d473c85741f08945e6d15bd1722b..fb7af606490052a513bd2a8433237fcbfca14aa4 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBandQ/StrippingCcbar2LstLst.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBandQ/StrippingCcbar2LstLst.py
@@ -12,12 +12,10 @@
 Module for selecting Ccbar->LstLst detached line, with loose PT, PID cuts. 
 '''
 
-from StandardParticles import StdNoPIDsProtons, StdNoPIDsKaons
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
+from PhysSelPython.Wrappers import DataOnDemand, Selection
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = ['Andrii Usachov']
 __date__ = '12/01/2017'
 
@@ -58,19 +56,19 @@ class Ccbar2LstLstConf(LineBuilder):
         self.name = name
         self.config = config
 
-        TRCHI2DOF = config['TRCHI2DOF']
-        KaonProbNNk = config['KaonProbNNk']
-        KaonPTSec = config['KaonPTSec']
-        ProtonProbNNp = config['ProtonProbNNp']
-        ProtonP = config['ProtonP']
-        ProtonPTSec = config['ProtonPTSec']
-        LstVtxChi2 = config['LstVtxChi2']
-        LstMinMass = config['LstMinMass']
-        LstMaxMass = config['LstMaxMass']
-        CombMaxMass = config['CombMaxMass']
-        CombMinMass = config['CombMinMass']
-        MaxMass = config['MaxMass']
-        MinMass = config['MinMass']
+        config['TRCHI2DOF']
+        config['KaonProbNNk']
+        config['KaonPTSec']
+        config['ProtonProbNNp']
+        config['ProtonP']
+        config['ProtonPTSec']
+        config['LstVtxChi2']
+        config['LstMinMass']
+        config['LstMaxMass']
+        config['CombMaxMass']
+        config['CombMinMass']
+        config['MaxMass']
+        config['MinMass']
 
         self.DetachedProtonForLst = self.createSubSel(OutputList="DetachedProtonForLst" + self.name,
                                                       InputList=DataOnDemand(
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBandQ/StrippingCcbar2PPPiPi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBandQ/StrippingCcbar2PPPiPi.py
index 28b6a56f5499cd8ecbce8b1d1e366f216f123073..91e5c78c655288eb933c6478d1eafcaee3904f84 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBandQ/StrippingCcbar2PPPiPi.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBandQ/StrippingCcbar2PPPiPi.py
@@ -12,12 +12,11 @@
 Module for selecting charmonium -> p pbar pi pi 
 '''
 
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
+from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
 from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
-from Gaudi.Configuration import *
 __author__ = ['Jibo He']
 __date__ = '12/11/2015'
 __version__ = '$Revision: 1.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBandQ/StrippingCcbar2PhiPhi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBandQ/StrippingCcbar2PhiPhi.py
index c21b9fa874a5dccb0d9c373c28e255bbe309ea95..101a8e21ba087c6c991fe35e18471728a0abe2e3 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBandQ/StrippingCcbar2PhiPhi.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBandQ/StrippingCcbar2PhiPhi.py
@@ -21,12 +21,10 @@ confCcbar2PhiPhi = Ccbar2PhiPhiConf( name = 'Ccbar2PhiPhi', config = config_Ccba
 stream.appendLines( confCcbar2PhiPhi.lines() )
 '''
 
-from StandardParticles import StdNoPIDsProtons, StdNoPIDsPions, StdNoPIDsDownPions
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
+from PhysSelPython.Wrappers import DataOnDemand, Selection
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = ['Jibo He']
 __date__ = '20/01/2012'
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBandQ/StrippingCcbar2PhiPhiDetached.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBandQ/StrippingCcbar2PhiPhiDetached.py
index 9cece8aa8a316b6c48d7062407ae3c5e4a4703e3..8d48d19f4b11b35402f710baec49d8b99bec7f11 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBandQ/StrippingCcbar2PhiPhiDetached.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBandQ/StrippingCcbar2PhiPhiDetached.py
@@ -15,12 +15,10 @@ Inherited from StrippingCcbar2PhiPhi.py; moved To FullDST
 
 '''
 
-from StandardParticles import StdNoPIDsProtons, StdNoPIDsPions, StdNoPIDsDownPions
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
+from PhysSelPython.Wrappers import DataOnDemand, Selection
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = ['Jibo He, Liupan An']
 __date__ = '11/01/2017'
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBandQ/StrippingCcbar2PhiPhiPiPi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBandQ/StrippingCcbar2PhiPhiPiPi.py
index 3255f0fb24ce2bf3d5dedf3d48901b1a3b7fdf4c..8ded03963ceb90126c111e3d53772e2529b17348 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBandQ/StrippingCcbar2PhiPhiPiPi.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBandQ/StrippingCcbar2PhiPhiPiPi.py
@@ -12,12 +12,11 @@
 Module for selecting charmonium -> phi phi pi pi 
 '''
 
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
+from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
 from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
-from Gaudi.Configuration import *
 __author__ = ['Andrii Usachov']
 __date__ = '10/04/2017'
 __version__ = '$Revision: 1.1 $'
@@ -60,12 +59,12 @@ class Ccbar2PhiPhiPiPiConf(LineBuilder):
         self.name = name
         self.config = config
 
-        PhiVtxChi2 = config['PhiVtxChi2']
-        PhiMassW = config['PhiMassW']
-        KaonPT = config['KaonPT']
-        TRCHI2DOF = config['TRCHI2DOF']
-        KaonProbNNk = config['KaonProbNNk']
-        KaonIPCHI2 = config['KaonIPCHI2']
+        config['PhiVtxChi2']
+        config['PhiMassW']
+        config['KaonPT']
+        config['TRCHI2DOF']
+        config['KaonProbNNk']
+        config['KaonIPCHI2']
 
         self.SelPions = self.createSubSel(OutputList=self.name + "SelPions",
                                           InputList=DataOnDemand(
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBandQ/StrippingCcbar2PpbarNew.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBandQ/StrippingCcbar2PpbarNew.py
index 6e80dee948fe3928d23932c8ec18a2e77170e4e8..75fac29b68495153392b3f882a10b78695089d15 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBandQ/StrippingCcbar2PpbarNew.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBandQ/StrippingCcbar2PpbarNew.py
@@ -18,9 +18,8 @@ Module for Charmonium->p pbar, including three lines
 
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
+from PhysSelPython.Wrappers import Selection
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 __author__ = ['Jibo He']
 __date__ = '03/10/2010'
 __version__ = '$Revision: 1.2 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBandQ/StrippingChiCJPsiGammaConv.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBandQ/StrippingChiCJPsiGammaConv.py
index 0974ad33bc785e6c21ccfbd8abd76c1de3c8330d..13c82277579b4165c559b3e45a8dc8a26f329028 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBandQ/StrippingChiCJPsiGammaConv.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBandQ/StrippingChiCJPsiGammaConv.py
@@ -11,8 +11,7 @@
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
-from Configurables import FilterDesktop, CombineParticles, OfflineVertexFitter
-from Gaudi.Configuration import *
+from Configurables import CombineParticles, FilterDesktop
 __author__ = 'Edwige Tournefier'
 __date__ = '08/06/2012'
 __version__ = '$ 1.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBandQ/StrippingDiMuonForXsection.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBandQ/StrippingDiMuonForXsection.py
index 99d45c194f644de10f8a90371ed1079dcd2e147e..7ceb214bd70cc59ffa52391a7a3321cce9dba642 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBandQ/StrippingDiMuonForXsection.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBandQ/StrippingDiMuonForXsection.py
@@ -16,7 +16,6 @@ from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
-from Gaudi.Configuration import *
 __author__ = ['Jibo He']
 __date__ = '28/03/2012'
 __version__ = '$Revision: 1.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBandQ/StrippingDiMuonNew.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBandQ/StrippingDiMuonNew.py
index 7c60c2e0a15b0e700724dae73d54a428fd669c7a..dd539e9d69fb0fa229c32fd245d281db456c4fed 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBandQ/StrippingDiMuonNew.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBandQ/StrippingDiMuonNew.py
@@ -60,7 +60,6 @@ from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand, EventSelection
 from Configurables import LoKi__VoidFilter
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
-from Gaudi.Configuration import *
 __author__ = ['Jibo He']
 __date__ = '30/09/2010'
 __version__ = '$Revision: 1.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBandQ/StrippingHeavyBaryons.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBandQ/StrippingHeavyBaryons.py
index fdc48e45e9d8cddbdbd0c89c4f67663a329603f3..500f8829198f1352b6129c8bf22fff77d3f04e68 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBandQ/StrippingHeavyBaryons.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBandQ/StrippingHeavyBaryons.py
@@ -12,14 +12,10 @@
 Stripping line for HeavyBaryons studies : Xi_b-, Xi_b0 and Omega_b-
 Author: Yasmine Amhis
 '''
-from GaudiKernel.SystemOfUnits import MeV
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
-from StandardParticles import StdAllLoosePions, StdAllLooseKaons
-from StandardParticles import StdLoosePions, StdNoPIDsDownPions, StdLooseKaons, StdLooseDownKaons
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = ['Yasmine Amhis']
 __date__ = '19/05/2011'
 __version__ = '$Revision: 1.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBandQ/StrippingLb2EtacKp.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBandQ/StrippingLb2EtacKp.py
index 8a3c40d6d917cd55ada1e72c0055edbb6fc858d4..a589ceeb17ed97f680fa80aba492a758463d9474 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBandQ/StrippingLb2EtacKp.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBandQ/StrippingLb2EtacKp.py
@@ -17,7 +17,6 @@ from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
-from Gaudi.Configuration import *
 __author__ = ['Liming Zhang', 'Xuesong Liu']
 __date__ = '23/11/2016'
 __version__ = '$Revision: 2.0$'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBandQ/StrippingOmegab2XicKpi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBandQ/StrippingOmegab2XicKpi.py
index 8a70403dd8fa18dfaddeb8195f9451277a91f501..d421f354b44c7aabc1d6b1a430c6eb0805291530 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBandQ/StrippingOmegab2XicKpi.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBandQ/StrippingOmegab2XicKpi.py
@@ -25,8 +25,7 @@ __all__ = ('Omegab2XicKpiConf',
            'makeOmegab2XicKpi',
            'default_config')
 
-from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBandQ/StrippingPPMuMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBandQ/StrippingPPMuMu.py
index cfa93241546b8cb1958f0c080bce3ed3974eb196..1e28adc9f8419151808afa067316d7a0f98387fb 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBandQ/StrippingPPMuMu.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBandQ/StrippingPPMuMu.py
@@ -12,12 +12,11 @@
 Module for selecting Hc -> p pbar mu mu
 '''
 
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
+from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
 from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
-from Gaudi.Configuration import *
 __author__ = ['Liupan An']
 __date__ = '18/05/2017'
 __version__ = '$Revision: 1.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBandQ/StrippingXibc.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBandQ/StrippingXibc.py
index ed73d91a4d03fe2ff6427b7cd54ccc7ed18aeaa7..d0446cddfd42feba526eaf11c9d8cf13a4160779 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBandQ/StrippingXibc.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBandQ/StrippingXibc.py
@@ -47,17 +47,11 @@ __all__ = ('XibcBuilder'  # LineBuilder class specialization
            )
 
 
-from Gaudi.Configuration import *
-
 from Configurables import FilterDesktop, CombineParticles
 from PhysSelPython.Wrappers import Selection, AutomaticData, MergedSelection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 
-from CommonParticles.StdLooseLambda import StdLooseLambdaLL, StdLooseLambdaDD
-from GaudiKernel.SystemOfUnits import MeV, GeV, mm
-from Configurables import TisTosParticleTagger
-
 
 default_name = "Xibc"
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBandQ/StrippingXibcBDT.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBandQ/StrippingXibcBDT.py
index 5520ac91aac71eded5064eb9daf551c6b35891fe..28b1ca4c2d5b6567ed207d4b3cd2e8dcd52a9324 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBandQ/StrippingXibcBDT.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBandQ/StrippingXibcBDT.py
@@ -33,8 +33,6 @@ from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticle
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, MergedSelection, DataOnDemand
-from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays
-from Gaudi.Configuration import *
 __author__ = ['Jibo He']
 __date__ = '20/11/2016'
 __version__ = '$Revision: 1.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBandQ/StrippingXiccBDT.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBandQ/StrippingXiccBDT.py
index 0fda677dfb8d63acd803c2278c95da8b32d22700..7dde23cf7ee6e3329158f6ed2ef36ed1b1c5655c 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBandQ/StrippingXiccBDT.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBandQ/StrippingXiccBDT.py
@@ -30,9 +30,7 @@ Xicc+  -> D+ p+ K-
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, MergedSelection, DataOnDemand
-from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays
-from Gaudi.Configuration import *
+from PhysSelPython.Wrappers import DataOnDemand, Selection
 __author__ = ['Jibo He']
 __date__ = '20/11/2016'
 __version__ = '$Revision: 1.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBnoC/StrippingB24pLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBnoC/StrippingB24pLines.py
index fed91323554dd309e9a4137174eba46ba8676d87..2c744f40e0299eacf7acf157af33557db0eec23d 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBnoC/StrippingB24pLines.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBnoC/StrippingB24pLines.py
@@ -54,12 +54,10 @@ Exported symbols (use python help!):
    - 
 """
 
-from GaudiKernel.PhysicalConstants import c_light
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
-from Configurables import FilterDesktop, CombineParticles, DaVinci__N4BodyDecays
-from Gaudi.Configuration import *
+from Configurables import DaVinci__N4BodyDecays
 __author__ = ["Pietro Marino", "Oliver Gruenberg"]
 __date__ = "13.10.2017"
 __version__ = "$Revision: 3.0 $"
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBnoC/StrippingB2CharmlessInclusive.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBnoC/StrippingB2CharmlessInclusive.py
index 7bf48ad34997ee3249ce7e2636285a51f6bb908b..e8e50e609900adc84c6b7f9853341ff1a6cc8ec1 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBnoC/StrippingB2CharmlessInclusive.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBnoC/StrippingB2CharmlessInclusive.py
@@ -16,9 +16,8 @@ from StandardParticles import StdLooseKsDD, StdLooseKsLL
 from StandardParticles import StdNoPIDsPions, StdLooseAllPhotons, StdLooseMergedPi0, StdLooseResolvedPi0
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand, SimpleSelection
+from PhysSelPython.Wrappers import Selection, SimpleSelection
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = ['Fred Blanc', 'Luca Pescatore']
 __date__ = '30/11/2016'
 __version__ = '$Revision: 3.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBnoC/StrippingB2HHBDT.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBnoC/StrippingB2HHBDT.py
index 58ec12b040a0d920e656286d4bfc1dda9cf9a73f..e6d9ba6ae39bf426ebdfb99b036c32ac4554915e 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBnoC/StrippingB2HHBDT.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBnoC/StrippingB2HHBDT.py
@@ -24,16 +24,13 @@ __all__ = ('B2HHBDTLines',
            'applyBDT',
            'default_config')
 
-from Gaudi.Configuration import *
 
-from GaudiKernel.SystemOfUnits import *
-
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 from StandardParticles import StdNoPIDsPions
 
 from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
-from StrippingUtils.Utils import LineBuilder, checkConfig
+from StrippingUtils.Utils import LineBuilder
 
 
 default_config = {
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBnoC/StrippingB2HHPi0.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBnoC/StrippingB2HHPi0.py
index f1095b036f3e034d540b8411e06b8865e0c3ff0c..ef02d37ee2de63dc6ef7b277b662a495617f7774 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBnoC/StrippingB2HHPi0.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBnoC/StrippingB2HHPi0.py
@@ -27,9 +27,8 @@ __all__ = ('StrippingB2HHPi0Conf',
            'makeB2HHPi0M',
            'default_config')
 
-from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from PhysSelPython.Wrappers import Selection, DataOnDemand
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
+from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from StandardParticles import StdNoPIDsPions, StdLooseMergedPi0, StdLooseResolvedPi0
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBnoC/StrippingB2KShh.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBnoC/StrippingB2KShh.py
index cd845ff93be466dac98225910b4d4a9cf0cc4082..cd83fed3f3e870f4d30b9ef2dff2aad45ca92941 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBnoC/StrippingB2KShh.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBnoC/StrippingB2KShh.py
@@ -25,7 +25,6 @@ __version__ = 'Stripping24r1/Stripping26r1'
 __all__ = {'B2KShhConf',
            'default_config'}
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, DaVinci__N3BodyDecays
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBnoC/StrippingB2KShhh.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBnoC/StrippingB2KShhh.py
index f95cf109667b3401f5eb904c78285279c34d00b5..07d236ac77af02d637424d32f3f4e637192ba3e1 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBnoC/StrippingB2KShhh.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBnoC/StrippingB2KShhh.py
@@ -27,13 +27,13 @@ __all__ = ('B2KShhhConf',
 
 from Gaudi.Configuration import *
 
-from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N4BodyDecays
+from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays
 from StandardParticles import StdNoPIDsPions, StdNoPIDsKaons  # ipchi2 cut
 from StandardParticles import StdLooseKsDD, StdLooseKsLL
 
-from PhysSelPython.Wrappers import Selection, MergedSelection
+from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
-from StrippingUtils.Utils import LineBuilder, checkConfig
+from StrippingUtils.Utils import LineBuilder
 
 from Configurables import FilterDesktop
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBnoC/StrippingB2Ksthh.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBnoC/StrippingB2Ksthh.py
index 94a25a2714e9626cb22e6966b9ad7a1955d78eb9..a39998cb04eef71b62a1bf9337b6fb914d58a917 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBnoC/StrippingB2Ksthh.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBnoC/StrippingB2Ksthh.py
@@ -22,7 +22,6 @@ __version__ = 'Stripping26'
 __all__ = {'B2KsthhConf',
            'default_config'}
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
@@ -176,7 +175,7 @@ class B2KsthhConf(LineBuilder):
         _massCutHigh = "(AM<(5279+%s)*MeV)" % config['B_Mhigh']
         _aptCut = "(APT>%s*MeV)" % config['B_APTmin']
         _daugMedPtCut = "(ANUM(PT>%s*MeV)>=2)" % config['BDaug_MedPT_PT']
-        _daugMaxPtIPCut = "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['BDaug_MaxPT_IP']
+        "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['BDaug_MaxPT_IP']
         _daugPtSumCut = "((APT1+APT2+APT3)>%s*MeV)" % config['BDaug_PTsum']
 
         _combCuts = _aptCut
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBnoC/StrippingB2TwoBaryons.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBnoC/StrippingB2TwoBaryons.py
index 8911a3d3bdc4a0add9f550c63095470ab59d4fef..93fef262a5bd7d8cd0abd1063e287bef85404e66 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBnoC/StrippingB2TwoBaryons.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBnoC/StrippingB2TwoBaryons.py
@@ -31,11 +31,10 @@ from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
 from StandardParticles import StdLooseProtons
 from StandardParticles import StdNoPIDsPions as Pions
-from CommonParticles.StdLooseLambda import StdLooseLambdaLL, StdLooseLambdaDD
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
-from StrippingUtils.Utils import LineBuilder, checkConfig
-from GaudiKernel.SystemOfUnits import MeV, GeV, mm, ns
+from StrippingUtils.Utils import LineBuilder
+from GaudiKernel.SystemOfUnits import GeV, MeV, mm
 
 default_config = {'NAME': 'B2TwoBaryons',
                   'WGs': ['BnoC'],
@@ -157,7 +156,7 @@ class B2TwoBaryonLines(LineBuilder):
 
         B2PPbarName = name + "B2PPbar"
 
-        B2PPSameSignName = name + "B2PPSameSign"
+        name + "B2PPSameSign"
 
         B2Lp_dd_name = name+'B2PLambdabarDD'
         B2Lp_ll_name = name+'B2PLambdabarLL'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBnoC/StrippingB2XEta.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBnoC/StrippingB2XEta.py
index e1adec50004bf9392e263cc5cb3ba465d4e08bf7..95fbd42162ff7cf67819bcb2ccbe2b4f88c30155 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBnoC/StrippingB2XEta.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBnoC/StrippingB2XEta.py
@@ -25,9 +25,7 @@ from StandardParticles import StdLoosePions as Pions
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, DaVinci__N3BodyDecays
-from PhysSelPython.Wrappers import DataOnDemand, Selection, SelectionSequence, MergedSelection
-from GaudiKernel import SystemOfUnits as Units
-from Gaudi.Configuration import *
+from PhysSelPython.Wrappers import DataOnDemand, MergedSelection, Selection
 __author__ = ['Timothy Williams']
 __date__ = '1/12/2016'
 __version__ = 'Stripping26r1'
@@ -564,7 +562,7 @@ class B2XEtaConf(LineBuilder):
         _trackCuts = _track_PT+'&'+_track_Chi2+'&'+_track_GPCut+'&'+_track_PIDCut
         _combCuts = _massCut+'&'+_docaCut
         _combCut12Doca = "ACHI2DOCA(1,2)<%s" % config['eta_DOCA']
-        _combCut12Vtx = "(VFASPF(VCHI2/VDOF)<%s)" % config['eta_vtxChi2']
+        "(VFASPF(VCHI2/VDOF)<%s)" % config['eta_vtxChi2']
         _combCut12 = _combCut12Doca
 
         # _eta3Pi=CombineParticles("eta3Pi",
@@ -592,7 +590,7 @@ class B2XEtaConf(LineBuilder):
         _trackCuts = _track_PT+'&'+_track_Chi2+'&'+_track_GPCut+'&'+_track_PIDCut
         _combCuts = _massCut+'&'+_docaCut
         _combCut12Doca = "ACHI2DOCA(1,2)<%s" % config['eta_prime_DOCA']
-        _combCut12Vtx = "(VFASPF(VCHI2/VDOF)<%s)" % config['eta_prime_vtxChi2']
+        "(VFASPF(VCHI2/VDOF)<%s)" % config['eta_prime_vtxChi2']
         _combCut12 = _combCut12Doca
 
         # _etap=CombineParticles("etap",
@@ -883,7 +881,7 @@ class B2XEtaConf(LineBuilder):
         _combCuts = _massCut+'&'+_docaCut
         _allCuts = _PTCut+'&'+_vtxCut+'&'+_diraCut+'&'+_IPChi2Cut
         _combCut12Doca = "ACHI2DOCA(1,2)<%s" % config['LbDaug_LL_maxDocaChi2']
-        _combCut12Vtx = "(VFASPF(VCHI2/VDOF)<%s)" % config['Lb_VtxChi2']
+        "(VFASPF(VCHI2/VDOF)<%s)" % config['Lb_VtxChi2']
         _combCut12 = _combCut12Doca
 
         _Lb2pKetap = DaVinci__N3BodyDecays(DecayDescriptor="[Lambda_b0 -> p+ K- eta_prime]cc",
@@ -921,7 +919,7 @@ class B2XEtaConf(LineBuilder):
         _combCuts = _massCut
         _allCuts = _PTCut+'&'+_IPChi2Cut+'&'+_vtxCut+'&'+_diraCut
         _combCut12Doca = "ACHI2DOCA(1,2)<%s" % config['LbDaug_LL_maxDocaChi2']
-        _combCut12Vtx = "(VFASPF(VCHI2/VDOF)<%s)" % config['Lb_VtxChi2']
+        "(VFASPF(VCHI2/VDOF)<%s)" % config['Lb_VtxChi2']
         _combCut12 = _combCut12Doca
 
         _Lb2pKeta3Pi = DaVinci__N3BodyDecays(DecayDescriptor="[Lambda_b0 -> p+ K- eta]cc",
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBnoC/StrippingB2a1Pi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBnoC/StrippingB2a1Pi.py
index 29c0766744b242c4ed1be4817cca727495bcb265..9f701cc986294843a275fb204128fb9f3c88fb1d 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBnoC/StrippingB2a1Pi.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBnoC/StrippingB2a1Pi.py
@@ -17,7 +17,6 @@ from Configurables import DaVinci__N4BodyDecays
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
-from Gaudi.Configuration import *
 __author__ = ['Daniel Vieira, Jibo He']
 __date__ = '01/12/2016'
 __version__ = '$Revision: 1.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBnoC/StrippingB2pphh.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBnoC/StrippingB2pphh.py
old mode 100755
new mode 100644
index 782d89e7466f93f490e15dd1095ac153359b502b..99d5b7265b684f2c69cc962f37bc4fe0b20ac220
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBnoC/StrippingB2pphh.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBnoC/StrippingB2pphh.py
@@ -25,16 +25,13 @@ __all__ = ('B2pphhConf',
            )
 
 
-from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop
+from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
 # from Configurables import DaVinci__N4BodyDecays
 from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays
 
-from StandardParticles import StdAllNoPIDsKaons, StdAllNoPIDsPions, StdAllNoPIDsProtons
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from Configurables import LoKi__VoidFilter as VoidFilter
 
 default_config = {
     'NAME': 'B2pphh',
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBnoC/StrippingBc2hhh_BnoC.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBnoC/StrippingBc2hhh_BnoC.py
index cc0952e7ed4c72dc5b618028ac8bc563928c126d..21b92fa5aab68df4d68f10c50e59c126b546bd31 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBnoC/StrippingBc2hhh_BnoC.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBnoC/StrippingBc2hhh_BnoC.py
@@ -23,13 +23,11 @@ Exported symbols (use python help!):
    - makeppK_excl  
 '''
 
-from Configurables import LoKi__VoidFilter as VoidFilter
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection
 import StandardParticles
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 __author__ = ['Alvaro Gomes', 'Adlene Hicheur']
 __date__ = '31/08/2014'
 __version__ = '$Revision: 1.5 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBnoC/StrippingBs2KKhh.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBnoC/StrippingBs2KKhh.py
index c9b61ca022f83746560bd95dce95d56ab056c7d1..03011c3e32fb079bbbaa6b9d424d8c8b718c76bb 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBnoC/StrippingBs2KKhh.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBnoC/StrippingBs2KKhh.py
@@ -30,7 +30,6 @@ from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop
-from Gaudi.Configuration import *
 __author__ = ['Sean Benson', 'Adam Morris', 'Laurence Carson',
               'Emmy Pauline Maria Gabriel' 'Markus Roehrken']
 __date__ = '22/11/2016'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBnoC/StrippingBs2KSKS_Run2.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBnoC/StrippingBs2KSKS_Run2.py
index 629ca8140bd72d6380100393e840bf791f2f2cd9..6afaa37fab4f411e76010a848c09d7d72e5a05d9 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBnoC/StrippingBs2KSKS_Run2.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBnoC/StrippingBs2KSKS_Run2.py
@@ -22,15 +22,11 @@ __date__ = '13/09/2016'
 __version__ = 'Run2'
 __all__ = {'Bs2KSKSConf', 'default_config'}
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
+from PhysSelPython.Wrappers import DataOnDemand, Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 
-from StandardParticles import StdNoPIDsPions as Pions
-from StandardParticles import StdNoPIDsDownPions as DownPions
-
 
 default_config = {
     'NAME': 'Bs2KSKS',
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBnoC/StrippingBs2Kst_0Kst_0.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBnoC/StrippingBs2Kst_0Kst_0.py
index 6179c70e7f0f16586cd5a958eb2131e9f13bf1ad..7345868ade6e0cebd873ec58d7ea07808efe59f9 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBnoC/StrippingBs2Kst_0Kst_0.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBnoC/StrippingBs2Kst_0Kst_0.py
@@ -22,11 +22,8 @@ Rate estimated on 100K events using a 2017 data sample is: 0.027%
 
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, SelectionSequence, DataOnDemand
+from PhysSelPython.Wrappers import DataOnDemand, Selection
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-from CommonParticles.Utils import *
-from LHCbKernel.Configuration import *
-from Gaudi.Configuration import *
 __author__ = ['Brais Sanmartin Sedes']
 __date__ = '12/11/2015'
 __version__ = '5.1'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBnoC/StrippingBs2PhiKst0.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBnoC/StrippingBs2PhiKst0.py
index ceb8daa24373fc0cd210ec42fdbc56fd456f51e4..0c1ff7d620f2ef3058536bb8bbba7bedc35b168a 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBnoC/StrippingBs2PhiKst0.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBnoC/StrippingBs2PhiKst0.py
@@ -20,11 +20,8 @@ Exported symbols (use python help!):
 
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, SelectionSequence, DataOnDemand
+from PhysSelPython.Wrappers import DataOnDemand, Selection
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-from CommonParticles.Utils import *
-from LHCbKernel.Configuration import *
-from Gaudi.Configuration import *
 __author__ = ['Brais Sanmartin Sedes']
 __date__ = '01/12/2015'
 __version__ = '5.0'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBnoC/StrippingBs2PhiPhi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBnoC/StrippingBs2PhiPhi.py
index 0f280a3a06ba478759dc6e19bf80e278c15e5d40..1124dcdfd432c594fe79f1bc1e0b70fc24f9d21f 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBnoC/StrippingBs2PhiPhi.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBnoC/StrippingBs2PhiPhi.py
@@ -23,13 +23,10 @@ Exports the following stripping lines as instance data members:
 '''
 
 from StandardParticles import StdAllLooseANNKaons as MyLooseKaons
-from StandardParticles import StdLooseANNUpKaons as MyLooseUpKaons
-import StandardParticles
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
+from PhysSelPython.Wrappers import Selection
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 __author__ = ['Sean Benson']
 __date__ = '2013/08/15'
 __version__ = '3.0'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBnoC/StrippingBu2Ksthh.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBnoC/StrippingBu2Ksthh.py
index 5a06d1502605fd2037a6b16043d5efb150ce86d5..032717bced65040c1e6edaf12520110a1398cd1d 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBnoC/StrippingBu2Ksthh.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBnoC/StrippingBu2Ksthh.py
@@ -23,7 +23,6 @@ __version__ = 'Stripping26'
 __all__ = {'Bu2KsthhConf',
            'default_config'}
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
@@ -302,7 +301,7 @@ class Bu2KsthhConf(LineBuilder):
         _massCutHigh = "(AM<(5279+%s)*MeV)" % config['B_Mhigh']
         _aptCut = "(APT>%s*MeV)" % config['B_APTmin']
         _daugMedPtCut = "(ANUM(PT>%s*MeV)>=2)" % config['BDaug_MedPT_PT']
-        _daugMaxPtIPCut = "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['BDaug_MaxPT_IP']
+        "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['BDaug_MaxPT_IP']
         _maxDocaChi2Cut = "(ACUTDOCACHI2(%s,''))" % config['BDaug_DD_maxDocaChi2']
         _daugPtSumCut = "((APT1+APT2+APT3)>%s*MeV)" % config['BDaug_DD_PTsum']
 
@@ -359,7 +358,7 @@ class Bu2KsthhConf(LineBuilder):
         _massCutHigh = "(AM<(5279+%s)*MeV)" % config['B_Mhigh']
         _aptCut = "(APT>%s*MeV)" % config['B_APTmin']
         _daugMedPtCut = "(ANUM(PT>%s*MeV)>=2)" % config['BDaug_MedPT_PT']
-        _daugMaxPtIPCut = "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['BDaug_MaxPT_IP']
+        "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['BDaug_MaxPT_IP']
         _maxDocaChi2Cut = "(ACUTDOCACHI2(%s,''))" % config['BDaug_LL_maxDocaChi2']
         _daugPtSumCut = "((APT1+APT2+APT3)>%s*MeV)" % config['BDaug_LL_PTsum']
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBnoC/StrippingBu2hhh.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBnoC/StrippingBu2hhh.py
index 890eba4692dbe06517c0d7aee8f51d320cca8a64..62ede4129b7f2bd6ff173b27d26ebf7e47e4e6ea 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBnoC/StrippingBu2hhh.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBnoC/StrippingBu2hhh.py
@@ -22,13 +22,11 @@ Exported symbols (use python help!):
    - makepph_incl
 '''
 
-from Configurables import LoKi__VoidFilter as VoidFilter
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection
 import StandardParticles
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 __author__ = ['Irina Nasteva', 'Jussara Miranda', 'Alvaro Gomes']
 __date__ = '19/05/2017'
 __version__ = 'Stripping29'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBnoC/StrippingBu2rho0rhoPlus.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBnoC/StrippingBu2rho0rhoPlus.py
index 6ff36ce6304e5d819eb96fe6ca06587bb1baa6cc..51df1d5067b9100ee67537610b0005b048a5d51f 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBnoC/StrippingBu2rho0rhoPlus.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBnoC/StrippingBu2rho0rhoPlus.py
@@ -21,7 +21,6 @@ from StrippingUtils.Utils import LineBuilder, checkConfig
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = "Jason E Andrews"
 __date__ = "26/11/2016"
 __version__ = "4.0"
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBnoC/StrippingButo5h.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBnoC/StrippingButo5h.py
index be4eeb8a2dc0617afde7aab5929540d3bc8d05c7..65e1b29f0dde00492a6a5432e53292b9bc4c81a7 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBnoC/StrippingButo5h.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBnoC/StrippingButo5h.py
@@ -23,13 +23,11 @@ Exported symbols (use python help!):
    - makeppKpipi_excl
 '''
 
-from Configurables import LoKi__VoidFilter as VoidFilter
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection
 import StandardParticles
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 __author__ = ['Luiz Gustavo de Oliveira',
               'Alvaro Gomes', 'Bruno Souza de Paula']
 __date__ = '22/Aug/2014'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBnoC/StrippingD2HHBDT.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBnoC/StrippingD2HHBDT.py
index 6bee345112d54e258044f31f0e7d809849b112f7..98ef43000bc5732a81fe2e10bace645263334787 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBnoC/StrippingD2HHBDT.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBnoC/StrippingD2HHBDT.py
@@ -23,14 +23,13 @@ __all__ = ('D2HHBDTLines',
            'makeD2HHBDT',
            'default_config')
 
-from Gaudi.Configuration import *
 
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
 from StandardParticles import StdNoPIDsKaons, StdAllNoPIDsPions
 
 from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
-from StrippingUtils.Utils import LineBuilder, checkConfig
+from StrippingUtils.Utils import LineBuilder
 
 
 default_config = {
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBnoC/StrippingHb2Charged2Body.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBnoC/StrippingHb2Charged2Body.py
index 11da99218434ae71c894fa73b708dca4ee60de5d..3b3424d2fb6688333e151f52793701a7a2c00dbe 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBnoC/StrippingHb2Charged2Body.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBnoC/StrippingHb2Charged2Body.py
@@ -23,14 +23,13 @@ __all__ = ('Hb2Charged2BodyLines',
            'makeB2Charged2Body',
            'default_config')
 
-from Gaudi.Configuration import *
 
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-from StandardParticles import StdNoPIDsPions, StdLooseProtons, StdLooseKaons
+from StandardParticles import StdNoPIDsPions
 
 from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
-from StrippingUtils.Utils import LineBuilder, checkConfig
+from StrippingUtils.Utils import LineBuilder
 
 
 default_config = {
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBnoC/StrippingHb2V0V0h.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBnoC/StrippingHb2V0V0h.py
index 6b1c9eb94b261dbc185e979f0314ffe2bd69f930..f3104c9b58e73817c70f7fa7e3d68a0b9ecf0860 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBnoC/StrippingHb2V0V0h.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBnoC/StrippingHb2V0V0h.py
@@ -22,7 +22,6 @@ __date__ = '10/02/2017'
 __version__ = 'Stripping28'
 __all__ = 'Hb2V0V0hConf'
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBnoC/StrippingLb2V0hh.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBnoC/StrippingLb2V0hh.py
index c2e428e39111ecbcc3289b28272ce5a9de2ffb91..61dc7972f8dc320a7c8305eb888e7e21d3f2e7b7 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBnoC/StrippingLb2V0hh.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBnoC/StrippingLb2V0hh.py
@@ -25,7 +25,6 @@ __date__ = '11/01/2017'
 __version__ = 'Stripping28'
 __all__ = 'Lb2V0hhConf'
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
@@ -211,8 +210,8 @@ class Lb2V0hhConf(LineBuilder):
         _vtxCut = "(VFASPF(VCHI2)<%s)   " % config['Lambda_DD_VtxChi2']
         _fdChi2Cut = "(BPVVDCHI2>%s)" % config['Lambda_DD_FDChi2']
         _momCut = "(P>%s*MeV)" % config['Lambda_DD_Pmin']
-        _trkGhostProbCut1 = "(CHILDCUT((TRGHOSTPROB<%s),1))" % config['Trk_GhostProb']
-        _trkGhostProbCut2 = "(CHILDCUT((TRGHOSTPROB<%s),2))" % config['Trk_GhostProb']
+        "(CHILDCUT((TRGHOSTPROB<%s),1))" % config['Trk_GhostProb']
+        "(CHILDCUT((TRGHOSTPROB<%s),2))" % config['Trk_GhostProb']
 
         _allCuts = _momCut
         _allCuts += '&'+_massCut
@@ -267,8 +266,8 @@ class Lb2V0hhConf(LineBuilder):
         _vtxCut = "(VFASPF(VCHI2)<%s)   " % config['Lambda_DD_VtxChi2']
         _fdChi2Cut = "(BPVVDCHI2>%s)" % config['Lambda_DD_FDChi2']
         _momCut = "(P>%s*MeV)" % config['Lambda_DD_Pmin']
-        _trkGhostProbCut1 = "(CHILDCUT((TRGHOSTPROB<%s),1))" % config['Trk_GhostProb']
-        _trkGhostProbCut2 = "(CHILDCUT((TRGHOSTPROB<%s),2))" % config['Trk_GhostProb']
+        "(CHILDCUT((TRGHOSTPROB<%s),1))" % config['Trk_GhostProb']
+        "(CHILDCUT((TRGHOSTPROB<%s),2))" % config['Trk_GhostProb']
 
         _allCuts = _momCut
         _allCuts += '&'+_massCut
@@ -301,7 +300,7 @@ class Lb2V0hhConf(LineBuilder):
         _massCutHigh = "(AM<(5619+%s)*MeV)" % config['Lb_2bodyMhigh']
         _aptCut = "(APT>%s*MeV)" % config['Lb_APTmin']
         _daugMedPtCut = "(ANUM(PT>%s*MeV)>=2)" % config['LbDaug_MedPT_PT']
-        _daugMaxPtIPCut = "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP']
+        "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP']
         _maxDocaChi2Cut = "(ACUTDOCACHI2(%s,''))" % config['LbDaug_DD_maxDocaChi2']
         _daugPtSumCut = "(APT1>%s*MeV)" % config['Lbh_DD_PTMin']
 
@@ -352,7 +351,7 @@ class Lb2V0hhConf(LineBuilder):
         _massCutHigh = "(AM<(5619+%s)*MeV)" % config['Lb_Mhigh']
         _aptCut = "(APT>%s*MeV)" % config['Lb_APTmin']
         _daugMedPtCut = "(ANUM(PT>%s*MeV)>=2)" % config['LbDaug_MedPT_PT']
-        _daugMaxPtIPCut = "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP']
+        "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP']
         _maxDocaChi2Cut = "(ACUTDOCACHI2(%s,''))" % config['LbDaug_DD_maxDocaChi2']
         _daugPtSumCut = "((APT1+APT2+APT3)>%s*MeV)" % config['LbDaug_DD_PTsum']
 
@@ -368,7 +367,7 @@ class Lb2V0hhConf(LineBuilder):
         _vtxChi2Cut = "(VFASPF(VCHI2)<%s)" % config['Lb_VtxChi2']
         _diraCut = "(BPVDIRA>%s)" % config['Lb_DD_Dira']
         _ipChi2Cut = "(MIPCHI2DV(PRIMARY)<%s)" % config['Lb_DD_IPCHI2wrtPV']
-        _fdCut = "(VFASPF(VMINVDDV(PRIMARY))>%s)" % config['Lb_FDwrtPV']
+        "(VFASPF(VMINVDDV(PRIMARY))>%s)" % config['Lb_FDwrtPV']
         _fdChi2Cut = "(BPVVDCHI2>%s)" % config['Lb_DD_FDChi2']
 
         _motherCuts = _ptCut
@@ -540,7 +539,7 @@ class Lb2V0hhConf(LineBuilder):
         _massCutHigh = "(AM<(5619+%s)*MeV)" % config['Lb_2bodyMhigh']
         _aptCut = "(APT>%s*MeV)" % config['Lb_APTmin']
         _daugMedPtCut = "(ANUM(PT>%s*MeV)>=2)" % config['LbDaug_MedPT_PT']
-        _daugMaxPtIPCut = "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP']
+        "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP']
         _maxDocaChi2Cut = "(ACUTDOCACHI2(%s,''))" % config['LbDaug_LD_maxDocaChi2']
         _daugPtSumCut = "(APT1>%s*MeV)" % config['Lbh_LD_PTMin']
 
@@ -591,7 +590,7 @@ class Lb2V0hhConf(LineBuilder):
         _massCutHigh = "(AM<(5619+%s)*MeV)" % config['Lb_Mhigh']
         _aptCut = "(APT>%s*MeV)" % config['Lb_APTmin']
         _daugMedPtCut = "(ANUM(PT>%s*MeV)>=2)" % config['LbDaug_MedPT_PT']
-        _daugMaxPtIPCut = "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP']
+        "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP']
         _maxDocaChi2Cut = "(ACUTDOCACHI2(%s,''))" % config['LbDaug_LD_maxDocaChi2']
         _daugPtSumCut = "((APT1+APT2+APT3)>%s*MeV)" % config['LbDaug_LD_PTsum']
 
@@ -607,7 +606,7 @@ class Lb2V0hhConf(LineBuilder):
         _vtxChi2Cut = "(VFASPF(VCHI2)<%s)" % config['Lb_VtxChi2']
         _diraCut = "(BPVDIRA>%s)" % config['Lb_LD_Dira']
         _ipChi2Cut = "(MIPCHI2DV(PRIMARY)<%s)" % config['Lb_LD_IPCHI2wrtPV']
-        _fdCut = "(VFASPF(VMINVDDV(PRIMARY))>%s)" % config['Lb_FDwrtPV']
+        "(VFASPF(VMINVDDV(PRIMARY))>%s)" % config['Lb_FDwrtPV']
         _fdChi2Cut = "(BPVVDCHI2>%s)" % config['Lb_LD_FDChi2']
 
         _motherCuts = _ptCut
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBnoC/StrippingLb2V0pp.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBnoC/StrippingLb2V0pp.py
index 9a4b9e30dfca4b819fa286ad303a8cfd63e401a2..a8cd38477646e93bbf2eefe0097d7cfc4bf34d07 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBnoC/StrippingLb2V0pp.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBnoC/StrippingLb2V0pp.py
@@ -24,7 +24,6 @@ __date__ = '28/02/2018'
 __version__ = 'Stripping34'
 __all__ = 'Lb2V0ppConf'
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
@@ -215,8 +214,8 @@ class Lb2V0ppConf(LineBuilder):
         _vtxCut = "(VFASPF(VCHI2)<%s)   " % config['Lambda_DD_VtxChi2']
         _fdChi2Cut = "(BPVVDCHI2>%s)" % config['Lambda_DD_FDChi2']
         _momCut = "(P>%s*MeV)" % config['Lambda_DD_Pmin']
-        _trkGhostProbCut1 = "(CHILDCUT((TRGHOSTPROB<%s),1))" % config['Trk_GhostProb']
-        _trkGhostProbCut2 = "(CHILDCUT((TRGHOSTPROB<%s),2))" % config['Trk_GhostProb']
+        "(CHILDCUT((TRGHOSTPROB<%s),1))" % config['Trk_GhostProb']
+        "(CHILDCUT((TRGHOSTPROB<%s),2))" % config['Trk_GhostProb']
 
         _allCuts = _momCut
         _allCuts += '&'+_massCut
@@ -271,8 +270,8 @@ class Lb2V0ppConf(LineBuilder):
         _vtxCut = "(VFASPF(VCHI2)<%s)   " % config['Lambda_DD_VtxChi2']
         _fdChi2Cut = "(BPVVDCHI2>%s)" % config['Lambda_DD_FDChi2']
         _momCut = "(P>%s*MeV)" % config['Lambda_DD_Pmin']
-        _trkGhostProbCut1 = "(CHILDCUT((TRGHOSTPROB<%s),1))" % config['Trk_GhostProb']
-        _trkGhostProbCut2 = "(CHILDCUT((TRGHOSTPROB<%s),2))" % config['Trk_GhostProb']
+        "(CHILDCUT((TRGHOSTPROB<%s),1))" % config['Trk_GhostProb']
+        "(CHILDCUT((TRGHOSTPROB<%s),2))" % config['Trk_GhostProb']
 
         _allCuts = _momCut
         _allCuts += '&'+_massCut
@@ -305,7 +304,7 @@ class Lb2V0ppConf(LineBuilder):
         _massCutHigh = "(AM<(5619+%s)*MeV)" % config['Lb_2bodyMhigh']
         _aptCut = "(APT>%s*MeV)" % config['Lb_APTmin']
         _daugMedPtCut = "(ANUM(PT>%s*MeV)>=2)" % config['LbDaug_MedPT_PT']
-        _daugMaxPtIPCut = "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP']
+        "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP']
         _maxDocaChi2Cut = "(ACUTDOCACHI2(%s,''))" % config['LbDaug_DD_maxDocaChi2']
         _daugPtSumCut = "(APT1>%s*MeV)" % config['Lbh_DD_PTMin']
 
@@ -356,7 +355,7 @@ class Lb2V0ppConf(LineBuilder):
         _massCutHigh = "(AM<(5619+%s)*MeV)" % config['Lb_Mhigh']
         _aptCut = "(APT>%s*MeV)" % config['Lb_APTmin']
         _daugMedPtCut = "(ANUM(PT>%s*MeV)>=2)" % config['LbDaug_MedPT_PT']
-        _daugMaxPtIPCut = "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP']
+        "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP']
         _maxDocaChi2Cut = "(ACUTDOCACHI2(%s,''))" % config['LbDaug_DD_maxDocaChi2']
         _daugPtSumCut = "((APT1+APT2+APT3)>%s*MeV)" % config['LbDaug_DD_PTsum']
 
@@ -372,7 +371,7 @@ class Lb2V0ppConf(LineBuilder):
         _vtxChi2Cut = "(VFASPF(VCHI2)<%s)" % config['Lb_VtxChi2']
         _diraCut = "(BPVDIRA>%s)" % config['Lb_DD_Dira']
         _ipChi2Cut = "(MIPCHI2DV(PRIMARY)<%s)" % config['Lb_DD_IPCHI2wrtPV']
-        _fdCut = "(VFASPF(VMINVDDV(PRIMARY))>%s)" % config['Lb_FDwrtPV']
+        "(VFASPF(VMINVDDV(PRIMARY))>%s)" % config['Lb_FDwrtPV']
         _fdChi2Cut = "(BPVVDCHI2>%s)" % config['Lb_DD_FDChi2']
 
         _motherCuts = _ptCut
@@ -544,7 +543,7 @@ class Lb2V0ppConf(LineBuilder):
         _massCutHigh = "(AM<(5619+%s)*MeV)" % config['Lb_2bodyMhigh']
         _aptCut = "(APT>%s*MeV)" % config['Lb_APTmin']
         _daugMedPtCut = "(ANUM(PT>%s*MeV)>=2)" % config['LbDaug_MedPT_PT']
-        _daugMaxPtIPCut = "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP']
+        "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP']
         _maxDocaChi2Cut = "(ACUTDOCACHI2(%s,''))" % config['LbDaug_LD_maxDocaChi2']
         _daugPtSumCut = "(APT1>%s*MeV)" % config['Lbh_LD_PTMin']
 
@@ -595,7 +594,7 @@ class Lb2V0ppConf(LineBuilder):
         _massCutHigh = "(AM<(5619+%s)*MeV)" % config['Lb_Mhigh']
         _aptCut = "(APT>%s*MeV)" % config['Lb_APTmin']
         _daugMedPtCut = "(ANUM(PT>%s*MeV)>=2)" % config['LbDaug_MedPT_PT']
-        _daugMaxPtIPCut = "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP']
+        "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP']
         _maxDocaChi2Cut = "(ACUTDOCACHI2(%s,''))" % config['LbDaug_LD_maxDocaChi2']
         _daugPtSumCut = "((APT1+APT2+APT3)>%s*MeV)" % config['LbDaug_LD_PTsum']
 
@@ -611,7 +610,7 @@ class Lb2V0ppConf(LineBuilder):
         _vtxChi2Cut = "(VFASPF(VCHI2)<%s)" % config['Lb_VtxChi2']
         _diraCut = "(BPVDIRA>%s)" % config['Lb_LD_Dira']
         _ipChi2Cut = "(MIPCHI2DV(PRIMARY)<%s)" % config['Lb_LD_IPCHI2wrtPV']
-        _fdCut = "(VFASPF(VMINVDDV(PRIMARY))>%s)" % config['Lb_FDwrtPV']
+        "(VFASPF(VMINVDDV(PRIMARY))>%s)" % config['Lb_FDwrtPV']
         _fdChi2Cut = "(BPVVDCHI2>%s)" % config['Lb_LD_FDChi2']
 
         _motherCuts = _ptCut
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBnoC/StrippingXb23ph.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBnoC/StrippingXb23ph.py
index 44ba838d436b418c4eaef7372eccd95c28426134..ef24837631cfc50b46aabe0cc7dba0c8cdeb66fd 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBnoC/StrippingXb23ph.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBnoC/StrippingXb23ph.py
@@ -22,7 +22,6 @@ from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, DaVinci__N4Body
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection
-from Gaudi.Configuration import *
 __author__ = ['Jinlin Fu', 'Maurizio Martinelli', 'Andrea Merli']
 __date__ = '12/11/2015'
 __version__ = 'v1r0'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBnoC/StrippingXb2p3h.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBnoC/StrippingXb2p3h.py
index d07d7e52c17b8a01201968b3a1b929751c31bc9d..2c10d1f20bf15892c5e8ef6a5861130250a0a8ae 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBnoC/StrippingXb2p3h.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBnoC/StrippingXb2p3h.py
@@ -22,7 +22,6 @@ from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, DaVinci__N4Body
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection
-from Gaudi.Configuration import *
 __author__ = ['Jan Mickelle V. Maratas', 'Stephane Monteil', 'Andrea Merli']
 __date__ = '01/04/2016'
 __version__ = 'v1r0'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBnoC/StrippingXb2phh.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBnoC/StrippingXb2phh.py
index ae62ac803dcda11696229820fa7bcb3737c75114..35432dcb4a93cdbf47f1ec738735037534d82c07 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBnoC/StrippingXb2phh.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingBnoC/StrippingXb2phh.py
@@ -22,7 +22,6 @@ from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, DaVinci__N3Body
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection
-from Gaudi.Configuration import *
 __author__ = ['Jan Mickelle V. Maratas', 'Stephane Monteil', 'Thomas Latham']
 __date__ = '24/11/2016'
 __version__ = 'v1r0'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCalib/StrippingCharmFromBSemiForHadronAsy.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCalib/StrippingCharmFromBSemiForHadronAsy.py
index c458c3e6c38ed0b1337c2e69289afaa140b1e0f3..98fad852e24de6fd9dc371c05e6185a34f3863c8 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCalib/StrippingCharmFromBSemiForHadronAsy.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCalib/StrippingCharmFromBSemiForHadronAsy.py
@@ -19,14 +19,12 @@ __author__ = ['Mika Vesterinen']
 __date__ = '10/03/2013'
 __version__ = '$Revision: 0.0 $'
 
-from Gaudi.Configuration import *
 
 from Configurables import FilterDesktop, CombineParticles
 from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from StandardParticles import StdAllLoosePions, StdLoosePions, StdLooseMuons, StdLooseKaons, StdLooseProtons
-from Configurables import TisTosParticleTagger
+from StandardParticles import StdLooseKaons, StdLooseMuons, StdLoosePions
 
 __all__ = ('CharmFromBSemiForHadronAsyAllLinesConf',
            'TOSFilter',
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCalib/StrippingCharmFromBSemiForProtonPID.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCalib/StrippingCharmFromBSemiForProtonPID.py
index 6f3f2812e25963f1f870143d02a3d51033043fa3..c0a1239d14ca3226bdea889799f796896158e4dc 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCalib/StrippingCharmFromBSemiForProtonPID.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCalib/StrippingCharmFromBSemiForProtonPID.py
@@ -18,12 +18,11 @@ __author__ = ['Mika Vesterinen']
 __date__ = '19/03/2013'
 __version__ = '$Revision: 0.0 $'
 
-from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from StandardParticles import StdLoosePions, StdLooseMuons, StdLooseKaons, StdLooseProtons, StdNoPIDsProtons
+from StandardParticles import StdLooseKaons, StdLooseMuons, StdLoosePions, StdNoPIDsProtons
 
 __all__ = ('CharmFromBSemiForProtonPIDAllLinesConf',
            'default_config')
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCalib/StrippingD02KPiPi0.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCalib/StrippingD02KPiPi0.py
index b8f25c6552ad8b11e685418ec13a2ac622d2bef8..7fd939520aebcb1dc21eb98628f0836710acb20c 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCalib/StrippingD02KPiPi0.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCalib/StrippingD02KPiPi0.py
@@ -25,9 +25,8 @@ __all__ = ('StrippingD02KPiPi0Conf',
            'makeD02KPiPi0M',
            'default_config')
 
-from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from PhysSelPython.Wrappers import Selection, DataOnDemand
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
+from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from StandardParticles import StdTightPions, StdTightKaons, StdLooseMergedPi0, StdLooseResolvedPi0
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCalib/StrippingD02KPiPi0DalitzPartReco.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCalib/StrippingD02KPiPi0DalitzPartReco.py
index ac92a6c8cd5234f3436c2a8b2ed17b8fbf90700a..c14b9b11f394fd5c53a93657f063a53eb32b8e66 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCalib/StrippingD02KPiPi0DalitzPartReco.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCalib/StrippingD02KPiPi0DalitzPartReco.py
@@ -8,9 +8,7 @@
 # granted to it by virtue of its status as an Intergovernmental Organization  #
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
-import logging
 from StrippingUtils.Utils import LineBuilder
-from Gaudi.Configuration import *
 __author__ = ['Greg Ciezarek', 'Liang Sun', 'Adam Davis']
 __date__ = '18/05/2017'
 __version__ = '$Revision: 0.01 $'
@@ -75,7 +73,6 @@ class D2KPiPi0_PartRecoBuilder(LineBuilder):
     def __init__(self, name, config):
         LineBuilder.__init__(self, name, config)
         self._config = config
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
 
         # self.GECs = { "Code":"( recSummaryTrack(LHCb.RecSummary.nLongTracks, TrLONG) < %(GEC_nLongTrk)s )" % config,
         #              "Preambulo": ["from LoKiTracks.decorators import *"]}
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCalib/StrippingD0ForBXX.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCalib/StrippingD0ForBXX.py
index bd7db7dbc518eb886e4f9c11699b772d11dd126b..b5eea4d7cb0b283585ff2aa80e59a84aa67c7051 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCalib/StrippingD0ForBXX.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCalib/StrippingD0ForBXX.py
@@ -20,7 +20,7 @@ from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from StandardParticles import StdLoosePions, StdLooseKaons, StdLooseProtons, StdAllLoosePions
+from StandardParticles import StdAllLoosePions, StdLooseKaons, StdLoosePions
 
 
 name = 'confD0forBXX'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCalib/StrippingDstarD02hhPi0PartRecoForPhotonCalib.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCalib/StrippingDstarD02hhPi0PartRecoForPhotonCalib.py
index bb492119404e92cf4b528566b6d751426a37fb57..5d48089749f1fd55cdc397d3e9db672ebb0f4cab 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCalib/StrippingDstarD02hhPi0PartRecoForPhotonCalib.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCalib/StrippingDstarD02hhPi0PartRecoForPhotonCalib.py
@@ -31,15 +31,15 @@ from Gaudi.Configuration import *
 
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 from StandardParticles import StdAllNoPIDsPions, StdNoPIDsPions, StdNoPIDsKaons
-from StandardParticles import StdLooseAllPhotons, StdLooseResolvedPi0, StdLooseMergedPi0
+from StandardParticles import StdLooseAllPhotons
 
 from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
-from StrippingUtils.Utils import LineBuilder, checkConfig
+from StrippingUtils.Utils import LineBuilder
 
 from Configurables import FilterDesktop
 
-from GaudiKernel.SystemOfUnits import GeV, MeV, picosecond, mm
+from GaudiKernel.SystemOfUnits import GeV, MeV, picosecond
 
 default_config = {
     'NAME': 'DstarD2hhGammaCalib',
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCalib/StrippingElectronID.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCalib/StrippingElectronID.py
index 79ab8b9195261332d4edf68ef429b42b14910dc9..4c669d1a511812ffba26ffd00d69422f9416a9c0 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCalib/StrippingElectronID.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCalib/StrippingElectronID.py
@@ -23,9 +23,8 @@ stream.appendLines( [
 
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand
+from PhysSelPython.Wrappers import Selection
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = ['Jibo He']
 __date__ = '03/10/2010'
 __version__ = '$Revision: 1.2 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCalib/StrippingElectronRecoEff.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCalib/StrippingElectronRecoEff.py
index d6c25fb813cd3c7454f8672dda31948541cb5424..99db91defbcc10dddd1a34a1f73f3af1c7eea174 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCalib/StrippingElectronRecoEff.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCalib/StrippingElectronRecoEff.py
@@ -13,7 +13,6 @@ Stripping line to mimic Electron Track Reconstruction Efficiency HLT2 line
 Tag and probe with VELO info for J/psi -> ee
 '''
 
-from StandardParticles import StdAllLoosePions as Hlt2Pions
 from StandardParticles import StdAllLooseKaons as Hlt2Kaons
 from StandardParticles import StdNoPIDsElectrons as Hlt2Electrons
 from StandardParticles import StdNoPIDsMuons as Hlt2Muons
@@ -23,7 +22,7 @@ from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
 from StrippingConf.StrippingLine import StrippingLine
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 from StrippingUtils.Utils import LineBuilder
-from GaudiKernel.SystemOfUnits import GeV, MeV, mm
+from GaudiKernel.SystemOfUnits import MeV, mm
 from Gaudi.Configuration import *
 __author__ = ['Adam Davis', 'Laurent Dufour', 'V. V. Gligorov']
 __date__ = '14/1/2018'
@@ -41,10 +40,9 @@ from PhysSelPython.Wrappers import Selection, Hlt1Selection, Hlt2Selection, L0Se
 from SelPy.utils import (UniquelyNamedObject,
                          ClonableObject,
                          SelectionBase)
-from Configurables import (DecodeVeloRawBuffer, FastVeloTracking, TrackPrepareVelo,
-                           NoPIDsParticleMaker, DataOnDemandSvc, ChargedProtoParticleMaker,
-                           PrTrackAssociator, DelegatingTrackSelector, TrackContainerCopy, TrackAssociator,
-                           TrackStateInitAlg, TrackStateInitTool)
+from Configurables import (FastVeloTracking, NoPIDsParticleMaker, DataOnDemandSvc,
+                           ChargedProtoParticleMaker, DelegatingTrackSelector, TrackContainerCopy,
+                           TrackStateInitAlg)
 
 default_config = {'NAME': 'ElectronRecoEff',
                   'WGs': ['ALL'],
@@ -150,7 +148,6 @@ class StrippingElectronRecoEffLines(LineBuilder):
 
     def __init__(self, name, config):
         LineBuilder.__init__(self, name, config)
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
         self._config = config
         self.name = name
 
@@ -307,7 +304,6 @@ class StrippingElectronRecoEffLines(LineBuilder):
     def MakeVeloTracks(self, prefilter):
         if self._config["DoVeloDecoding"]:
             from DAQSys.Decoders import DecoderDB
-            from DAQSys.DecoderClass import decodersForBank
             decs = []
             vdec = DecoderDB["DecodeVeloRawBuffer/createBothVeloClusters"]
             vdec.Active = True
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCalib/StrippingJPsiForSL.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCalib/StrippingJPsiForSL.py
index 66d3cf569e7e3d642fb1e90689c09009970a9f91..f83a469f0d79f559f3b8f1ce7fa0a29617c07287 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCalib/StrippingJPsiForSL.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCalib/StrippingJPsiForSL.py
@@ -20,11 +20,10 @@ __version__ = '$Revision: 0.1 $'
 
 from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from PhysSelPython.Wrappers import Selection, DataOnDemand
+from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from StandardParticles import StdLoosePions, StdLooseMuons, StdLooseKaons, StdLooseProtons, StdNoPIDsPions, StdNoPIDsMuons, StdLooseMergedPi0, StdLooseResolvedPi0, StdLooseElectrons, StdNoPIDsKaons
-from Configurables import TisTosParticleTagger
+from StandardParticles import StdNoPIDsKaons, StdNoPIDsMuons
 
 __all__ = ('JPsiForSLAllLinesConf',
            'confdict')
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCalib/StrippingLowPtMuID.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCalib/StrippingLowPtMuID.py
index 849af60821a273768229a8a895da2389daebffad..4e62d87ffa44ec34ad4dd9352745c0f8ea332584 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCalib/StrippingLowPtMuID.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCalib/StrippingLowPtMuID.py
@@ -19,12 +19,9 @@ largely cloned from line written by 'S.Furcas', 'G.Lanfranchi', 'M.Palutan', 'A.
 
 from StandardParticles import StdAllNoPIDsMuons
 from StrippingUtils.Utils import LineBuilder
-from Configurables import LoKi__Hybrid__CoreFactory as CoreFactory
-from Configurables import LoKi__VoidFilter as VoidFilter
-from PhysSelPython.Wrappers import DataOnDemand, Selection, SelectionSequence, MergedSelection
+from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 __author__ = ['G.Ciezarek', ]
 __date__ = '03/12/2015'
 __version__ = '$Revision: 1.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCalib/StrippingMuIDCalib.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCalib/StrippingMuIDCalib.py
index 8ed3b7917713dcdae7109d96b5ce7e541b774184..4a048294ae649e248f99d79c1048afbb079b8f41 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCalib/StrippingMuIDCalib.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCalib/StrippingMuIDCalib.py
@@ -22,15 +22,12 @@ lb = builder( 'MuIDCalib', config_params )
 
 '''
 
-from StandardParticles import StdAllNoPIDsKaons, StdAllNoPIDsMuons, StdAllNoPIDsPions, StdAllNoPIDsProtons
+from StandardParticles import StdAllNoPIDsMuons
 from StandardParticles import StdNoPIDsKaons, StdNoPIDsMuons, StdNoPIDsPions, StdNoPIDsProtons
 from StrippingUtils.Utils import LineBuilder
-from Configurables import LoKi__Hybrid__CoreFactory as CoreFactory
-from Configurables import LoKi__VoidFilter as VoidFilter
-from PhysSelPython.Wrappers import DataOnDemand, Selection, SelectionSequence, MergedSelection
+from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 __author__ = ['S.Furcas', 'G.Lanfranchi',
               'M.Palutan', 'A.Sarti', 'D.Milanes', 'MuID Team']
 __date__ = '23/08/2011'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCalib/StrippingNoPIDDstarWithD02RSKPi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCalib/StrippingNoPIDDstarWithD02RSKPi.py
index 868e856df383049c36f53e699ed778b832066ac6..7fe001240ffb5cf7467478c858f91fa24f7c8477 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCalib/StrippingNoPIDDstarWithD02RSKPi.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCalib/StrippingNoPIDDstarWithD02RSKPi.py
@@ -13,10 +13,8 @@
 from StandardParticles import StdAllNoPIDsKaons, StdAllNoPIDsPions
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from LHCbKernel.Configuration import *
-from Gaudi.Configuration import *
+from PhysSelPython.Wrappers import Selection
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 __author__ = ['Philip Xing', 'Andrew Powell']
 __date__ = '23rd August 2012'
 __version__ = '$Revision: 7.0 $'
@@ -42,7 +40,7 @@ StrippingReport                                                INFO Event 100000
 __all__ = ('NoPIDDstarWithD02RSKPiConf', 'default_config')
 
 
-from GaudiKernel.SystemOfUnits import mm, cm, MeV, GeV
+from GaudiKernel.SystemOfUnits import GeV, MeV
 # from Configurables import FilterDesktop, CombineParticles
 
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCalib/StrippingPIDCalib.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCalib/StrippingPIDCalib.py
index b8575891b3f25394b06308e9898d43859cb829c3..5b97ce1b7b0d57e66017855c7434385379549503 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCalib/StrippingPIDCalib.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCalib/StrippingPIDCalib.py
@@ -35,9 +35,7 @@ from Configurables import DaVinci__N3BodyDecays
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
 from Configurables import CombineParticles
-from Gaudi.Configuration import *
 __author__ = ['Lucio Anderlini']
 __date__ = '25/02/2015'
 __version__ = '$Revision: 1.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCalib/StrippingTrackEffD0ToKPi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCalib/StrippingTrackEffD0ToKPi.py
index d200634cbeb18cfb4624e0334c74003de565ccd2..a45124cce3ff88a08dea422bc38f6797b6048ef8 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCalib/StrippingTrackEffD0ToKPi.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCalib/StrippingTrackEffD0ToKPi.py
@@ -17,7 +17,7 @@ from Configurables import FilterDesktop, CombineParticles
 from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from StandardParticles import StdLooseKaons, StdLoosePions, StdAllLoosePions, StdAllNoPIDsPions
+from StandardParticles import StdAllLoosePions, StdLooseKaons, StdLoosePions
 from SelPy.utils import (UniquelyNamedObject,
                          ClonableObject,
                          SelectionBase)
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCalib/StrippingTrackEffDownMuon.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCalib/StrippingTrackEffDownMuon.py
old mode 100755
new mode 100644
index 924e2dbae0957d7751117318f1da927d76f3e105..bf9bd8b1e8d32543a206635529995a12c8a1404a
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCalib/StrippingTrackEffDownMuon.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCalib/StrippingTrackEffDownMuon.py
@@ -43,34 +43,26 @@ __all__ = ('StrippingTrackEffDownMuonConf',
 # FIXME Write includes in a cleaner way
 from Gaudi.Configuration import *
 from LHCbKernel.Configuration import *
-from DAQSys.DecoderClass import Decoder
 from Configurables import GaudiSequencer
 from Configurables import UnpackTrack, ChargedProtoParticleMaker, DelegatingTrackSelector, TrackSelector, BestPIDParticleMaker
-from TrackFitter.ConfiguredFitters import ConfiguredFit
 from Configurables import TrackStateInitAlg
 from StrippingConf.StrippingLine import StrippingLine
-from Configurables import ChargedProtoParticleAddMuonInfo, MuonIDAlgLite
+from Configurables import ChargedProtoParticleAddMuonInfo
 from MuonID import ConfiguredMuonIDs
 from Configurables import ChargedProtoCombineDLLsAlg, ProtoParticleMUONFilter
-from PhysSelPython.Wrappers import Selection, DataOnDemand
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
+from PhysSelPython.Wrappers import Selection
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 
 from StrippingUtils.Utils import LineBuilder
-from Configurables import LoKi__VoidFilter
-from os import environ
 from Gaudi.Configuration import *
-import GaudiKernel.ProcessJobOptions
-from GaudiKernel.SystemOfUnits import mm
 
 from GaudiConfUtils.ConfigurableGenerators import TisTosParticleTagger
 from StandardParticles import StdAllLooseMuons
 from Configurables import GaudiSequencer
 from Configurables import TrackToDST
-from Configurables import TrackSys
 from Configurables import PatSeeding, PatSeedingTool, PatLongLivedTracking
-from PhysSelPython.Wrappers import AutomaticData
 # Get the fitters
-from TrackFitter.ConfiguredFitters import ConfiguredFit, ConfiguredFitSeed, ConfiguredFitDownstream
+from TrackFitter.ConfiguredFitters import ConfiguredFitDownstream
 from PatAlgorithms import PatAlgConf
 
 from SelPy.utils import (UniquelyNamedObject,
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCalib/StrippingTrackEffMuonTT.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCalib/StrippingTrackEffMuonTT.py
index 03f3836bd9fcb92ff018a024653984e9e0edfe0c..b590cd28e4d579c0844476611a30d625a35e14e0 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCalib/StrippingTrackEffMuonTT.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCalib/StrippingTrackEffMuonTT.py
@@ -62,11 +62,10 @@ __all__ = ('StrippingTrackEffMuonTTConf',
            'makeBJpsiKTrackEff',
            'filterHLT2ForBJpsiK')
 
-from Gaudi.Configuration import *
-from PhysSelPython.Wrappers import Selection, DataOnDemand, ChargedProtoParticleSelection
+from PhysSelPython.Wrappers import ChargedProtoParticleSelection, Selection
 from StrippingConf.StrippingLine import StrippingLine
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from StrippingUtils.Utils import LineBuilder, checkConfig
+from StrippingUtils.Utils import LineBuilder
 from StandardParticles import StdLooseKaons, StdLooseMuons, StdAllLooseMuons
 
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCalib/StrippingTrackEffVeloMuon.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCalib/StrippingTrackEffVeloMuon.py
old mode 100755
new mode 100644
index 1f8e2fed49228bbb9e2220a46d490475e41c3660..bd1a8d9f2f7537a5bf5c3c9bac70efb09b84d540
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCalib/StrippingTrackEffVeloMuon.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCalib/StrippingTrackEffVeloMuon.py
@@ -40,30 +40,22 @@ __all__ = ('StrippingTrackEffVeloMuonConf',
            )
 
 
-from Gaudi.Configuration import *
-from LHCbKernel.Configuration import *
 from Configurables import CombineParticles
-from PhysSelPython.Wrappers import Selection, SelectionSequence, DataOnDemand
-from Configurables import ChargedProtoParticleMaker, NoPIDsParticleMaker, DataOnDemandSvc, DelegatingTrackSelector, TrackSelector, CombinedParticleMaker, BestPIDParticleMaker
+from PhysSelPython.Wrappers import Selection
+from Configurables import ChargedProtoParticleMaker, DataOnDemandSvc, DelegatingTrackSelector, NoPIDsParticleMaker, TrackSelector
 from Configurables import FastVeloTracking
 
 from StrippingConf.StrippingLine import StrippingLine
-from Configurables import TrackStateInitAlg, TrackEventFitter, TrackPrepareVelo, TrackContainerCopy, Tf__PatVeloSpaceTool, StandaloneMuonRec
-from Configurables import TrackCloneFinder
+from Configurables import StandaloneMuonRec, TrackPrepareVelo
 from StrippingUtils.Utils import LineBuilder
 from StandardParticles import StdLooseMuons
 
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, TisTosParticleTagger
 
 from Configurables import GaudiSequencer
-from Configurables import TrackSys
-from PhysSelPython.Wrappers import AutomaticData
 # Get the fitters
-from TrackFitter.ConfiguredFitters import ConfiguredFit
 
-from Configurables import TrackEventCloneKiller, VeloMuonBuilder
-from Configurables import TrackEventFitter, TrackMasterFitter
-from Configurables import TrackKalmanFilter, TrackMasterExtrapolator
+from Configurables import VeloMuonBuilder
 # from TrackFitter.ConfiguredFitters import ConfiguredFastFitter
 # from Configurables import TrackCloneFinder
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCharm/StrippingB2ppipiSigmacmm_Lcpi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCharm/StrippingB2ppipiSigmacmm_Lcpi.py
index 316195569102a380d44bcad73ab40d9b4b2ffcc8..25cd049b1fac0d99feae2dbf2e80a306df5abcd1 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCharm/StrippingB2ppipiSigmacmm_Lcpi.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCharm/StrippingB2ppipiSigmacmm_Lcpi.py
@@ -31,12 +31,11 @@ __all__ = ('StrippingB2ppipiSigmacmm_Lcpi_Conf', 'makepifromSigmacmm', 'makeThre
            )
 
 from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, ConjugateNeutralPID, DaVinci__N3BodyDecays
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N3BodyDecays, FilterDesktop
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
-from StrippingUtils.Utils import checkConfig, LineBuilder
+from StrippingUtils.Utils import LineBuilder
 from GaudiKernel.SystemOfUnits import MeV, GeV, mm
-from copy import copy
 
 name = 'StrippingB2ppipiSigmacmm_Lcpi'
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCharm/StrippingChargedHyperons.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCharm/StrippingChargedHyperons.py
index 920c9faefc12697a4686bb708606c7aefce7c812..1e9ecbdf32eac322732659ae13423893f4c17ced 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCharm/StrippingChargedHyperons.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCharm/StrippingChargedHyperons.py
@@ -21,13 +21,9 @@ __version__ = '$Revision: 1.0 $'
 __all__ = ('StrippingChargedHyperonsConf', 'default_config')
 
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from StandardParticles import StdLoosePions, StdNoPIDsDownPions, StdLooseKaons, StdLooseDownKaons
-from StandardParticles import StdAllLoosePions, StdAllLooseKaons
 
 from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
-from PhysSelPython.Wrappers import MultiSelectionSequence
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from GaudiKernel.SystemOfUnits import MeV, mm, picosecond
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCharm/StrippingCharm2PPX.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCharm/StrippingCharm2PPX.py
index 8f420ab23681879eda33d3f11a9c1854083e6f5d..1776621bc50d11dd212c17cc7c967c25e7570f68 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCharm/StrippingCharm2PPX.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCharm/StrippingCharm2PPX.py
@@ -26,7 +26,7 @@ __all__ = (
     'StrippingCharm2PPXConf'  # ???
 )
 
-from GaudiKernel.SystemOfUnits import MeV, GeV, mm, mrad
+from GaudiKernel.SystemOfUnits import GeV, MeV, mm
 from Configurables import CombineParticles, FilterDesktop
 # from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop, DaVinci__N3BodyDecays
 from StandardParticles import (
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCharm/StrippingCharmForVub.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCharm/StrippingCharmForVub.py
index addb5112d833323e807d80a2fcd5d1c6ef104d89..196b7aca8b732e4ce87cfa408c9240c9d4ca9fe8 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCharm/StrippingCharmForVub.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCharm/StrippingCharmForVub.py
@@ -31,9 +31,8 @@ __all__ = ('CharmForVubConf',
            'makeDstarD02HMuNu')
 
 from Gaudi.Configuration import *
-from Configurables import SubstitutePID
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
+from PhysSelPython.Wrappers import MergedSelection, Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from StandardParticles import StdLooseMuons, StdLooseKaons, StdAllLoosePions, StdLoosePions
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCharm/StrippingD02KSKS.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCharm/StrippingD02KSKS.py
index 048a0f735673d789716920a6b813f3734a817158..2e831b063d5dd66449d672d2c0c14659bb9d9210 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCharm/StrippingD02KSKS.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCharm/StrippingD02KSKS.py
@@ -25,9 +25,8 @@ __date__ = '15/05/2014'
 __version__ = 'Stripping23'
 __all__ = 'D02KSKSConf'
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
+from PhysSelPython.Wrappers import DataOnDemand, Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 
@@ -556,7 +555,7 @@ class D02KSKSConf(LineBuilder):
         _daughterCuts = "(TRGHOSTPROB <=%s )" % config['slowPi_LLL_TRGHOSTPROB']
 
         # 40
-        _vertexChi2_cut = "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_LL']
+        "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_LL']
 
         # 200
         _combCuts = "(ADAMASS('D*(2010)+') < %s*MeV)" % config['Dst_mass_LL']
@@ -593,7 +592,7 @@ class D02KSKSConf(LineBuilder):
         _daughterCuts = "(TRGHOSTPROB <=%s )" % config['slowPi_LLU_TRGHOSTPROB']
 
         # 40
-        _vertexChi2_cut = "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_LL']
+        "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_LL']
 
         # 200
         _combCuts = "(ADAMASS('D*(2010)+') < %s*MeV)" % config['Dst_mass_LL']
@@ -630,7 +629,7 @@ class D02KSKSConf(LineBuilder):
         _daughterCuts = "(TRGHOSTPROB <=%s )" % config['slowPi_LDL_TRGHOSTPROB']
 
         # 40
-        _vertexChi2_cut = "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_LD']
+        "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_LD']
 
         # 200
         _combCuts = "(ADAMASS('D*(2010)+') < %s*MeV)" % config['Dst_mass_LD']
@@ -667,7 +666,7 @@ class D02KSKSConf(LineBuilder):
         _daughterCuts = "(TRGHOSTPROB <=%s )" % config['slowPi_LDU_TRGHOSTPROB']
 
         # 40
-        _vertexChi2_cut = "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_LD']
+        "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_LD']
 
         # 200
         _combCuts = "(ADAMASS('D*(2010)+') < %s*MeV)" % config['Dst_mass_LD']
@@ -704,7 +703,7 @@ class D02KSKSConf(LineBuilder):
         _daughterCuts = "(TRGHOSTPROB <=%s )" % config['slowPi_DDL_TRGHOSTPROB']
 
         # 40
-        _vertexChi2_cut = "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_DD']
+        "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_DD']
 
         # 200
         _combCuts = "(ADAMASS('D*(2010)+') < %s*MeV)" % config['Dst_mass_DD']
@@ -741,7 +740,7 @@ class D02KSKSConf(LineBuilder):
         _daughterCuts = "(TRGHOSTPROB <=%s )" % config['slowPi_DDU_TRGHOSTPROB']
 
         # 40
-        _vertexChi2_cut = "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_DD']
+        "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_DD']
 
         # 200
         _combCuts = "(ADAMASS('D*(2010)+') < %s*MeV)" % config['Dst_mass_DD']
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCharm/StrippingD2HHHKs.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCharm/StrippingD2HHHKs.py
index e5639b90812290f4e2226c3b0c140285aa788b00..8b56f2ae08f0d364c45bed96aa90657daee77a7d 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCharm/StrippingD2HHHKs.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCharm/StrippingD2HHHKs.py
@@ -22,19 +22,18 @@ __version__ = '$Revision: 0.1 $'
 __all__ = ('D2HHHKsLines',
            'default_config')
 
-from Gaudi.Configuration import *
 
-from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N4BodyDecays
+from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays
 from StandardParticles import StdNoPIDsPions, StdNoPIDsKaons
 from StandardParticles import StdLooseKsDD, StdLooseKsLL
 
 from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
-from StrippingUtils.Utils import LineBuilder, checkConfig
+from StrippingUtils.Utils import LineBuilder
 
 from Configurables import FilterDesktop
 
-from GaudiKernel.SystemOfUnits import GeV, MeV, picosecond, mm
+from GaudiKernel.SystemOfUnits import MeV, mm, picosecond
 
 
 default_config = {
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCharm/StrippingD2HHHPi0.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCharm/StrippingD2HHHPi0.py
index 6083359069ac88d66ad4d2d0c3f6c4a785962da6..8557b0ed7b6ea3312ecd34ede82d7cbd720f6775 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCharm/StrippingD2HHHPi0.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCharm/StrippingD2HHHPi0.py
@@ -22,19 +22,18 @@ __version__ = '$Revision: 0.1 $'
 __all__ = ('D2HHHPi0Lines',
            'default_config')
 
-from Gaudi.Configuration import *
 
-from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N4BodyDecays
+from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays
 from StandardParticles import StdNoPIDsPions, StdNoPIDsKaons
 from StandardParticles import StdLooseResolvedPi0, StdLooseMergedPi0
 
 from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
-from StrippingUtils.Utils import LineBuilder, checkConfig
+from StrippingUtils.Utils import LineBuilder
 
 from Configurables import FilterDesktop
 
-from GaudiKernel.SystemOfUnits import GeV, MeV, picosecond, mm
+from GaudiKernel.SystemOfUnits import GeV, MeV, picosecond
 
 
 default_config = {
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCharm/StrippingD2HMuNu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCharm/StrippingD2HMuNu.py
index 2ceba3956453266f579b29b43ab66b82c4dc906a..0b1aa8422f7bb32ab3d194b98dead0e474772019 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCharm/StrippingD2HMuNu.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCharm/StrippingD2HMuNu.py
@@ -9,9 +9,7 @@
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
 
-import logging
 from StrippingUtils.Utils import LineBuilder
-from Gaudi.Configuration import *
 __author__ = ['Liang Sun', 'Adam Davis']
 __date__ = '09/11/2015'
 __version__ = '$Revision: 0.01 $'
@@ -98,7 +96,6 @@ class D2HLepNuBuilder(LineBuilder):
     def __init__(self, name, config):
         LineBuilder.__init__(self, name, config)
         self._config = config
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
 
         self.GECs = {"Code": "( recSummaryTrack(LHCb.RecSummary.nLongTracks, TrLONG) < %(GEC_nLongTrk)s )" % config,
                      "Preambulo": ["from LoKiTracks.decorators import *"]}
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCharm/StrippingD2KS0H_conf.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCharm/StrippingD2KS0H_conf.py
index d58964475590bc2e6571bcd929685425e3694bc1..e5b9f6c8683eaaab3109aca8686f163c2f08aef0 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCharm/StrippingD2KS0H_conf.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCharm/StrippingD2KS0H_conf.py
@@ -44,9 +44,9 @@ from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticle
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StandardParticles import StdLoosePions, StdLooseKaons
 from StrippingConf.StrippingLine import StrippingLine
-from StrippingUtils.Utils import LineBuilder, checkConfig
+from StrippingUtils.Utils import LineBuilder
 from Configurables import TisTosParticleTagger
-from GaudiKernel.SystemOfUnits import GeV, MeV, picosecond, mm
+from GaudiKernel.SystemOfUnits import MeV, mm, picosecond
 
 default_name = 'D2KS0H'
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCharm/StrippingD2PiPi0.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCharm/StrippingD2PiPi0.py
index 2cf2e1f2dfcc01187fa87b6b497e55c580034ef2..3593748cd50e6ab84496cfb7045a1b29f0016504 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCharm/StrippingD2PiPi0.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCharm/StrippingD2PiPi0.py
@@ -33,7 +33,7 @@ __all__ = (
 
 )
 
-from GaudiKernel.SystemOfUnits import MeV, GeV, mrad, picosecond
+from GaudiKernel.SystemOfUnits import MeV, picosecond
 
 from StandardParticles import (
     StdAllNoPIDsKaons,
@@ -51,7 +51,7 @@ from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 
 # from Configurables import CombineParticles, FilterDesktop
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, ConjugateNeutralPID, DaVinci__N3BodyDecays
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N3BodyDecays
 
 default_config = {
     'D2Pi0H': {
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCharm/StrippingD2XMuMuSS.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCharm/StrippingD2XMuMuSS.py
index 6cb43802872df951b5676b3b0a91f42091655f73..f2ecc06f375c01960838df612bae449a097161ea 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCharm/StrippingD2XMuMuSS.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCharm/StrippingD2XMuMuSS.py
@@ -9,14 +9,13 @@
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
 
-from StandardParticles import StdAllLooseElectrons, StdAllNoPIDsElectrons
+from StandardParticles import StdAllLooseElectrons
 from StandardParticles import StdAllLooseKaons, StdAllLoosePions, StdAllLooseMuons, StdAllNoPIDsPions, StdAllNoPIDsKaons
-from StandardParticles import StdLooseKaons, StdLoosePions, StdLooseMuons, StdNoPIDsPions, StdNoPIDsKaons, StdLooseProtons, StdAllNoPIDsProtons
+from StandardParticles import StdAllNoPIDsProtons, StdLooseKaons, StdLooseMuons, StdLoosePions, StdLooseProtons
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, OfflineVertexFitter
-from Gaudi.Configuration import *
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop
 import copy
 __author__ = ['Malcolm John', 'B. Viaud', 'O. Kochebina']
 __date__ = '25/6/2012'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCharm/StrippingD2hh.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCharm/StrippingD2hh.py
index 51c213ed2d3c259435dcd6aef0631877156b6bb0..a370c49abb16101fe062f7fa9fd7c27efecb37e3 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCharm/StrippingD2hh.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCharm/StrippingD2hh.py
@@ -24,7 +24,6 @@ __all__ = ('D2hhBuilder',
 '''
 This file contains stripping lines for time-dependent two-body charm analyses of mixing, yCP, and A_Gamma
 '''
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
@@ -129,7 +128,7 @@ class D2hhBuilder(LineBuilder):
         stdNoPIDsPions = StdAllNoPIDsPions
 
         d2kpi_name = name+'PromptD2KPi'
-        d0RS_name = name+'PromptD0RS'
+        name+'PromptD0RS'
         d0WS_name = name+'PromptD0WS'
         d2kk_name = name+'PromptD2KK'
         d2pipi_name = name+'PromptD2PiPi'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCharm/StrippingD2hhh_FTcalib.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCharm/StrippingD2hhh_FTcalib.py
index 1ec2a52397a24a0cbc076e1b808944bfc5bf21da..eb622bead0fbe08c7b00587f38e94c60ed0a8ade 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCharm/StrippingD2hhh_FTcalib.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCharm/StrippingD2hhh_FTcalib.py
@@ -29,13 +29,10 @@ __version__ = '$Revision: 0.0 $'
 __all__ = ('D2hhhFTCalibConf',
            'makeStdD2hhhFT')
 
-from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
+from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from StandardParticles import (StdNoPIDsPions,
-                               StdTightKaons)
 
 name = "D2hhhFTCalib"
 # Cuts to be implemented vy the Stripping team in Stripping Settings
@@ -254,7 +251,6 @@ def globalEventCutFilter(name,
     if MaxTrSIZE == None:
         return None
 
-    from Configurables import LoKi__VoidFilter as VoidFilter
     from Configurables import LoKi__Hybrid__CoreFactory as CoreFactory
     modules = CoreFactory('CoreFactory').Modules
     for i in ['LoKiTracks.decorators']:
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCharm/StrippingD2hhh_conf.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCharm/StrippingD2hhh_conf.py
index 436d8a20ebfa69a07273b9fc952667e306a823fd..49374bf7789c8403fcf3e4660b179452634cef16 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCharm/StrippingD2hhh_conf.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCharm/StrippingD2hhh_conf.py
@@ -38,8 +38,7 @@ from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticle
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from StandardParticles import (StdNoPIDsPions,
-                               StdTightKaons)
+from StandardParticles import StdNoPIDsPions
 
 name = "D2hhh"
 # Cuts to be implemented vy the Stripping team in Stripping Settings
@@ -717,7 +716,6 @@ def globalEventCutFilter(name,
     if MaxTrSIZE == None:
         return None
 
-    from Configurables import LoKi__VoidFilter as VoidFilter
     from Configurables import LoKi__Hybrid__CoreFactory as CoreFactory
     modules = CoreFactory('CoreFactory').Modules
     for i in ['LoKiTracks.decorators']:
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCharm/StrippingDstarD02xx.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCharm/StrippingDstarD02xx.py
index ce2ac8d8facde4ad7816e78bcb9fd402160bb81a..e052e20eec4a83a6f489851d64e937c3ee00b05f 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCharm/StrippingDstarD02xx.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCharm/StrippingDstarD02xx.py
@@ -22,8 +22,7 @@ __all__ = ('StrippingDstarD02xxConf', 'combinetwobody', 'combineDstar', 'default
             where xx = {mu mu, pi pi, pi mu, k mu, ... }
             
 '''
-from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCharm/StrippingDstarD0ToHHPi0.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCharm/StrippingDstarD0ToHHPi0.py
index fd5188441bc83f651edf601e0fc081e5761b90a2..9f366f1a65e17dac9704f2cda14ac7c90073bb1d 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCharm/StrippingDstarD0ToHHPi0.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCharm/StrippingDstarD0ToHHPi0.py
@@ -17,13 +17,11 @@ Module for D* tagged D0 -> hhpi0.
 Supersedes StrippingDstarD2hhpi0
 """
 
-from Gaudi.Configuration import *
 from Configurables import FilterDesktop, CombineParticles, OfflineVertexFitter
 from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from StandardParticles import StdAllLoosePions, StdLoosePions, StdLooseKaons, StdLooseResolvedPi0, StdLooseMergedPi0
-from Configurables import TisTosParticleTagger
 
 __all__ = ('DstarD0ToHHPi0AllLinesBuilder',
            'DstarMaker',
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCharm/StrippingDstarD2HHHH.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCharm/StrippingDstarD2HHHH.py
index 79b905d65e08f76846da8aeebd29e1bd52022454..15c8bc47e0445328a0083162a53a4335865cca1b 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCharm/StrippingDstarD2HHHH.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCharm/StrippingDstarD2HHHH.py
@@ -22,16 +22,15 @@ __version__ = '$Revision: 1.0 $'
 __all__ = ('DstarD2HHHHLines',
            'default_config')
 
-from Gaudi.Configuration import *
 
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N4BodyDecays
 from StandardParticles import StdAllNoPIDsPions, StdNoPIDsPions, StdNoPIDsKaons
 
 from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
-from StrippingUtils.Utils import LineBuilder, checkConfig
+from StrippingUtils.Utils import LineBuilder
 
-from GaudiKernel.SystemOfUnits import GeV, MeV, picosecond, mm
+from GaudiKernel.SystemOfUnits import MeV, picosecond
 
 
 default_config = {
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCharm/StrippingDstarD2KSHHPi0.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCharm/StrippingDstarD2KSHHPi0.py
index 1a1c91b788986c0a547216e92ee30ee234979f5e..2cf7967d07c7867df16b8b2cfa45c3c0ddd24ac4 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCharm/StrippingDstarD2KSHHPi0.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCharm/StrippingDstarD2KSHHPi0.py
@@ -22,18 +22,17 @@ __version__ = '$Revision: 1.0 $'
 __all__ = ('DstarD2KSHHPi0Lines',
            'default_config')
 
-from Gaudi.Configuration import *
 
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N4BodyDecays
 from StandardParticles import StdAllNoPIDsPions, StdNoPIDsPions, StdNoPIDsKaons, StdLooseResolvedPi0, StdLooseMergedPi0, StdLooseKsDD, StdLooseKsLL
 
 from PhysSelPython.Wrappers import Selection, MergedSelection
 from StrippingConf.StrippingLine import StrippingLine
-from StrippingUtils.Utils import LineBuilder, checkConfig
+from StrippingUtils.Utils import LineBuilder
 
 from Configurables import FilterDesktop
 
-from GaudiKernel.SystemOfUnits import GeV, MeV, picosecond, mm
+from GaudiKernel.SystemOfUnits import MeV, mm, picosecond
 
 
 default_config = {
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCharm/StrippingDstarD2KShh.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCharm/StrippingDstarD2KShh.py
index 0446a490bf8b78aaa6a090c0170ee5d84241b931..8bb88c690db0782705ee07f1579b03266ff72d96 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCharm/StrippingDstarD2KShh.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCharm/StrippingDstarD2KShh.py
@@ -34,7 +34,6 @@ __all__ = ('DstarD2KShhBuilder',
            'makeD2KShh',
            'makeDstar')
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCharm/StrippingDstarD2XGamma.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCharm/StrippingDstarD2XGamma.py
index 1575053319e4358cb7754f031f3cae2d700fd95f..3c27a0af512acea7459896bcb8390d7c4bed0501 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCharm/StrippingDstarD2XGamma.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCharm/StrippingDstarD2XGamma.py
@@ -24,7 +24,6 @@ __version__ = '$Revision: 0.1 $'
 __all__ = ('DstarD2XGammaLines',
            'default_config')
 
-from Gaudi.Configuration import *
 
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 from StandardParticles import StdAllNoPIDsPions, StdNoPIDsPions, StdNoPIDsKaons
@@ -32,11 +31,11 @@ from StandardParticles import StdLooseAllPhotons, StdAllLooseGammaLL, StdAllLoos
 
 from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
-from StrippingUtils.Utils import LineBuilder, checkConfig
+from StrippingUtils.Utils import LineBuilder
 
 from Configurables import FilterDesktop
 
-from GaudiKernel.SystemOfUnits import GeV, MeV, picosecond, mm
+from GaudiKernel.SystemOfUnits import GeV, MeV, picosecond
 
 default_config = {
     'NAME': 'DstarD2XGamma',
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCharm/StrippingDstarPromptWithD02HHHH.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCharm/StrippingDstarPromptWithD02HHHH.py
index 13343e4031d3c9fe7ad9b92cfb6f3c3fff754d98..22e9ffd46fd5a0b8ab4623cae0293fe3c10c129d 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCharm/StrippingDstarPromptWithD02HHHH.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCharm/StrippingDstarPromptWithD02HHHH.py
@@ -36,11 +36,10 @@ __version__ = '$Revision: 1.2 $'
 __all__ = ('DstarPromptWithD02HHHHConf', 'makeD02hhhh',
            'makePromptDstar', 'default_config')
 
-from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, ConjugateNeutralPID
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles, ConjugateNeutralPID
 from PhysSelPython.Wrappers import Selection, MergedSelection
 from StrippingConf.StrippingLine import StrippingLine
-from StrippingUtils.Utils import checkConfig, LineBuilder
+from StrippingUtils.Utils import LineBuilder
 from GaudiKernel.SystemOfUnits import MeV, GeV, mm
 from copy import copy
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCharm/StrippingDstarPromptWithD02HHMuMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCharm/StrippingDstarPromptWithD02HHMuMu.py
index e83ad60bb1ff3c30f6cfd21e7ea0e2fb6ead7646..a1c41727aab9df91366ea29963944e783d29f676 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCharm/StrippingDstarPromptWithD02HHMuMu.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCharm/StrippingDstarPromptWithD02HHMuMu.py
@@ -29,11 +29,10 @@ __version__ = '$Revision: 2.0 $'
 __all__ = ('DstarPromptWithD02HHLLConf', 'makeD02hhll',
            'makePromptDstar', 'default_config')
 
-from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, ConjugateNeutralPID
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles, ConjugateNeutralPID
 from PhysSelPython.Wrappers import Selection, MergedSelection
 from StrippingConf.StrippingLine import StrippingLine
-from StrippingUtils.Utils import checkConfig, LineBuilder
+from StrippingUtils.Utils import LineBuilder
 from GaudiKernel.SystemOfUnits import MeV, GeV, mm
 from copy import copy
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCharm/StrippingExcitedDsSpectroscopy.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCharm/StrippingExcitedDsSpectroscopy.py
index 6b08898929e9ee290d51640d43d073b4a548a98b..dadd6c5c25c094fb4e5dfdef695cd98af0384ee1 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCharm/StrippingExcitedDsSpectroscopy.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCharm/StrippingExcitedDsSpectroscopy.py
@@ -321,7 +321,6 @@ def globalEventCutFilter(name,
     if MaxTrSIZE == None:
         return None
 
-    from Configurables import LoKi__VoidFilter as VoidFilter
     from Configurables import LoKi__Hybrid__CoreFactory as CoreFactory
     modules = CoreFactory('CoreFactory').Modules
     for i in ['LoKiTracks.decorators']:
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCharm/StrippingHc2V02H.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCharm/StrippingHc2V02H.py
index 5f63de83baa118d330a0b95e541553d6a8e4581f..ca96215521b00ad6379d0a82538d3ada0714a5a3 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCharm/StrippingHc2V02H.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCharm/StrippingHc2V02H.py
@@ -27,11 +27,9 @@ __all__ = (
 )
 
 from GaudiKernel.SystemOfUnits import MeV, GeV, mm, mrad
-from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop, DaVinci__N3BodyDecays
+from GaudiConfUtils.ConfigurableGenerators import DaVinci__N3BodyDecays, FilterDesktop
 from StandardParticles import StdNoPIDsPions as InputPions
 from StandardParticles import StdNoPIDsKaons as InputKaons
-from StandardParticles import StdLooseLambdaLL as InputLambdasLL
-from StandardParticles import StdLooseLambdaDD as InputLambdasDD
 
 from PhysSelPython.Wrappers import Selection, MergedSelection, DataOnDemand
 from StrippingUtils.Utils import LineBuilder
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCharm/StrippingHc2V03H.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCharm/StrippingHc2V03H.py
index 77f8f1aecfa7a04b18d5642386d1c094392b96cd..84c4dbd802a10fae27a11a4440538bce29b36ffc 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCharm/StrippingHc2V03H.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCharm/StrippingHc2V03H.py
@@ -27,11 +27,9 @@ __all__ = (
 )
 
 from GaudiKernel.SystemOfUnits import MeV, GeV, mm, mrad
-from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop, DaVinci__N4BodyDecays
+from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays, FilterDesktop
 from StandardParticles import StdNoPIDsPions as InputPions
 from StandardParticles import StdNoPIDsKaons as InputKaons
-from StandardParticles import StdLooseLambdaLL as InputLambdasLL
-from StandardParticles import StdLooseLambdaDD as InputLambdasDD
 
 from PhysSelPython.Wrappers import Selection, MergedSelection, DataOnDemand
 from StrippingUtils.Utils import LineBuilder
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCharm/StrippingHc2V2H.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCharm/StrippingHc2V2H.py
index 1cc1e18bb59332589773894f931054575d3bd57d..62f83f01a95c995d84514559ea3eb725d34e7335 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCharm/StrippingHc2V2H.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCharm/StrippingHc2V2H.py
@@ -29,8 +29,6 @@ from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDeskto
 from StandardParticles import StdNoPIDsDownPions as InputDownPions
 from StandardParticles import StdNoPIDsPions as InputPions
 from StandardParticles import StdNoPIDsKaons as InputKaons
-from StandardParticles import StdLooseLambdaLL as InputLambdasLL
-from StandardParticles import StdLooseLambdaDD as InputLambdasDD
 
 from PhysSelPython.Wrappers import Selection, MergedSelection, DataOnDemand
 from StrippingUtils.Utils import LineBuilder
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCharm/StrippingHc2V3H.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCharm/StrippingHc2V3H.py
index 8860909e6ec1c8f2862b43d64f75e5158a1c67e3..05d0ef19028d88f3cf40161b0e7b207226c117e3 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCharm/StrippingHc2V3H.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCharm/StrippingHc2V3H.py
@@ -31,8 +31,6 @@ from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDeskto
 from StandardParticles import StdNoPIDsDownPions as InputDownPions
 from StandardParticles import StdNoPIDsPions as InputPions
 from StandardParticles import StdNoPIDsKaons as InputKaons
-from StandardParticles import StdLooseLambdaLL as InputLambdasLL
-from StandardParticles import StdLooseLambdaDD as InputLambdasDD
 
 from PhysSelPython.Wrappers import Selection, MergedSelection, DataOnDemand
 from StrippingUtils.Utils import LineBuilder
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCharm/StrippingKKPiPi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCharm/StrippingKKPiPi.py
index cedaab2089da1034f1207a1c958ba82c6e694ba7..767a1fdbf50445fb204987a0cc70c2f97dfb5421 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCharm/StrippingKKPiPi.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCharm/StrippingKKPiPi.py
@@ -12,12 +12,11 @@
 Module for selecting [cs][ubar dbar] -> K+ K+ pi- pi-
 '''
 
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
+from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
 from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
-from Gaudi.Configuration import *
 __author__ = ['Mengzhen Wang']
 __date__ = '10/10/2017'
 __version__ = '$Revision: 1.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCharm/StrippingLambdac2V03H.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCharm/StrippingLambdac2V03H.py
index 8c19d9d3aeebd29855bd2d76b366fe9611b08aaf..9689bee39c9e7d84a61e56605ba3bb5f443ec5d1 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCharm/StrippingLambdac2V03H.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCharm/StrippingLambdac2V03H.py
@@ -27,7 +27,7 @@ __all__ = (
 )
 
 from GaudiKernel.SystemOfUnits import MeV, GeV, mm, mrad
-from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop, DaVinci__N4BodyDecays
+from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays, FilterDesktop
 from StandardParticles import StdNoPIDsPions as InputPions
 from StandardParticles import StdNoPIDsKaons as InputKaons
 from StandardParticles import StdLooseLambdaLL as InputLambdasLL
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCharm/StrippingLc2L0LLpi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCharm/StrippingLc2L0LLpi.py
index 0165e116e9da33c044fd297b7fa4c1090c6cbf39..0a027afeb1d2d303ea6a37758bc2b3bf4bb5f79d 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCharm/StrippingLc2L0LLpi.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCharm/StrippingLc2L0LLpi.py
@@ -12,17 +12,10 @@
 Module for selecting Lambda_c+->Lambda pi+
 '''
 
-from StandardParticles import (StdAllLoosePions, StdLooseProtons,
-                               StdLoosePions, StdNoPIDsUpPions)
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from StandardParticles import StdLooseAllPhotons, StdVeryLooseAllPhotons
-from Configurables import LoKi__VoidFilter
-from PhysSelPython.Wrappers import MergedSelection
-from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
-from Gaudi.Configuration import *
 __author__ = ['Guiyun Ding', 'Jiesheng Yu', 'Yuehong Xie']
 __date__ = '28/11/2016'
 __version__ = '$Revision: 2.0$'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCharm/StrippingNeutralCBaryons.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCharm/StrippingNeutralCBaryons.py
index bf6d1603296752d86c0e7c13ec03b037aa4b7dd0..165e0fbf71ca71084e7f0b7ac538d4257975d87f 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCharm/StrippingNeutralCBaryons.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCharm/StrippingNeutralCBaryons.py
@@ -23,13 +23,9 @@ __version__ = '$Revision: 1.0 $'
 __all__ = ('StrippingNeutralCBaryonsConf', 'default_config')
 
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from StandardParticles import StdLoosePions, StdNoPIDsDownPions, StdLooseKaons, StdLooseDownKaons
-from StandardParticles import StdAllLoosePions, StdAllLooseKaons
 
 from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
-from PhysSelPython.Wrappers import MultiSelectionSequence
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from GaudiKernel.SystemOfUnits import MeV, mm, picosecond
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCharm/StrippingXic2HHH.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCharm/StrippingXic2HHH.py
index e34807cd11d54a2a33e0a1189dffe5a4b8d17475..32300611aa84de3bdf0390670c07b3849c390e20 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCharm/StrippingXic2HHH.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCharm/StrippingXic2HHH.py
@@ -8,18 +8,15 @@
 # granted to it by virtue of its status as an Intergovernmental Organization  #
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
-from StandardParticles import StdNoPIDsPions, StdNoPIDsKaons, StdNoPIDsProtons, StdAllNoPIDsProtons
-from Configurables import TisTosParticleTagger
+from StandardParticles import StdNoPIDsKaons, StdNoPIDsPions, StdNoPIDsProtons
 from StrippingUtils.Utils import LineBuilder
-from PhysSelPython.Wrappers import MultiSelectionSequence
-from PhysSelPython.Wrappers import Selection, DataOnDemand, AutomaticData, MergedSelection
+from PhysSelPython.Wrappers import DataOnDemand, MergedSelection, Selection
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
 from Configurables import FilterDesktop, CombineParticles
 from LHCbKernel.Configuration import *
-from GaudiKernel.SystemOfUnits import MeV, mm, ns
+from GaudiKernel.SystemOfUnits import MeV, mm
 from StrippingConf.StrippingLine import StrippingLine
 from Gaudi.Configuration import *
-import re
 all
 ''' Xic+ and Theta+ lines Designed by Yury Shcheglov, Alexey Dzyuba, Nelya Sagidova to study Xic+ and Theta+ particles '''
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCharm/StrippingXicc.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCharm/StrippingXicc.py
index 2468c2d79739511bfdefe170463aa125124d506e..45478d9be226dbd5e3fdd09b0ff769294d99d064 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCharm/StrippingXicc.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingCharm/StrippingXicc.py
@@ -52,9 +52,6 @@ from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticle
 from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from StandardParticles import StdAllLoosePions, StdAllLooseKaons, StdAllLooseProtons
-from StandardParticles import StdLoosePions
-from CommonParticles.StdLooseLambda import StdLooseLambdaLL, StdLooseLambdaDD
 from GaudiKernel.SystemOfUnits import MeV, GeV, mm
 from Configurables import TisTosParticleTagger
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingIFT/StrippingHeavyIonD02KPiPi0.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingIFT/StrippingHeavyIonD02KPiPi0.py
index 3e380b9342ba9bebae1a3195dcadf08a1b598fc9..8ffdf55b27ce401ff26b2fe355cc99597f755347 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingIFT/StrippingHeavyIonD02KPiPi0.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingIFT/StrippingHeavyIonD02KPiPi0.py
@@ -25,9 +25,8 @@ __all__ = ('StrippingHeavyIonD02KPiPi0Conf',
            'makeD02KPiPi0M',
            'default_config')
 
-from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from PhysSelPython.Wrappers import Selection, DataOnDemand
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
+from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from StandardParticles import StdTightPions, StdTightKaons, StdLooseMergedPi0, StdLooseResolvedPi0
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingIFT/StrippingHeavyIonDiMuon.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingIFT/StrippingHeavyIonDiMuon.py
index 0c2b044b5fe850934f513781b14f5faf5b8fc181..e97c2ed82a33c94fba2489f2b078001b5dc839e6 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingIFT/StrippingHeavyIonDiMuon.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingIFT/StrippingHeavyIonDiMuon.py
@@ -17,8 +17,7 @@ from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 from StandardParticles import StdAllLooseMuons
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand
-from Gaudi.Configuration import *
+from PhysSelPython.Wrappers import Selection
 __author__ = ['Emilie MAURICE']
 __date__ = ''
 __version__ = '$Revision: 2.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingIFT/StrippingHeavyIonDst2D0KPiForPID.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingIFT/StrippingHeavyIonDst2D0KPiForPID.py
index 4282eb3c7b386840ce3bb3a47569a6a981e3194c..c3ba0aa8f46df637625d1f88481903dd9414f15e 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingIFT/StrippingHeavyIonDst2D0KPiForPID.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingIFT/StrippingHeavyIonDst2D0KPiForPID.py
@@ -13,10 +13,8 @@
 from StandardParticles import StdAllNoPIDsKaons, StdAllNoPIDsPions
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from LHCbKernel.Configuration import *
-from Gaudi.Configuration import *
+from PhysSelPython.Wrappers import Selection
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 __author__ = ['Philip Xing', 'Andrew Powell']
 __date__ = '23rd August 2012'
 __version__ = '$Revision: 7.0 $'
@@ -36,7 +34,7 @@ Usage:
 __all__ = ('HeavyIonDst2D0KPiForPIDConf', 'default_config', "D0", "Dstar")
 
 
-from GaudiKernel.SystemOfUnits import mm, cm, MeV, GeV
+from GaudiKernel.SystemOfUnits import GeV, MeV
 # from Configurables import FilterDesktop, CombineParticles
 
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingIFT/StrippingHeavyIonOthercc.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingIFT/StrippingHeavyIonOthercc.py
index 8b2646261f0a63495352f4a665d035a33536a2e3..0c56eb32606ca137ee0e97099fd1810e155b01f7 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingIFT/StrippingHeavyIonOthercc.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingIFT/StrippingHeavyIonOthercc.py
@@ -17,8 +17,7 @@ from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 from StandardParticles import StdNoPIDsElectrons, StdLooseProtons, StdLooseMuons
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand
-from Gaudi.Configuration import *
+from PhysSelPython.Wrappers import Selection
 __author__ = ['Emilie MAURICE']
 __date__ = ''
 __version__ = '$Revision: 1.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingIFT/StrippingHeavyIonPIDCalib.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingIFT/StrippingHeavyIonPIDCalib.py
index 4d96b70412efeeaa567401f7247511c02704fc0f..635480e78d2cba544bf3537d6a6d0e92293ac75f 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingIFT/StrippingHeavyIonPIDCalib.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingIFT/StrippingHeavyIonPIDCalib.py
@@ -37,7 +37,6 @@ from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
 from Gaudi.Configuration import *
 __author__ = ['Yanxi ZHANG']
 __date__ = '25/02/2015'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingIFT/StrippingHeavyIonTopology.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingIFT/StrippingHeavyIonTopology.py
index 9e96e4e01e3c8dee0e26a254dbb38b56ff1b8a39..8ee4ce0bff9e418242f9c9f8c12add43fc236773 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingIFT/StrippingHeavyIonTopology.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingIFT/StrippingHeavyIonTopology.py
@@ -12,13 +12,9 @@
 Module for selecting specific topology
 '''
 
-from Configurables import FilterDesktop, CombineParticles
-from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-from StandardParticles import StdAllLooseMuons, StdAllLoosePions, StdAllNoPIDsPions, StdLoosePhotons
+from Configurables import FilterDesktop
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand
-from Gaudi.Configuration import *
 __author__ = ['Emilie MAURICE']
 __date__ = ''
 __version__ = '$Revision: 1.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingIFT/StrippingHeavyIonTrackEffDownMuon.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingIFT/StrippingHeavyIonTrackEffDownMuon.py
index ce5d14b9240dd356b0f3139a35fb649aca062aed..10036bf8ebd21b9cf3a337366fb0f9e3e186504d 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingIFT/StrippingHeavyIonTrackEffDownMuon.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingIFT/StrippingHeavyIonTrackEffDownMuon.py
@@ -43,34 +43,26 @@ __all__ = ('StrippingHeavyIonTrackEffDownMuonConf',
 # FIXME Write includes in a cleaner way
 from Gaudi.Configuration import *
 from LHCbKernel.Configuration import *
-from DAQSys.DecoderClass import Decoder
 from Configurables import GaudiSequencer
 from Configurables import UnpackTrack, ChargedProtoParticleMaker, DelegatingTrackSelector, TrackSelector, BestPIDParticleMaker
-from TrackFitter.ConfiguredFitters import ConfiguredFit
 from Configurables import TrackStateInitAlg
 from StrippingConf.StrippingLine import StrippingLine
-from Configurables import ChargedProtoParticleAddMuonInfo, MuonIDAlgLite
+from Configurables import ChargedProtoParticleAddMuonInfo
 from MuonID import ConfiguredMuonIDs
 from Configurables import ChargedProtoCombineDLLsAlg, ProtoParticleMUONFilter
-from PhysSelPython.Wrappers import Selection, DataOnDemand
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
+from PhysSelPython.Wrappers import Selection
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 
 from StrippingUtils.Utils import LineBuilder
-from Configurables import LoKi__VoidFilter
-from os import environ
 from Gaudi.Configuration import *
-import GaudiKernel.ProcessJobOptions
-from GaudiKernel.SystemOfUnits import mm
 
 from GaudiConfUtils.ConfigurableGenerators import TisTosParticleTagger
 from StandardParticles import StdAllLooseMuons
 from Configurables import GaudiSequencer
 from Configurables import TrackToDST
-from Configurables import TrackSys
 from Configurables import PatSeeding, PatSeedingTool, PatLongLivedTracking
-from PhysSelPython.Wrappers import AutomaticData
 # Get the fitters
-from TrackFitter.ConfiguredFitters import ConfiguredFit, ConfiguredFitSeed, ConfiguredFitDownstream
+from TrackFitter.ConfiguredFitters import ConfiguredFitDownstream
 from PatAlgorithms import PatAlgConf
 
 from SelPy.utils import (UniquelyNamedObject,
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingIFT/StrippingHeavyIonTrackEffMuonTT.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingIFT/StrippingHeavyIonTrackEffMuonTT.py
index 353e33b90208d82b9d6f48c7e29de85839020ca4..e7b8a349477e610a58f6cdeb5fb59970072dccc3 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingIFT/StrippingHeavyIonTrackEffMuonTT.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingIFT/StrippingHeavyIonTrackEffMuonTT.py
@@ -63,10 +63,10 @@ __all__ = ('StrippingHeavyionTrackEffMuonTTConf',
            'filterHLT2ForBJpsiK')
 
 from Gaudi.Configuration import *
-from PhysSelPython.Wrappers import Selection, DataOnDemand, ChargedProtoParticleSelection
+from PhysSelPython.Wrappers import ChargedProtoParticleSelection, Selection
 from StrippingConf.StrippingLine import StrippingLine
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from StrippingUtils.Utils import LineBuilder, checkConfig
+from StrippingUtils.Utils import LineBuilder
 from StandardParticles import StdLooseKaons, StdLooseMuons, StdAllLooseMuons
 
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingIFT/StrippingHeavyIonTrackEffVeloMuon.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingIFT/StrippingHeavyIonTrackEffVeloMuon.py
index c91e15ecaaebcc3d1474c5d85d300398604504da..9b65c27646a93f1c79d2addef700eb3463f95e85 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingIFT/StrippingHeavyIonTrackEffVeloMuon.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingIFT/StrippingHeavyIonTrackEffVeloMuon.py
@@ -40,17 +40,14 @@ __all__ = ('HeavyIonTrackEffVeloMuonConf',
            )
 
 
-from Gaudi.Configuration import *
-from LHCbKernel.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 # from Configurables import CombineParticles
-from PhysSelPython.Wrappers import Selection, SelectionSequence, DataOnDemand
-from Configurables import ChargedProtoParticleMaker, NoPIDsParticleMaker, DataOnDemandSvc, DelegatingTrackSelector, TrackSelector, CombinedParticleMaker, BestPIDParticleMaker
+from PhysSelPython.Wrappers import Selection
+from Configurables import ChargedProtoParticleMaker, DataOnDemandSvc, DelegatingTrackSelector, NoPIDsParticleMaker, TrackSelector
 from Configurables import FastVeloTracking
 
 from StrippingConf.StrippingLine import StrippingLine
-from Configurables import TrackStateInitAlg, TrackEventFitter, TrackPrepareVelo, TrackContainerCopy, Tf__PatVeloSpaceTool, StandaloneMuonRec
-from Configurables import TrackCloneFinder
+from Configurables import StandaloneMuonRec, TrackPrepareVelo
 from StrippingUtils.Utils import LineBuilder
 # changed from StdLooseMuons, yanxi
 from StandardParticles import StdAllLooseMuons
@@ -59,14 +56,9 @@ from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, TisTosParticleT
 # from Configurables import TisTosParticleTagger
 
 from Configurables import GaudiSequencer
-from Configurables import TrackSys
-from PhysSelPython.Wrappers import AutomaticData
 # Get the fitters
-from TrackFitter.ConfiguredFitters import ConfiguredFit
 
-from Configurables import TrackEventCloneKiller, VeloMuonBuilder
-from Configurables import TrackEventFitter, TrackMasterFitter
-from Configurables import TrackKalmanFilter, TrackMasterExtrapolator
+from Configurables import VeloMuonBuilder
 # from TrackFitter.ConfiguredFitters import ConfiguredFastFitter
 # from Configurables import TrackCloneFinder
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingMiniBias/StrippingBadEvents.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingMiniBias/StrippingBadEvents.py
index 4d837a2f722d72d1c7683e8f61d6316db037f332..460036843530f41526b7139b73c204dba3cf9160 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingMiniBias/StrippingBadEvents.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingMiniBias/StrippingBadEvents.py
@@ -8,7 +8,6 @@
 # granted to it by virtue of its status as an Intergovernmental Organization  #
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
-from PhysSelPython.Wrappers import Selection
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 __author__ = 'Andrea Contu'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingMiniBias/StrippingMiniBias.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingMiniBias/StrippingMiniBias.py
index 7ba890fe41b117c0dcaaac7777296c741c397754..f791c6cd1cfac775c9b2357307a4044a5100eb87 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingMiniBias/StrippingMiniBias.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingMiniBias/StrippingMiniBias.py
@@ -8,7 +8,6 @@
 # granted to it by virtue of its status as an Intergovernmental Organization  #
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
-from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 __author__ = 'Patrick Koppenburg'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingQEE/DisplVertices_Utils.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingQEE/DisplVertices_Utils.py
index f9e3c9136e46dcf7697209e381ff7735b840ed2e..bcd9752464adf9657cb3a290918226a7d0f05341 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingQEE/DisplVertices_Utils.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingQEE/DisplVertices_Utils.py
@@ -14,12 +14,11 @@ Utilities for displaced vertex stripping: wrapper class around PatPV3D
 
 __all__ = ("SelectionFromAlgorithmWithTools", "SelectionPatPV3DWrapper")
 
-from GaudiConfUtils import isConfigurable
 
 from SelPy.utils import (UniquelyNamedObject, ClonableObject, SelectionBase, compatibleSequences,
-                         IncompatibleInputLocations, CloneCallable, makeOutputLocation, setOutputLocation)
+                         IncompatibleInputLocations, makeOutputLocation, setOutputLocation)
 
-from PhysSelPython.Wrappers import checkConfigurable, checkName
+from PhysSelPython.Wrappers import checkName
 
 
 def connectToRequiredSelections(selection, inputSetter):
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingQEE/StrippingA1MuMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingQEE/StrippingA1MuMu.py
old mode 100755
new mode 100644
index 91e62b0b649d88ac57d91a3cf24db5351e7b19de..281aebf4be79ceaf5c90e7533eb04d49847e5185
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingQEE/StrippingA1MuMu.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingQEE/StrippingA1MuMu.py
@@ -23,11 +23,9 @@ A_1 -> mu+ mu-, based on functionality from StrippingDiMuonNew by Jibo He.
 
 """
 
-from Gaudi.Configuration import *
-from LHCbKernel.Configuration import *
 
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
-from PhysSelPython.Wrappers import Selection, DataOnDemand, SimpleSelection
+from PhysSelPython.Wrappers import SimpleSelection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from GaudiKernel.SystemOfUnits import MeV
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingQEE/StrippingA2MuMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingQEE/StrippingA2MuMu.py
index 64c106858ef1dd3206b2083b5ea5e630aec55ae8..cd47529d168278a387e79f1f772ca7cf3b1d8040 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingQEE/StrippingA2MuMu.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingQEE/StrippingA2MuMu.py
@@ -22,7 +22,7 @@ from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from StandardParticles import StdAllLooseMuons, StdAllNoPIDsMuons
+from StandardParticles import StdAllLooseMuons
 from GaudiKernel.SystemOfUnits import GeV
 
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingQEE/StrippingA2MuMuSameSign.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingQEE/StrippingA2MuMuSameSign.py
index 5911c40e36b1e66721231826c818abbc79aed758..a89a6a8b5ff2bf6571b4fe0fcaeb93088567f2a5 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingQEE/StrippingA2MuMuSameSign.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingQEE/StrippingA2MuMuSameSign.py
@@ -22,7 +22,7 @@ from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from StandardParticles import StdAllLooseMuons, StdAllNoPIDsMuons
+from StandardParticles import StdAllLooseMuons
 from GaudiKernel.SystemOfUnits import GeV
 
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingQEE/StrippingConvertedPhoton.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingQEE/StrippingConvertedPhoton.py
index 75d6970b1df2c63c192f20d524128d15f914343b..6a24e6a634b2578b9537332d82053d30b73013fd 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingQEE/StrippingConvertedPhoton.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingQEE/StrippingConvertedPhoton.py
@@ -23,7 +23,7 @@ __all__ = (
 
 from Gaudi.Configuration import *
 from CommonParticles.Utils import *
-from GaudiKernel.SystemOfUnits import MeV, GeV, mm
+from GaudiKernel.SystemOfUnits import MeV, mm
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
 from Configurables import (DiElectronMaker,
                            ProtoParticleCALOFilter,
@@ -31,9 +31,7 @@ from Configurables import (DiElectronMaker,
                            LoKi__VertexFitter,
                            )
 from PhysSelPython.Wrappers import (Selection,
-                                    SimpleSelection,
-                                    MergedSelection,
-                                    AutomaticData)
+                                    MergedSelection)
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingQEE/StrippingDY2MuMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingQEE/StrippingDY2MuMu.py
index 9c7c8a7706d666e3fac7a8f8316de58468cc8b74..6a28183b934ae8110dbdef65c4d96d44dd261b82 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingQEE/StrippingDY2MuMu.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingQEE/StrippingDY2MuMu.py
@@ -26,9 +26,8 @@ __author__ = ['J. Anderson']
 
 __all__ = 'DY2MuMuConf', 'default_config'
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-from PhysSelPython.Wrappers import Selection, SimpleSelection
+from PhysSelPython.Wrappers import SimpleSelection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from StandardParticles import StdAllLooseMuons
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingQEE/StrippingDY2ee.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingQEE/StrippingDY2ee.py
index a80a06710257e4a747b068f38b65eda9b6b0de8c..3a4d7395f7894461a94f0c47d79c1d2bc20d648e 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingQEE/StrippingDY2ee.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingQEE/StrippingDY2ee.py
@@ -20,9 +20,8 @@ __author__ = ['S.Bifani', 'D.Ward']
 
 __all__ = ('DY2eeConf', 'default_config')
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-from PhysSelPython.Wrappers import Selection, DataOnDemand
+from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from StandardParticles import StdAllNoPIDsElectrons
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingQEE/StrippingDisplJets.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingQEE/StrippingDisplJets.py
index 5fef3562a7eba983dc7ba2e37ee9b5a47fc6bebf..28c1bab64dafcce7d73fff3cdfe6a61833456218 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingQEE/StrippingDisplJets.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingQEE/StrippingDisplJets.py
@@ -9,8 +9,6 @@
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
 
-from Gaudi.Configuration import *
-from CommonParticles.Utils import *
 # from Configurables import FilterDesktop
 # from PhysSelPython.Wrappers import Selection, DataOnDemand, FilterSelection
 from StrippingConf.StrippingLine import StrippingLine
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingQEE/StrippingDisplVertices.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingQEE/StrippingDisplVertices.py
index 1ceed257a457950890e0fc33aaf7abc06342b70a..66be8a1f8712b367d96e50ebeb3d82892c0f2c1b 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingQEE/StrippingDisplVertices.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingQEE/StrippingDisplVertices.py
@@ -40,7 +40,6 @@ __all__ = ('DisplVerticesConf', 'default_config')
 
 from Gaudi.Configuration import *
 from GaudiKernel import SystemOfUnits as units
-from LHCbKernel.Configuration import DEBUG, VERBOSE
 
 import logging
 logger = logging.getLogger(__name__)
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingQEE/StrippingDitau.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingQEE/StrippingDitau.py
old mode 100755
new mode 100644
index fa049324f79a44e720a641aa2ed2cdc857f4435e..3e2dd3df509a4ead7bb1a73e4cccd6e5f2e99c0f
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingQEE/StrippingDitau.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingQEE/StrippingDitau.py
@@ -155,8 +155,7 @@ Derived from works of S.Farry & P. Ilten
 
 """
 
-import os
-from GaudiKernel.SystemOfUnits import MeV, GeV, micrometer
+from GaudiKernel.SystemOfUnits import GeV, MeV
 from PhysSelPython.Wrappers import Selection, SimpleSelection, PassThroughSelection, MergedSelection, AutomaticData
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
@@ -894,7 +893,7 @@ def Tuples():
 
     """
     import re
-    from DecayTreeTuple.Configuration import DecayTreeTuple, EventTuple
+    from DecayTreeTuple.Configuration import DecayTreeTuple
 
     seq = GaudiSequencer('TupleSeq')
     seq.ModeOR = True
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingQEE/StrippingExotica.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingQEE/StrippingExotica.py
old mode 100755
new mode 100644
index 6bc342e6673e7b1e6203b8260039fdde1761206c..6bb564d6b7bbd36c36350f55b005a51272e6ab12
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingQEE/StrippingExotica.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingQEE/StrippingExotica.py
@@ -34,7 +34,7 @@ Hlt2ExoticaEtaToDiEGamma
 from GaudiKernel.SystemOfUnits import MeV, GeV, mm, picosecond
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-from PhysSelPython.Wrappers import Selection, SimpleSelection, MergedSelection, AutomaticData
+from PhysSelPython.Wrappers import AutomaticData, SimpleSelection
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingQEE/StrippingFullDiJets.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingQEE/StrippingFullDiJets.py
index 0e20ce2d9fcbfbea2ea7828e4bd1f9db7eed9790..b2931713d0c65ae7ee7dfa387b7b5473c635eba4 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingQEE/StrippingFullDiJets.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingQEE/StrippingFullDiJets.py
@@ -9,14 +9,10 @@
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
 
-from Gaudi.Configuration import *
-from Configurables import FilterDesktop, CombineParticles, LoKi__VertexFitter
+from Configurables import CombineParticles, LoKi__VertexFitter
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from StandardParticles import StdJets
-from CommonParticles.Utils import *
-from Configurables import FilterJet
 from GaudiKernel.SystemOfUnits import GeV
 
 __author__ = "Xabier Cid Vidal", "Cedric Potterat", "William Barter"
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingQEE/StrippingLFVExotica.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingQEE/StrippingLFVExotica.py
old mode 100755
new mode 100644
index 17fe1ffe185c2cba686f2a4cb6699fc4794a2191..d2e08a40d007080f0ef505ce5501a41bd8bc8526
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingQEE/StrippingLFVExotica.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingQEE/StrippingLFVExotica.py
@@ -127,7 +127,7 @@ def create_stdjets(strob, line_location, stdjets_name_ban):
         strob.StdJetsNoJetIDBan = [myconf1]
 
     # configure Data-On-Demand service
-    locations = updateDoD(myconf1)
+    updateDoD(myconf1)
 
 
 relInfoJetsVars = ["JETNOMU1PX", "JETNOMU1PY", "JETNOMU1PZ", "JETNOMU1PT", "JETNOMU1JETWIDTH", "JETNOMU1NNTAG", "JETNOMU1MNF", "JETNOMU2PX", "JETNOMU2PY", "JETNOMU2PZ", "JETNOMU2PT", "JETNOMU2JETWIDTH", "JETNOMU2NNTAG", "JETNOMU2MNF", "JETNOMU3PX", "JETNOMU3PY",
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingQEE/StrippingLLP2MuX.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingQEE/StrippingLLP2MuX.py
index 16654f3c9d1acc1925968a5d39f0087bea5086a7..f93bc4732424f6eaeb1951cb1a244ef0de7e8b5e 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingQEE/StrippingLLP2MuX.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingQEE/StrippingLLP2MuX.py
@@ -16,7 +16,6 @@ from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import AutomaticData, Selection
 from GaudiKernel import SystemOfUnits as units
-from LHCbKernel.Configuration import *
 __author__ = "Pieter David"
 __date__ = "2014-08-28"
 __all__ = ("LLP2MuXConf", "default_config")
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingQEE/StrippingLb2dp.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingQEE/StrippingLb2dp.py
old mode 100755
new mode 100644
index cf2bf7494c36f78187f495fe46a2fcfe068338e0..cbd7593f597ef30b0f56f7070b78fe66905549e5
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingQEE/StrippingLb2dp.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingQEE/StrippingLb2dp.py
@@ -23,15 +23,11 @@ __all__ = ('Lb2dpConf',
            )
 
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop
-from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays
 
-from StandardParticles import StdAllNoPIDsPions, StdAllNoPIDsProtons,  StdAllNoPIDsKaons
 from PhysSelPython.Wrappers import Selection, DataOnDemand, SimpleSelection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from Configurables import LoKi__VoidFilter as VoidFilter
 
 default_config = {
     'NAME': 'Lb2dp',
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingQEE/StrippingMicroDiJets.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingQEE/StrippingMicroDiJets.py
index 60a35abe10febcab0dcf2d24628e23b510f946b5..db8af2aecfab54badd7fd3305d3d0716cbe4802b 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingQEE/StrippingMicroDiJets.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingQEE/StrippingMicroDiJets.py
@@ -10,13 +10,12 @@
 ###############################################################################
 
 from Gaudi.Configuration import *
-from Configurables import FilterDesktop, CombineParticles, LoKi__VertexFitter
+from Configurables import CombineParticles
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from StandardParticles import StdJets
 from CommonParticles.Utils import *
-from Configurables import FilterJet, ClearDaughters
+from Configurables import ClearDaughters
 from GaudiKernel.SystemOfUnits import GeV
 
 __author__ = "Xabier Cid Vidal", "Cedric Potterat", "William Barter"
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingQEE/StrippingMuMuSS.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingQEE/StrippingMuMuSS.py
index 46e50bf48c5974152d914b654bd5b1fd74bb2b6e..130bda526520d302d34046bd7d905f2bb8920adf 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingQEE/StrippingMuMuSS.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingQEE/StrippingMuMuSS.py
@@ -26,7 +26,7 @@ __author__ = (
 )
 
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-from PhysSelPython.Wrappers import Selection, SimpleSelection
+from PhysSelPython.Wrappers import SimpleSelection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from StandardParticles import StdAllLooseMuons
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingQEE/StrippingSbarSCorrelations.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingQEE/StrippingSbarSCorrelations.py
index 63378eabc81bb7a2995cb94f8b8e7faad734f19d..33589834379b334e6b432982e264803ceb8d8308 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingQEE/StrippingSbarSCorrelations.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingQEE/StrippingSbarSCorrelations.py
@@ -21,10 +21,8 @@ Long tracks only
 from GaudiKernel.SystemOfUnits import MeV, GeV
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
-from StandardParticles import StdAllNoPIDsPions, StdTightKaons, StdAllNoPIDsProtons
+from PhysSelPython.Wrappers import DataOnDemand, Selection
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = ['Florin MACIUC']
 __date__ = '24/08/2013'
 __version__ = '$Revision: 1.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingQEE/StrippingStrangeBaryons.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingQEE/StrippingStrangeBaryons.py
index f3dd8ebdec4e50abd2bed892959740435ac5d9b5..2405f0e9c6f1695dd9f652d6aae992473b3135a2 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingQEE/StrippingStrangeBaryons.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingQEE/StrippingStrangeBaryons.py
@@ -18,14 +18,10 @@ Xi -> Lambda pi,   Omega -> Lambda K
 LLL DDL DDD
 '''
 
-from GaudiKernel.SystemOfUnits import MeV
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
-from CommonParticles import StdLooseLambda
-from StandardParticles import StdLoosePions, StdNoPIDsDownPions, StdLooseKaons, StdLooseDownKaons, StdLooseProtons, StdNoPIDsDownProtons
+from PhysSelPython.Wrappers import DataOnDemand, Selection
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = ['Mihai Straticiuc', 'Florin Maciuc', 'Nguyen Thi Dung']
 __date__ = '26/06/2012'
 __version__ = '$Revision: 0.3 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingQEE/StrippingStrangeBaryonsNoPID.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingQEE/StrippingStrangeBaryonsNoPID.py
index 668986b834d39169c5ae15803bf5d5fb33cff67b..208ab8bad23a5e36e2a0a609a82dd6ca2fc9d012 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingQEE/StrippingStrangeBaryonsNoPID.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingQEE/StrippingStrangeBaryonsNoPID.py
@@ -18,12 +18,10 @@ Xi -> Lambda pi,   Omega -> Lambda K
 LLL
 '''
 
-from GaudiKernel.SystemOfUnits import MeV
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
+from PhysSelPython.Wrappers import DataOnDemand, Selection
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = ['Florin Maciuc']
 __date__ = '13/01/2014'
 __version__ = '$Revision: 0.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingQEE/StrippingTaggedJets.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingQEE/StrippingTaggedJets.py
old mode 100755
new mode 100644
index 2205ce56dd85643e92bc55ab369b85378152951c..4927224c3710ed4cad5cd3baa918ec4b163f34f2
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingQEE/StrippingTaggedJets.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingQEE/StrippingTaggedJets.py
@@ -10,11 +10,10 @@
 ###############################################################################
 
 from Gaudi.Configuration import *
-from Configurables import FilterDesktop, CombineParticles, LoKi__VertexFitter
+from Configurables import CombineParticles, LoKi__VertexFitter
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from StandardParticles import StdJets
 from CommonParticles.Utils import *
 from Configurables import FilterJet
 from GaudiKernel.SystemOfUnits import GeV
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingQEE/StrippingW2nH.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingQEE/StrippingW2nH.py
index cc373f666cb49309b9f3e2efe0dae8e52ac260a4..22eacc1d77ba55838726dc481db0fa8f76e6bf1d 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingQEE/StrippingW2nH.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingQEE/StrippingW2nH.py
@@ -26,7 +26,6 @@ from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from StandardParticles import StdAllNoPIDsPions
 from GaudiKernel.SystemOfUnits import GeV
-from GaudiKernel.SystemOfUnits import MeV
 
 
 default_config = {
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingQEE/StrippingWJets.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingQEE/StrippingWJets.py
old mode 100755
new mode 100644
index 69b6940c49ad110ace21f32d3dbb3e2904580aed..a8dd17366932d60f3bf41f7c5c6503ba39ea6532
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingQEE/StrippingWJets.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingQEE/StrippingWJets.py
@@ -22,14 +22,12 @@ They are then cover a phasespace complementarily on each other.
 
 """
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
 from Configurables import CombineParticles, LoKi__VertexFitter
 from PhysSelPython.Wrappers import Selection, SimpleSelection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from StandardParticles import StdAllLooseMuons, StdAllNoPIDsElectrons, StdJets
-from CommonParticles.Utils import *
 from GaudiKernel.SystemOfUnits import GeV, MeV
 
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingQEE/StrippingWRareDecay.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingQEE/StrippingWRareDecay.py
index de1eaf98e07a599774f9667406768492a892a465..f599f543313af3af803cfd1ae503077a399fbebb 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingQEE/StrippingWRareDecay.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingQEE/StrippingWRareDecay.py
@@ -21,8 +21,7 @@ from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from GaudiKernel.SystemOfUnits import MeV, GeV, mm, picosecond
-from Gaudi.Configuration import *
+from GaudiKernel.SystemOfUnits import MeV, picosecond
 __author__ = ['Hang Yin', 'Qundong Han']
 __date__ = '11/29/2016'
 __version__ = '$Revision: 2.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingQEE/StrippingWe.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingQEE/StrippingWe.py
index 0820e8b431f0bb8891ac3f88f980c3fcbe0a181c..3e509fb26655db393ee396f8d85f74a24b0c62d7 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingQEE/StrippingWe.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingQEE/StrippingWe.py
@@ -21,7 +21,6 @@ We control: StdAllNoPIDsElectrons, PRS>50Mev & E_ECal/P>0.1 & E_HCal/P<0.05 & pT
 __all__ = 'WeConf', 'default_config'
 __author__ = 'S. Bifani', 'D. Ward'
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
 from PhysSelPython.Wrappers import SimpleSelection
 from StrippingConf.StrippingLine import StrippingLine
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingQEE/StrippingZ02ee.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingQEE/StrippingZ02ee.py
index e797011998c7d9201276f70cdabaa1b30ae4d70f..f6977308a75475dc2fd7e695d713190194177820 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingQEE/StrippingZ02ee.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingQEE/StrippingZ02ee.py
@@ -23,7 +23,6 @@ __all__ = (
     'default_config',
 )
 
-from Gaudi.Configuration import *
 from GaudiKernel.SystemOfUnits import GeV, MeV
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 from PhysSelPython.Wrappers import SimpleSelection
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingQEE/StrippingZ02nH.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingQEE/StrippingZ02nH.py
index 2f8d8eb612b1c353cf08c5e72ca77ae205eb7a72..35de5f4d789850497ba9aa5b71430ef065284077 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingQEE/StrippingZ02nH.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingQEE/StrippingZ02nH.py
@@ -26,7 +26,6 @@ from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from StandardParticles import StdAllNoPIDsPions
 from GaudiKernel.SystemOfUnits import GeV
-from GaudiKernel.SystemOfUnits import MeV
 
 
 default_config = {
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingQEE/StrippingZ0RareDecay.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingQEE/StrippingZ0RareDecay.py
index 57c2091f2ac6a4efcb43bd28c4251acba348f513..e181b28533d1769723804e5ccc2d55ce3dfbccea 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingQEE/StrippingZ0RareDecay.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingQEE/StrippingZ0RareDecay.py
@@ -22,8 +22,7 @@ __version__ = '$Revision: 2.0 $'
 
 __all__ = 'default_config', 'Z0RareDecayConf'
 
-from Gaudi.Configuration import *
-from GaudiKernel.SystemOfUnits import MeV, GeV, mm
+from GaudiKernel.SystemOfUnits import MeV
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
 from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
 from StrippingConf.StrippingLine import StrippingLine
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingQEE/depreciated/StrippingDijets.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingQEE/depreciated/StrippingDijets.py
index f0793d3411791797729ad540397e458f4646f78b..975321a6b30b00b6f80aee11878eb20ba9d16b84 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingQEE/depreciated/StrippingDijets.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingQEE/depreciated/StrippingDijets.py
@@ -15,8 +15,7 @@
 __all__ = ('DijetsConf',
            'default_config')
 
-from Gaudi.Configuration import *
-from GaudiKernel.SystemOfUnits import MeV, GeV, mm
+from GaudiKernel.SystemOfUnits import GeV, MeV
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingQEE/depreciated/StrippingHighPtTopoJets.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingQEE/depreciated/StrippingHighPtTopoJets.py
index 73ca61d9e7e0914a21b65e40361131e8f38c026d..6078cdec364615de35d547f813533d0a763afeef 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingQEE/depreciated/StrippingHighPtTopoJets.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingQEE/depreciated/StrippingHighPtTopoJets.py
@@ -21,8 +21,6 @@ __all__ = ('default_config', 'HighPtTopoJetsConf')
 # \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\#
 
 
-from Gaudi.Configuration import *
-from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from PhysSelPython.Wrappers import EventSelection
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingQEE/depreciated/StrippingJets.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingQEE/depreciated/StrippingJets.py
index 02e5fc43080729f2f38d0bc0bde65232a21f0202..55abf24d99577dcb8f10b30fda8803015b0c09f0 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingQEE/depreciated/StrippingJets.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingQEE/depreciated/StrippingJets.py
@@ -15,13 +15,11 @@
 __all__ = ('JetsConf',
            'default_config')
 
-from Gaudi.Configuration import *
-from GaudiKernel.SystemOfUnits import MeV, GeV, mm
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
+from GaudiKernel.SystemOfUnits import GeV, MeV
+from PhysSelPython.Wrappers import MergedSelection, Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
-from JetAccessories.JetMaker_Config import JetMakerConf
 from StandardParticles import StdJets, StdAllNoPIDsPions
 from Configurables import CombineParticles
 from Configurables import TopologicalTagging
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/Beauty2Charm_LoKiCuts.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/Beauty2Charm_LoKiCuts.py
index ce5265655cf518aa12121d3a5728d84c36da26cd..666cef80aacee423a071365fe7281c63e506e27d 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/Beauty2Charm_LoKiCuts.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/Beauty2Charm_LoKiCuts.py
@@ -10,11 +10,6 @@
 ###############################################################################
 # \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\#
 
-from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
-from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-from PhysSelPython.Wrappers import Selection, MergedSelection
-from StandardParticles import StdNoPIDsPions, StdNoPIDsKaons
 
 # \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\#
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingB02Lcmu_pKpi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingB02Lcmu_pKpi.py
index 3d6992fd337683bf5bcf97e994e4fd64705add4f..93bd54fbf8871329e8e7bcb95f7722d9913e1cff 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingB02Lcmu_pKpi.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingB02Lcmu_pKpi.py
@@ -14,7 +14,6 @@ from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = ['Nikita Beliy', 'Jibo He']
 __date__ = '28/11/2016'
 __version__ = '$Revision: 1.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingB23MuLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingB23MuLines.py
index a6e53abda621d1f1b0efe6185553c1b46aae67e6..15ea2076dcaea1a75c4fec8295e895be19887b4a 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingB23MuLines.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingB23MuLines.py
@@ -55,13 +55,11 @@ __all__ = ("B23MuLinesConf",
 
 #############################################################################
 
-from Gaudi.Configuration import *
-from Configurables import FilterDesktop, CombineParticles, DaVinci__N3BodyDecays
+from Configurables import DaVinci__N3BodyDecays
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 # from StrippingSelections.Utils import checkConfig
-from GaudiKernel.PhysicalConstants import c_light
 
 #############################################################################
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingB2KLLXInclusive.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingB2KLLXInclusive.py
index a9d2ffd4e4d8d6444da6c3df3731248c13fce6e7..61a740d6b5d3d92a7f2015b59a5021738a7a2958 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingB2KLLXInclusive.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingB2KLLXInclusive.py
@@ -19,15 +19,12 @@ __all__ = ('B2KLLXInclusiveConf', 'default_config')
 Stripping selection for inclusively selected B->KmumuX decays.
 """
 
-from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop
+from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
 
 from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from LHCbKernel.Configuration import *  # check if needed
-from Configurables import SubstitutePID
-from Configurables import SubPIDMMFilter
 
 
 #################
@@ -333,7 +330,6 @@ class B2KLLXInclusiveConf(LineBuilder):
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         CombineDiMuon = CombineParticles()
         CombineDiMuon.DecayDescriptors = ["[B+ -> J/psi(1S) K+]cc"]
-        sel_name = "InclKLL"
         CombineDiMuon.MotherCut = self.InclKLLCut
         # choose
         leptons = self.InclLeptons
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingB2KstTauTau.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingB2KstTauTau.py
index 0e62fb1a13ae5f9586b34995cc3f4f00d8de7dee..a236059c8ca69aa4aaf625cf6925165cda17c83a 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingB2KstTauTau.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingB2KstTauTau.py
@@ -15,8 +15,7 @@ from StandardParticles import StdTightMuons
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, OfflineVertexFitter, DaVinci__N3BodyDecays
-from Gaudi.Configuration import *
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N3BodyDecays, FilterDesktop
 __author__ = [' G. Mancinelli, J. Serrano']
 __date__ = '15/08/2014'
 __version__ = '$Revision: 0.1 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingB2LLXBDT.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingB2LLXBDT.py
index 109b0d412f7ae1c59c85c02a91e455f2481e6036..d3bce843421438aa96e19db0d27614ec0fb34790 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingB2LLXBDT.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingB2LLXBDT.py
@@ -20,8 +20,6 @@ from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticle
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, MergedSelection
-from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays
-from Gaudi.Configuration import *
 __author__ = ['Jibo He']
 __date__ = '20/11/2015'
 __version__ = '$Revision: 1.0 $'
@@ -240,7 +238,7 @@ class B2LLXBDTConf(LineBuilder):
         """
         Kshort, both LL and DD
         """
-        from StandardParticles import StdLooseKsDD, StdLooseKsLL
+        from StandardParticles import StdLooseKsDD
 
         self.SelKsDD = self.createSubSel(OutputList=self.name + "SelKsDD",
                                          InputList=StdLooseKsDD,
@@ -276,7 +274,7 @@ class B2LLXBDTConf(LineBuilder):
         """
         Lambda, both LL and DD
         """
-        from StandardParticles import StdLooseLambdaDD, StdLooseLambdaLL
+        from StandardParticles import StdLooseLambdaDD
 
         self.SelLambdaDD = self.createSubSel(OutputList=self.name + "SelLambdaDD",
                                              InputList=StdLooseLambdaDD,
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingB2Lambda0MuLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingB2Lambda0MuLines.py
index a054613d0704a7963e610f2572ba88b082f66814..fa771110364f67cbc9d0958eab12334187a60802 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingB2Lambda0MuLines.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingB2Lambda0MuLines.py
@@ -21,7 +21,6 @@ __all__ = ('B2Lambda0MuLines',
            'default_config')
 
 from StandardParticles import StdLoosePions, StdLooseMuons, StdLooseDownMuons, StdNoPIDsDownPions
-from Configurables import TisTosParticleTagger
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingB2MuMuMuMuLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingB2MuMuMuMuLines.py
index e8be535494b2f042b5e0ac87439ef9f4f7c4bd9d..e6a830521e3233715c6896a50d0ffe4616617755 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingB2MuMuMuMuLines.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingB2MuMuMuMuLines.py
@@ -19,7 +19,7 @@ from Beauty2Charm_LoKiCuts import LoKiCuts
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
-from Configurables import FilterDesktop, CombineParticles
+from Configurables import CombineParticles
 from Gaudi.Configuration import *
 __author__ = ['Diego Martinez Santos', 'Johannes Albrecht',
               'Konstantinos A. Petridis', 'Alexander Baranov']
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingB2XLL.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingB2XLL.py
old mode 100755
new mode 100644
index 893c8f7d24822aaf5128c145a0ea679b0efd25cc..54c9d8dbdf1774215b4f2574855ce20420b67924
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingB2XLL.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingB2XLL.py
@@ -10,9 +10,8 @@
 ###############################################################################
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection, AutomaticData
+from PhysSelPython.Wrappers import MergedSelection, Selection
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = 'Raja Nandakumar, Fergus Wilson, Stefania Ricciardi'
 __date__ = '04/11/2015'
 __version__ = '$Revision: 0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingB2XMuMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingB2XMuMu.py
index 8e508e6b18835068583f0559bb639cf60f677970..d21cafebb79a26d75af3a595a92a930cb6d90a9e 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingB2XMuMu.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingB2XMuMu.py
@@ -19,7 +19,6 @@ __version__ = '$Revision: 1.2 $'
 __all__ = ('B2XMuMuConf', 'default_config')
 
 
-from Gaudi.Configuration import *
 from LHCbKernel.Configuration import *  # check if needed
 
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingB2XTau.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingB2XTau.py
index 89967ffc1bd10cb56544c7233004d1b229731f9c..9050443393da5af1c9abb3eee3ba2e1eda76009d 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingB2XTau.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingB2XTau.py
@@ -8,16 +8,13 @@
 # granted to it by virtue of its status as an Intergovernmental Organization  #
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
-from StandardParticles import StdAllLoosePions, StdAllNoPIDsPions
-from copy import deepcopy
 from StandardParticles import StdLooseKaons
-from StandardParticles import StdLoosePions, StdTightPions
-from StandardParticles import StdNoPIDsKaons, StdNoPIDsPions, StdTightMuons
+from StandardParticles import StdLoosePions
+from StandardParticles import StdNoPIDsPions, StdTightMuons
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, OfflineVertexFitter, DaVinci__N3BodyDecays
-from Gaudi.Configuration import *
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N3BodyDecays, FilterDesktop
 __author__ = ['G. Dujany, G. Mancinelli, J. Serrano']
 __date__ = '24/05/2010,15/01/2014, 19/10/2017'
 __version__ = '$Revision: 1.3 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingB2XTauMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingB2XTauMu.py
index 1539daf38aad3280d179e42101b30c7b9367dc90..3bf392ac2eb839b14fbb1f75d9e94e760e94edd9 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingB2XTauMu.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingB2XTauMu.py
@@ -25,8 +25,6 @@ __all__ = ('B2XTauMuConf',
            'default_config')
 
 
-from Gaudi.Configuration import *
-
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
 from PhysSelPython.Wrappers import Selection, MergedSelection
 from StrippingConf.StrippingLine import StrippingLine
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingBLVLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingBLVLines.py
index 8bf68933cf866f19e4931849021862745276afe7..a5196ce34b14f3f32b717e3c7fcb254e2f21f2fa 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingBLVLines.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingBLVLines.py
@@ -95,8 +95,7 @@ __all__ = ("BLVLinesConf",
 
 ###################################################################################################
 
-from Gaudi.Configuration import *
-from Configurables import FilterDesktop, CombineParticles, DaVinci__N3BodyDecays
+from Configurables import CombineParticles, DaVinci__N3BodyDecays
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingBd2KSLLX.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingBd2KSLLX.py
index 419b0f7505b9bb8f7a0008bd6bd040167c12c60a..54c987ef8b72fd7e148a11fb44cebadb12188639 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingBd2KSLLX.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingBd2KSLLX.py
@@ -10,9 +10,8 @@
 ###############################################################################
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection, AutomaticData
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, DaVinci__N3BodyDecays
-from Gaudi.Configuration import *
+from PhysSelPython.Wrappers import MergedSelection, Selection
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop
 __author__ = 'SB'
 __date__ = '08/10/2017'
 __version__ = '$Revision: 1 $'
@@ -47,15 +46,8 @@ class Bd2KSLLXConf(LineBuilder):
         mmXLine_name = name + "_mm"
         eeXLine_name = name + "_ee"
 
-        from StandardParticles import StdLoosePions as Pions
-        from StandardParticles import StdLooseKaons as Kaons
-        from StandardParticles import StdLooseKstar2Kpi as Kstars
-        from StandardParticles import StdLoosePhi2KK as Phis
         from StandardParticles import StdLooseKsLL as KshortsLL
         from StandardParticles import StdLooseKsDD as KshortsDD
-        from StandardParticles import StdLooseLambdaLL as LambdasLL
-        from StandardParticles import StdLooseLambdaDD as LambdasDD
-        from StandardParticles import StdLooseLambdastar2pK as Lambdastars
 
         SelKshortsLL = self._filterHadron(name="KshortsLLFor" + self._name,
                                           sel=KshortsLL,
@@ -64,12 +56,10 @@ class Bd2KSLLXConf(LineBuilder):
                                           sel=KshortsDD,
                                           params=config)
 
-        from StandardParticles import StdDiElectronFromTracks as DiElectronsFromTracks
         from StandardParticles import StdLooseDiElectron as DiElectrons
         from StandardParticles import StdLooseDiMuon as DiMuons
 
-        ElecID = "(PIDe > %(PIDe)s)" % config
-        MuonID = "(HASMUON)&(ISMUON)"
+        "(PIDe > %(PIDe)s)" % config
 
         DiElectronID = "(2 == NINTREE((ABSID==11)&(PIDe > %(PIDe)s)))" % config
         DiMuonID = "(2 == NINTREE((ABSID==13)&(HASMUON)&(ISMUON)))"
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingBd2eeKstarBDT.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingBd2eeKstarBDT.py
index 1a6b3547113e58f48bff1e36952cfc3fb4d30295..6776dcdf27807a56103010584c7a22734b4a8a3f 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingBd2eeKstarBDT.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingBd2eeKstarBDT.py
@@ -18,7 +18,6 @@ from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = ['Marie-Helene Schune', 'Jibo He']
 __date__ = '20/01/2012'
 __version__ = '$Revision: 1.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingBeauty2XGamma.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingBeauty2XGamma.py
index f07ddb81031d4b834195c321bde00adbcbad8efc..80c413e939e48af32343e618df219aac699bef6a 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingBeauty2XGamma.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingBeauty2XGamma.py
@@ -12,7 +12,7 @@
 B-> X Gamma selections
 '''
 
-from StandardParticles import StdAllNoPIDsKaons, StdAllNoPIDsPions, StdLooseAllPhotons, StdLooseMergedPi0, StdLooseResolvedPi0, StdAllLooseGammaDD, StdAllLooseGammaLL, StdAllNoPIDsProtons
+from StandardParticles import StdAllLooseGammaDD, StdAllLooseGammaLL, StdAllNoPIDsPions, StdLooseAllPhotons, StdLooseMergedPi0, StdLooseResolvedPi0
 from Configurables import TisTosParticleTagger
 from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays as Combine4Particles
 from GaudiConfUtils.ConfigurableGenerators import DaVinci__N3BodyDecays as Combine3Particles
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingBs2MuMuGamma.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingBs2MuMuGamma.py
index 0cfb5425d7a51fe618e72a66a2e6e2062510e41d..f1f37c46035071eccb7cf880d283aafb532e0b8f 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingBs2MuMuGamma.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingBs2MuMuGamma.py
@@ -15,7 +15,7 @@ Authors: Meril Reboud, Jean-Francois Marchand
 """
 
 ########################################################################
-from StrippingUtils.Utils import LineBuilder, checkConfig
+from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Combine3BodySelection
 from StandardParticles import StdLooseMuons, StdLooseAllPhotons
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingBs2MuMuLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingBs2MuMuLines.py
index 83814baf180de07952b534a10d4fed42b9b8eb7d..d1be9584f636ad8990b8634c4b788bbc3c8dc160 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingBs2MuMuLines.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingBs2MuMuLines.py
@@ -26,7 +26,7 @@ from Gaudi.Configuration import *
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
-from Configurables import FilterDesktop, CombineParticles
+from Configurables import CombineParticles
 from JetAccessories.JetMaker_Config import JetMakerConf
 from CommonParticles.Utils import *
 from Gaudi.Configuration import *
@@ -159,7 +159,7 @@ def create_stdjets(strob, line_location, stdjets_name_ban, stdjets_name_addb):
         strob.StdJetsNoJetIDBan = [myconf1]
 
     # configure Data-On-Demand service
-    locations = updateDoD(myconf1)
+    updateDoD(myconf1)
 
     myconf2 = JetMakerConf(stdjets_name_addb,
                            Inputs=['Phys/PFParticles/Particles', line_location],
@@ -173,7 +173,7 @@ def create_stdjets(strob, line_location, stdjets_name_ban, stdjets_name_addb):
         strob.StdJetsNoJetIDAddB = [myconf2]
 
     # configure Data-On-Demand service
-    locations = updateDoD(myconf2)
+    updateDoD(myconf2)
 
 ##########################################
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingBs2gammagamma.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingBs2gammagamma.py
index a19590514ce1912b186311ffed8d51783a633f9c..5dd7a2cdce789ca4b9dbc99b6ec9ffef3e98e01e 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingBs2gammagamma.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingBs2gammagamma.py
@@ -21,16 +21,11 @@ Exports the following stripping lines as instance data members:
 - Bs2gammagamma_NoConvWideLine  : wide line with 0 conversions
 '''
 
-from Configurables import (DiElectronMaker, ProtoParticleCALOFilter,
-                           ParticleTransporter, BremAdder)
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop  # , CombineParticles
-from CommonParticles import StdLooseAllPhotons
-from CommonParticles import StdAllLooseGammaConversion
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
 from Configurables import CombineParticles
-from Gaudi.Configuration import *
 __author__ = ['Sean Benson']
 __date__ = '2016/04/08'
 __version__ = '1.2'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingBs2st2KKMuX.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingBs2st2KKMuX.py
index 86d2fbe036d44821a158f2fba4fe7e558c1d3d55..22e9c5c994936c1db65ca0b5c70f9d8f5601bd3b 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingBs2st2KKMuX.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingBs2st2KKMuX.py
@@ -22,9 +22,8 @@ Stripping lines:
 from StandardParticles import StdLooseMuons, StdLooseKaons, StdAllLooseKaons, StdMassConstrainedJpsi2MuMu
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand
+from PhysSelPython.Wrappers import Selection
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = ['Jianchun Wang']
 __date__ = '03/22/2015'
 __version__ = '$Revision: 0.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingBu2LLK.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingBu2LLK.py
index 90d4099a6dc0b53a7143a2d610cfcbd4958f2602..3c2ca0c04414ae31c795d035b518d5b9e5639643 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingBu2LLK.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingBu2LLK.py
@@ -10,9 +10,8 @@
 ###############################################################################
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection, AutomaticData
+from PhysSelPython.Wrappers import DataOnDemand, MergedSelection, Selection
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, DaVinci__N3BodyDecays
-from Gaudi.Configuration import *
 __author__ = 'Patrick Koppenburg, Alex Shires, Thomas Blake, Luca Pescatore, Simone Bifani, Yasmine Amhis, Paula Alvarez Cartelle, Harry Cliff, Rafael Silva Coutinho, Guido Andreassi, Mick Mulder'
 __date__ = '16/06/2014'
 __version__ = '$Revision: 3 $'
@@ -714,7 +713,6 @@ class Bu2LLKConf(LineBuilder):
         from StandardParticles import StdLooseMuons as Muons
         # from CommonParticles import StdLooseDetachedTau
         # Taus = DataOnDemand(Location = "Phys/StdLooseDetachedTau3pi/Particles")
-        from CommonParticles import StdTightDetachedTau
         Taus = DataOnDemand(Location="Phys/StdTightDetachedTau3pi/Particles")
 
         _DecayDescriptor = "[J/psi(1S) -> mu+ tau-]cc"
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingBu2MajoLep.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingBu2MajoLep.py
index 5a96cdedd562ea723f6b2b20d6b2cf30f98f517f..850c2f87ccfaddc8f68a9b6e087f3f6d41cebbb1 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingBu2MajoLep.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingBu2MajoLep.py
@@ -19,12 +19,10 @@ __version__ = 'V0.9'
 __all__ = ('Bu2MajoLepConf',
            'default_config')
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
+from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from GaudiKernel.SystemOfUnits import *
 
 from StandardParticles import StdLooseMuons as Muons
 from StandardParticles import StdLoosePions as Pions
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingBu2MuNu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingBu2MuNu.py
index 19ce21e90e54ca7bc0f65d55187d37c95520c6d9..4163901dd65f50c70f659de9c335932f2c9649fa 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingBu2MuNu.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingBu2MuNu.py
@@ -25,12 +25,11 @@ __all__ = ('Bu2MuNuConf',
            'default_config')
 
 from Gaudi.Configuration import *
-from PhysSelPython.Wrappers import Selection, DataOnDemand
+from PhysSelPython.Wrappers import DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from StandardParticles import StdTightMuons, StdTightANNMuons
 from CommonParticles.Utils import *
-from Configurables import FilterDesktop, CombineParticles
+from Configurables import FilterDesktop
 from JetAccessories.JetMaker_Config import JetMakerConf
 
 default_name = 'Bu2MuNu'
@@ -72,7 +71,7 @@ def create_stdjets(strobj, line_location, stdjets_name_ban):
         strobj.StdJetsNoJetIDBan = [myconf1]
 
     # configure Data-On-Demand service
-    locations = updateDoD(myconf1)
+    updateDoD(myconf1)
 
 
 relInfoJetsVars = ["JETNOMU1PX", "JETNOMU1PY", "JETNOMU1PZ", "JETNOMU1PT", "JETNOMU1JETWIDTH", "JETNOMU1NNTAG", "JETNOMU1MNF", "JETNOMU2PX", "JETNOMU2PY", "JETNOMU2PZ", "JETNOMU2PT", "JETNOMU2JETWIDTH", "JETNOMU2NNTAG",
@@ -255,7 +254,7 @@ class Bu2MuNuConf(LineBuilder):
                                            JetIDCut=False).algorithms[0]
 
         # configure Data-On-Demand service
-        locations = updateDoD(StdJetsNoJetIDNoBan)
+        updateDoD(StdJetsNoJetIDNoBan)
 
         # add the jets with the specific banning
         create_stdjets(self, self.ControlLine.outputLocation(),
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingD23MuLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingD23MuLines.py
index 9d9153bde02604dd6518511524323b953c58b810..a119c6aadabeb6405ae23f48d28004723f035a3b 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingD23MuLines.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingD23MuLines.py
@@ -51,12 +51,11 @@ __all__ = ("D23MuLinesConf",
 #############################################################################
 
 from Gaudi.Configuration import *
-from Configurables import FilterDesktop, CombineParticles, DaVinci__N3BodyDecays
+from Configurables import DaVinci__N3BodyDecays
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 # from StrippingSelections.Utils import checkConfig
-from GaudiKernel.PhysicalConstants import c_light
 
 #############################################################################
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingDarkBoson.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingDarkBoson.py
index 9cbd23ab60ae4ca685775a5b5320a32475dbf7cd..5f0ed1ef98e3e1a3ccc913ce00f38b85106147d8 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingDarkBoson.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingDarkBoson.py
@@ -17,23 +17,18 @@ Author: M. Williams
 from Configurables import DiElectronMaker, ProtoParticleCALOFilter
 from GaudiConfUtils.ConfigurableGenerators import DaVinci__N3BodyDecays
 from CommonParticles.Utils import *
-from copy import deepcopy
 from Configurables import SubstitutePID
 from StandardParticles import StdAllLooseGammaLL, StdAllLooseGammaDD, \
     StdAllLooseElectrons, StdLooseAllPhotons  # , StdDiElectronFromTracks
 from Beauty2Charm_LoKiCuts import LoKiCuts
 from StandardParticles import StdAllNoPIDsPions, StdAllNoPIDsKaons, \
-    StdAllNoPIDsProtons, StdNoPIDsUpPions, StdAllLooseMuons, \
-    StdLooseDownMuons
-from Configurables import LoKi__VoidFilter
+    StdAllLooseMuons, StdLooseDownMuons
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import EventSelection
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
+from PhysSelPython.Wrappers import DataOnDemand, Selection
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
 from Gaudi.Configuration import *
-import re
 __author__ = ['Mike Williams']
 
 moduleName = 'DarkBoson'
@@ -251,7 +246,7 @@ class DarkBosonConf(LineBuilder):
         mmDDX = makeX(
             'MuMuDD', default_config['XDD'], 'KS0 -> mu+ mu-', [muDX])
         kkX = makeX('KK', default_config['XLL'], 'KS0 -> K+ K-', [kX])
-        kkDDX = makeX('KKDD', default_config['XDD'], 'KS0 -> K+ K-', [kDX])
+        makeX('KKDD', default_config['XDD'], 'KS0 -> K+ K-', [kDX])
         pipiX = makeX(
             'PiPi', default_config['XLLhard'], 'KS0 -> pi+ pi-', [piX])
         pipiDDX = makeX(
@@ -273,7 +268,7 @@ class DarkBosonConf(LineBuilder):
             'PiPiSSDD', default_config['XDD'], '[KS0 -> pi+ pi+]cc', [piDX])
         preSS = default_config['Prescales']['SS']
 
-        preDD = default_config['Prescales']['DD']
+        default_config['Prescales']['DD']
         preKK = default_config['Prescales']['KK']
 
         j = makeJ(default_config['J'], [muJ])
@@ -390,7 +385,7 @@ class DarkBosonConf(LineBuilder):
         kst = filterKst()
         self._makeBLine('B2JKst', ['[B0 -> J/psi(1S) K*(892)0]cc'],
                         [j, kst], default_config['B2KX'])
-        rho = makeRho([piB])
+        makeRho([piB])
         # self._makeBLine('B2RhoX2MuMu',['B0 -> rho(770)0 KS0'],[rho,mmX],
         #                default_config['B2HHX'])
         # self._makeBLine('B2RhoX2MuMuDD',['B0 -> rho(770)0 KS0'],[rho,mmDDX],
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingDoubleSLForRX.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingDoubleSLForRX.py
index f7e5ccc228e7525247584f38f94bf53502f3cdea..3116bd40e9e8d6da906924d79ac8c85fabf37565 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingDoubleSLForRX.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingDoubleSLForRX.py
@@ -19,7 +19,6 @@ from GaudiConfUtils.ConfigurableGenerators import (CombineParticles,
                                                    DaVinci__N3BodyDecays)
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from Gaudi.Configuration import *
 __author__ = 'M. Kreps, T. Blake, D. Loh'
 __date__ = '10/11/2016'
 __version__ = '$Revision: 1.0$'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingHypb2L0HGamma.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingHypb2L0HGamma.py
index 38d0330645e0b234f4b40eaf26ac74b7e8211c36..67e9f1cbe60a0af52573095b4ca759bbeed2d935 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingHypb2L0HGamma.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingHypb2L0HGamma.py
@@ -16,8 +16,8 @@ __all__ = ('Hypb2L0HGammaConf',
            'default_config', )
 
 from Gaudi.Configuration import *
-from Configurables import FilterDesktop, CombineParticles, TisTosParticleTagger
-from PhysSelPython.Wrappers import Selection, MergedSelection, DataOnDemand
+from Configurables import CombineParticles, FilterDesktop
+from PhysSelPython.Wrappers import DataOnDemand, Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from StandardParticles import StdLooseAllPhotons
@@ -384,7 +384,7 @@ def tisTosSelection(sel, TISTOSdict):
 
 
 def makevelotracks(name):
-    from Configurables import FastVeloTracking, TrackPrepareVelo, DecodeVeloRawBuffer, TrackEventFitter, TrackStateInitAlg,  TrackContainerCopy
+    from Configurables import FastVeloTracking, TrackContainerCopy, TrackStateInitAlg
     from TrackFitter.ConfiguredFitters import ConfiguredEventFitter
 
     MyFastVeloTracking = FastVeloTracking(
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingK0s2XXMuMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingK0s2XXMuMu.py
index 454c44356bf363573cfae8fad85f13e9b83e92ea..dc8a94331712da6fda2d902eeaadf4a4c7f30f0f 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingK0s2XXMuMu.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingK0s2XXMuMu.py
@@ -19,9 +19,7 @@ from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection
 from StandardParticles import StdAllLoosePions, StdAllLooseMuons
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-from GaudiKernel.PhysicalConstants import c_light
-from GaudiKernel.SystemOfUnits import MeV, m, mm, picosecond
-from Gaudi.Configuration import *
+from GaudiKernel.SystemOfUnits import MeV, mm, picosecond
 __author__ = ['Miguel Ramos Pernas']
 __date__ = '10/10/2017'
 __version__ = '$Revision: 0.00 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingKshort2MuMuMuMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingKshort2MuMuMuMu.py
index 86a943e5a6fb41852c6a9f29c92389947b9c890f..81ef82f2043ed504638103a44bd0a0e915d41771 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingKshort2MuMuMuMu.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingKshort2MuMuMuMu.py
@@ -15,15 +15,12 @@ derived, in large measure, from StrippingKshort2PiPiMuMu.py
 '''
 
 from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays
-from GaudiKernel.SystemOfUnits import MeV
-from StandardParticles import StdNoPIDsDownPions, StdLooseDownMuons
-from StandardParticles import StdAllLoosePions, StdAllLooseMuons, StdAllNoPIDsPions
-from StandardParticles import StdLoosePions, StdLooseMuons, StdNoPIDsPions
+from StandardParticles import StdLooseDownMuons
+from StandardParticles import StdAllLooseMuons
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
+from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
 __author__ = ['Mike Sokoloff']
 __date__ = '07 January 2014'
 __version__ = '$Revision: 0.1 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingKshort2PiPiMuMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingKshort2PiPiMuMu.py
index 0955f65fa0e2efdcb575b1c11a7ad439f53a1944..07b134c737342e2921702f4d74fa30eda7121cf9 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingKshort2PiPiMuMu.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingKshort2PiPiMuMu.py
@@ -10,15 +10,12 @@
 ###############################################################################
 
 from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays
-from GaudiKernel.SystemOfUnits import MeV
 from StandardParticles import StdNoPIDsDownPions, StdLooseDownMuons
-from StandardParticles import StdAllLoosePions, StdAllLooseMuons, StdAllNoPIDsPions
-from StandardParticles import StdLoosePions, StdLooseMuons, StdNoPIDsPions
+from StandardParticles import StdAllLooseMuons, StdAllLoosePions
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
+from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
 __author__ = ['Mike Sokoloff']
 __date__ = '25/10/2012'
 __version__ = '$Revision: 0.1 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingKshort2eePiPi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingKshort2eePiPi.py
index 5ac8f83630db4b9cf4e5a235dd3ceeb48b0a2a95..d8b95bcb790eaafc5b7c90a8f83fe5663eee0c11 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingKshort2eePiPi.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingKshort2eePiPi.py
@@ -23,7 +23,6 @@ from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection
 from GaudiConfUtils.ConfigurableGenerators import DaVinci__N3BodyDecays as Combine3Particles
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
-from Gaudi.Configuration import *
 __author__ = ['Carla Marin', 'Xabier Cid Vidal',  'Adrian Casais Vidal']
 __date__ = '23/02/2018'
 __version__ = '$2.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingLFVLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingLFVLines.py
index 5be28d212752c8efe58916a270f0a2fd95e3f8a4..119a6d67e6e72b90eee2e47f841de2b6a89f2820 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingLFVLines.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingLFVLines.py
@@ -23,14 +23,12 @@ __all__ = ('LFVLinesConf',
            'default_config',
            )
 
-from Gaudi.Configuration import *
 # from Configurables import FilterDesktop, CombineParticles
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, DaVinci__N3BodyDecays
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N3BodyDecays
 from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from GaudiKernel.PhysicalConstants import c_light
-from GaudiKernel.SystemOfUnits import GeV, MeV, mm
+from GaudiKernel.SystemOfUnits import MeV, mm
 from copy import deepcopy
 #
 # Configure related info tools
@@ -1177,7 +1175,7 @@ class LFVLinesConf(LineBuilder):
         hemu_name = name+'B2heMu'
         pmu_name = name+'B2hMu'
         bu_name = name+'Bu2KJPsiee'
-        taumu_name = name+'B2TauMu'
+        name+'B2TauMu'
         htaumu_name = name+'B2hTauMu'
         muetap_gamma_name = name+'Tau2MuEtaP2pipig'
         muetap_pi_name = name+'Tau2MuEtaP2pipipi'
@@ -1670,7 +1668,6 @@ def makeB2TauMu(name):
         "& (BPVVDCHI2> 225)"\
         "& (BPVIPCHI2()< 25) "
 
-    from CommonParticles import StdLooseDetachedTau, StdLooseDipion
     _stdLooseMuons = DataOnDemand(Location="Phys/StdLooseMuons/Particles")
     _stdLooseDetachedTaus = DataOnDemand(
         Location="Phys/StdLooseDetachedTau3pi/Particles")
@@ -2310,7 +2307,6 @@ def makeB2hTauMu(name):
                           "& (BPVVDCHI2> 225)"\
                           "& (BPVIPCHI2()< 16) "  # maybe 16
 
-    from CommonParticles import StdLooseDetachedTau, StdLooseDipion
     _stdLooseMuons = DataOnDemand(Location="Phys/StdLooseMuons/Particles")
     _stdLooseDetachedTaus = DataOnDemand(
         Location="Phys/StdLooseDetachedTau3pi/Particles")
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingLb2L0Gamma.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingLb2L0Gamma.py
index 8c5b2ce8e1fe6efd952c2e31aae1cd4773e6ca2c..29f8067fd4dafb46840ba7a46cde320cd917a56f 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingLb2L0Gamma.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingLb2L0Gamma.py
@@ -25,9 +25,6 @@ __date__ = "14.11.2016"
 __version__ = "2.0"
 __all__ = ("default_config", "StrippingLb2L0GammaConf")
 
-import os
-
-from Gaudi.Configuration import *
 
 from Configurables import CombineParticles
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
@@ -36,9 +33,7 @@ from PhysSelPython.Wrappers import Selection, MergedSelection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 
-from StandardParticles import StdAllNoPIDsPions, StdAllNoPIDsProtons
 from StandardParticles import StdLooseAllPhotons, StdAllLooseGammaDD, StdAllLooseGammaLL
-from StandardParticles import StdVeryLooseDetachedKst2Kpi
 from StandardParticles import StdLooseJpsi2MuMu
 
 default_config = {'NAME': 'Lb2L0Gamma',
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingLc23MuLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingLc23MuLines.py
index 6acafdde8c6e7891b5fa784cd7a09f4926b90d52..d433a7839c1839ac9f84be9cf1208f7094d86d2b 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingLc23MuLines.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingLc23MuLines.py
@@ -66,11 +66,10 @@ __all__ = ("Lc23MuLinesConf",
 ###################################################################################################
 
 from Gaudi.Configuration import *
-from Configurables import FilterDesktop, CombineParticles, DaVinci__N3BodyDecays
+from Configurables import DaVinci__N3BodyDecays
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from GaudiKernel.PhysicalConstants import c_light
 
 ###################################################################################################
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingPhiToKSKS.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingPhiToKSKS.py
index ff157859dd3877ab38f9cad234fb49a80418e50d..1a62ef5db16a204dc0a3d66d1fd1d1f75d4a04d4 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingPhiToKSKS.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingPhiToKSKS.py
@@ -23,8 +23,7 @@ from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from StandardParticles import StdAllLooseKaons, StdAllLooseMuons
-from Configurables import FitDecayTrees
-from PhysSelPython.Wrappers import AutomaticData, MergedSelection
+from PhysSelPython.Wrappers import MergedSelection
 
 __all__ = ('PhiToKSKSAllLinesConf',
            'TOSFilter',
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingRareNStrange.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingRareNStrange.py
index 95f70d0b641829f0a44259b730566f4c68fa1093..98b3814df4bee7388e334a0c9969c741474a9f63 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingRareNStrange.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingRareNStrange.py
@@ -10,9 +10,8 @@
 ###############################################################################
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection, AutomaticData
+from PhysSelPython.Wrappers import Selection
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = 'Diego Martinez Santos, Carlos Vazquez, Xabier Cid, Jessica Prisciandaro, Miguel Ramos Pernas'
 __date__ = '08/05/2015'
 __version__ = '$Revision: Not sure $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingRareStrange.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingRareStrange.py
index 6f7264e1db8f4045b2b139a11daa3e90056e3c44..bba73d994ee42cf94a9237f00597a4d7be7cc54d 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingRareStrange.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingRareStrange.py
@@ -59,15 +59,11 @@ __all__ = ('RareStrangeLinesConf',
 from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 from GaudiConfUtils.ConfigurableGenerators import DaVinci__N3BodyDecays as Combine3Particles
-from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays as Combine4Particles
-from CommonParticles import StdNoPIDsDownElectrons
 from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from GaudiKernel.PhysicalConstants import c_light
-from StandardParticles import (StdAllNoPIDsPions, StdNoPIDsDownPions,
-                               StdLoosePions, StdLooseDownMuons,
-                               StdLooseMergedPi0, StdLooseResolvedPi0, StdLooseDalitzPi0)
+from StandardParticles import (StdLooseMergedPi0, StdLooseResolvedPi0,
+                               StdLooseDalitzPi0)
 
 # from CommonParticles.StdLooseDalitzPi0 import (StdLoosePi02gee, StdLoosePi024e)
 
@@ -2786,7 +2782,7 @@ def makeLambdaPPiEE(name, config, inputs):
 
 
 def makevelotracks(name):
-    from Configurables import FastVeloTracking, TrackPrepareVelo, DecodeVeloRawBuffer, TrackEventFitter, TrackStateInitAlg,  TrackContainerCopy
+    from Configurables import FastVeloTracking, TrackContainerCopy, TrackStateInitAlg
     from TrackFitter.ConfiguredFitters import ConfiguredEventFitter
 
     MyFastVeloTracking = FastVeloTracking(
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingStrangeSL.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingStrangeSL.py
index f328a4ad421ec3eebf7d41f4f90b3974aa66defa..70bb42a092e709bc9197e4434d6809dcc2105d13 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingStrangeSL.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingStrangeSL.py
@@ -35,23 +35,12 @@ __all__ = ('default_config',
            'StrangeSLConf',
            )
 
-import os
 
-from Gaudi.Configuration import *
-
-from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-
-from GaudiConfUtils.ConfigurableGenerators import DaVinci__N3BodyDecays as Combine3Particles
-from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays as Combine4Particles
-from CommonParticles import StdNoPIDsDownElectrons
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
+from PhysSelPython.Wrappers import DataOnDemand, Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from GaudiKernel.PhysicalConstants import c_light
 from GaudiKernel.SystemOfUnits import MeV
 
-from StandardParticles import StdAllNoPIDsPions, StdLoosePions, StdLooseProtons, StdAllLoosePions, StdAllLooseMuons
-from StandardParticles import StdLooseMergedPi0, StdLooseResolvedPi0, StdLooseDalitzPi0
 from PhysConf.Selections import CombineSelection
 
 default_config = {
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingTau23MuLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingTau23MuLines.py
index 5671eec2903b81d281b9ff5eaaa5a2fbf9c127b1..47ad42c6670341e9349f43fc4ad0adb901cfd560 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingTau23MuLines.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingTau23MuLines.py
@@ -35,7 +35,6 @@ from GaudiConfUtils.ConfigurableGenerators import DaVinci__N5BodyDecays as Combi
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from GaudiKernel.PhysicalConstants import c_light
 
 default_config = {
     'NAME': 'Tau23Mu',
@@ -70,7 +69,7 @@ class Tau23MuLinesConf(LineBuilder):
         # checkConfig(Bs2MuMuLinesConf.__configuration_keys__,config)
 
         tau_name = name+'Tau23Mu'
-        ds23PiTIS_name = name+'Ds23PiTIS'
+        name+'Ds23PiTIS'
         ds23Pi_name = name+'Ds23Pi'
         ds2PhiPi_name = name+'Ds2PhiPi'
         tau25_name = name+'Tau25Mu'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingTau2LambdaMuLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingTau2LambdaMuLines.py
index 6f7caa01d008433cca4a3184d6bdfeb2a9bcd909..2e5401740f914b698345c335bfe29788f1e7ed2e 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingTau2LambdaMuLines.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingTau2LambdaMuLines.py
@@ -16,12 +16,10 @@ Exported symbols (use python help!):
    - 
 '''
 
-from GaudiKernel.PhysicalConstants import c_light
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
-from Configurables import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
+from Configurables import CombineParticles
 __author__ = ['Marcin Chrzaszcz']
 __date__ = '14/12/2012'
 __version__ = '$Revision: 1.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingZVTOP.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingZVTOP.py
index f4ee63f69c4320486335e4fa797004ccb36ecca4..6b5cbfa74e249908ea9e854e9c0f238ebdd2d9cf 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingZVTOP.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingRD/StrippingZVTOP.py
@@ -9,14 +9,12 @@
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
 from Configurables import TopoTauAlg, TopoVertexTool
-from StandardParticles import StdLooseKaons
-from StandardParticles import StdLoosePions, StdTightPions
-from StandardParticles import StdNoPIDsKaons, StdNoPIDsPions
+from StandardParticles import StdLoosePions
+from StandardParticles import StdNoPIDsPions
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, OfflineVertexFitter
-from Gaudi.Configuration import *
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop
 __author__ = ['Giampi Mancinelli', 'Julien Cogan', 'Justine Serrano']
 
 __date__ = '14/01/2014'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingSL/StrippingB23MuNu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingSL/StrippingB23MuNu.py
index 11d81c34fb0178677727235bc3bd636b83427207..97c4220c4e62f1a00d3c320d5f76806aba8c4c4a 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingSL/StrippingB23MuNu.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingSL/StrippingB23MuNu.py
@@ -19,15 +19,12 @@ __all__ = ('B23MuNuConf')
 Stripping selection for B to three muons and a neutrino.
 """
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop
 
-from PhysSelPython.Wrappers import Selection, AutomaticData, MergedSelection
+from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from LHCbKernel.Configuration import *  # check if needed
-from Configurables import SubstitutePID
-from Configurables import SubPIDMMFilter
 
 
 #################
@@ -161,15 +158,13 @@ class B23MuNuConf(LineBuilder):
         """
         Creates Jpsi as proxy for dimuon
         """
-        from PhysSelPython.Wrappers import AutomaticData, Selection, SelectionSequence, DataOnDemand, MergedSelection
+        from PhysSelPython.Wrappers import Selection
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         # from Configurables import CombineParticles
 
         CombineJpsi = CombineParticles(DecayDescriptors=["J/psi(1S) -> mu+ mu-", "[J/psi(1S) -> mu+ mu+]cc"],
                                        MotherCut="ALL")
 
-        sel_name = "Jpsi"
-
         from PhysSelPython.Wrappers import Selection
         SelJpsi = Selection("Sel_" + self.name + "_Jpsi", Algorithm=CombineJpsi,
                             RequiredSelections=[self.Muons])
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingSL/StrippingB2DMuForTauMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingSL/StrippingB2DMuForTauMu.py
index bbb6591f636c547192b1c9759ebfeedf27b88e2b..8bd9a436ea3d941e0b4ec5b3610d262206579753 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingSL/StrippingB2DMuForTauMu.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingSL/StrippingB2DMuForTauMu.py
@@ -18,12 +18,10 @@ __version__ = '$Revision: 2.0 $'
 
 from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from PhysSelPython.Wrappers import Selection, DataOnDemand
+from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from StandardParticles import StdLoosePions, StdAllLooseMuons, StdLooseKaons, StdLooseProtons, StdAllLoosePions, StdLooseMergedPi0, StdLooseResolvedPi0, StdAllNoPIDsMuons, StdLooseANNUpPions
-from Configurables import ConjugateNeutralPID
-from PhysSelPython.Wrappers import MergedSelection
+from StandardParticles import StdAllLooseMuons, StdAllNoPIDsMuons, StdLooseKaons, StdLoosePions, StdLooseProtons
 
 __all__ = ('B2DMuForTauMuconf',
            # 'makeb2DMuX',
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingSL/StrippingB2DMuNuX.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingSL/StrippingB2DMuNuX.py
index b5f34c927b7088cb907bc14aa24645280cb776ea..40663531445560cd3134319a73cf2e117b229712 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingSL/StrippingB2DMuNuX.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingSL/StrippingB2DMuNuX.py
@@ -13,14 +13,13 @@ __date__ = '23/07/2010'
 __version__ = '$Revision: 5.0 $'
 
 from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
+from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
 from PhysSelPython.Wrappers import Selection
-from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from StandardParticles import StdLoosePions, StdLooseMuons, StdLooseKaons, StdLooseProtons, StdLooseElectrons
 from StandardParticles import StdNoPIDsPions, StdNoPIDsKaons, StdNoPIDsProtons, StdNoPIDsMuons
 from StrippingB2DMuNuXUtils import *
-from GaudiKernel.SystemOfUnits import MeV, GeV, cm, mm
+from GaudiKernel.SystemOfUnits import GeV, MeV, mm
 
 __all__ = ('B2DMuNuXAllLinesConf',
            'default_config')
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingSL/StrippingB2DMuNuXUtils.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingSL/StrippingB2DMuNuXUtils.py
index 6130e13de2c5b9fe72cd44d5967aeceaa4452074..e91f29e3fa36cef61e702f06f89eb4418ddf4695 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingSL/StrippingB2DMuNuXUtils.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingSL/StrippingB2DMuNuXUtils.py
@@ -13,11 +13,9 @@ __date__ = '06/03/2015'
 __version__ = '$Revision: 0.0 $'
 
 from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
-from StrippingUtils.Utils import LineBuilder
-from StandardParticles import StdLoosePions, StdLooseMuons, StdLooseKaons, StdLooseProtons, StdNoPIDsPions, StdLooseElectrons, StdNoPIDsMuons
 
 
 def BtoDlnuLine(module_name,
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingSL/StrippingB2Dlnu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingSL/StrippingB2Dlnu.py
index 0c8d00bd94717af821926626f5446a85cb20a902..b05a05c95319c31661cfe61524eca70e234905c3 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingSL/StrippingB2Dlnu.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingSL/StrippingB2Dlnu.py
@@ -17,12 +17,10 @@ __version__ = '$Revision: 1.0 $'
 
 from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from PhysSelPython.Wrappers import Selection, DataOnDemand
+from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from StandardParticles import StdLoosePions, StdLooseMuons, StdLooseKaons, StdLooseProtons, StdAllLoosePions, StdLooseMergedPi0, StdLooseResolvedPi0, StdAllNoPIDsMuons, StdLooseANNUpPions, StdLooseElectrons
-from Configurables import ConjugateNeutralPID
-from PhysSelPython.Wrappers import MergedSelection
+from StandardParticles import StdAllNoPIDsMuons, StdLooseElectrons, StdLooseKaons, StdLooseMuons, StdLoosePions
 
 __all__ = ('B2DMuForLNuconf',
            # 'makeb2DMuX',
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingSL/StrippingB2DstMuNuIncl.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingSL/StrippingB2DstMuNuIncl.py
index 6abd041bf344194b0ad86747d5d5622ae5fdddf9..3a91f70e613b554c2c0d5b7095d89a8eb3c67f3d 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingSL/StrippingB2DstMuNuIncl.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingSL/StrippingB2DstMuNuIncl.py
@@ -12,9 +12,8 @@ __author__ = ['Mika Vesterinen']
 __date__ = '04/04/2015'
 __version__ = '$Revision: 0.0 $'
 
-from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from PhysSelPython.Wrappers import Selection, DataOnDemand
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
+from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from StandardParticles import StdLoosePions, StdLooseMuons, StdLooseKaons, StdAllLoosePions
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingSL/StrippingB2PPbarMuForTauMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingSL/StrippingB2PPbarMuForTauMu.py
index 290eb2789217549a92dff80958601e35bd4be44d..7801e06774ba2f3e352883ea169a9b93d194be16 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingSL/StrippingB2PPbarMuForTauMu.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingSL/StrippingB2PPbarMuForTauMu.py
@@ -9,9 +9,7 @@
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
 
-import logging
 from StrippingUtils.Utils import LineBuilder
-from Gaudi.Configuration import *
 __author__ = ['Mark Smith']
 __date__ = '17/10/2016'
 __version__ = '$Revision: 1.0 $'
@@ -107,8 +105,6 @@ class B2PPbarMuForTauMuBuilder(LineBuilder):
     def __init__(self, name, config):
         LineBuilder.__init__(self, name, config)
 
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
-
         self.GECs = {"Code": "( recSummary(LHCb.RecSummary.nSPDhits,'Raw/Spd/Digits') < %(GEC_nSPDHits)s )" % config,
                      "Preambulo": ["from LoKiTracks.decorators import *"]}
 
@@ -437,7 +433,7 @@ class B2PPbarMuForTauMuBuilder(LineBuilder):
     ###### B->ppMuNu Signal ######
     def _bhad2PMuX_B(self):
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-        from PhysSelPython.Wrappers import Selection, MergedSelection
+        from PhysSelPython.Wrappers import Selection
 
         _pMu = CombineParticles(
             DecayDescriptors=self._config["DECAYS"], ReFitPVs=True)
@@ -454,7 +450,7 @@ class B2PPbarMuForTauMuBuilder(LineBuilder):
     ###### B->ppMuNu Signal for Topo Line ######
     def _bhad2PMuX_BTopo(self):
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-        from PhysSelPython.Wrappers import Selection, MergedSelection
+        from PhysSelPython.Wrappers import Selection
 
         _pMu = CombineParticles(
             DecayDescriptors=self._config["DECAYS"], ReFitPVs=True)
@@ -471,7 +467,7 @@ class B2PPbarMuForTauMuBuilder(LineBuilder):
     ###### B->ppMuNu Same-Sign protons ######
     def _bhad2PMuX_B_SS(self):
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-        from PhysSelPython.Wrappers import Selection, MergedSelection
+        from PhysSelPython.Wrappers import Selection
 
         _pMu = CombineParticles(
             DecayDescriptors=self._config["DECAYS"], ReFitPVs=True)
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingSL/StrippingB2XTauNu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingSL/StrippingB2XTauNu.py
index f85e9edd455551e136e8578c65d8c987f291e326..d5e2a476012ce6a15c2670bcf12452e8587937d1 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingSL/StrippingB2XTauNu.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingSL/StrippingB2XTauNu.py
@@ -498,7 +498,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         self.__MakeB0d2DdoubleStarTauNuNonPhysTau__()
 
         from StrippingConf.StrippingLine import StrippingLine
-        from PhysSelPython.Wrappers import SelectionSequence
 
         # TisTos filter
         def filterTisTos(name, Input, myTisTosSpecs):
@@ -1048,7 +1047,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
 
         from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseJpsi2MuMu
 
         JpsiForBc = FilterDesktop(
             Code=self.totalJpsiCut
@@ -1067,7 +1065,7 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
 
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
+        from PhysSelPython.Wrappers import Selection
         from StandardParticles import StdLoosePions
 
         CombDdoubleStar2DstarPi = CombineParticles(
@@ -1089,7 +1087,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3pi/Particles')
@@ -1112,7 +1109,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3pi/Particles')
@@ -1137,7 +1133,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3pi/Particles')
@@ -1161,7 +1156,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTauNonPhys
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3piNonPhys/Particles')
@@ -1185,7 +1179,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3pi/Particles')
@@ -1210,7 +1203,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3pi/Particles')
@@ -1235,7 +1227,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTauNonPhys
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3piNonPhys/Particles')
@@ -1259,7 +1250,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3pi/Particles')
@@ -1284,7 +1274,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3pi/Particles')
@@ -1309,7 +1298,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTauNonPhys
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3piNonPhys/Particles')
@@ -1334,7 +1322,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3pi/Particles')
@@ -1358,7 +1345,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTauNonPhys
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3piNonPhys/Particles')
@@ -1382,7 +1368,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3pi/Particles')
@@ -1407,7 +1392,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3pi/Particles')
@@ -1432,7 +1416,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTauNonPhys
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3piNonPhys/Particles')
@@ -1457,7 +1440,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3pi/Particles')
@@ -1483,7 +1465,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3pi/Particles')
@@ -1507,7 +1488,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3pi/Particles')
@@ -1533,7 +1513,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3pi/Particles')
@@ -1558,7 +1537,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTauNonPhys
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3piNonPhys/Particles')
@@ -1584,7 +1562,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3pi/Particles')
@@ -1608,7 +1585,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3pi/Particles')
@@ -1632,7 +1608,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3pi/Particles')
@@ -1657,7 +1632,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3pi/Particles')
@@ -1683,7 +1657,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTauNonPhys
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3piNonPhys/Particles')
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingSL/StrippingB2XuMuNu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingSL/StrippingB2XuMuNu.py
index 2030ab55bceabeabacb751a8dcb72733c2f8efbc..855040885b3b1ae6bd41b9f1ed5a454512122eb0 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingSL/StrippingB2XuMuNu.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingSL/StrippingB2XuMuNu.py
@@ -9,9 +9,7 @@
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
 
-import logging
 from StrippingUtils.Utils import LineBuilder
-from Gaudi.Configuration import *
 __author__ = ['Phillip Urquijo, Alessandra Borgia']
 __date__ = '08/05/2010'
 __version__ = '$Revision: 1.6 $'
@@ -221,7 +219,7 @@ class B2XuMuNuBuilder(LineBuilder):
     def __init__(self, name, config):
         LineBuilder.__init__(self, name, config)
         self.config = config
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
+        from PhysSelPython.Wrappers import DataOnDemand
         self._stdLooseKsLL = DataOnDemand("Phys/StdLooseKsLL/Particles")
         self._stdLooseKsLD = DataOnDemand("Phys/StdLooseKsLD/Particles")
         self._stdLooseKsDD = DataOnDemand("Phys/StdLooseKsDD/Particles")
@@ -627,8 +625,8 @@ class B2XuMuNuBuilder(LineBuilder):
         if self._KSSel is not None:
             return self._KSSel
 
-        from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
+        from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
+        from PhysSelPython.Wrappers import Selection
 
         _code = FilterDesktop(Code=self._NominalKsSelection() % self._config)
 
@@ -748,7 +746,7 @@ class B2XuMuNuBuilder(LineBuilder):
 
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection
-        from StandardParticles import StdLoosePions, StdLooseMuons
+        from StandardParticles import StdLoosePions
 
         _Ksh = CombineParticles(
             DecayDescriptor="KS0 -> mu- pi+",
@@ -776,7 +774,7 @@ class B2XuMuNuBuilder(LineBuilder):
 
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection
-        from StandardParticles import StdLoosePions, StdLooseMuons
+        from StandardParticles import StdLoosePions
 
         _Ksh = CombineParticles(
             DecayDescriptor="KS0 -> mu+ pi-",
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingSL/StrippingCharmFromBSemiForHadronAsy.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingSL/StrippingCharmFromBSemiForHadronAsy.py
index a80fcb301fa6917bd97160506a3b0a679ff40777..ddaec2925512363daba54947938f97bdafffeb41 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingSL/StrippingCharmFromBSemiForHadronAsy.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingSL/StrippingCharmFromBSemiForHadronAsy.py
@@ -25,8 +25,7 @@ from Configurables import FilterDesktop, CombineParticles
 from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from StandardParticles import StdAllLoosePions, StdLoosePions, StdLooseMuons, StdLooseKaons, StdLooseProtons
-from Configurables import TisTosParticleTagger
+from StandardParticles import StdLooseKaons, StdLooseMuons, StdLoosePions
 
 __all__ = ('CharmFromBSemiForHadronAsyAllLinesConf',
            'TOSFilter',
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingSL/StrippingLb2pMuNuVub.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingSL/StrippingLb2pMuNuVub.py
index cd969d689449a9dc069bd745b4acbc62f683dfda..e74c7de20e90982142bcf10f66be4a6cb90689e6 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingSL/StrippingLb2pMuNuVub.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingSL/StrippingLb2pMuNuVub.py
@@ -9,9 +9,7 @@
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
 
-import logging
 from StrippingUtils.Utils import LineBuilder
-from Gaudi.Configuration import *
 __author__ = ['William Sutcliffe']
 __date__ = '19/01/2014'
 __version__ = '$Revision: 1.0 $'
@@ -137,8 +135,6 @@ class Lb2pMuNuVubBuilder(LineBuilder):
     def __init__(self, name, config):
         LineBuilder.__init__(self, name, config)
 
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
-
         self.GECs = {"Code": "( recSummaryTrack(LHCb.RecSummary.nLongTracks, TrLONG) < %(GEC_nLongTrk)s )" % config,
                      "Preambulo": ["from LoKiTracks.decorators import *"]}
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingSL/Strippingbhad2PMuX.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingSL/Strippingbhad2PMuX.py
index e89305332152e8ebc4ee1e72a7f10cd8d9d2dfae..f46738721f8dbfce869e840a1aa8cbb13c6fdd2f 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingSL/Strippingbhad2PMuX.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34/StrippingSL/Strippingbhad2PMuX.py
@@ -9,9 +9,7 @@
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
 
-import logging
 from StrippingUtils.Utils import LineBuilder
-from Gaudi.Configuration import *
 __author__ = ['William Sutcliffe', 'Patrick Owen']
 __date__ = '02/12/2015'
 __version__ = '$Revision: 2.0 $'
@@ -132,8 +130,6 @@ class bhad2PMuXBuilder(LineBuilder):
     def __init__(self, name, config):
         LineBuilder.__init__(self, name, config)
 
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
-
         self.GECs = {"Code": "( recSummaryTrack(LHCb.RecSummary.nLongTracks, TrLONG) < %(GEC_nLongTrk)s )" % config,
                      "Preambulo": ["from LoKiTracks.decorators import *"]}
 
@@ -455,7 +451,7 @@ class bhad2PMuXBuilder(LineBuilder):
     ###### Lb->pMuNu High M_corr Opposite Sign ######
     def _bhad2PMuX_Lb(self):
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-        from PhysSelPython.Wrappers import Selection, MergedSelection
+        from PhysSelPython.Wrappers import Selection
 
         _pMu = CombineParticles(
             DecayDescriptors=self._config["DECAYS"], ReFitPVs=True)
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingB2CC/StrippingB2JpsiHH.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingB2CC/StrippingB2JpsiHH.py
index 426a15a03fdb410fd33fba1d83ccac165f4c345b..ea80a2693083b0dd305af119c0794a0a03dd0088 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingB2CC/StrippingB2JpsiHH.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingB2CC/StrippingB2JpsiHH.py
@@ -20,18 +20,10 @@ __date__ = '10/11/2016'
 
 __all__ = ('B2JpsiHHConf', 'default_config')
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from CommonParticles.Utils import updateDoD
-from StandardParticles import StdLoosePions
-from StandardParticles import StdLooseKaons
-from StandardParticles import StdLooseProtons
-from StandardParticles import StdAllLooseKaons
-from StandardParticles import StdAllLooseProtons
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
+from PhysSelPython.Wrappers import DataOnDemand, Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from GaudiKernel.SystemOfUnits import MeV
 
 default_config = {
     'NAME': 'B2JpsiHH',
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingB2CC/StrippingB2JpsiPi0.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingB2CC/StrippingB2JpsiPi0.py
index 90740f80b4fbe5d7cdd945fc3fb2a4331ac1e49d..170baf2fb63c5dbaab6735a4dbe697c61ed379a3 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingB2CC/StrippingB2JpsiPi0.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingB2CC/StrippingB2JpsiPi0.py
@@ -14,15 +14,10 @@ __version__ = '$Revision: 1.1$'
 
 __all__ = ('B2JpsiPi0Conf', 'default_config')
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from CommonParticles.Utils import updateDoD
-from StandardParticles import StdLooseResolvedPi0
-from StandardParticles import StdLooseMergedPi0
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
+from PhysSelPython.Wrappers import DataOnDemand, Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from GaudiKernel.SystemOfUnits import MeV
 
 default_config = {
     # The real name of the lines is BetaS, this is a reference this for the Settings.
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingB2CC/StrippingB2JpsiPi0_Run1.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingB2CC/StrippingB2JpsiPi0_Run1.py
index 3f5f0443aa9132ab2494cbb48813c4ad8991fc1b..1bf462e0083a2da3704b1f804d03b10239ecd920 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingB2CC/StrippingB2JpsiPi0_Run1.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingB2CC/StrippingB2JpsiPi0_Run1.py
@@ -14,15 +14,10 @@ __version__ = '$Revision: 1.2$'
 
 __all__ = ('B2JpsiPi0Conf_RI', 'default_config')
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from CommonParticles.Utils import updateDoD
-from StandardParticles import StdLooseResolvedPi0
-from StandardParticles import StdLooseMergedPi0
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
+from PhysSelPython.Wrappers import DataOnDemand, Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from GaudiKernel.SystemOfUnits import MeV
 
 default_config = {
     # The real name of the lines is BetaS, this is a reference this for the Settings.
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingB2CC/StrippingB2JpsiX0.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingB2CC/StrippingB2JpsiX0.py
index d93a42cce82d84a0ed23627a007cbaad6d469573..e15a04497fca1b721a890552c1359e732098a2be 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingB2CC/StrippingB2JpsiX0.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingB2CC/StrippingB2JpsiX0.py
@@ -20,18 +20,10 @@ __date__ = '22/01/2018'
 
 __all__ = ('B2JpsiX0Conf', 'default_config')
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from CommonParticles.Utils import updateDoD
-from StandardParticles import StdLoosePions
-from StandardParticles import StdLooseKaons
-from StandardParticles import StdLooseProtons
-from StandardParticles import StdAllLooseKaons
-from StandardParticles import StdAllLooseProtons
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
+from PhysSelPython.Wrappers import DataOnDemand, Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from GaudiKernel.SystemOfUnits import MeV
 
 default_config = {
     'NAME': 'B2JpsiX0',
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingB2CC/StrippingB2JpsiXforBeta_s.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingB2CC/StrippingB2JpsiXforBeta_s.py
index f249942b6e70534073a342298d7e41c294d2ac84..83cfcf7fbfeca7d7da85f9148f6fff86360c328b 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingB2CC/StrippingB2JpsiXforBeta_s.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingB2CC/StrippingB2JpsiXforBeta_s.py
@@ -26,16 +26,12 @@ __version__ = '$Revision: 4.0$'
 
 __all__ = ('B2JpsiXforBeta_sConf', 'default_config')
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from CommonParticles.Utils import updateDoD
 from StandardParticles import StdLoosePions
 from StandardParticles import StdLooseKaons
-from StandardParticles import StdAllLooseKaons
 from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from GaudiKernel.SystemOfUnits import MeV
 
 default_config = {
     'NAME': 'BetaS',
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingB2CC/StrippingBd2JpsieeKS.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingB2CC/StrippingBd2JpsieeKS.py
index 447acfd66a8a888ea16f056888b1b5a41ccee167..ccac3244d5f71227250f84d9c5d0c485845ab5b3 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingB2CC/StrippingBd2JpsieeKS.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingB2CC/StrippingBd2JpsieeKS.py
@@ -8,16 +8,10 @@
 # granted to it by virtue of its status as an Intergovernmental Organization  #
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
-from GaudiKernel.SystemOfUnits import MeV
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
-from StandardParticles import StdAllLooseKaons
-from StandardParticles import StdLooseKaons
-from StandardParticles import StdLoosePions
-from CommonParticles.Utils import updateDoD
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = 'Ramon Niet'
 __date__ = '2014/10/23'
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingB2CC/StrippingBd2JpsieeKstar.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingB2CC/StrippingBd2JpsieeKstar.py
index 2f212b3648b3a956f93594588b6f5fd1a345b725..8ce24bba33857f9f52e405dfb33b6f4cfbc72be8 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingB2CC/StrippingBd2JpsieeKstar.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingB2CC/StrippingBd2JpsieeKstar.py
@@ -12,7 +12,6 @@ from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from Configurables import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = 'Artur Ukleja, Jibo He, Konrad Klimaszewski, Varvara Batozskaya'
 __date__ = '2019/01/22'
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingB2CC/StrippingBs2EtacPhiBDT.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingB2CC/StrippingBs2EtacPhiBDT.py
index b6e256eaa1235a84cbf3b68362eea9bf7f387897..30d69a2c110a19ab5a45303854da636781997f4f 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingB2CC/StrippingBs2EtacPhiBDT.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingB2CC/StrippingBs2EtacPhiBDT.py
@@ -17,7 +17,6 @@ from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
-from Gaudi.Configuration import *
 __author__ = ['Morgan Martin, Jibo He']
 __date__ = '20/08/2014'
 __version__ = '$Revision: 1.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingB2CC/StrippingBs2JpsieePhi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingB2CC/StrippingBs2JpsieePhi.py
index 933c2f46f93196ffa448a855cea7a82e5fca3652..ee8bf0cf2aad66cd3771f048a336fffb0ed8165d 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingB2CC/StrippingBs2JpsieePhi.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingB2CC/StrippingBs2JpsieePhi.py
@@ -12,7 +12,6 @@ from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from Configurables import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = 'Artur Ukleja, Jibo He, Konrad Klimaszewski'
 __date__ = '2011/03/01'
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingB2OC/Beauty2Charm_B2DXBuilder.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingB2OC/Beauty2Charm_B2DXBuilder.py
index 2d1c9d69a292481caadad4c128dc90547777bf58..d86ed2e85c6a4d8cd4220bde92edd4e1f99e0d84 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingB2OC/Beauty2Charm_B2DXBuilder.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingB2OC/Beauty2Charm_B2DXBuilder.py
@@ -12,11 +12,7 @@
 
 from copy import deepcopy
 from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-from PhysSelPython.Wrappers import Selection
-from Beauty2Charm_LoKiCuts import LoKiCuts
 from Beauty2Charm_Utils import *
-from Configurables import SubstitutePID
 
 # \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\#
 
@@ -1090,7 +1086,7 @@ class B2DXBuilder(object):
                                     "B- -> D*_2(2460)0 D0 K-"],
                   'B2D0st2460D0Pi': ["B+ -> D*_2(2460)0 D0 pi+",
                                      "B- -> D*_2(2460)0 D0 pi-"]}
-        input = self.dst.dpi_2460_pid+self.d.kpi_pid+self.topoKaons_PID
+        self.dst.dpi_2460_pid+self.d.kpi_pid+self.topoKaons_PID
         inputs = {'B2D0st2460D0K': self.dst.dpi_2460_pid+self.d.kpi_pid+self.topoKaons_PID,
                   'B2D0st2460D0Pi': self.dst.dpi_2460_pid+self.d.kpi_pid+self.topoPions_PID}
         rs = makeB2XSels(decays, '', inputs, self.config)
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingB2OC/Beauty2Charm_Bc2BXBuilder.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingB2OC/Beauty2Charm_Bc2BXBuilder.py
index 63ecc854364bae2f29d64ea2b95c3484988c7016..5bb9297a5c69f56bc7b9761489bf517623df7d3c 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingB2OC/Beauty2Charm_Bc2BXBuilder.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingB2OC/Beauty2Charm_Bc2BXBuilder.py
@@ -8,11 +8,9 @@
 # granted to it by virtue of its status as an Intergovernmental Organization  #
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
-from copy import deepcopy
 from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 from PhysSelPython.Wrappers import Selection, MergedSelection
-from Beauty2Charm_LoKiCuts import LoKiCuts
 from Beauty2Charm_Utils import *
 
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingB2OC/Beauty2Charm_Bc2DDBuilder.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingB2OC/Beauty2Charm_Bc2DDBuilder.py
index 17eda4547110606bb00b589ef9a9081a7ab985e7..44526bcd78bbc48eb6f8c6416c9eabdc38313ac4 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingB2OC/Beauty2Charm_Bc2DDBuilder.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingB2OC/Beauty2Charm_Bc2DDBuilder.py
@@ -11,10 +11,8 @@
 
 # \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\#
 
-from copy import deepcopy
 from Gaudi.Configuration import *
-from PhysSelPython.Wrappers import Selection, MergedSelection
-from Beauty2Charm_LoKiCuts import LoKiCuts
+from PhysSelPython.Wrappers import MergedSelection
 from Beauty2Charm_Utils import *
 # from Configurables import SubstitutePID
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingB2OC/Beauty2Charm_Bc2DXBuilder.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingB2OC/Beauty2Charm_Bc2DXBuilder.py
index 6f6b41a5a8d8e6494ece3c8a144bcc57574870b7..4965e7a83f1b9871f219ab719abb3e950ee03bbd 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingB2OC/Beauty2Charm_Bc2DXBuilder.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingB2OC/Beauty2Charm_Bc2DXBuilder.py
@@ -10,9 +10,6 @@
 ###############################################################################
 from copy import deepcopy
 from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-from PhysSelPython.Wrappers import Selection, MergedSelection
-from Beauty2Charm_LoKiCuts import LoKiCuts
 from Beauty2Charm_Utils import *
 
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingB2OC/Beauty2Charm_DBuilder.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingB2OC/Beauty2Charm_DBuilder.py
index d4740efb1cda30fc3ac5cdfb96c40d12fe5606f3..c4e957ea4c19356392178500bc0038fb77f701cb 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingB2OC/Beauty2Charm_DBuilder.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingB2OC/Beauty2Charm_DBuilder.py
@@ -321,7 +321,6 @@ class DBuilder(object):
         # self.k3pi_ddx_pid = [filterSelection('D2k3pi_for_DDX',LoKiCuts(['VCHI2DOF','BPVVDCHI2'],config_for_ddx).code(),self.k3pi_pid)]
 
         # use this below
-        d_cf_noMassWin = d_cf
         d_cf = LoKiCuts.combine([d_cf, "in_range(%s,MM,%s)" % (d_min, d_max)])
         ds_cf = LoKiCuts.combine(
             [ds_cf, "in_range(%s,MM,%s)" % (ds_min, ds_max)])
@@ -1820,9 +1819,6 @@ class DBuilder(object):
 
     def _makeD2PhiMuNu(self, up=False):
         '''makes Ds->phi mu nu'''
-        decays = [['phi(1020)', 'mu+']]
-        min = '1125.13*MeV'
-        max = '2168.49*MeV'
         cpkk = CombineParticles(CombinationCut="ADAMASS('phi(1020)') < 150*MeV",  # ( hasTopoChild() )
                                 MotherCut='(VFASPF(VCHI2/VDOF) < 10)',
                                 DaughtersCuts={'K+': '(PIDK>-10)'},
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingB2OC/Beauty2Charm_HHBuilder.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingB2OC/Beauty2Charm_HHBuilder.py
index ac91c76ab1a16bdd9e6da4a8f26964aba8913d00..2a73dd8afc3d6f2f1e9b68b60ae7b3dd4bb6654c 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingB2OC/Beauty2Charm_HHBuilder.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingB2OC/Beauty2Charm_HHBuilder.py
@@ -10,7 +10,6 @@
 ###############################################################################
 # \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\#
 
-from copy import deepcopy
 from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 from PhysSelPython.Wrappers import Selection
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingB2OC/Beauty2Charm_HHHBuilder.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingB2OC/Beauty2Charm_HHHBuilder.py
index 4ca95e738689e28e73bea3eb642ac88f607712a1..28ca931f76590f11cdabcf62760db4c23769a749 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingB2OC/Beauty2Charm_HHHBuilder.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingB2OC/Beauty2Charm_HHHBuilder.py
@@ -10,9 +10,8 @@
 ###############################################################################
 # \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\#
 
-from copy import deepcopy
 from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N3BodyDecays
+from GaudiConfUtils.ConfigurableGenerators import DaVinci__N3BodyDecays
 from PhysSelPython.Wrappers import Selection
 from Beauty2Charm_LoKiCuts import LoKiCuts
 from Beauty2Charm_Utils import *
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingB2OC/Beauty2Charm_Lb2XBuilder.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingB2OC/Beauty2Charm_Lb2XBuilder.py
index b7be9235f35813eff39c035e1cb6714db9d90ca1..45e5b0dd4789b8e7ff6c046e70b87ec2e5b19c66 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingB2OC/Beauty2Charm_Lb2XBuilder.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingB2OC/Beauty2Charm_Lb2XBuilder.py
@@ -1333,7 +1333,7 @@ class Lb2XBuilder(object):
 
     def _makeX2LcKPiPiPi(self):
         '''Makes RS + WS Xib -> Lc HH + c.c.'''
-        pions = self.pions
+        self.pions
         kaons = self.kaons
         pipipi = self.hhh.pipipi
         config = deepcopy(self.config)
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingB2OC/Beauty2Charm_LoKiCuts.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingB2OC/Beauty2Charm_LoKiCuts.py
index 54540ea2a223d554a751b02cf83000df4f3aa076..0fd327f8d32075591c9ca0e2d4dd434636c0ab35 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingB2OC/Beauty2Charm_LoKiCuts.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingB2OC/Beauty2Charm_LoKiCuts.py
@@ -10,11 +10,6 @@
 ###############################################################################
 # \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\#
 
-from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
-from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-from PhysSelPython.Wrappers import Selection, MergedSelection
-from StandardParticles import StdNoPIDsPions, StdNoPIDsKaons
 
 # \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\#
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingB2OC/Beauty2Charm_Utils.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingB2OC/Beauty2Charm_Utils.py
index 1fe78df7c079a95de0d4ea880934703d735084c0..4a7f7a1c5fd4d4c38087b77dfd87eb04fa363095 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingB2OC/Beauty2Charm_Utils.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingB2OC/Beauty2Charm_Utils.py
@@ -10,13 +10,11 @@
 ###############################################################################
 # \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\#
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-from PhysSelPython.Wrappers import DataOnDemand, Selection, MergedSelection, VoidEventSelection
+from PhysSelPython.Wrappers import DataOnDemand, Selection, VoidEventSelection
 from Beauty2Charm_LoKiCuts import LoKiCuts
 from Configurables import SubstitutePID
-from Configurables import ConeJetProxyFilter
 
 # \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\#
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingB2OC/StrippingB2DDphi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingB2OC/StrippingB2DDphi.py
index b0f8982f1efb389032da5f7becb2881e3c005379..92ca95c2ea3f7c46766aedbc04dbbc34c9c0b8ef 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingB2OC/StrippingB2DDphi.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingB2OC/StrippingB2DDphi.py
@@ -15,8 +15,7 @@ Author: M. Martinelli
 Notes: Excited states are included by placing the line in FULL.DST
 '''
 from PhysSelPython.Wrappers import Selection, DataOnDemand
-from Configurables import FilterDesktop, CombineParticles, DaVinci__N4BodyDecays
-from GaudiConfUtils.ConfigurableGenerators import CombineParticles
+from Configurables import DaVinci__N4BodyDecays, FilterDesktop
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 __author__ = ['Maurizio Martinelli']
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingB2OC/StrippingB2DXD2HMuNu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingB2OC/StrippingB2DXD2HMuNu.py
index 0c33c7610ceda08cc07fbbc35c72e2186d8d5d81..d01564ec9dde10135fe1fc2b84e567d131876e4c 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingB2OC/StrippingB2DXD2HMuNu.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingB2OC/StrippingB2DXD2HMuNu.py
@@ -12,13 +12,11 @@ __author__ = ['Wenbin Qian']
 __date__ = '09/11/2015'
 __version__ = '$Revision: 0.01 $'
 
-from Gaudi.Configuration import *
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, DaVinci__N4BodyDecays, DaVinci__N3BodyDecays
-from PhysSelPython.Wrappers import Selection, DataOnDemand
+from PhysSelPython.Wrappers import Selection
 from StandardParticles import StdLooseMuons, StdLoosePions, StdLooseKaons
-from GaudiKernel.SystemOfUnits import MeV, GeV, cm, mm
 
 __all__ = ('B2DXD2HMuNuBuilder',
            'default_config')
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingB2OC/StrippingB2nbody.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingB2OC/StrippingB2nbody.py
index 663bdbbf855c3d8d19dad3a29b6be667edaeedb9..04c84fc2dc39eb4b3d3d954f3c0083396e0c84fa 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingB2OC/StrippingB2nbody.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingB2OC/StrippingB2nbody.py
@@ -16,7 +16,6 @@ from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, MergedSelection, DataOnDemand, VoidEventSelection
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = ['Rudolf Oldeman']
 __date__ = '08/02/2011'
 __version__ = '$Revision: 1.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingB2OC/StrippingBeauty2Charm.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingB2OC/StrippingBeauty2Charm.py
index 4d5f2c9be463ca2124ea2f2d0afc00614c46a995..3742d441c292d70cce6002696220883629d7fe34 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingB2OC/StrippingBeauty2Charm.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingB2OC/StrippingBeauty2Charm.py
@@ -28,11 +28,9 @@ from Beauty2Charm_HHHBuilder import *
 from Beauty2Charm_HHBuilder import *
 from Beauty2Charm_DBuilder import *
 from StandardParticles import StdLooseAllPhotons, StdVeryLooseAllPhotons
-from Configurables import LoKi__VoidFilter
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import EventSelection
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
+from PhysSelPython.Wrappers import MergedSelection, Selection
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
 from Gaudi.Configuration import *
 import re
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBandQ/StrippingB2Chic0KPi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBandQ/StrippingB2Chic0KPi.py
index 69e18721b3c6b45435046eaac0c9a79d5818b6da..030871800dfb7d9f6c18c93c207febaf3fad5cf8 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBandQ/StrippingB2Chic0KPi.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBandQ/StrippingB2Chic0KPi.py
@@ -17,7 +17,6 @@ from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
-from Gaudi.Configuration import *
 __author__ = ['Andrii Usachov']
 __date__ = '13/03/2018'
 __version__ = '$Revision: 1.2$'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBandQ/StrippingB2JpsiXforEM_s.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBandQ/StrippingB2JpsiXforEM_s.py
index d3aeeef75411f9cecca87053ee0faa991e8c7fd8..394fd7c3171d61beb9b93f762a890a248f2b190f 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBandQ/StrippingB2JpsiXforEM_s.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBandQ/StrippingB2JpsiXforEM_s.py
@@ -20,21 +20,11 @@ __version__ = '$Revision: 0.0 $'
 
 __all__ = ('B2JpsiXforEM_sConf', 'default_config')
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
 from Configurables import LoKi__PVReFitter, CombineParticles
-from CommonParticles.Utils import updateDoD
-from StandardParticles import StdLoosePions
-from StandardParticles import StdLooseKaons
-from StandardParticles import StdAllLooseKaons
-from StandardParticles import StdLooseResolvedPi0
-from StandardParticles import StdLooseMergedPi0
-from StandardParticles import StdNoPIDsPions
-from StandardParticles import StdLooseProtons
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
+from PhysSelPython.Wrappers import DataOnDemand, Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from GaudiKernel.SystemOfUnits import MeV
 
 default_config = {
     'NAME': 'B2JpsiXforEM',
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBandQ/StrippingBbbar2PhiPhi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBandQ/StrippingBbbar2PhiPhi.py
index 2c308991a8d9592619777fb7aad4c619a4a40437..fd4e526f5796889d5eb13efd1f1fca7adfbf4a97 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBandQ/StrippingBbbar2PhiPhi.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBandQ/StrippingBbbar2PhiPhi.py
@@ -21,12 +21,10 @@ confBbbar2PhiPhi = Bbbar2PhiPhiConf( name = 'Bbbar2PhiPhi', config = config_Bbba
 stream.appendLines( confBbbar2PhiPhi.lines() )
 '''
 
-from StandardParticles import StdNoPIDsProtons, StdNoPIDsPions, StdNoPIDsDownPions
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
+from PhysSelPython.Wrappers import DataOnDemand, Selection
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = ['Simone Stracka']
 __date__ = '10/03/2015'
 __all__ = (
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBandQ/StrippingBc2JpsiHBDT.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBandQ/StrippingBc2JpsiHBDT.py
index d973f13d2bc8b32c5045776e5b5d3f96bc618e74..7b5a84a9de9b55f09a9ef0da7469b5cc113c4602 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBandQ/StrippingBc2JpsiHBDT.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBandQ/StrippingBc2JpsiHBDT.py
@@ -18,7 +18,6 @@ from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = ['Jibo He']
 __date__ = '02/11/2013'
 __version__ = '$Revision: 2.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBandQ/StrippingBc2JpsiMuXNew.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBandQ/StrippingBc2JpsiMuXNew.py
index 946bad8366ac6019498b9d14e89f0a8899cf70d4..bd156feb81f0deaaf2a07b14df76bcbbcdd03d5c 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBandQ/StrippingBc2JpsiMuXNew.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBandQ/StrippingBc2JpsiMuXNew.py
@@ -18,7 +18,6 @@ from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = ['Jibo He']
 __date__ = '02/09/2010'
 __version__ = '$Revision: 2.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBandQ/StrippingCC2DD.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBandQ/StrippingCC2DD.py
index 58f89513ddb6f5ae23ad89c616deb7d8f0c6f719..39a30438368c27a6a42f57688de187a8b1135e72 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBandQ/StrippingCC2DD.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBandQ/StrippingCC2DD.py
@@ -22,8 +22,7 @@ Module for construction of CC->D D, where CC is a particle decaying to D D
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 __author__ = ['Lucio Anderlini', 'Andrea Bizzeti']
 __date__ = '2015-12-01'
 __version__ = '$Revision: 0.4 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBandQ/StrippingCcbar2Baryons.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBandQ/StrippingCcbar2Baryons.py
index e5a87f652fa30a90026cc6172bb112eb157c1e0f..3e235742a82cc6b6eef181ba5871e7096a9e965d 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBandQ/StrippingCcbar2Baryons.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBandQ/StrippingCcbar2Baryons.py
@@ -20,7 +20,6 @@ stream.appendLines( [
 ])
 '''
 
-from StandardParticles import StdNoPIDsProtons, StdNoPIDsPions, StdNoPIDsDownPions
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBandQ/StrippingCcbar2LambdaLambda.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBandQ/StrippingCcbar2LambdaLambda.py
index 627203da22f81a94eda9c6247ea6c2a1fb128927..283be918e66c410e5d5d0c9fd13effb397d4b70b 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBandQ/StrippingCcbar2LambdaLambda.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBandQ/StrippingCcbar2LambdaLambda.py
@@ -12,14 +12,10 @@
 Module for selecting Ccbar->LambdaLambda detached line, with loose PT, PID cuts. 
 '''
 
-from StandardParticles import StdAllLoosePions
-from StandardParticles import StdLoosePions, StdNoPIDsDownPions
-from StandardParticles import StdNoPIDsProtons
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = ['Andrii Usachov']
 __date__ = '27/01/2019'
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBandQ/StrippingCcbar2LstLambda.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBandQ/StrippingCcbar2LstLambda.py
index 0c317712061ae5a153e89bd41b8390a4fc74e187..4937ef3626431e3998bb3086fe7c656fa4ec9e57 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBandQ/StrippingCcbar2LstLambda.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBandQ/StrippingCcbar2LstLambda.py
@@ -12,14 +12,10 @@
 Module for selecting Ccbar->LstLambda detached line, with loose PT, PID cuts. 
 '''
 
-from StandardParticles import StdAllLoosePions, StdAllLooseKaons
-from StandardParticles import StdLoosePions, StdNoPIDsDownPions, StdLooseKaons, StdLooseDownKaons
-from StandardParticles import StdNoPIDsProtons, StdNoPIDsKaons
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = ['Andrii Usachov']
 __date__ = '23/11/2017'
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBandQ/StrippingCcbar2LstLst.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBandQ/StrippingCcbar2LstLst.py
index cf2d3319f4c8d473c85741f08945e6d15bd1722b..fb7af606490052a513bd2a8433237fcbfca14aa4 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBandQ/StrippingCcbar2LstLst.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBandQ/StrippingCcbar2LstLst.py
@@ -12,12 +12,10 @@
 Module for selecting Ccbar->LstLst detached line, with loose PT, PID cuts. 
 '''
 
-from StandardParticles import StdNoPIDsProtons, StdNoPIDsKaons
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
+from PhysSelPython.Wrappers import DataOnDemand, Selection
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = ['Andrii Usachov']
 __date__ = '12/01/2017'
 
@@ -58,19 +56,19 @@ class Ccbar2LstLstConf(LineBuilder):
         self.name = name
         self.config = config
 
-        TRCHI2DOF = config['TRCHI2DOF']
-        KaonProbNNk = config['KaonProbNNk']
-        KaonPTSec = config['KaonPTSec']
-        ProtonProbNNp = config['ProtonProbNNp']
-        ProtonP = config['ProtonP']
-        ProtonPTSec = config['ProtonPTSec']
-        LstVtxChi2 = config['LstVtxChi2']
-        LstMinMass = config['LstMinMass']
-        LstMaxMass = config['LstMaxMass']
-        CombMaxMass = config['CombMaxMass']
-        CombMinMass = config['CombMinMass']
-        MaxMass = config['MaxMass']
-        MinMass = config['MinMass']
+        config['TRCHI2DOF']
+        config['KaonProbNNk']
+        config['KaonPTSec']
+        config['ProtonProbNNp']
+        config['ProtonP']
+        config['ProtonPTSec']
+        config['LstVtxChi2']
+        config['LstMinMass']
+        config['LstMaxMass']
+        config['CombMaxMass']
+        config['CombMinMass']
+        config['MaxMass']
+        config['MinMass']
 
         self.DetachedProtonForLst = self.createSubSel(OutputList="DetachedProtonForLst" + self.name,
                                                       InputList=DataOnDemand(
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBandQ/StrippingCcbar2PPPiPi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBandQ/StrippingCcbar2PPPiPi.py
index 28b6a56f5499cd8ecbce8b1d1e366f216f123073..91e5c78c655288eb933c6478d1eafcaee3904f84 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBandQ/StrippingCcbar2PPPiPi.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBandQ/StrippingCcbar2PPPiPi.py
@@ -12,12 +12,11 @@
 Module for selecting charmonium -> p pbar pi pi 
 '''
 
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
+from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
 from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
-from Gaudi.Configuration import *
 __author__ = ['Jibo He']
 __date__ = '12/11/2015'
 __version__ = '$Revision: 1.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBandQ/StrippingCcbar2PhiPhi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBandQ/StrippingCcbar2PhiPhi.py
index c21b9fa874a5dccb0d9c373c28e255bbe309ea95..101a8e21ba087c6c991fe35e18471728a0abe2e3 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBandQ/StrippingCcbar2PhiPhi.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBandQ/StrippingCcbar2PhiPhi.py
@@ -21,12 +21,10 @@ confCcbar2PhiPhi = Ccbar2PhiPhiConf( name = 'Ccbar2PhiPhi', config = config_Ccba
 stream.appendLines( confCcbar2PhiPhi.lines() )
 '''
 
-from StandardParticles import StdNoPIDsProtons, StdNoPIDsPions, StdNoPIDsDownPions
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
+from PhysSelPython.Wrappers import DataOnDemand, Selection
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = ['Jibo He']
 __date__ = '20/01/2012'
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBandQ/StrippingCcbar2PhiPhiDetached.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBandQ/StrippingCcbar2PhiPhiDetached.py
index 9cece8aa8a316b6c48d7062407ae3c5e4a4703e3..8d48d19f4b11b35402f710baec49d8b99bec7f11 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBandQ/StrippingCcbar2PhiPhiDetached.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBandQ/StrippingCcbar2PhiPhiDetached.py
@@ -15,12 +15,10 @@ Inherited from StrippingCcbar2PhiPhi.py; moved To FullDST
 
 '''
 
-from StandardParticles import StdNoPIDsProtons, StdNoPIDsPions, StdNoPIDsDownPions
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
+from PhysSelPython.Wrappers import DataOnDemand, Selection
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = ['Jibo He, Liupan An']
 __date__ = '11/01/2017'
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBandQ/StrippingCcbar2PhiPhiPiPi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBandQ/StrippingCcbar2PhiPhiPiPi.py
index 3255f0fb24ce2bf3d5dedf3d48901b1a3b7fdf4c..8ded03963ceb90126c111e3d53772e2529b17348 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBandQ/StrippingCcbar2PhiPhiPiPi.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBandQ/StrippingCcbar2PhiPhiPiPi.py
@@ -12,12 +12,11 @@
 Module for selecting charmonium -> phi phi pi pi 
 '''
 
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
+from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
 from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
-from Gaudi.Configuration import *
 __author__ = ['Andrii Usachov']
 __date__ = '10/04/2017'
 __version__ = '$Revision: 1.1 $'
@@ -60,12 +59,12 @@ class Ccbar2PhiPhiPiPiConf(LineBuilder):
         self.name = name
         self.config = config
 
-        PhiVtxChi2 = config['PhiVtxChi2']
-        PhiMassW = config['PhiMassW']
-        KaonPT = config['KaonPT']
-        TRCHI2DOF = config['TRCHI2DOF']
-        KaonProbNNk = config['KaonProbNNk']
-        KaonIPCHI2 = config['KaonIPCHI2']
+        config['PhiVtxChi2']
+        config['PhiMassW']
+        config['KaonPT']
+        config['TRCHI2DOF']
+        config['KaonProbNNk']
+        config['KaonIPCHI2']
 
         self.SelPions = self.createSubSel(OutputList=self.name + "SelPions",
                                           InputList=DataOnDemand(
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBandQ/StrippingCcbar2PpbarNew.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBandQ/StrippingCcbar2PpbarNew.py
index ee8963df34aa184b52ef4e748c679800cc8ef52e..85282982e0396ca96b5935ba315d5b23bee0ba45 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBandQ/StrippingCcbar2PpbarNew.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBandQ/StrippingCcbar2PpbarNew.py
@@ -18,9 +18,8 @@ Module for Charmonium->p pbar, including three lines
 
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
+from PhysSelPython.Wrappers import Selection
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 __author__ = ['Jibo He']
 __date__ = '03/10/2010'
 __version__ = '$Revision: 1.2 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBandQ/StrippingChiCJPsiGammaConv.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBandQ/StrippingChiCJPsiGammaConv.py
index 0974ad33bc785e6c21ccfbd8abd76c1de3c8330d..13c82277579b4165c559b3e45a8dc8a26f329028 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBandQ/StrippingChiCJPsiGammaConv.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBandQ/StrippingChiCJPsiGammaConv.py
@@ -11,8 +11,7 @@
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
-from Configurables import FilterDesktop, CombineParticles, OfflineVertexFitter
-from Gaudi.Configuration import *
+from Configurables import CombineParticles, FilterDesktop
 __author__ = 'Edwige Tournefier'
 __date__ = '08/06/2012'
 __version__ = '$ 1.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBandQ/StrippingDiMuonForXsection.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBandQ/StrippingDiMuonForXsection.py
index 99d45c194f644de10f8a90371ed1079dcd2e147e..7ceb214bd70cc59ffa52391a7a3321cce9dba642 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBandQ/StrippingDiMuonForXsection.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBandQ/StrippingDiMuonForXsection.py
@@ -16,7 +16,6 @@ from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
-from Gaudi.Configuration import *
 __author__ = ['Jibo He']
 __date__ = '28/03/2012'
 __version__ = '$Revision: 1.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBandQ/StrippingDiMuonNew.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBandQ/StrippingDiMuonNew.py
index 7c60c2e0a15b0e700724dae73d54a428fd669c7a..dd539e9d69fb0fa229c32fd245d281db456c4fed 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBandQ/StrippingDiMuonNew.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBandQ/StrippingDiMuonNew.py
@@ -60,7 +60,6 @@ from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand, EventSelection
 from Configurables import LoKi__VoidFilter
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
-from Gaudi.Configuration import *
 __author__ = ['Jibo He']
 __date__ = '30/09/2010'
 __version__ = '$Revision: 1.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBandQ/StrippingEtap2pipimumu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBandQ/StrippingEtap2pipimumu.py
index d3d1d1ace791be2cf505fc6059dff04cd92af55b..af48f7c83025956348c7d9b1611c8e902321aa5f 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBandQ/StrippingEtap2pipimumu.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBandQ/StrippingEtap2pipimumu.py
@@ -13,9 +13,7 @@ from StandardParticles import StdAllLooseMuons, StdAllLoosePions, StdAllLooseKao
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, OfflineVertexFitter
-from Gaudi.Configuration import *
-from copy import copy
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop
 __author__ = ['Xabier Cid Vidal']
 # inspired by StrippingD2XMuMuSSConf, from Malcolm John, B. Viaud and O. Kochebina
 __date__ = '25/1/2019'
@@ -149,10 +147,10 @@ class StrippingEtap2pipimumuConf(LineBuilder):
 
         LineBuilder.__init__(self, name, config)
 
-        Ds2EtapLine_name = name+"_Ds2Etap"
-        Bu2EtapLine_name = name+"_Bu2Etap"
-        Ds2Phi3PiLine_name = name+"_Ds2Phi3Pi"
-        Bu2JPsiKLine_name = name+"_Bu2JPsiK"
+        name+"_Ds2Etap"
+        name+"_Bu2Etap"
+        name+"_Ds2Phi3Pi"
+        name+"_Bu2JPsiK"
 
         # 1 : Make pions and kaons
         selPionsEta = makeDaughters(
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBandQ/StrippingHeavyBaryons.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBandQ/StrippingHeavyBaryons.py
index fdc48e45e9d8cddbdbd0c89c4f67663a329603f3..500f8829198f1352b6129c8bf22fff77d3f04e68 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBandQ/StrippingHeavyBaryons.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBandQ/StrippingHeavyBaryons.py
@@ -12,14 +12,10 @@
 Stripping line for HeavyBaryons studies : Xi_b-, Xi_b0 and Omega_b-
 Author: Yasmine Amhis
 '''
-from GaudiKernel.SystemOfUnits import MeV
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
-from StandardParticles import StdAllLoosePions, StdAllLooseKaons
-from StandardParticles import StdLoosePions, StdNoPIDsDownPions, StdLooseKaons, StdLooseDownKaons
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = ['Yasmine Amhis']
 __date__ = '19/05/2011'
 __version__ = '$Revision: 1.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBandQ/StrippingInclusiveCharmBaryons.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBandQ/StrippingInclusiveCharmBaryons.py
index 201c096247b241236a2ac4156fecd55babf00dd3..5b13bff30a6f8279c85e884ed961904aa89e38d3 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBandQ/StrippingInclusiveCharmBaryons.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBandQ/StrippingInclusiveCharmBaryons.py
@@ -17,13 +17,10 @@ Author: M. Stahl
 Notes: Be creative!
 '''
 from PhysSelPython.Wrappers import Selection, AutomaticData
-import math
 from LoKiProtoParticles.decorators import *
 from LoKiArrayFunctors.decorators import *
 from LoKiPhys.decorators import *
-from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-from Configurables import FilterDesktop
-from PhysConf.Selections import FilterSelection, CombineSelection, Combine4BodySelection, Combine3BodySelection, LimitSelection, MergedSelection
+from PhysConf.Selections import Combine3BodySelection, Combine4BodySelection, FilterSelection, MergedSelection
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 __author__ = ['Marian Stahl']
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBandQ/StrippingInclusiveDoubleD.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBandQ/StrippingInclusiveDoubleD.py
index a06a38a50584fac39714125ffd40ab9e15ade044..6feefa7e6c9dc9308b80bba2c991944f64e4fafb 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBandQ/StrippingInclusiveDoubleD.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBandQ/StrippingInclusiveDoubleD.py
@@ -18,13 +18,10 @@ Author: M. Stahl
 Notes: Be creative!
 '''
 from PhysSelPython.Wrappers import Selection, AutomaticData
-import math
 from LoKiProtoParticles.decorators import *
 from LoKiArrayFunctors.decorators import *
 from LoKiPhys.decorators import *
-from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-from Configurables import FilterDesktop
-from PhysConf.Selections import FilterSelection, CombineSelection, Combine4BodySelection, Combine3BodySelection, LimitSelection, MergedSelection
+from PhysConf.Selections import Combine3BodySelection, Combine4BodySelection, CombineSelection, FilterSelection, MergedSelection
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 __author__ = ['Marian Stahl']
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBandQ/StrippingLb2EtacKp.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBandQ/StrippingLb2EtacKp.py
index 55d3c83ddc36e31f40d92545ba06d3c99b11dcce..860ca3a5a0957521bcd7a48d6e0a5073d1e24017 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBandQ/StrippingLb2EtacKp.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBandQ/StrippingLb2EtacKp.py
@@ -17,7 +17,6 @@ from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
-from Gaudi.Configuration import *
 __author__ = ['Liming Zhang', 'Xuesong Liu']
 __date__ = '23/11/2016'
 __version__ = '$Revision: 2.0$'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBandQ/StrippingOmegabDecays.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBandQ/StrippingOmegabDecays.py
index 10321ae5335297f63b4b8b2f71c70f7293172c1a..4002bd8ca389c38c15dddd1c90f1046ac80538f9 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBandQ/StrippingOmegabDecays.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBandQ/StrippingOmegabDecays.py
@@ -32,8 +32,7 @@ __all__ = ('OmegabDecaysConf',
            'makeOmegab2Omegacgammapi',
            'default_config')
 
-from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBandQ/StrippingPPMuMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBandQ/StrippingPPMuMu.py
index cfa93241546b8cb1958f0c080bce3ed3974eb196..1e28adc9f8419151808afa067316d7a0f98387fb 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBandQ/StrippingPPMuMu.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBandQ/StrippingPPMuMu.py
@@ -12,12 +12,11 @@
 Module for selecting Hc -> p pbar mu mu
 '''
 
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
+from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
 from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
-from Gaudi.Configuration import *
 __author__ = ['Liupan An']
 __date__ = '18/05/2017'
 __version__ = '$Revision: 1.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBandQ/StrippingXibc.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBandQ/StrippingXibc.py
index ed73d91a4d03fe2ff6427b7cd54ccc7ed18aeaa7..d0446cddfd42feba526eaf11c9d8cf13a4160779 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBandQ/StrippingXibc.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBandQ/StrippingXibc.py
@@ -47,17 +47,11 @@ __all__ = ('XibcBuilder'  # LineBuilder class specialization
            )
 
 
-from Gaudi.Configuration import *
-
 from Configurables import FilterDesktop, CombineParticles
 from PhysSelPython.Wrappers import Selection, AutomaticData, MergedSelection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 
-from CommonParticles.StdLooseLambda import StdLooseLambdaLL, StdLooseLambdaDD
-from GaudiKernel.SystemOfUnits import MeV, GeV, mm
-from Configurables import TisTosParticleTagger
-
 
 default_name = "Xibc"
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBandQ/StrippingXibcBDT.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBandQ/StrippingXibcBDT.py
index 5520ac91aac71eded5064eb9daf551c6b35891fe..28b1ca4c2d5b6567ed207d4b3cd2e8dcd52a9324 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBandQ/StrippingXibcBDT.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBandQ/StrippingXibcBDT.py
@@ -33,8 +33,6 @@ from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticle
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, MergedSelection, DataOnDemand
-from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays
-from Gaudi.Configuration import *
 __author__ = ['Jibo He']
 __date__ = '20/11/2016'
 __version__ = '$Revision: 1.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBandQ/StrippingXiccBDT.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBandQ/StrippingXiccBDT.py
index 0fda677dfb8d63acd803c2278c95da8b32d22700..7dde23cf7ee6e3329158f6ed2ef36ed1b1c5655c 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBandQ/StrippingXiccBDT.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBandQ/StrippingXiccBDT.py
@@ -30,9 +30,7 @@ Xicc+  -> D+ p+ K-
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, MergedSelection, DataOnDemand
-from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays
-from Gaudi.Configuration import *
+from PhysSelPython.Wrappers import DataOnDemand, Selection
 __author__ = ['Jibo He']
 __date__ = '20/11/2016'
 __version__ = '$Revision: 1.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBnoC/StrippingB24pLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBnoC/StrippingB24pLines.py
index fed91323554dd309e9a4137174eba46ba8676d87..2c744f40e0299eacf7acf157af33557db0eec23d 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBnoC/StrippingB24pLines.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBnoC/StrippingB24pLines.py
@@ -54,12 +54,10 @@ Exported symbols (use python help!):
    - 
 """
 
-from GaudiKernel.PhysicalConstants import c_light
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
-from Configurables import FilterDesktop, CombineParticles, DaVinci__N4BodyDecays
-from Gaudi.Configuration import *
+from Configurables import DaVinci__N4BodyDecays
 __author__ = ["Pietro Marino", "Oliver Gruenberg"]
 __date__ = "13.10.2017"
 __version__ = "$Revision: 3.0 $"
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBnoC/StrippingB2CharmlessInclusive.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBnoC/StrippingB2CharmlessInclusive.py
index 056df1189d8c6e124a4dcb4201ec68d8ac1fc40d..8ae9f04166a6ba66089d684f07c4dfc79cbbc333 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBnoC/StrippingB2CharmlessInclusive.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBnoC/StrippingB2CharmlessInclusive.py
@@ -16,9 +16,8 @@ from StandardParticles import StdLooseKsDD, StdLooseKsLL
 from StandardParticles import StdNoPIDsPions, StdLooseAllPhotons, StdLooseMergedPi0, StdLooseResolvedPi0
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand, SimpleSelection, MergedSelection
+from PhysSelPython.Wrappers import MergedSelection, Selection, SimpleSelection
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = ['Fred Blanc', 'Luca Pescatore']
 __date__ = '23/01/2019'
 __version__ = '$Revision: 3.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBnoC/StrippingB2HHBDT.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBnoC/StrippingB2HHBDT.py
index 58ec12b040a0d920e656286d4bfc1dda9cf9a73f..e6d9ba6ae39bf426ebdfb99b036c32ac4554915e 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBnoC/StrippingB2HHBDT.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBnoC/StrippingB2HHBDT.py
@@ -24,16 +24,13 @@ __all__ = ('B2HHBDTLines',
            'applyBDT',
            'default_config')
 
-from Gaudi.Configuration import *
 
-from GaudiKernel.SystemOfUnits import *
-
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 from StandardParticles import StdNoPIDsPions
 
 from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
-from StrippingUtils.Utils import LineBuilder, checkConfig
+from StrippingUtils.Utils import LineBuilder
 
 
 default_config = {
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBnoC/StrippingB2HHPi0.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBnoC/StrippingB2HHPi0.py
index bb255a96ff5e37e3059e4fd6df5cfadc8cfb0b7a..f8813f46fcbbc60b4f1ff068547e0ee3c7d07454 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBnoC/StrippingB2HHPi0.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBnoC/StrippingB2HHPi0.py
@@ -27,9 +27,8 @@ __all__ = ('StrippingB2HHPi0Conf',
            'makeB2HHPi0M',
            'default_config')
 
-from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from PhysSelPython.Wrappers import Selection, DataOnDemand
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
+from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from StandardParticles import StdNoPIDsPions, StdLooseMergedPi0, StdLooseResolvedPi0
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBnoC/StrippingB2KShh.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBnoC/StrippingB2KShh.py
index f404e2a87328dc23eb64929a9a9f3cd002ddadcf..2dcd40aee03deb0e241de124f68de39f1abe783b 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBnoC/StrippingB2KShh.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBnoC/StrippingB2KShh.py
@@ -25,7 +25,6 @@ __version__ = 'Stripping24r1/Stripping26r1'
 __all__ = {'B2KShhConf',
            'default_config'}
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, DaVinci__N3BodyDecays
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBnoC/StrippingB2KShhh.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBnoC/StrippingB2KShhh.py
index f95cf109667b3401f5eb904c78285279c34d00b5..07d236ac77af02d637424d32f3f4e637192ba3e1 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBnoC/StrippingB2KShhh.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBnoC/StrippingB2KShhh.py
@@ -27,13 +27,13 @@ __all__ = ('B2KShhhConf',
 
 from Gaudi.Configuration import *
 
-from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N4BodyDecays
+from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays
 from StandardParticles import StdNoPIDsPions, StdNoPIDsKaons  # ipchi2 cut
 from StandardParticles import StdLooseKsDD, StdLooseKsLL
 
-from PhysSelPython.Wrappers import Selection, MergedSelection
+from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
-from StrippingUtils.Utils import LineBuilder, checkConfig
+from StrippingUtils.Utils import LineBuilder
 
 from Configurables import FilterDesktop
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBnoC/StrippingB2Ksthh.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBnoC/StrippingB2Ksthh.py
index 94a25a2714e9626cb22e6966b9ad7a1955d78eb9..a39998cb04eef71b62a1bf9337b6fb914d58a917 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBnoC/StrippingB2Ksthh.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBnoC/StrippingB2Ksthh.py
@@ -22,7 +22,6 @@ __version__ = 'Stripping26'
 __all__ = {'B2KsthhConf',
            'default_config'}
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
@@ -176,7 +175,7 @@ class B2KsthhConf(LineBuilder):
         _massCutHigh = "(AM<(5279+%s)*MeV)" % config['B_Mhigh']
         _aptCut = "(APT>%s*MeV)" % config['B_APTmin']
         _daugMedPtCut = "(ANUM(PT>%s*MeV)>=2)" % config['BDaug_MedPT_PT']
-        _daugMaxPtIPCut = "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['BDaug_MaxPT_IP']
+        "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['BDaug_MaxPT_IP']
         _daugPtSumCut = "((APT1+APT2+APT3)>%s*MeV)" % config['BDaug_PTsum']
 
         _combCuts = _aptCut
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBnoC/StrippingB2TwoBaryons.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBnoC/StrippingB2TwoBaryons.py
index 8911a3d3bdc4a0add9f550c63095470ab59d4fef..93fef262a5bd7d8cd0abd1063e287bef85404e66 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBnoC/StrippingB2TwoBaryons.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBnoC/StrippingB2TwoBaryons.py
@@ -31,11 +31,10 @@ from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
 from StandardParticles import StdLooseProtons
 from StandardParticles import StdNoPIDsPions as Pions
-from CommonParticles.StdLooseLambda import StdLooseLambdaLL, StdLooseLambdaDD
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
-from StrippingUtils.Utils import LineBuilder, checkConfig
-from GaudiKernel.SystemOfUnits import MeV, GeV, mm, ns
+from StrippingUtils.Utils import LineBuilder
+from GaudiKernel.SystemOfUnits import GeV, MeV, mm
 
 default_config = {'NAME': 'B2TwoBaryons',
                   'WGs': ['BnoC'],
@@ -157,7 +156,7 @@ class B2TwoBaryonLines(LineBuilder):
 
         B2PPbarName = name + "B2PPbar"
 
-        B2PPSameSignName = name + "B2PPSameSign"
+        name + "B2PPSameSign"
 
         B2Lp_dd_name = name+'B2PLambdabarDD'
         B2Lp_ll_name = name+'B2PLambdabarLL'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBnoC/StrippingB2XEta.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBnoC/StrippingB2XEta.py
index e1adec50004bf9392e263cc5cb3ba465d4e08bf7..95fbd42162ff7cf67819bcb2ccbe2b4f88c30155 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBnoC/StrippingB2XEta.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBnoC/StrippingB2XEta.py
@@ -25,9 +25,7 @@ from StandardParticles import StdLoosePions as Pions
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, DaVinci__N3BodyDecays
-from PhysSelPython.Wrappers import DataOnDemand, Selection, SelectionSequence, MergedSelection
-from GaudiKernel import SystemOfUnits as Units
-from Gaudi.Configuration import *
+from PhysSelPython.Wrappers import DataOnDemand, MergedSelection, Selection
 __author__ = ['Timothy Williams']
 __date__ = '1/12/2016'
 __version__ = 'Stripping26r1'
@@ -564,7 +562,7 @@ class B2XEtaConf(LineBuilder):
         _trackCuts = _track_PT+'&'+_track_Chi2+'&'+_track_GPCut+'&'+_track_PIDCut
         _combCuts = _massCut+'&'+_docaCut
         _combCut12Doca = "ACHI2DOCA(1,2)<%s" % config['eta_DOCA']
-        _combCut12Vtx = "(VFASPF(VCHI2/VDOF)<%s)" % config['eta_vtxChi2']
+        "(VFASPF(VCHI2/VDOF)<%s)" % config['eta_vtxChi2']
         _combCut12 = _combCut12Doca
 
         # _eta3Pi=CombineParticles("eta3Pi",
@@ -592,7 +590,7 @@ class B2XEtaConf(LineBuilder):
         _trackCuts = _track_PT+'&'+_track_Chi2+'&'+_track_GPCut+'&'+_track_PIDCut
         _combCuts = _massCut+'&'+_docaCut
         _combCut12Doca = "ACHI2DOCA(1,2)<%s" % config['eta_prime_DOCA']
-        _combCut12Vtx = "(VFASPF(VCHI2/VDOF)<%s)" % config['eta_prime_vtxChi2']
+        "(VFASPF(VCHI2/VDOF)<%s)" % config['eta_prime_vtxChi2']
         _combCut12 = _combCut12Doca
 
         # _etap=CombineParticles("etap",
@@ -883,7 +881,7 @@ class B2XEtaConf(LineBuilder):
         _combCuts = _massCut+'&'+_docaCut
         _allCuts = _PTCut+'&'+_vtxCut+'&'+_diraCut+'&'+_IPChi2Cut
         _combCut12Doca = "ACHI2DOCA(1,2)<%s" % config['LbDaug_LL_maxDocaChi2']
-        _combCut12Vtx = "(VFASPF(VCHI2/VDOF)<%s)" % config['Lb_VtxChi2']
+        "(VFASPF(VCHI2/VDOF)<%s)" % config['Lb_VtxChi2']
         _combCut12 = _combCut12Doca
 
         _Lb2pKetap = DaVinci__N3BodyDecays(DecayDescriptor="[Lambda_b0 -> p+ K- eta_prime]cc",
@@ -921,7 +919,7 @@ class B2XEtaConf(LineBuilder):
         _combCuts = _massCut
         _allCuts = _PTCut+'&'+_IPChi2Cut+'&'+_vtxCut+'&'+_diraCut
         _combCut12Doca = "ACHI2DOCA(1,2)<%s" % config['LbDaug_LL_maxDocaChi2']
-        _combCut12Vtx = "(VFASPF(VCHI2/VDOF)<%s)" % config['Lb_VtxChi2']
+        "(VFASPF(VCHI2/VDOF)<%s)" % config['Lb_VtxChi2']
         _combCut12 = _combCut12Doca
 
         _Lb2pKeta3Pi = DaVinci__N3BodyDecays(DecayDescriptor="[Lambda_b0 -> p+ K- eta]cc",
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBnoC/StrippingB2a1Pi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBnoC/StrippingB2a1Pi.py
index 29c0766744b242c4ed1be4817cca727495bcb265..9f701cc986294843a275fb204128fb9f3c88fb1d 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBnoC/StrippingB2a1Pi.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBnoC/StrippingB2a1Pi.py
@@ -17,7 +17,6 @@ from Configurables import DaVinci__N4BodyDecays
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
-from Gaudi.Configuration import *
 __author__ = ['Daniel Vieira, Jibo He']
 __date__ = '01/12/2016'
 __version__ = '$Revision: 1.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBnoC/StrippingB2hhpipiPhsSpcCut.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBnoC/StrippingB2hhpipiPhsSpcCut.py
index 08e1d2943eafcfa9ad7d1764a6d5aab6ce3c9526..9fe5c82af0b14937c33c30fd9627961fa0731c0a 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBnoC/StrippingB2hhpipiPhsSpcCut.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBnoC/StrippingB2hhpipiPhsSpcCut.py
@@ -17,7 +17,6 @@ from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = ['Daniel Vieira']
 __date__ = '29/11/2018'
 __version__ = '$Revision: 1.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBnoC/StrippingB2pphh.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBnoC/StrippingB2pphh.py
old mode 100755
new mode 100644
index 782d89e7466f93f490e15dd1095ac153359b502b..99d5b7265b684f2c69cc962f37bc4fe0b20ac220
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBnoC/StrippingB2pphh.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBnoC/StrippingB2pphh.py
@@ -25,16 +25,13 @@ __all__ = ('B2pphhConf',
            )
 
 
-from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop
+from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
 # from Configurables import DaVinci__N4BodyDecays
 from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays
 
-from StandardParticles import StdAllNoPIDsKaons, StdAllNoPIDsPions, StdAllNoPIDsProtons
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from Configurables import LoKi__VoidFilter as VoidFilter
 
 default_config = {
     'NAME': 'B2pphh',
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBnoC/StrippingBc2hhh_BnoC.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBnoC/StrippingBc2hhh_BnoC.py
index cc0952e7ed4c72dc5b618028ac8bc563928c126d..21b92fa5aab68df4d68f10c50e59c126b546bd31 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBnoC/StrippingBc2hhh_BnoC.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBnoC/StrippingBc2hhh_BnoC.py
@@ -23,13 +23,11 @@ Exported symbols (use python help!):
    - makeppK_excl  
 '''
 
-from Configurables import LoKi__VoidFilter as VoidFilter
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection
 import StandardParticles
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 __author__ = ['Alvaro Gomes', 'Adlene Hicheur']
 __date__ = '31/08/2014'
 __version__ = '$Revision: 1.5 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBnoC/StrippingBs2KKhh.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBnoC/StrippingBs2KKhh.py
index c9b61ca022f83746560bd95dce95d56ab056c7d1..03011c3e32fb079bbbaa6b9d424d8c8b718c76bb 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBnoC/StrippingBs2KKhh.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBnoC/StrippingBs2KKhh.py
@@ -30,7 +30,6 @@ from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop
-from Gaudi.Configuration import *
 __author__ = ['Sean Benson', 'Adam Morris', 'Laurence Carson',
               'Emmy Pauline Maria Gabriel' 'Markus Roehrken']
 __date__ = '22/11/2016'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBnoC/StrippingBs2KSKS_Run2.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBnoC/StrippingBs2KSKS_Run2.py
index 629ca8140bd72d6380100393e840bf791f2f2cd9..6afaa37fab4f411e76010a848c09d7d72e5a05d9 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBnoC/StrippingBs2KSKS_Run2.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBnoC/StrippingBs2KSKS_Run2.py
@@ -22,15 +22,11 @@ __date__ = '13/09/2016'
 __version__ = 'Run2'
 __all__ = {'Bs2KSKSConf', 'default_config'}
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
+from PhysSelPython.Wrappers import DataOnDemand, Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 
-from StandardParticles import StdNoPIDsPions as Pions
-from StandardParticles import StdNoPIDsDownPions as DownPions
-
 
 default_config = {
     'NAME': 'Bs2KSKS',
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBnoC/StrippingBs2Kst_0Kst_0.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBnoC/StrippingBs2Kst_0Kst_0.py
index 6179c70e7f0f16586cd5a958eb2131e9f13bf1ad..7345868ade6e0cebd873ec58d7ea07808efe59f9 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBnoC/StrippingBs2Kst_0Kst_0.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBnoC/StrippingBs2Kst_0Kst_0.py
@@ -22,11 +22,8 @@ Rate estimated on 100K events using a 2017 data sample is: 0.027%
 
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, SelectionSequence, DataOnDemand
+from PhysSelPython.Wrappers import DataOnDemand, Selection
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-from CommonParticles.Utils import *
-from LHCbKernel.Configuration import *
-from Gaudi.Configuration import *
 __author__ = ['Brais Sanmartin Sedes']
 __date__ = '12/11/2015'
 __version__ = '5.1'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBnoC/StrippingBs2PhiKst0.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBnoC/StrippingBs2PhiKst0.py
index ceb8daa24373fc0cd210ec42fdbc56fd456f51e4..0c1ff7d620f2ef3058536bb8bbba7bedc35b168a 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBnoC/StrippingBs2PhiKst0.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBnoC/StrippingBs2PhiKst0.py
@@ -20,11 +20,8 @@ Exported symbols (use python help!):
 
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, SelectionSequence, DataOnDemand
+from PhysSelPython.Wrappers import DataOnDemand, Selection
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-from CommonParticles.Utils import *
-from LHCbKernel.Configuration import *
-from Gaudi.Configuration import *
 __author__ = ['Brais Sanmartin Sedes']
 __date__ = '01/12/2015'
 __version__ = '5.0'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBnoC/StrippingBs2PhiPhi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBnoC/StrippingBs2PhiPhi.py
index 0f280a3a06ba478759dc6e19bf80e278c15e5d40..1124dcdfd432c594fe79f1bc1e0b70fc24f9d21f 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBnoC/StrippingBs2PhiPhi.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBnoC/StrippingBs2PhiPhi.py
@@ -23,13 +23,10 @@ Exports the following stripping lines as instance data members:
 '''
 
 from StandardParticles import StdAllLooseANNKaons as MyLooseKaons
-from StandardParticles import StdLooseANNUpKaons as MyLooseUpKaons
-import StandardParticles
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
+from PhysSelPython.Wrappers import Selection
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 __author__ = ['Sean Benson']
 __date__ = '2013/08/15'
 __version__ = '3.0'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBnoC/StrippingBu2Ksthh.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBnoC/StrippingBu2Ksthh.py
index 5a06d1502605fd2037a6b16043d5efb150ce86d5..032717bced65040c1e6edaf12520110a1398cd1d 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBnoC/StrippingBu2Ksthh.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBnoC/StrippingBu2Ksthh.py
@@ -23,7 +23,6 @@ __version__ = 'Stripping26'
 __all__ = {'Bu2KsthhConf',
            'default_config'}
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
@@ -302,7 +301,7 @@ class Bu2KsthhConf(LineBuilder):
         _massCutHigh = "(AM<(5279+%s)*MeV)" % config['B_Mhigh']
         _aptCut = "(APT>%s*MeV)" % config['B_APTmin']
         _daugMedPtCut = "(ANUM(PT>%s*MeV)>=2)" % config['BDaug_MedPT_PT']
-        _daugMaxPtIPCut = "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['BDaug_MaxPT_IP']
+        "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['BDaug_MaxPT_IP']
         _maxDocaChi2Cut = "(ACUTDOCACHI2(%s,''))" % config['BDaug_DD_maxDocaChi2']
         _daugPtSumCut = "((APT1+APT2+APT3)>%s*MeV)" % config['BDaug_DD_PTsum']
 
@@ -359,7 +358,7 @@ class Bu2KsthhConf(LineBuilder):
         _massCutHigh = "(AM<(5279+%s)*MeV)" % config['B_Mhigh']
         _aptCut = "(APT>%s*MeV)" % config['B_APTmin']
         _daugMedPtCut = "(ANUM(PT>%s*MeV)>=2)" % config['BDaug_MedPT_PT']
-        _daugMaxPtIPCut = "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['BDaug_MaxPT_IP']
+        "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['BDaug_MaxPT_IP']
         _maxDocaChi2Cut = "(ACUTDOCACHI2(%s,''))" % config['BDaug_LL_maxDocaChi2']
         _daugPtSumCut = "((APT1+APT2+APT3)>%s*MeV)" % config['BDaug_LL_PTsum']
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBnoC/StrippingBu2hhh.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBnoC/StrippingBu2hhh.py
index 890eba4692dbe06517c0d7aee8f51d320cca8a64..62ede4129b7f2bd6ff173b27d26ebf7e47e4e6ea 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBnoC/StrippingBu2hhh.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBnoC/StrippingBu2hhh.py
@@ -22,13 +22,11 @@ Exported symbols (use python help!):
    - makepph_incl
 '''
 
-from Configurables import LoKi__VoidFilter as VoidFilter
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection
 import StandardParticles
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 __author__ = ['Irina Nasteva', 'Jussara Miranda', 'Alvaro Gomes']
 __date__ = '19/05/2017'
 __version__ = 'Stripping29'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBnoC/StrippingBu2rho0rhoPlus.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBnoC/StrippingBu2rho0rhoPlus.py
index 6ff36ce6304e5d819eb96fe6ca06587bb1baa6cc..51df1d5067b9100ee67537610b0005b048a5d51f 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBnoC/StrippingBu2rho0rhoPlus.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBnoC/StrippingBu2rho0rhoPlus.py
@@ -21,7 +21,6 @@ from StrippingUtils.Utils import LineBuilder, checkConfig
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = "Jason E Andrews"
 __date__ = "26/11/2016"
 __version__ = "4.0"
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBnoC/StrippingButo5h.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBnoC/StrippingButo5h.py
index be4eeb8a2dc0617afde7aab5929540d3bc8d05c7..65e1b29f0dde00492a6a5432e53292b9bc4c81a7 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBnoC/StrippingButo5h.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBnoC/StrippingButo5h.py
@@ -23,13 +23,11 @@ Exported symbols (use python help!):
    - makeppKpipi_excl
 '''
 
-from Configurables import LoKi__VoidFilter as VoidFilter
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection
 import StandardParticles
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 __author__ = ['Luiz Gustavo de Oliveira',
               'Alvaro Gomes', 'Bruno Souza de Paula']
 __date__ = '22/Aug/2014'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBnoC/StrippingD2HHBDT.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBnoC/StrippingD2HHBDT.py
index 6bee345112d54e258044f31f0e7d809849b112f7..98ef43000bc5732a81fe2e10bace645263334787 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBnoC/StrippingD2HHBDT.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBnoC/StrippingD2HHBDT.py
@@ -23,14 +23,13 @@ __all__ = ('D2HHBDTLines',
            'makeD2HHBDT',
            'default_config')
 
-from Gaudi.Configuration import *
 
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
 from StandardParticles import StdNoPIDsKaons, StdAllNoPIDsPions
 
 from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
-from StrippingUtils.Utils import LineBuilder, checkConfig
+from StrippingUtils.Utils import LineBuilder
 
 
 default_config = {
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBnoC/StrippingHb2Charged2Body.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBnoC/StrippingHb2Charged2Body.py
index 11da99218434ae71c894fa73b708dca4ee60de5d..3b3424d2fb6688333e151f52793701a7a2c00dbe 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBnoC/StrippingHb2Charged2Body.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBnoC/StrippingHb2Charged2Body.py
@@ -23,14 +23,13 @@ __all__ = ('Hb2Charged2BodyLines',
            'makeB2Charged2Body',
            'default_config')
 
-from Gaudi.Configuration import *
 
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-from StandardParticles import StdNoPIDsPions, StdLooseProtons, StdLooseKaons
+from StandardParticles import StdNoPIDsPions
 
 from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
-from StrippingUtils.Utils import LineBuilder, checkConfig
+from StrippingUtils.Utils import LineBuilder
 
 
 default_config = {
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBnoC/StrippingHb2V0V0h.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBnoC/StrippingHb2V0V0h.py
index 6b1c9eb94b261dbc185e979f0314ffe2bd69f930..f3104c9b58e73817c70f7fa7e3d68a0b9ecf0860 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBnoC/StrippingHb2V0V0h.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBnoC/StrippingHb2V0V0h.py
@@ -22,7 +22,6 @@ __date__ = '10/02/2017'
 __version__ = 'Stripping28'
 __all__ = 'Hb2V0V0hConf'
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBnoC/StrippingLb2V0hh.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBnoC/StrippingLb2V0hh.py
index f63034e02f45426009146384bed4036d16056a26..e896944db6cf521ad12d86186f9bda930b5bfd87 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBnoC/StrippingLb2V0hh.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBnoC/StrippingLb2V0hh.py
@@ -25,7 +25,6 @@ __date__ = '11/01/2017'
 __version__ = 'Stripping28'
 __all__ = 'Lb2V0hhConf'
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
@@ -211,8 +210,8 @@ class Lb2V0hhConf(LineBuilder):
         _vtxCut = "(VFASPF(VCHI2)<%s)   " % config['Lambda_DD_VtxChi2']
         _fdChi2Cut = "(BPVVDCHI2>%s)" % config['Lambda_DD_FDChi2']
         _momCut = "(P>%s*MeV)" % config['Lambda_DD_Pmin']
-        _trkGhostProbCut1 = "(CHILDCUT((TRGHOSTPROB<%s),1))" % config['Trk_GhostProb']
-        _trkGhostProbCut2 = "(CHILDCUT((TRGHOSTPROB<%s),2))" % config['Trk_GhostProb']
+        "(CHILDCUT((TRGHOSTPROB<%s),1))" % config['Trk_GhostProb']
+        "(CHILDCUT((TRGHOSTPROB<%s),2))" % config['Trk_GhostProb']
 
         _allCuts = _momCut
         _allCuts += '&'+_massCut
@@ -268,8 +267,8 @@ class Lb2V0hhConf(LineBuilder):
         _vtxCut = "(VFASPF(VCHI2)<%s)   " % config['Lambda_DD_VtxChi2']
         _fdChi2Cut = "(BPVVDCHI2>%s)" % config['Lambda_DD_FDChi2']
         _momCut = "(P>%s*MeV)" % config['Lambda_DD_Pmin']
-        _trkGhostProbCut1 = "(CHILDCUT((TRGHOSTPROB<%s),1))" % config['Trk_GhostProb']
-        _trkGhostProbCut2 = "(CHILDCUT((TRGHOSTPROB<%s),2))" % config['Trk_GhostProb']
+        "(CHILDCUT((TRGHOSTPROB<%s),1))" % config['Trk_GhostProb']
+        "(CHILDCUT((TRGHOSTPROB<%s),2))" % config['Trk_GhostProb']
 
         _allCuts = _momCut
         _allCuts += '&'+_massCut
@@ -302,7 +301,7 @@ class Lb2V0hhConf(LineBuilder):
         _massCutHigh = "(AM<(5619+%s)*MeV)" % config['Lb_2bodyMhigh']
         _aptCut = "(APT>%s*MeV)" % config['Lb_APTmin']
         _daugMedPtCut = "(ANUM(PT>%s*MeV)>=2)" % config['LbDaug_MedPT_PT']
-        _daugMaxPtIPCut = "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP']
+        "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP']
         _maxDocaChi2Cut = "(ACUTDOCACHI2(%s,''))" % config['LbDaug_DD_maxDocaChi2']
         _daugPtSumCut = "(APT1>%s*MeV)" % config['Lbh_DD_PTMin']
 
@@ -353,7 +352,7 @@ class Lb2V0hhConf(LineBuilder):
         _massCutHigh = "(AM<(5619+%s)*MeV)" % config['Lb_Mhigh']
         _aptCut = "(APT>%s*MeV)" % config['Lb_APTmin']
         _daugMedPtCut = "(ANUM(PT>%s*MeV)>=2)" % config['LbDaug_MedPT_PT']
-        _daugMaxPtIPCut = "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP']
+        "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP']
         _maxDocaChi2Cut = "(ACUTDOCACHI2(%s,''))" % config['LbDaug_DD_maxDocaChi2']
         _daugPtSumCut = "((APT1+APT2+APT3)>%s*MeV)" % config['LbDaug_DD_PTsum']
 
@@ -369,7 +368,7 @@ class Lb2V0hhConf(LineBuilder):
         _vtxChi2Cut = "(VFASPF(VCHI2)<%s)" % config['Lb_VtxChi2']
         _diraCut = "(BPVDIRA>%s)" % config['Lb_DD_Dira']
         _ipChi2Cut = "(MIPCHI2DV(PRIMARY)<%s)" % config['Lb_DD_IPCHI2wrtPV']
-        _fdCut = "(VFASPF(VMINVDDV(PRIMARY))>%s)" % config['Lb_FDwrtPV']
+        "(VFASPF(VMINVDDV(PRIMARY))>%s)" % config['Lb_FDwrtPV']
         _fdChi2Cut = "(BPVVDCHI2>%s)" % config['Lb_DD_FDChi2']
 
         _motherCuts = _ptCut
@@ -541,7 +540,7 @@ class Lb2V0hhConf(LineBuilder):
         _massCutHigh = "(AM<(5619+%s)*MeV)" % config['Lb_2bodyMhigh']
         _aptCut = "(APT>%s*MeV)" % config['Lb_APTmin']
         _daugMedPtCut = "(ANUM(PT>%s*MeV)>=2)" % config['LbDaug_MedPT_PT']
-        _daugMaxPtIPCut = "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP']
+        "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP']
         _maxDocaChi2Cut = "(ACUTDOCACHI2(%s,''))" % config['LbDaug_LD_maxDocaChi2']
         _daugPtSumCut = "(APT1>%s*MeV)" % config['Lbh_LD_PTMin']
 
@@ -592,7 +591,7 @@ class Lb2V0hhConf(LineBuilder):
         _massCutHigh = "(AM<(5619+%s)*MeV)" % config['Lb_Mhigh']
         _aptCut = "(APT>%s*MeV)" % config['Lb_APTmin']
         _daugMedPtCut = "(ANUM(PT>%s*MeV)>=2)" % config['LbDaug_MedPT_PT']
-        _daugMaxPtIPCut = "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP']
+        "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP']
         _maxDocaChi2Cut = "(ACUTDOCACHI2(%s,''))" % config['LbDaug_LD_maxDocaChi2']
         _daugPtSumCut = "((APT1+APT2+APT3)>%s*MeV)" % config['LbDaug_LD_PTsum']
 
@@ -608,7 +607,7 @@ class Lb2V0hhConf(LineBuilder):
         _vtxChi2Cut = "(VFASPF(VCHI2)<%s)" % config['Lb_VtxChi2']
         _diraCut = "(BPVDIRA>%s)" % config['Lb_LD_Dira']
         _ipChi2Cut = "(MIPCHI2DV(PRIMARY)<%s)" % config['Lb_LD_IPCHI2wrtPV']
-        _fdCut = "(VFASPF(VMINVDDV(PRIMARY))>%s)" % config['Lb_FDwrtPV']
+        "(VFASPF(VMINVDDV(PRIMARY))>%s)" % config['Lb_FDwrtPV']
         _fdChi2Cut = "(BPVVDCHI2>%s)" % config['Lb_LD_FDChi2']
 
         _motherCuts = _ptCut
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBnoC/StrippingLb2V0pp.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBnoC/StrippingLb2V0pp.py
index 23c63deba0a566efad08463be4f9e9577abecd08..77385a7d77c2a03b1678f32801ca31cd7356be5c 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBnoC/StrippingLb2V0pp.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBnoC/StrippingLb2V0pp.py
@@ -24,7 +24,6 @@ __date__ = '06/01/2019'
 __version__ = 'Stripping34'
 __all__ = 'Lb2V0ppConf'
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
@@ -210,8 +209,8 @@ class Lb2V0ppConf(LineBuilder):
         _vtxCut = "(VFASPF(VCHI2)<%s)   " % config['Lambda_DD_VtxChi2']
         _fdChi2Cut = "(BPVVDCHI2>%s)" % config['Lambda_DD_FDChi2']
         _momCut = "(P>%s*MeV)" % config['Lambda_DD_Pmin']
-        _trkGhostProbCut1 = "(CHILDCUT((TRGHOSTPROB<%s),1))" % config['Trk_GhostProb']
-        _trkGhostProbCut2 = "(CHILDCUT((TRGHOSTPROB<%s),2))" % config['Trk_GhostProb']
+        "(CHILDCUT((TRGHOSTPROB<%s),1))" % config['Trk_GhostProb']
+        "(CHILDCUT((TRGHOSTPROB<%s),2))" % config['Trk_GhostProb']
 
         _allCuts = _momCut
         _allCuts += '&'+_massCut
@@ -266,8 +265,8 @@ class Lb2V0ppConf(LineBuilder):
         _vtxCut = "(VFASPF(VCHI2)<%s)   " % config['Lambda_DD_VtxChi2']
         _fdChi2Cut = "(BPVVDCHI2>%s)" % config['Lambda_DD_FDChi2']
         _momCut = "(P>%s*MeV)" % config['Lambda_DD_Pmin']
-        _trkGhostProbCut1 = "(CHILDCUT((TRGHOSTPROB<%s),1))" % config['Trk_GhostProb']
-        _trkGhostProbCut2 = "(CHILDCUT((TRGHOSTPROB<%s),2))" % config['Trk_GhostProb']
+        "(CHILDCUT((TRGHOSTPROB<%s),1))" % config['Trk_GhostProb']
+        "(CHILDCUT((TRGHOSTPROB<%s),2))" % config['Trk_GhostProb']
 
         _allCuts = _momCut
         _allCuts += '&'+_massCut
@@ -300,7 +299,7 @@ class Lb2V0ppConf(LineBuilder):
         _massCutHigh = "(AM<(5619+%s)*MeV)" % config['Lb_2bodyMhigh']
         _aptCut = "(APT>%s*MeV)" % config['Lb_APTmin']
         _daugMedPtCut = "(ANUM(PT>%s*MeV)>=2)" % config['LbDaug_MedPT_PT']
-        _daugMaxPtIPCut = "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP']
+        "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP']
         _maxDocaChi2Cut = "(ACUTDOCACHI2(%s,''))" % config['LbDaug_DD_maxDocaChi2']
         _daugPtSumCut = "(APT1>%s*MeV)" % config['Lbh_DD_PTMin']
 
@@ -351,7 +350,7 @@ class Lb2V0ppConf(LineBuilder):
         _massCutHigh = "(AM<(5619+%s)*MeV)" % config['Lb_Mhigh']
         _aptCut = "(APT>%s*MeV)" % config['Lb_APTmin']
         _daugMedPtCut = "(ANUM(PT>%s*MeV)>=2)" % config['LbDaug_MedPT_PT']
-        _daugMaxPtIPCut = "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP']
+        "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP']
         _maxDocaChi2Cut = "(ACUTDOCACHI2(%s,''))" % config['LbDaug_DD_maxDocaChi2']
         _daugPtSumCut = "((APT1+APT2+APT3)>%s*MeV)" % config['LbDaug_DD_PTsum']
 
@@ -540,7 +539,7 @@ class Lb2V0ppConf(LineBuilder):
         _massCutHigh = "(AM<(5619+%s)*MeV)" % config['Lb_2bodyMhigh']
         _aptCut = "(APT>%s*MeV)" % config['Lb_APTmin']
         _daugMedPtCut = "(ANUM(PT>%s*MeV)>=2)" % config['LbDaug_MedPT_PT']
-        _daugMaxPtIPCut = "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP']
+        "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP']
         _maxDocaChi2Cut = "(ACUTDOCACHI2(%s,''))" % config['LbDaug_LD_maxDocaChi2']
         _daugPtSumCut = "(APT1>%s*MeV)" % config['Lbh_LD_PTMin']
 
@@ -591,7 +590,7 @@ class Lb2V0ppConf(LineBuilder):
         _massCutHigh = "(AM<(5619+%s)*MeV)" % config['Lb_Mhigh']
         _aptCut = "(APT>%s*MeV)" % config['Lb_APTmin']
         _daugMedPtCut = "(ANUM(PT>%s*MeV)>=2)" % config['LbDaug_MedPT_PT']
-        _daugMaxPtIPCut = "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP']
+        "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP']
         _maxDocaChi2Cut = "(ACUTDOCACHI2(%s,''))" % config['LbDaug_LD_maxDocaChi2']
         _daugPtSumCut = "((APT1+APT2+APT3)>%s*MeV)" % config['LbDaug_LD_PTsum']
 
@@ -607,7 +606,7 @@ class Lb2V0ppConf(LineBuilder):
         _vtxChi2Cut = "(VFASPF(VCHI2)<%s)" % config['Lb_VtxChi2']
         _diraCut = "(BPVDIRA>%s)" % config['Lb_LD_Dira']
         _ipChi2Cut = "(MIPCHI2DV(PRIMARY)<%s)" % config['Lb_LD_IPCHI2wrtPV']
-        _fdCut = "(VFASPF(VMINVDDV(PRIMARY))>%s)" % config['Lb_FDwrtPV']
+        "(VFASPF(VMINVDDV(PRIMARY))>%s)" % config['Lb_FDwrtPV']
         _fdChi2Cut = "(BPVVDCHI2>%s)" % config['Lb_LD_FDChi2']
 
         _motherCuts = _ptCut
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBnoC/StrippingXb23ph.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBnoC/StrippingXb23ph.py
index 44ba838d436b418c4eaef7372eccd95c28426134..ef24837631cfc50b46aabe0cc7dba0c8cdeb66fd 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBnoC/StrippingXb23ph.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBnoC/StrippingXb23ph.py
@@ -22,7 +22,6 @@ from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, DaVinci__N4Body
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection
-from Gaudi.Configuration import *
 __author__ = ['Jinlin Fu', 'Maurizio Martinelli', 'Andrea Merli']
 __date__ = '12/11/2015'
 __version__ = 'v1r0'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBnoC/StrippingXb2p3h.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBnoC/StrippingXb2p3h.py
index d07d7e52c17b8a01201968b3a1b929751c31bc9d..2c10d1f20bf15892c5e8ef6a5861130250a0a8ae 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBnoC/StrippingXb2p3h.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBnoC/StrippingXb2p3h.py
@@ -22,7 +22,6 @@ from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, DaVinci__N4Body
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection
-from Gaudi.Configuration import *
 __author__ = ['Jan Mickelle V. Maratas', 'Stephane Monteil', 'Andrea Merli']
 __date__ = '01/04/2016'
 __version__ = 'v1r0'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBnoC/StrippingXb2phh.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBnoC/StrippingXb2phh.py
index ae62ac803dcda11696229820fa7bcb3737c75114..35432dcb4a93cdbf47f1ec738735037534d82c07 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBnoC/StrippingXb2phh.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingBnoC/StrippingXb2phh.py
@@ -22,7 +22,6 @@ from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, DaVinci__N3Body
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection
-from Gaudi.Configuration import *
 __author__ = ['Jan Mickelle V. Maratas', 'Stephane Monteil', 'Thomas Latham']
 __date__ = '24/11/2016'
 __version__ = 'v1r0'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCalib/StrippingCharmFromBSemiForHadronAsy.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCalib/StrippingCharmFromBSemiForHadronAsy.py
index 08e7ce501b97c255a5b8e5a3de8395e4cbcf3cb6..6156fdca33abf5ffff5cbf8a3a9368f977dbcd6f 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCalib/StrippingCharmFromBSemiForHadronAsy.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCalib/StrippingCharmFromBSemiForHadronAsy.py
@@ -19,14 +19,12 @@ __author__ = ['Mika Vesterinen']
 __date__ = '10/03/2013'
 __version__ = '$Revision: 0.0 $'
 
-from Gaudi.Configuration import *
 
 from Configurables import FilterDesktop, CombineParticles
 from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from StandardParticles import StdAllLoosePions, StdLoosePions, StdLooseMuons, StdLooseKaons, StdLooseProtons
-from Configurables import TisTosParticleTagger
+from StandardParticles import StdLooseKaons, StdLooseMuons, StdLoosePions
 
 __all__ = ('CharmFromBSemiForHadronAsyAllLinesConf',
            'TOSFilter',
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCalib/StrippingCharmFromBSemiForProtonPID.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCalib/StrippingCharmFromBSemiForProtonPID.py
index 331ebd34b3e7842bbf2e94a73977d8b0cc10b450..a1e805b96edf80f3f08a3ba0f447e47d13b203c2 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCalib/StrippingCharmFromBSemiForProtonPID.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCalib/StrippingCharmFromBSemiForProtonPID.py
@@ -18,12 +18,11 @@ __author__ = ['Mika Vesterinen']
 __date__ = '19/03/2013'
 __version__ = '$Revision: 0.0 $'
 
-from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from StandardParticles import StdLoosePions, StdLooseMuons, StdLooseKaons, StdLooseProtons, StdNoPIDsProtons
+from StandardParticles import StdLooseKaons, StdLooseMuons, StdLoosePions, StdNoPIDsProtons
 
 __all__ = ('CharmFromBSemiForProtonPIDAllLinesConf',
            'default_config')
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCalib/StrippingD02KPiPi0.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCalib/StrippingD02KPiPi0.py
index b0efbccbb69d5ac6209e0a251edf9943a222afe9..a431e7b970041f35d68bc9a765db0757832a6fdd 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCalib/StrippingD02KPiPi0.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCalib/StrippingD02KPiPi0.py
@@ -25,9 +25,8 @@ __all__ = ('StrippingD02KPiPi0Conf',
            'makeD02KPiPi0M',
            'default_config')
 
-from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from PhysSelPython.Wrappers import Selection, DataOnDemand
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
+from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from StandardParticles import StdTightPions, StdTightKaons, StdLooseMergedPi0, StdLooseResolvedPi0
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCalib/StrippingD02KPiPi0DalitzPartReco.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCalib/StrippingD02KPiPi0DalitzPartReco.py
index caaa8b1b857ec7efb302c62895c9b7a334961cbf..7a1c97e88520fb73f140818146de685e254df9f7 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCalib/StrippingD02KPiPi0DalitzPartReco.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCalib/StrippingD02KPiPi0DalitzPartReco.py
@@ -8,9 +8,7 @@
 # granted to it by virtue of its status as an Intergovernmental Organization  #
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
-import logging
 from StrippingUtils.Utils import LineBuilder
-from Gaudi.Configuration import *
 __author__ = ['Greg Ciezarek', 'Liang Sun', 'Adam Davis']
 __date__ = '18/05/2017'
 __version__ = '$Revision: 0.01 $'
@@ -75,7 +73,6 @@ class D2KPiPi0_PartRecoBuilder(LineBuilder):
     def __init__(self, name, config):
         LineBuilder.__init__(self, name, config)
         self._config = config
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
 
         # self.GECs = { "Code":"( recSummaryTrack(LHCb.RecSummary.nLongTracks, TrLONG) < %(GEC_nLongTrk)s )" % config,
         #              "Preambulo": ["from LoKiTracks.decorators import *"]}
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCalib/StrippingD0ForBXX.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCalib/StrippingD0ForBXX.py
index 836cb251bf6bed5dcdba32758964e9950e666b07..d9859abdb5e61ecd488fc22f98c91f6df28e248f 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCalib/StrippingD0ForBXX.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCalib/StrippingD0ForBXX.py
@@ -20,7 +20,7 @@ from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from StandardParticles import StdLoosePions, StdLooseKaons, StdLooseProtons, StdAllLoosePions
+from StandardParticles import StdAllLoosePions, StdLooseKaons, StdLoosePions
 
 
 name = 'confD0forBXX'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCalib/StrippingDstarD02hhPi0PartRecoForPhotonCalib.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCalib/StrippingDstarD02hhPi0PartRecoForPhotonCalib.py
index ee8e553744feb3138a51e275635fb7d6e5f04f18..5e9f1e9a8d8aaff44060d1c66e8f15e033d7db22 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCalib/StrippingDstarD02hhPi0PartRecoForPhotonCalib.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCalib/StrippingDstarD02hhPi0PartRecoForPhotonCalib.py
@@ -31,15 +31,15 @@ from Gaudi.Configuration import *
 
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 from StandardParticles import StdAllNoPIDsPions, StdNoPIDsPions, StdNoPIDsKaons
-from StandardParticles import StdLooseAllPhotons, StdLooseResolvedPi0, StdLooseMergedPi0
+from StandardParticles import StdLooseAllPhotons
 
 from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
-from StrippingUtils.Utils import LineBuilder, checkConfig
+from StrippingUtils.Utils import LineBuilder
 
 from Configurables import FilterDesktop
 
-from GaudiKernel.SystemOfUnits import GeV, MeV, picosecond, mm
+from GaudiKernel.SystemOfUnits import GeV, MeV, picosecond
 
 default_config = {
     'NAME': 'DstarD2hhGammaCalib',
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCalib/StrippingElectronID.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCalib/StrippingElectronID.py
index f8385e403a664f2d870608e8c28ac1032d182cc0..1b5dd98b23444069027c372e85ae7f6f3318a423 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCalib/StrippingElectronID.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCalib/StrippingElectronID.py
@@ -23,9 +23,8 @@ stream.appendLines( [
 
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand
+from PhysSelPython.Wrappers import Selection
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = ['Jibo He']
 __date__ = '03/10/2010'
 __version__ = '$Revision: 1.2 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCalib/StrippingElectronRecoEff.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCalib/StrippingElectronRecoEff.py
index 13da09ea7872edc275e37588d6b0a2860d2d652f..3670f29246f5fae96b4bb956a4cb787ac8615228 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCalib/StrippingElectronRecoEff.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCalib/StrippingElectronRecoEff.py
@@ -17,17 +17,15 @@ from StandardParticles import StdAllLoosePions as Hlt2Pions
 from StandardParticles import StdAllLooseKaons as Hlt2Kaons
 from StandardParticles import StdNoPIDsElectrons as Hlt2Electrons
 from StandardParticles import StdNoPIDsMuons as Hlt2Muons
-from TrackFitter.ConfiguredFitters import (ConfiguredEventFitter,
-                                           ConfiguredForwardStraightLineEventFitter)
+from TrackFitter.ConfiguredFitters import ConfiguredEventFitter
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import DataOnDemand, MergedSelection
 from PhysConf.Selections import L0TOSSelection
 from PhysConf.Selections import Hlt1TOSSelection
 from PhysConf.Selections import Hlt2TOSSelection
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 from StrippingUtils.Utils import LineBuilder
-from GaudiKernel.SystemOfUnits import GeV, MeV, mm
+from GaudiKernel.SystemOfUnits import MeV, mm
 from Gaudi.Configuration import *
 __author__ = ['Adam Davis', 'Laurent Dufour', 'V. V. Gligorov']
 __date__ = '14/1/2018'
@@ -45,10 +43,9 @@ from PhysSelPython.Wrappers import Selection, Hlt1Selection, Hlt2Selection, L0Se
 from SelPy.utils import (UniquelyNamedObject,
                          ClonableObject,
                          SelectionBase)
-from Configurables import (DecodeVeloRawBuffer, FastVeloTracking, TrackPrepareVelo,
-                           NoPIDsParticleMaker, DataOnDemandSvc, ChargedProtoParticleMaker,
-                           PrTrackAssociator, DelegatingTrackSelector, TrackContainerCopy, TrackAssociator,
-                           TrackStateInitAlg, TrackStateInitTool)
+from Configurables import (FastVeloTracking, NoPIDsParticleMaker, DataOnDemandSvc,
+                           ChargedProtoParticleMaker, DelegatingTrackSelector, TrackContainerCopy,
+                           TrackStateInitAlg)
 
 default_config = {'NAME': 'ElectronRecoEff',
                   'WGs': ['Calib'],
@@ -287,7 +284,6 @@ class StrippingElectronRecoEffLines(LineBuilder):
     def __init__(self, name, config):
         LineBuilder.__init__(self, name, config)
 
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
         self._config = config
         self.name = name
 
@@ -572,7 +568,7 @@ class StrippingElectronRecoEffLines(LineBuilder):
         )
 
     def DetachedEEKPair(self, _name):
-        configuration = self._config["DetachedEEK"]
+        self._config["DetachedEEK"]
 
         _DetachedEEKPair = self.getCPForEEK("DetachedEEK")
         _DetachedEEKPair_Sel = Selection("SelEEK_for_"+_name,
@@ -592,7 +588,7 @@ class StrippingElectronRecoEffLines(LineBuilder):
         return line
 
     def DetachedEEKstarPair(self, _name):
-        configuration = self._config["DetachedEEKstar"]
+        self._config["DetachedEEKstar"]
 
         _DetachedEEKstarPair = self.getCPForEEK("DetachedEEKstar")
         _DetachedEEKstarPair_Sel = Selection("SelEEKstar_for_"+_name,
@@ -612,7 +608,7 @@ class StrippingElectronRecoEffLines(LineBuilder):
         return line
 
     def DetachedEEPhiPair(self, _name):
-        configuration = self._config["DetachedEEPhi"]
+        self._config["DetachedEEPhi"]
 
         _DetachedEEPhiPair = self.getCPForEEK("DetachedEEPhi")
         _DetachedEEPhiPair_Sel = Selection("SelEEPhi_for_"+_name,
@@ -884,7 +880,6 @@ class StrippingElectronRecoEffLines(LineBuilder):
     def MakeVeloTracks(self, prefilter):
         if self._config["DoVeloDecoding"]:
             from DAQSys.Decoders import DecoderDB
-            from DAQSys.DecoderClass import decodersForBank
             decs = []
             vdec = DecoderDB["DecodeVeloRawBuffer/createBothVeloClusters"]
             vdec.Active = True
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCalib/StrippingJPsiForSL.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCalib/StrippingJPsiForSL.py
index 66d3cf569e7e3d642fb1e90689c09009970a9f91..f83a469f0d79f559f3b8f1ce7fa0a29617c07287 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCalib/StrippingJPsiForSL.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCalib/StrippingJPsiForSL.py
@@ -20,11 +20,10 @@ __version__ = '$Revision: 0.1 $'
 
 from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from PhysSelPython.Wrappers import Selection, DataOnDemand
+from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from StandardParticles import StdLoosePions, StdLooseMuons, StdLooseKaons, StdLooseProtons, StdNoPIDsPions, StdNoPIDsMuons, StdLooseMergedPi0, StdLooseResolvedPi0, StdLooseElectrons, StdNoPIDsKaons
-from Configurables import TisTosParticleTagger
+from StandardParticles import StdNoPIDsKaons, StdNoPIDsMuons
 
 __all__ = ('JPsiForSLAllLinesConf',
            'confdict')
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCalib/StrippingK23PiForDownstreamTrackEff.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCalib/StrippingK23PiForDownstreamTrackEff.py
index 5e95ecb40bf4a7b0d570152c6cb5a85c2e157431..9ea071dc760c1a4d2e8adb1bd47ddd464f85a7d1 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCalib/StrippingK23PiForDownstreamTrackEff.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCalib/StrippingK23PiForDownstreamTrackEff.py
@@ -14,10 +14,6 @@ one missing pion, using the corrected mass
 '''
 
 from StrippingUtils.Utils import LineBuilder
-from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = ['Michel De Cian']
 __date__ = '19/12/2018'
 __version__ = '$Revision: 1.0 $'
@@ -269,8 +265,8 @@ class K23PiForDownstreamTrackEffConf(LineBuilder):
         if self._dipionSelSSNarrowDownstream is not None:
             return self._dipionSelSSNarrowDownstream
 
-        from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
+        from GaudiConfUtils.ConfigurableGenerators import CombineParticles
+        from PhysSelPython.Wrappers import Selection
 
         _k2pipi = CombineParticles(
             DecayDescriptors=["[phi(1020) -> pi+ pi+]cc"],
@@ -293,8 +289,8 @@ class K23PiForDownstreamTrackEffConf(LineBuilder):
         if self._dipionSelSSNarrowLong is not None:
             return self._dipionSelSSNarrowLong
 
-        from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
+        from GaudiConfUtils.ConfigurableGenerators import CombineParticles
+        from PhysSelPython.Wrappers import Selection
 
         _k2pipi = CombineParticles(
             DecayDescriptors=["[phi(1020) -> pi+ pi+]cc"],
@@ -317,8 +313,8 @@ class K23PiForDownstreamTrackEffConf(LineBuilder):
         if self._dipionSelSSWide is not None:
             return self._dipionSelSSWide
 
-        from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
+        from GaudiConfUtils.ConfigurableGenerators import CombineParticles
+        from PhysSelPython.Wrappers import Selection
 
         _k2pipi = CombineParticles(
             DecayDescriptors=["[phi(1020) -> pi+ pi+]cc"],
@@ -342,8 +338,8 @@ class K23PiForDownstreamTrackEffConf(LineBuilder):
         if self._dipionSelOSNarrowDownstream is not None:
             return self._dipionSelOSNarrowDownstream
 
-        from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
+        from GaudiConfUtils.ConfigurableGenerators import CombineParticles
+        from PhysSelPython.Wrappers import Selection
 
         # Cut out the Kshort
         mCut = self._dipionSelectionNarrow() + " & (ADMASS('KS0') > 40)"
@@ -370,8 +366,8 @@ class K23PiForDownstreamTrackEffConf(LineBuilder):
         if self._dipionSelOSNarrowLong is not None:
             return self._dipionSelOSNarrowLong
 
-        from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
+        from GaudiConfUtils.ConfigurableGenerators import CombineParticles
+        from PhysSelPython.Wrappers import Selection
 
         # Cut out the Kshort
         mCut = self._dipionSelectionNarrow() + " & (ADMASS('KS0') > 40)"
@@ -398,8 +394,8 @@ class K23PiForDownstreamTrackEffConf(LineBuilder):
         if self._dipionSelOSWide is not None:
             return self._dipionSelOSWide
 
-        from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
+        from GaudiConfUtils.ConfigurableGenerators import CombineParticles
+        from PhysSelPython.Wrappers import Selection
 
         # Cut out the Kshort
         mCut = self._dipionSelectionWide() + " & (ADMASS('KS0') > 40)"
@@ -427,8 +423,8 @@ class K23PiForDownstreamTrackEffConf(LineBuilder):
         # if self._tripionSelDipionSS is not None:
         #   return self._tripionSelDipionSS
 
-        from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
+        from GaudiConfUtils.ConfigurableGenerators import CombineParticles
+        from PhysSelPython.Wrappers import Selection
 
         _k2pipipi = CombineParticles(
             DecayDescriptors=["[K+ -> phi(1020) pi-]cc"],
@@ -449,8 +445,8 @@ class K23PiForDownstreamTrackEffConf(LineBuilder):
         # if self._tripionSelDipionOS is not None:
         #   return self._tripionSelDipionOS
 
-        from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
+        from GaudiConfUtils.ConfigurableGenerators import CombineParticles
+        from PhysSelPython.Wrappers import Selection
 
         _k2pipipi = CombineParticles(
             DecayDescriptors=["[K+ -> phi(1020) pi+]cc"],
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCalib/StrippingLowPtMuID.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCalib/StrippingLowPtMuID.py
index c938bbfa4f325120436121227b8c9ba66d1420d7..96d9c592351659e6d677d1fb083266fb9f80f738 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCalib/StrippingLowPtMuID.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCalib/StrippingLowPtMuID.py
@@ -19,12 +19,9 @@ largely cloned from line written by 'S.Furcas', 'G.Lanfranchi', 'M.Palutan', 'A.
 
 from StandardParticles import StdAllNoPIDsMuons
 from StrippingUtils.Utils import LineBuilder
-from Configurables import LoKi__Hybrid__CoreFactory as CoreFactory
-from Configurables import LoKi__VoidFilter as VoidFilter
-from PhysSelPython.Wrappers import DataOnDemand, Selection, SelectionSequence, MergedSelection
+from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 __author__ = ['G.Ciezarek', ]
 __date__ = '03/12/2015'
 __version__ = '$Revision: 1.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCalib/StrippingMuIDCalib.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCalib/StrippingMuIDCalib.py
index 48473756334933bd76098e1f169f2fcac058f2d2..9647c11e74493f1b68f480afc92080ecc6f1c325 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCalib/StrippingMuIDCalib.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCalib/StrippingMuIDCalib.py
@@ -22,15 +22,12 @@ lb = builder( 'MuIDCalib', config_params )
 
 '''
 
-from StandardParticles import StdAllNoPIDsKaons, StdAllNoPIDsMuons, StdAllNoPIDsPions, StdAllNoPIDsProtons
+from StandardParticles import StdAllNoPIDsMuons
 from StandardParticles import StdNoPIDsKaons, StdNoPIDsMuons, StdNoPIDsPions, StdNoPIDsProtons
 from StrippingUtils.Utils import LineBuilder
-from Configurables import LoKi__Hybrid__CoreFactory as CoreFactory
-from Configurables import LoKi__VoidFilter as VoidFilter
-from PhysSelPython.Wrappers import DataOnDemand, Selection, SelectionSequence, MergedSelection
+from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 __author__ = ['S.Furcas', 'G.Lanfranchi',
               'M.Palutan', 'A.Sarti', 'D.Milanes', 'MuID Team']
 __date__ = '23/08/2011'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCalib/StrippingNoPIDDstarWithD02RSKPi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCalib/StrippingNoPIDDstarWithD02RSKPi.py
index 914c4a47cd048e3cd64e662985a9b4f35d9be508..5969dfaafb882830e2b62086af2a6274bffd846b 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCalib/StrippingNoPIDDstarWithD02RSKPi.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCalib/StrippingNoPIDDstarWithD02RSKPi.py
@@ -13,10 +13,8 @@
 from StandardParticles import StdAllNoPIDsKaons, StdAllNoPIDsPions
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from LHCbKernel.Configuration import *
-from Gaudi.Configuration import *
+from PhysSelPython.Wrappers import Selection
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 __author__ = ['Philip Xing', 'Andrew Powell']
 __date__ = '23rd August 2012'
 __version__ = '$Revision: 7.0 $'
@@ -42,7 +40,7 @@ StrippingReport                                                INFO Event 100000
 __all__ = ('NoPIDDstarWithD02RSKPiConf', 'default_config')
 
 
-from GaudiKernel.SystemOfUnits import mm, cm, MeV, GeV
+from GaudiKernel.SystemOfUnits import GeV, MeV
 # from Configurables import FilterDesktop, CombineParticles
 
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCalib/StrippingPIDCalib.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCalib/StrippingPIDCalib.py
index f3872175c1963791b4ef11e27dece0c57f983c05..65099ba3209f82b019bfdda36cf17bc93d0b54e0 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCalib/StrippingPIDCalib.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCalib/StrippingPIDCalib.py
@@ -35,9 +35,7 @@ from Configurables import DaVinci__N3BodyDecays
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
 from Configurables import CombineParticles
-from Gaudi.Configuration import *
 __author__ = ['Lucio Anderlini']
 __date__ = '25/02/2015'
 __version__ = '$Revision: 1.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCalib/StrippingTrackEffD0ToKPi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCalib/StrippingTrackEffD0ToKPi.py
index b93a420e3f50b2e4f8f1d92b1881f55e362e1bcf..1a0ca1d608bbe19c5586681674ba9a975871571b 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCalib/StrippingTrackEffD0ToKPi.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCalib/StrippingTrackEffD0ToKPi.py
@@ -17,7 +17,7 @@ from Configurables import FilterDesktop, CombineParticles
 from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from StandardParticles import StdLooseKaons, StdLoosePions, StdAllLoosePions, StdAllNoPIDsPions
+from StandardParticles import StdAllLoosePions, StdLooseKaons, StdLoosePions
 from SelPy.utils import (UniquelyNamedObject,
                          ClonableObject,
                          SelectionBase)
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCalib/StrippingTrackEffDownMuon.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCalib/StrippingTrackEffDownMuon.py
old mode 100755
new mode 100644
index 21183c23cb96bfab39ffdcc6bd7c4179aa95fcb1..c1b3a3d27fbe6ff6795e43bbb378b51ecdd2211d
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCalib/StrippingTrackEffDownMuon.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCalib/StrippingTrackEffDownMuon.py
@@ -48,35 +48,27 @@ __all__ = ('StrippingTrackEffDownMuonConf',
 # FIXME Write includes in a cleaner way
 from Gaudi.Configuration import *
 from LHCbKernel.Configuration import *
-from DAQSys.DecoderClass import Decoder
 from Configurables import GaudiSequencer
 from Configurables import UnpackTrack, ChargedProtoParticleMaker, DelegatingTrackSelector, TrackSelector, BestPIDParticleMaker
-from TrackFitter.ConfiguredFitters import ConfiguredFit
 from Configurables import TrackStateInitAlg
 from StrippingConf.StrippingLine import StrippingLine
-from Configurables import ChargedProtoParticleAddMuonInfo, MuonIDAlgLite
+from Configurables import ChargedProtoParticleAddMuonInfo
 from MuonID import ConfiguredMuonIDs
 from Configurables import ChargedProtoCombineDLLsAlg, ProtoParticleMUONFilter
-from PhysSelPython.Wrappers import Selection, DataOnDemand
+from PhysSelPython.Wrappers import Selection
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
 from StandardParticles import StdLooseMuons
 
 from StrippingUtils.Utils import LineBuilder
-from Configurables import LoKi__VoidFilter
-from os import environ
 from Gaudi.Configuration import *
-import GaudiKernel.ProcessJobOptions
-from GaudiKernel.SystemOfUnits import mm
 
 from GaudiConfUtils.ConfigurableGenerators import TisTosParticleTagger
 from StandardParticles import StdAllLooseMuons
 from Configurables import GaudiSequencer
 from Configurables import TrackToDST
-from Configurables import TrackSys
 from Configurables import PatSeeding, PatSeedingTool, PatLongLivedTracking
-from PhysSelPython.Wrappers import AutomaticData
 # Get the fitters
-from TrackFitter.ConfiguredFitters import ConfiguredFit, ConfiguredFitSeed, ConfiguredFitDownstream
+from TrackFitter.ConfiguredFitters import ConfiguredFitDownstream
 from PatAlgorithms import PatAlgConf
 
 from SelPy.utils import (UniquelyNamedObject,
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCalib/StrippingTrackEffMuonTT.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCalib/StrippingTrackEffMuonTT.py
index e4b5dcdd3e9e45e78514419f33215ba0c11c8214..2813f15a2bd11c522ce8fa41d62c8cba8c67b48f 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCalib/StrippingTrackEffMuonTT.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCalib/StrippingTrackEffMuonTT.py
@@ -64,11 +64,10 @@ __all__ = ('StrippingTrackEffMuonTTConf',
            'makeBJpsiKTrackEff',
            'filterHLT2ForBJpsiK')
 
-from Gaudi.Configuration import *
-from PhysSelPython.Wrappers import Selection, DataOnDemand, ChargedProtoParticleSelection
+from PhysSelPython.Wrappers import ChargedProtoParticleSelection, Selection
 from StrippingConf.StrippingLine import StrippingLine
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from StrippingUtils.Utils import LineBuilder, checkConfig
+from StrippingUtils.Utils import LineBuilder
 from StandardParticles import StdLooseKaons, StdLooseMuons, StdAllLooseMuons
 
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCalib/StrippingTrackEffVeloMuon.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCalib/StrippingTrackEffVeloMuon.py
index ffa92dea7667aef5332e746f9148e895be65ae03..6df059e2071e9e680868ea0fd9802ab4faedd9b1 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCalib/StrippingTrackEffVeloMuon.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCalib/StrippingTrackEffVeloMuon.py
@@ -43,30 +43,22 @@ __all__ = ('StrippingTrackEffVeloMuonConf',
            )
 
 
-from Gaudi.Configuration import *
-from LHCbKernel.Configuration import *
 from Configurables import CombineParticles
-from PhysSelPython.Wrappers import Selection, SelectionSequence, DataOnDemand
-from Configurables import ChargedProtoParticleMaker, NoPIDsParticleMaker, DataOnDemandSvc, DelegatingTrackSelector, TrackSelector, CombinedParticleMaker, BestPIDParticleMaker
+from PhysSelPython.Wrappers import Selection
+from Configurables import ChargedProtoParticleMaker, DataOnDemandSvc, DelegatingTrackSelector, NoPIDsParticleMaker, TrackSelector
 from Configurables import FastVeloTracking
 
 from StrippingConf.StrippingLine import StrippingLine
-from Configurables import TrackStateInitAlg, TrackEventFitter, TrackPrepareVelo, TrackContainerCopy, Tf__PatVeloSpaceTool, StandaloneMuonRec
-from Configurables import TrackCloneFinder
+from Configurables import StandaloneMuonRec, TrackPrepareVelo
 from StrippingUtils.Utils import LineBuilder
 from StandardParticles import StdLooseMuons
 
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, TisTosParticleTagger
 
 from Configurables import GaudiSequencer
-from Configurables import TrackSys
-from PhysSelPython.Wrappers import AutomaticData
 # Get the fitters
-from TrackFitter.ConfiguredFitters import ConfiguredFit
 
-from Configurables import TrackEventCloneKiller, VeloMuonBuilder
-from Configurables import TrackEventFitter, TrackMasterFitter
-from Configurables import TrackKalmanFilter, TrackMasterExtrapolator
+from Configurables import VeloMuonBuilder
 # from TrackFitter.ConfiguredFitters import ConfiguredFastFitter
 # from Configurables import TrackCloneFinder
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCharm/StrippingB2ppipiSigmacmm_Lcpi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCharm/StrippingB2ppipiSigmacmm_Lcpi.py
index 1932ea73632bfc335a5d650d07d5b01c5d455fa9..397b76425631bddc729ad4ce8bbb2a99c6f92bf2 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCharm/StrippingB2ppipiSigmacmm_Lcpi.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCharm/StrippingB2ppipiSigmacmm_Lcpi.py
@@ -31,12 +31,11 @@ __all__ = ('StrippingB2ppipiSigmacmm_Lcpi_Conf', 'makeLc2pKpi', 'makepifromSigma
            )
 
 from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, ConjugateNeutralPID, DaVinci__N3BodyDecays
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N3BodyDecays, FilterDesktop
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
-from StrippingUtils.Utils import checkConfig, LineBuilder
+from StrippingUtils.Utils import LineBuilder
 from GaudiKernel.SystemOfUnits import MeV, GeV, mm
-from copy import copy
 
 name = 'StrippingB2ppipiSigmacmm_Lcpi'
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCharm/StrippingChargedHyperons.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCharm/StrippingChargedHyperons.py
index 920c9faefc12697a4686bb708606c7aefce7c812..1e9ecbdf32eac322732659ae13423893f4c17ced 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCharm/StrippingChargedHyperons.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCharm/StrippingChargedHyperons.py
@@ -21,13 +21,9 @@ __version__ = '$Revision: 1.0 $'
 __all__ = ('StrippingChargedHyperonsConf', 'default_config')
 
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from StandardParticles import StdLoosePions, StdNoPIDsDownPions, StdLooseKaons, StdLooseDownKaons
-from StandardParticles import StdAllLoosePions, StdAllLooseKaons
 
 from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
-from PhysSelPython.Wrappers import MultiSelectionSequence
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from GaudiKernel.SystemOfUnits import MeV, mm, picosecond
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCharm/StrippingCharm2PPX.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCharm/StrippingCharm2PPX.py
index 8f420ab23681879eda33d3f11a9c1854083e6f5d..1776621bc50d11dd212c17cc7c967c25e7570f68 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCharm/StrippingCharm2PPX.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCharm/StrippingCharm2PPX.py
@@ -26,7 +26,7 @@ __all__ = (
     'StrippingCharm2PPXConf'  # ???
 )
 
-from GaudiKernel.SystemOfUnits import MeV, GeV, mm, mrad
+from GaudiKernel.SystemOfUnits import GeV, MeV, mm
 from Configurables import CombineParticles, FilterDesktop
 # from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop, DaVinci__N3BodyDecays
 from StandardParticles import (
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCharm/StrippingCharmForVub.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCharm/StrippingCharmForVub.py
index addb5112d833323e807d80a2fcd5d1c6ef104d89..196b7aca8b732e4ce87cfa408c9240c9d4ca9fe8 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCharm/StrippingCharmForVub.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCharm/StrippingCharmForVub.py
@@ -31,9 +31,8 @@ __all__ = ('CharmForVubConf',
            'makeDstarD02HMuNu')
 
 from Gaudi.Configuration import *
-from Configurables import SubstitutePID
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
+from PhysSelPython.Wrappers import MergedSelection, Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from StandardParticles import StdLooseMuons, StdLooseKaons, StdAllLoosePions, StdLoosePions
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCharm/StrippingCharmWeakDecays.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCharm/StrippingCharmWeakDecays.py
index 62cf538da90f04787baab5c812393440f86c3b23..72c36178501074aeada4d5d7f91bd305c974ec78 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCharm/StrippingCharmWeakDecays.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCharm/StrippingCharmWeakDecays.py
@@ -28,7 +28,7 @@ __all__ = ('CharmWeakDecaysConf',
            'default_config')
 
 from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCharm/StrippingD02KSKS.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCharm/StrippingD02KSKS.py
index 048a0f735673d789716920a6b813f3734a817158..2e831b063d5dd66449d672d2c0c14659bb9d9210 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCharm/StrippingD02KSKS.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCharm/StrippingD02KSKS.py
@@ -25,9 +25,8 @@ __date__ = '15/05/2014'
 __version__ = 'Stripping23'
 __all__ = 'D02KSKSConf'
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
+from PhysSelPython.Wrappers import DataOnDemand, Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 
@@ -556,7 +555,7 @@ class D02KSKSConf(LineBuilder):
         _daughterCuts = "(TRGHOSTPROB <=%s )" % config['slowPi_LLL_TRGHOSTPROB']
 
         # 40
-        _vertexChi2_cut = "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_LL']
+        "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_LL']
 
         # 200
         _combCuts = "(ADAMASS('D*(2010)+') < %s*MeV)" % config['Dst_mass_LL']
@@ -593,7 +592,7 @@ class D02KSKSConf(LineBuilder):
         _daughterCuts = "(TRGHOSTPROB <=%s )" % config['slowPi_LLU_TRGHOSTPROB']
 
         # 40
-        _vertexChi2_cut = "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_LL']
+        "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_LL']
 
         # 200
         _combCuts = "(ADAMASS('D*(2010)+') < %s*MeV)" % config['Dst_mass_LL']
@@ -630,7 +629,7 @@ class D02KSKSConf(LineBuilder):
         _daughterCuts = "(TRGHOSTPROB <=%s )" % config['slowPi_LDL_TRGHOSTPROB']
 
         # 40
-        _vertexChi2_cut = "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_LD']
+        "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_LD']
 
         # 200
         _combCuts = "(ADAMASS('D*(2010)+') < %s*MeV)" % config['Dst_mass_LD']
@@ -667,7 +666,7 @@ class D02KSKSConf(LineBuilder):
         _daughterCuts = "(TRGHOSTPROB <=%s )" % config['slowPi_LDU_TRGHOSTPROB']
 
         # 40
-        _vertexChi2_cut = "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_LD']
+        "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_LD']
 
         # 200
         _combCuts = "(ADAMASS('D*(2010)+') < %s*MeV)" % config['Dst_mass_LD']
@@ -704,7 +703,7 @@ class D02KSKSConf(LineBuilder):
         _daughterCuts = "(TRGHOSTPROB <=%s )" % config['slowPi_DDL_TRGHOSTPROB']
 
         # 40
-        _vertexChi2_cut = "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_DD']
+        "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_DD']
 
         # 200
         _combCuts = "(ADAMASS('D*(2010)+') < %s*MeV)" % config['Dst_mass_DD']
@@ -741,7 +740,7 @@ class D02KSKSConf(LineBuilder):
         _daughterCuts = "(TRGHOSTPROB <=%s )" % config['slowPi_DDU_TRGHOSTPROB']
 
         # 40
-        _vertexChi2_cut = "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_DD']
+        "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_DD']
 
         # 200
         _combCuts = "(ADAMASS('D*(2010)+') < %s*MeV)" % config['Dst_mass_DD']
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCharm/StrippingD2HHHGamma.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCharm/StrippingD2HHHGamma.py
index f493f6bd9021f7c482ad4f11110b31209e277d1e..e0da6bf833dec41ba4733267992c2593b1e66642 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCharm/StrippingD2HHHGamma.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCharm/StrippingD2HHHGamma.py
@@ -22,19 +22,18 @@ __version__ = '$Revision: 0.1 $'
 __all__ = ('D2HHHGammaLines',
            'default_config')
 
-from Gaudi.Configuration import *
 
-from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N4BodyDecays
+from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays
 from StandardParticles import StdNoPIDsPions, StdNoPIDsKaons
 from StandardParticles import StdLooseAllPhotons, StdAllLooseGammaLL, StdAllLooseGammaDD
 
 from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
-from StrippingUtils.Utils import LineBuilder, checkConfig
+from StrippingUtils.Utils import LineBuilder
 
 from Configurables import FilterDesktop
 
-from GaudiKernel.SystemOfUnits import GeV, MeV, picosecond, mm
+from GaudiKernel.SystemOfUnits import GeV, MeV, picosecond
 
 
 default_config = {
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCharm/StrippingD2HHHKs.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCharm/StrippingD2HHHKs.py
index e5639b90812290f4e2226c3b0c140285aa788b00..8b56f2ae08f0d364c45bed96aa90657daee77a7d 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCharm/StrippingD2HHHKs.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCharm/StrippingD2HHHKs.py
@@ -22,19 +22,18 @@ __version__ = '$Revision: 0.1 $'
 __all__ = ('D2HHHKsLines',
            'default_config')
 
-from Gaudi.Configuration import *
 
-from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N4BodyDecays
+from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays
 from StandardParticles import StdNoPIDsPions, StdNoPIDsKaons
 from StandardParticles import StdLooseKsDD, StdLooseKsLL
 
 from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
-from StrippingUtils.Utils import LineBuilder, checkConfig
+from StrippingUtils.Utils import LineBuilder
 
 from Configurables import FilterDesktop
 
-from GaudiKernel.SystemOfUnits import GeV, MeV, picosecond, mm
+from GaudiKernel.SystemOfUnits import MeV, mm, picosecond
 
 
 default_config = {
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCharm/StrippingD2HHHPi0.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCharm/StrippingD2HHHPi0.py
index 6083359069ac88d66ad4d2d0c3f6c4a785962da6..8557b0ed7b6ea3312ecd34ede82d7cbd720f6775 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCharm/StrippingD2HHHPi0.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCharm/StrippingD2HHHPi0.py
@@ -22,19 +22,18 @@ __version__ = '$Revision: 0.1 $'
 __all__ = ('D2HHHPi0Lines',
            'default_config')
 
-from Gaudi.Configuration import *
 
-from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N4BodyDecays
+from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays
 from StandardParticles import StdNoPIDsPions, StdNoPIDsKaons
 from StandardParticles import StdLooseResolvedPi0, StdLooseMergedPi0
 
 from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
-from StrippingUtils.Utils import LineBuilder, checkConfig
+from StrippingUtils.Utils import LineBuilder
 
 from Configurables import FilterDesktop
 
-from GaudiKernel.SystemOfUnits import GeV, MeV, picosecond, mm
+from GaudiKernel.SystemOfUnits import GeV, MeV, picosecond
 
 
 default_config = {
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCharm/StrippingD2HMuNu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCharm/StrippingD2HMuNu.py
index 2ceba3956453266f579b29b43ab66b82c4dc906a..0b1aa8422f7bb32ab3d194b98dead0e474772019 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCharm/StrippingD2HMuNu.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCharm/StrippingD2HMuNu.py
@@ -9,9 +9,7 @@
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
 
-import logging
 from StrippingUtils.Utils import LineBuilder
-from Gaudi.Configuration import *
 __author__ = ['Liang Sun', 'Adam Davis']
 __date__ = '09/11/2015'
 __version__ = '$Revision: 0.01 $'
@@ -98,7 +96,6 @@ class D2HLepNuBuilder(LineBuilder):
     def __init__(self, name, config):
         LineBuilder.__init__(self, name, config)
         self._config = config
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
 
         self.GECs = {"Code": "( recSummaryTrack(LHCb.RecSummary.nLongTracks, TrLONG) < %(GEC_nLongTrk)s )" % config,
                      "Preambulo": ["from LoKiTracks.decorators import *"]}
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCharm/StrippingD2KS0H_conf.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCharm/StrippingD2KS0H_conf.py
index d58964475590bc2e6571bcd929685425e3694bc1..e5b9f6c8683eaaab3109aca8686f163c2f08aef0 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCharm/StrippingD2KS0H_conf.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCharm/StrippingD2KS0H_conf.py
@@ -44,9 +44,9 @@ from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticle
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StandardParticles import StdLoosePions, StdLooseKaons
 from StrippingConf.StrippingLine import StrippingLine
-from StrippingUtils.Utils import LineBuilder, checkConfig
+from StrippingUtils.Utils import LineBuilder
 from Configurables import TisTosParticleTagger
-from GaudiKernel.SystemOfUnits import GeV, MeV, picosecond, mm
+from GaudiKernel.SystemOfUnits import MeV, mm, picosecond
 
 default_name = 'D2KS0H'
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCharm/StrippingD2PiPi0.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCharm/StrippingD2PiPi0.py
index 2cf2e1f2dfcc01187fa87b6b497e55c580034ef2..3593748cd50e6ab84496cfb7045a1b29f0016504 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCharm/StrippingD2PiPi0.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCharm/StrippingD2PiPi0.py
@@ -33,7 +33,7 @@ __all__ = (
 
 )
 
-from GaudiKernel.SystemOfUnits import MeV, GeV, mrad, picosecond
+from GaudiKernel.SystemOfUnits import MeV, picosecond
 
 from StandardParticles import (
     StdAllNoPIDsKaons,
@@ -51,7 +51,7 @@ from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 
 # from Configurables import CombineParticles, FilterDesktop
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, ConjugateNeutralPID, DaVinci__N3BodyDecays
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N3BodyDecays
 
 default_config = {
     'D2Pi0H': {
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCharm/StrippingD2XMuMuSS.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCharm/StrippingD2XMuMuSS.py
index 6cb43802872df951b5676b3b0a91f42091655f73..f2ecc06f375c01960838df612bae449a097161ea 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCharm/StrippingD2XMuMuSS.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCharm/StrippingD2XMuMuSS.py
@@ -9,14 +9,13 @@
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
 
-from StandardParticles import StdAllLooseElectrons, StdAllNoPIDsElectrons
+from StandardParticles import StdAllLooseElectrons
 from StandardParticles import StdAllLooseKaons, StdAllLoosePions, StdAllLooseMuons, StdAllNoPIDsPions, StdAllNoPIDsKaons
-from StandardParticles import StdLooseKaons, StdLoosePions, StdLooseMuons, StdNoPIDsPions, StdNoPIDsKaons, StdLooseProtons, StdAllNoPIDsProtons
+from StandardParticles import StdAllNoPIDsProtons, StdLooseKaons, StdLooseMuons, StdLoosePions, StdLooseProtons
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, OfflineVertexFitter
-from Gaudi.Configuration import *
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop
 import copy
 __author__ = ['Malcolm John', 'B. Viaud', 'O. Kochebina']
 __date__ = '25/6/2012'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCharm/StrippingD2hh.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCharm/StrippingD2hh.py
index 51c213ed2d3c259435dcd6aef0631877156b6bb0..a370c49abb16101fe062f7fa9fd7c27efecb37e3 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCharm/StrippingD2hh.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCharm/StrippingD2hh.py
@@ -24,7 +24,6 @@ __all__ = ('D2hhBuilder',
 '''
 This file contains stripping lines for time-dependent two-body charm analyses of mixing, yCP, and A_Gamma
 '''
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
@@ -129,7 +128,7 @@ class D2hhBuilder(LineBuilder):
         stdNoPIDsPions = StdAllNoPIDsPions
 
         d2kpi_name = name+'PromptD2KPi'
-        d0RS_name = name+'PromptD0RS'
+        name+'PromptD0RS'
         d0WS_name = name+'PromptD0WS'
         d2kk_name = name+'PromptD2KK'
         d2pipi_name = name+'PromptD2PiPi'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCharm/StrippingD2hhh_FTcalib.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCharm/StrippingD2hhh_FTcalib.py
index 1ec2a52397a24a0cbc076e1b808944bfc5bf21da..eb622bead0fbe08c7b00587f38e94c60ed0a8ade 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCharm/StrippingD2hhh_FTcalib.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCharm/StrippingD2hhh_FTcalib.py
@@ -29,13 +29,10 @@ __version__ = '$Revision: 0.0 $'
 __all__ = ('D2hhhFTCalibConf',
            'makeStdD2hhhFT')
 
-from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
+from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from StandardParticles import (StdNoPIDsPions,
-                               StdTightKaons)
 
 name = "D2hhhFTCalib"
 # Cuts to be implemented vy the Stripping team in Stripping Settings
@@ -254,7 +251,6 @@ def globalEventCutFilter(name,
     if MaxTrSIZE == None:
         return None
 
-    from Configurables import LoKi__VoidFilter as VoidFilter
     from Configurables import LoKi__Hybrid__CoreFactory as CoreFactory
     modules = CoreFactory('CoreFactory').Modules
     for i in ['LoKiTracks.decorators']:
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCharm/StrippingD2hhh_conf.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCharm/StrippingD2hhh_conf.py
index 436d8a20ebfa69a07273b9fc952667e306a823fd..49374bf7789c8403fcf3e4660b179452634cef16 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCharm/StrippingD2hhh_conf.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCharm/StrippingD2hhh_conf.py
@@ -38,8 +38,7 @@ from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticle
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from StandardParticles import (StdNoPIDsPions,
-                               StdTightKaons)
+from StandardParticles import StdNoPIDsPions
 
 name = "D2hhh"
 # Cuts to be implemented vy the Stripping team in Stripping Settings
@@ -717,7 +716,6 @@ def globalEventCutFilter(name,
     if MaxTrSIZE == None:
         return None
 
-    from Configurables import LoKi__VoidFilter as VoidFilter
     from Configurables import LoKi__Hybrid__CoreFactory as CoreFactory
     modules = CoreFactory('CoreFactory').Modules
     for i in ['LoKiTracks.decorators']:
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCharm/StrippingDstarD02xx.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCharm/StrippingDstarD02xx.py
index ce2ac8d8facde4ad7816e78bcb9fd402160bb81a..e052e20eec4a83a6f489851d64e937c3ee00b05f 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCharm/StrippingDstarD02xx.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCharm/StrippingDstarD02xx.py
@@ -22,8 +22,7 @@ __all__ = ('StrippingDstarD02xxConf', 'combinetwobody', 'combineDstar', 'default
             where xx = {mu mu, pi pi, pi mu, k mu, ... }
             
 '''
-from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCharm/StrippingDstarD0ToHHPi0.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCharm/StrippingDstarD0ToHHPi0.py
index fd5188441bc83f651edf601e0fc081e5761b90a2..9f366f1a65e17dac9704f2cda14ac7c90073bb1d 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCharm/StrippingDstarD0ToHHPi0.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCharm/StrippingDstarD0ToHHPi0.py
@@ -17,13 +17,11 @@ Module for D* tagged D0 -> hhpi0.
 Supersedes StrippingDstarD2hhpi0
 """
 
-from Gaudi.Configuration import *
 from Configurables import FilterDesktop, CombineParticles, OfflineVertexFitter
 from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from StandardParticles import StdAllLoosePions, StdLoosePions, StdLooseKaons, StdLooseResolvedPi0, StdLooseMergedPi0
-from Configurables import TisTosParticleTagger
 
 __all__ = ('DstarD0ToHHPi0AllLinesBuilder',
            'DstarMaker',
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCharm/StrippingDstarD2HHHH.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCharm/StrippingDstarD2HHHH.py
index 79b905d65e08f76846da8aeebd29e1bd52022454..15c8bc47e0445328a0083162a53a4335865cca1b 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCharm/StrippingDstarD2HHHH.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCharm/StrippingDstarD2HHHH.py
@@ -22,16 +22,15 @@ __version__ = '$Revision: 1.0 $'
 __all__ = ('DstarD2HHHHLines',
            'default_config')
 
-from Gaudi.Configuration import *
 
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N4BodyDecays
 from StandardParticles import StdAllNoPIDsPions, StdNoPIDsPions, StdNoPIDsKaons
 
 from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
-from StrippingUtils.Utils import LineBuilder, checkConfig
+from StrippingUtils.Utils import LineBuilder
 
-from GaudiKernel.SystemOfUnits import GeV, MeV, picosecond, mm
+from GaudiKernel.SystemOfUnits import MeV, picosecond
 
 
 default_config = {
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCharm/StrippingDstarD2KSHHPi0.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCharm/StrippingDstarD2KSHHPi0.py
index 1a1c91b788986c0a547216e92ee30ee234979f5e..2cf7967d07c7867df16b8b2cfa45c3c0ddd24ac4 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCharm/StrippingDstarD2KSHHPi0.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCharm/StrippingDstarD2KSHHPi0.py
@@ -22,18 +22,17 @@ __version__ = '$Revision: 1.0 $'
 __all__ = ('DstarD2KSHHPi0Lines',
            'default_config')
 
-from Gaudi.Configuration import *
 
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N4BodyDecays
 from StandardParticles import StdAllNoPIDsPions, StdNoPIDsPions, StdNoPIDsKaons, StdLooseResolvedPi0, StdLooseMergedPi0, StdLooseKsDD, StdLooseKsLL
 
 from PhysSelPython.Wrappers import Selection, MergedSelection
 from StrippingConf.StrippingLine import StrippingLine
-from StrippingUtils.Utils import LineBuilder, checkConfig
+from StrippingUtils.Utils import LineBuilder
 
 from Configurables import FilterDesktop
 
-from GaudiKernel.SystemOfUnits import GeV, MeV, picosecond, mm
+from GaudiKernel.SystemOfUnits import MeV, mm, picosecond
 
 
 default_config = {
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCharm/StrippingDstarD2KShh.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCharm/StrippingDstarD2KShh.py
index 0446a490bf8b78aaa6a090c0170ee5d84241b931..8bb88c690db0782705ee07f1579b03266ff72d96 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCharm/StrippingDstarD2KShh.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCharm/StrippingDstarD2KShh.py
@@ -34,7 +34,6 @@ __all__ = ('DstarD2KShhBuilder',
            'makeD2KShh',
            'makeDstar')
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCharm/StrippingDstarD2XGamma.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCharm/StrippingDstarD2XGamma.py
index 59e1a9cc73eb63cebf8d359be22611bfea10a6f4..4bebda09363078aa7f375ea30e19d74cba44a31c 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCharm/StrippingDstarD2XGamma.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCharm/StrippingDstarD2XGamma.py
@@ -26,7 +26,6 @@ __version__ = '$Revision: 0.2 $'
 __all__ = ('DstarD2XGammaLines',
            'default_config')
 
-from Gaudi.Configuration import *
 
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 from StandardParticles import StdAllNoPIDsPions, StdNoPIDsPions, StdNoPIDsKaons
@@ -34,11 +33,11 @@ from StandardParticles import StdLooseAllPhotons, StdAllLooseGammaLL, StdAllLoos
 
 from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
-from StrippingUtils.Utils import LineBuilder, checkConfig
+from StrippingUtils.Utils import LineBuilder
 
 from Configurables import FilterDesktop
 
-from GaudiKernel.SystemOfUnits import GeV, MeV, picosecond, mm
+from GaudiKernel.SystemOfUnits import GeV, MeV, picosecond
 
 default_config = {
     'NAME': 'DstarD2XGamma',
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCharm/StrippingDstarPromptWithD02HHHH.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCharm/StrippingDstarPromptWithD02HHHH.py
index 13343e4031d3c9fe7ad9b92cfb6f3c3fff754d98..22e9ffd46fd5a0b8ab4623cae0293fe3c10c129d 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCharm/StrippingDstarPromptWithD02HHHH.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCharm/StrippingDstarPromptWithD02HHHH.py
@@ -36,11 +36,10 @@ __version__ = '$Revision: 1.2 $'
 __all__ = ('DstarPromptWithD02HHHHConf', 'makeD02hhhh',
            'makePromptDstar', 'default_config')
 
-from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, ConjugateNeutralPID
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles, ConjugateNeutralPID
 from PhysSelPython.Wrappers import Selection, MergedSelection
 from StrippingConf.StrippingLine import StrippingLine
-from StrippingUtils.Utils import checkConfig, LineBuilder
+from StrippingUtils.Utils import LineBuilder
 from GaudiKernel.SystemOfUnits import MeV, GeV, mm
 from copy import copy
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCharm/StrippingDstarPromptWithD02HHMuMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCharm/StrippingDstarPromptWithD02HHMuMu.py
index e83ad60bb1ff3c30f6cfd21e7ea0e2fb6ead7646..a1c41727aab9df91366ea29963944e783d29f676 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCharm/StrippingDstarPromptWithD02HHMuMu.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCharm/StrippingDstarPromptWithD02HHMuMu.py
@@ -29,11 +29,10 @@ __version__ = '$Revision: 2.0 $'
 __all__ = ('DstarPromptWithD02HHLLConf', 'makeD02hhll',
            'makePromptDstar', 'default_config')
 
-from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, ConjugateNeutralPID
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles, ConjugateNeutralPID
 from PhysSelPython.Wrappers import Selection, MergedSelection
 from StrippingConf.StrippingLine import StrippingLine
-from StrippingUtils.Utils import checkConfig, LineBuilder
+from StrippingUtils.Utils import LineBuilder
 from GaudiKernel.SystemOfUnits import MeV, GeV, mm
 from copy import copy
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCharm/StrippingExcitedDsSpectroscopy.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCharm/StrippingExcitedDsSpectroscopy.py
index 6b08898929e9ee290d51640d43d073b4a548a98b..dadd6c5c25c094fb4e5dfdef695cd98af0384ee1 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCharm/StrippingExcitedDsSpectroscopy.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCharm/StrippingExcitedDsSpectroscopy.py
@@ -321,7 +321,6 @@ def globalEventCutFilter(name,
     if MaxTrSIZE == None:
         return None
 
-    from Configurables import LoKi__VoidFilter as VoidFilter
     from Configurables import LoKi__Hybrid__CoreFactory as CoreFactory
     modules = CoreFactory('CoreFactory').Modules
     for i in ['LoKiTracks.decorators']:
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCharm/StrippingHc2V02H.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCharm/StrippingHc2V02H.py
index 5f63de83baa118d330a0b95e541553d6a8e4581f..ca96215521b00ad6379d0a82538d3ada0714a5a3 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCharm/StrippingHc2V02H.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCharm/StrippingHc2V02H.py
@@ -27,11 +27,9 @@ __all__ = (
 )
 
 from GaudiKernel.SystemOfUnits import MeV, GeV, mm, mrad
-from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop, DaVinci__N3BodyDecays
+from GaudiConfUtils.ConfigurableGenerators import DaVinci__N3BodyDecays, FilterDesktop
 from StandardParticles import StdNoPIDsPions as InputPions
 from StandardParticles import StdNoPIDsKaons as InputKaons
-from StandardParticles import StdLooseLambdaLL as InputLambdasLL
-from StandardParticles import StdLooseLambdaDD as InputLambdasDD
 
 from PhysSelPython.Wrappers import Selection, MergedSelection, DataOnDemand
 from StrippingUtils.Utils import LineBuilder
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCharm/StrippingHc2V03H.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCharm/StrippingHc2V03H.py
index 77f8f1aecfa7a04b18d5642386d1c094392b96cd..84c4dbd802a10fae27a11a4440538bce29b36ffc 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCharm/StrippingHc2V03H.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCharm/StrippingHc2V03H.py
@@ -27,11 +27,9 @@ __all__ = (
 )
 
 from GaudiKernel.SystemOfUnits import MeV, GeV, mm, mrad
-from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop, DaVinci__N4BodyDecays
+from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays, FilterDesktop
 from StandardParticles import StdNoPIDsPions as InputPions
 from StandardParticles import StdNoPIDsKaons as InputKaons
-from StandardParticles import StdLooseLambdaLL as InputLambdasLL
-from StandardParticles import StdLooseLambdaDD as InputLambdasDD
 
 from PhysSelPython.Wrappers import Selection, MergedSelection, DataOnDemand
 from StrippingUtils.Utils import LineBuilder
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCharm/StrippingHc2V2H.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCharm/StrippingHc2V2H.py
index 1cc1e18bb59332589773894f931054575d3bd57d..62f83f01a95c995d84514559ea3eb725d34e7335 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCharm/StrippingHc2V2H.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCharm/StrippingHc2V2H.py
@@ -29,8 +29,6 @@ from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDeskto
 from StandardParticles import StdNoPIDsDownPions as InputDownPions
 from StandardParticles import StdNoPIDsPions as InputPions
 from StandardParticles import StdNoPIDsKaons as InputKaons
-from StandardParticles import StdLooseLambdaLL as InputLambdasLL
-from StandardParticles import StdLooseLambdaDD as InputLambdasDD
 
 from PhysSelPython.Wrappers import Selection, MergedSelection, DataOnDemand
 from StrippingUtils.Utils import LineBuilder
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCharm/StrippingHc2V3H.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCharm/StrippingHc2V3H.py
index 8860909e6ec1c8f2862b43d64f75e5158a1c67e3..05d0ef19028d88f3cf40161b0e7b207226c117e3 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCharm/StrippingHc2V3H.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCharm/StrippingHc2V3H.py
@@ -31,8 +31,6 @@ from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDeskto
 from StandardParticles import StdNoPIDsDownPions as InputDownPions
 from StandardParticles import StdNoPIDsPions as InputPions
 from StandardParticles import StdNoPIDsKaons as InputKaons
-from StandardParticles import StdLooseLambdaLL as InputLambdasLL
-from StandardParticles import StdLooseLambdaDD as InputLambdasDD
 
 from PhysSelPython.Wrappers import Selection, MergedSelection, DataOnDemand
 from StrippingUtils.Utils import LineBuilder
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCharm/StrippingKKPiPi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCharm/StrippingKKPiPi.py
index cedaab2089da1034f1207a1c958ba82c6e694ba7..767a1fdbf50445fb204987a0cc70c2f97dfb5421 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCharm/StrippingKKPiPi.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCharm/StrippingKKPiPi.py
@@ -12,12 +12,11 @@
 Module for selecting [cs][ubar dbar] -> K+ K+ pi- pi-
 '''
 
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
+from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
 from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
-from Gaudi.Configuration import *
 __author__ = ['Mengzhen Wang']
 __date__ = '10/10/2017'
 __version__ = '$Revision: 1.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCharm/StrippingLambdac2V03H.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCharm/StrippingLambdac2V03H.py
index 8c19d9d3aeebd29855bd2d76b366fe9611b08aaf..9689bee39c9e7d84a61e56605ba3bb5f443ec5d1 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCharm/StrippingLambdac2V03H.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCharm/StrippingLambdac2V03H.py
@@ -27,7 +27,7 @@ __all__ = (
 )
 
 from GaudiKernel.SystemOfUnits import MeV, GeV, mm, mrad
-from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop, DaVinci__N4BodyDecays
+from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays, FilterDesktop
 from StandardParticles import StdNoPIDsPions as InputPions
 from StandardParticles import StdNoPIDsKaons as InputKaons
 from StandardParticles import StdLooseLambdaLL as InputLambdasLL
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCharm/StrippingLc2L0LLpi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCharm/StrippingLc2L0LLpi.py
index 0165e116e9da33c044fd297b7fa4c1090c6cbf39..0a027afeb1d2d303ea6a37758bc2b3bf4bb5f79d 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCharm/StrippingLc2L0LLpi.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCharm/StrippingLc2L0LLpi.py
@@ -12,17 +12,10 @@
 Module for selecting Lambda_c+->Lambda pi+
 '''
 
-from StandardParticles import (StdAllLoosePions, StdLooseProtons,
-                               StdLoosePions, StdNoPIDsUpPions)
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from StandardParticles import StdLooseAllPhotons, StdVeryLooseAllPhotons
-from Configurables import LoKi__VoidFilter
-from PhysSelPython.Wrappers import MergedSelection
-from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
-from Gaudi.Configuration import *
 __author__ = ['Guiyun Ding', 'Jiesheng Yu', 'Yuehong Xie']
 __date__ = '28/11/2016'
 __version__ = '$Revision: 2.0$'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCharm/StrippingNeutralCBaryons.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCharm/StrippingNeutralCBaryons.py
index bf6d1603296752d86c0e7c13ec03b037aa4b7dd0..165e0fbf71ca71084e7f0b7ac538d4257975d87f 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCharm/StrippingNeutralCBaryons.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCharm/StrippingNeutralCBaryons.py
@@ -23,13 +23,9 @@ __version__ = '$Revision: 1.0 $'
 __all__ = ('StrippingNeutralCBaryonsConf', 'default_config')
 
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from StandardParticles import StdLoosePions, StdNoPIDsDownPions, StdLooseKaons, StdLooseDownKaons
-from StandardParticles import StdAllLoosePions, StdAllLooseKaons
 
 from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
-from PhysSelPython.Wrappers import MultiSelectionSequence
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from GaudiKernel.SystemOfUnits import MeV, mm, picosecond
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCharm/StrippingXic2HHH.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCharm/StrippingXic2HHH.py
index e34807cd11d54a2a33e0a1189dffe5a4b8d17475..32300611aa84de3bdf0390670c07b3849c390e20 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCharm/StrippingXic2HHH.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCharm/StrippingXic2HHH.py
@@ -8,18 +8,15 @@
 # granted to it by virtue of its status as an Intergovernmental Organization  #
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
-from StandardParticles import StdNoPIDsPions, StdNoPIDsKaons, StdNoPIDsProtons, StdAllNoPIDsProtons
-from Configurables import TisTosParticleTagger
+from StandardParticles import StdNoPIDsKaons, StdNoPIDsPions, StdNoPIDsProtons
 from StrippingUtils.Utils import LineBuilder
-from PhysSelPython.Wrappers import MultiSelectionSequence
-from PhysSelPython.Wrappers import Selection, DataOnDemand, AutomaticData, MergedSelection
+from PhysSelPython.Wrappers import DataOnDemand, MergedSelection, Selection
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
 from Configurables import FilterDesktop, CombineParticles
 from LHCbKernel.Configuration import *
-from GaudiKernel.SystemOfUnits import MeV, mm, ns
+from GaudiKernel.SystemOfUnits import MeV, mm
 from StrippingConf.StrippingLine import StrippingLine
 from Gaudi.Configuration import *
-import re
 all
 ''' Xic+ and Theta+ lines Designed by Yury Shcheglov, Alexey Dzyuba, Nelya Sagidova to study Xic+ and Theta+ particles '''
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCharm/StrippingXicc.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCharm/StrippingXicc.py
index 2468c2d79739511bfdefe170463aa125124d506e..45478d9be226dbd5e3fdd09b0ff769294d99d064 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCharm/StrippingXicc.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingCharm/StrippingXicc.py
@@ -52,9 +52,6 @@ from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticle
 from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from StandardParticles import StdAllLoosePions, StdAllLooseKaons, StdAllLooseProtons
-from StandardParticles import StdLoosePions
-from CommonParticles.StdLooseLambda import StdLooseLambdaLL, StdLooseLambdaDD
 from GaudiKernel.SystemOfUnits import MeV, GeV, mm
 from Configurables import TisTosParticleTagger
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingIFT/StrippingHeavyIonConvertedPhoton.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingIFT/StrippingHeavyIonConvertedPhoton.py
index b38a84b86b368e54eb7956ef92addf71154d1923..c8361ce1732d1f9749491ad6fa0d7449522abd70 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingIFT/StrippingHeavyIonConvertedPhoton.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingIFT/StrippingHeavyIonConvertedPhoton.py
@@ -23,7 +23,7 @@ __all__ = (
 
 from Gaudi.Configuration import *
 from CommonParticles.Utils import *
-from GaudiKernel.SystemOfUnits import MeV, GeV, mm
+from GaudiKernel.SystemOfUnits import MeV, mm
 from Configurables import (DiElectronMaker,
                            ProtoParticleCALOFilter,
                            ParticleTransporter,
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingIFT/StrippingHeavyIonD02KPiPi0.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingIFT/StrippingHeavyIonD02KPiPi0.py
index 3e380b9342ba9bebae1a3195dcadf08a1b598fc9..8ffdf55b27ce401ff26b2fe355cc99597f755347 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingIFT/StrippingHeavyIonD02KPiPi0.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingIFT/StrippingHeavyIonD02KPiPi0.py
@@ -25,9 +25,8 @@ __all__ = ('StrippingHeavyIonD02KPiPi0Conf',
            'makeD02KPiPi0M',
            'default_config')
 
-from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from PhysSelPython.Wrappers import Selection, DataOnDemand
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
+from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from StandardParticles import StdTightPions, StdTightKaons, StdLooseMergedPi0, StdLooseResolvedPi0
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingIFT/StrippingHeavyIonDiMuon.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingIFT/StrippingHeavyIonDiMuon.py
index 0c2b044b5fe850934f513781b14f5faf5b8fc181..e97c2ed82a33c94fba2489f2b078001b5dc839e6 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingIFT/StrippingHeavyIonDiMuon.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingIFT/StrippingHeavyIonDiMuon.py
@@ -17,8 +17,7 @@ from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 from StandardParticles import StdAllLooseMuons
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand
-from Gaudi.Configuration import *
+from PhysSelPython.Wrappers import Selection
 __author__ = ['Emilie MAURICE']
 __date__ = ''
 __version__ = '$Revision: 2.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingIFT/StrippingHeavyIonDst2D0KPiForPID.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingIFT/StrippingHeavyIonDst2D0KPiForPID.py
index 4282eb3c7b386840ce3bb3a47569a6a981e3194c..c3ba0aa8f46df637625d1f88481903dd9414f15e 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingIFT/StrippingHeavyIonDst2D0KPiForPID.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingIFT/StrippingHeavyIonDst2D0KPiForPID.py
@@ -13,10 +13,8 @@
 from StandardParticles import StdAllNoPIDsKaons, StdAllNoPIDsPions
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from LHCbKernel.Configuration import *
-from Gaudi.Configuration import *
+from PhysSelPython.Wrappers import Selection
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 __author__ = ['Philip Xing', 'Andrew Powell']
 __date__ = '23rd August 2012'
 __version__ = '$Revision: 7.0 $'
@@ -36,7 +34,7 @@ Usage:
 __all__ = ('HeavyIonDst2D0KPiForPIDConf', 'default_config', "D0", "Dstar")
 
 
-from GaudiKernel.SystemOfUnits import mm, cm, MeV, GeV
+from GaudiKernel.SystemOfUnits import GeV, MeV
 # from Configurables import FilterDesktop, CombineParticles
 
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingIFT/StrippingHeavyIonGammaHadron.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingIFT/StrippingHeavyIonGammaHadron.py
index df8ad92d7e7813151437ff0a0a8d2dfe8e9bab68..42c4e64093225339c3ada6e6ee97e25c483ed75e 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingIFT/StrippingHeavyIonGammaHadron.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingIFT/StrippingHeavyIonGammaHadron.py
@@ -13,13 +13,10 @@ Stripping selections or Gamma+Hadron physics.
 Based on those by Patrick K.
 '''
 
-from Configurables import RelInfoConeVariables
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from Configurables import FilterDesktop, CombineParticles
-from StandardParticles import StdLoosePhotons, StdAllLooseGammaLL, StdAllLooseGammaDD, StandardBasic
-from Gaudi.Configuration import *
+from Configurables import FilterDesktop
 __author__ = 'Cesar da Silva'
 __date__ = '30/04/2017'
 __version__ = '$Revision: 0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingIFT/StrippingHeavyIonMiniBias.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingIFT/StrippingHeavyIonMiniBias.py
index c63f00873a80c36c86290265b6ec4e0371de1408..685921c79f00fd6435fb915aaa8333675a7dfcff 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingIFT/StrippingHeavyIonMiniBias.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingIFT/StrippingHeavyIonMiniBias.py
@@ -13,7 +13,6 @@ Stripping selections or Minimum Bias physics.
 Based on those by Patrick K.
 '''
 
-from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 __author__ = 'Yanxi ZHANG, Emilie MAURICE'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingIFT/StrippingHeavyIonOpenCharm.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingIFT/StrippingHeavyIonOpenCharm.py
index 89ba90160c11f4ec225daca0022e27ee258efe57..75ee902a2bf417dec38a7240d3cd97c6aad266c4 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingIFT/StrippingHeavyIonOpenCharm.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingIFT/StrippingHeavyIonOpenCharm.py
@@ -31,8 +31,8 @@ __all__ = (
 )
 
 
-from GaudiKernel.SystemOfUnits import MeV, GeV, mrad, mm
-from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop
+from GaudiKernel.SystemOfUnits import GeV, MeV, mrad
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 # from Configurables import CombineParticles, FilterDesktop
 from StandardParticles import (
     StdAllNoPIDsKaons,
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingIFT/StrippingHeavyIonOthercc.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingIFT/StrippingHeavyIonOthercc.py
index 68874ffb4319386ba39c68da21a84cb3498f7c28..efc32ecd43b218de32e707b4d5f132d518d9658d 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingIFT/StrippingHeavyIonOthercc.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingIFT/StrippingHeavyIonOthercc.py
@@ -17,8 +17,7 @@ from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 from StandardParticles import StdNoPIDsElectrons, StdAllLooseProtons, StdLooseMuons
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand
-from Gaudi.Configuration import *
+from PhysSelPython.Wrappers import Selection
 __author__ = ['Emilie MAURICE']
 __date__ = ''
 __version__ = '$Revision: 1.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingIFT/StrippingHeavyIonPIDCalib.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingIFT/StrippingHeavyIonPIDCalib.py
index 4d96b70412efeeaa567401f7247511c02704fc0f..635480e78d2cba544bf3537d6a6d0e92293ac75f 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingIFT/StrippingHeavyIonPIDCalib.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingIFT/StrippingHeavyIonPIDCalib.py
@@ -37,7 +37,6 @@ from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
 from Gaudi.Configuration import *
 __author__ = ['Yanxi ZHANG']
 __date__ = '25/02/2015'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingIFT/StrippingHeavyIonSingleElectron.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingIFT/StrippingHeavyIonSingleElectron.py
index 4751a2767bc4a63d9d78087de7b67a9493851237..ce4c263cd6870c12d9bbbfccb585bedc00c300f9 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingIFT/StrippingHeavyIonSingleElectron.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingIFT/StrippingHeavyIonSingleElectron.py
@@ -14,7 +14,7 @@ Stripping selections for single scattered electrons
 
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
 from StandardParticles import StdAllNoPIDsElectrons
-from PhysSelPython.Wrappers import Selection, DataOnDemand
+from PhysSelPython.Wrappers import Selection
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 __author__ = 'Giacomo Graziani'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingIFT/StrippingHeavyIonTopology.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingIFT/StrippingHeavyIonTopology.py
index 19f3d03c95644de38c49321c5c0b7fb0636739e4..8308d72b5faed1731235c6cd48d682ca5b65d690 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingIFT/StrippingHeavyIonTopology.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingIFT/StrippingHeavyIonTopology.py
@@ -12,13 +12,9 @@
 Module for selecting specific topology
 '''
 
-from Configurables import FilterDesktop, CombineParticles
-from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-from StandardParticles import StdAllLooseMuons, StdAllLoosePions, StdAllNoPIDsPions, StdLoosePhotons
+from Configurables import FilterDesktop
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand
-from Gaudi.Configuration import *
 __author__ = ['Emilie MAURICE']
 __date__ = ''
 __version__ = '$Revision: 1.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingIFT/StrippingHeavyIonTrackEffDownMuon.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingIFT/StrippingHeavyIonTrackEffDownMuon.py
index 6e7eb7567d6f9a66f2e89cffa4cea4c71115f9cf..0880e97b075e2bc495173b6acf653ff01884be82 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingIFT/StrippingHeavyIonTrackEffDownMuon.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingIFT/StrippingHeavyIonTrackEffDownMuon.py
@@ -43,34 +43,26 @@ __all__ = ('StrippingHeavyIonTrackEffDownMuonConf',
 # FIXME Write includes in a cleaner way
 from Gaudi.Configuration import *
 from LHCbKernel.Configuration import *
-from DAQSys.DecoderClass import Decoder
 from Configurables import GaudiSequencer
 from Configurables import UnpackTrack, ChargedProtoParticleMaker, DelegatingTrackSelector, TrackSelector, BestPIDParticleMaker
-from TrackFitter.ConfiguredFitters import ConfiguredFit
 from Configurables import TrackStateInitAlg
 from StrippingConf.StrippingLine import StrippingLine
-from Configurables import ChargedProtoParticleAddMuonInfo, MuonIDAlgLite
+from Configurables import ChargedProtoParticleAddMuonInfo
 from MuonID import ConfiguredMuonIDs
 from Configurables import ChargedProtoCombineDLLsAlg, ProtoParticleMUONFilter
-from PhysSelPython.Wrappers import Selection, DataOnDemand
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
+from PhysSelPython.Wrappers import Selection
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 
 from StrippingUtils.Utils import LineBuilder
-from Configurables import LoKi__VoidFilter
-from os import environ
 from Gaudi.Configuration import *
-import GaudiKernel.ProcessJobOptions
-from GaudiKernel.SystemOfUnits import mm
 
 from GaudiConfUtils.ConfigurableGenerators import TisTosParticleTagger
 from StandardParticles import StdAllLooseMuons
 from Configurables import GaudiSequencer
 from Configurables import TrackToDST
-from Configurables import TrackSys
 from Configurables import PatSeeding, PatSeedingTool, PatLongLivedTracking
-from PhysSelPython.Wrappers import AutomaticData
 # Get the fitters
-from TrackFitter.ConfiguredFitters import ConfiguredFit, ConfiguredFitSeed, ConfiguredFitDownstream
+from TrackFitter.ConfiguredFitters import ConfiguredFitDownstream
 from PatAlgorithms import PatAlgConf
 
 from SelPy.utils import (UniquelyNamedObject,
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingIFT/StrippingHeavyIonTrackEffMuonTT.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingIFT/StrippingHeavyIonTrackEffMuonTT.py
index 56d4a18efe2b562eed3412a268bb47e35915eb37..3af84c0e2ed472dd795c0b18c8d095381ac3715c 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingIFT/StrippingHeavyIonTrackEffMuonTT.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingIFT/StrippingHeavyIonTrackEffMuonTT.py
@@ -63,10 +63,10 @@ __all__ = ('StrippingHeavyionTrackEffMuonTTConf',
            'filterHLT2ForBJpsiK')
 
 from Gaudi.Configuration import *
-from PhysSelPython.Wrappers import Selection, DataOnDemand, ChargedProtoParticleSelection
+from PhysSelPython.Wrappers import ChargedProtoParticleSelection, Selection
 from StrippingConf.StrippingLine import StrippingLine
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from StrippingUtils.Utils import LineBuilder, checkConfig
+from StrippingUtils.Utils import LineBuilder
 from StandardParticles import StdLooseKaons, StdLooseMuons, StdAllLooseMuons
 
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingIFT/StrippingHeavyIonTrackEffVeloMuon.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingIFT/StrippingHeavyIonTrackEffVeloMuon.py
index 0e07045325c58f87f6345eafe88988d9f7a3f147..7cd8b2c0d6f462f14fd64f8f6c50386fc74e091e 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingIFT/StrippingHeavyIonTrackEffVeloMuon.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingIFT/StrippingHeavyIonTrackEffVeloMuon.py
@@ -40,17 +40,14 @@ __all__ = ('HeavyIonTrackEffVeloMuonConf',
            )
 
 
-from Gaudi.Configuration import *
-from LHCbKernel.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 # from Configurables import CombineParticles
-from PhysSelPython.Wrappers import Selection, SelectionSequence, DataOnDemand
-from Configurables import ChargedProtoParticleMaker, NoPIDsParticleMaker, DataOnDemandSvc, DelegatingTrackSelector, TrackSelector, CombinedParticleMaker, BestPIDParticleMaker
+from PhysSelPython.Wrappers import Selection
+from Configurables import ChargedProtoParticleMaker, DataOnDemandSvc, DelegatingTrackSelector, NoPIDsParticleMaker, TrackSelector
 from Configurables import FastVeloTracking
 
 from StrippingConf.StrippingLine import StrippingLine
-from Configurables import TrackStateInitAlg, TrackEventFitter, TrackPrepareVelo, TrackContainerCopy, Tf__PatVeloSpaceTool, StandaloneMuonRec
-from Configurables import TrackCloneFinder
+from Configurables import StandaloneMuonRec, TrackPrepareVelo
 from StrippingUtils.Utils import LineBuilder
 # changed from StdLooseMuons, yanxi
 from StandardParticles import StdAllLooseMuons
@@ -59,14 +56,9 @@ from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, TisTosParticleT
 # from Configurables import TisTosParticleTagger
 
 from Configurables import GaudiSequencer
-from Configurables import TrackSys
-from PhysSelPython.Wrappers import AutomaticData
 # Get the fitters
-from TrackFitter.ConfiguredFitters import ConfiguredFit
 
-from Configurables import TrackEventCloneKiller, VeloMuonBuilder
-from Configurables import TrackEventFitter, TrackMasterFitter
-from Configurables import TrackKalmanFilter, TrackMasterExtrapolator
+from Configurables import VeloMuonBuilder
 # from TrackFitter.ConfiguredFitters import ConfiguredFastFitter
 # from Configurables import TrackCloneFinder
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingMiniBias/StrippingBadEvents.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingMiniBias/StrippingBadEvents.py
index 4d837a2f722d72d1c7683e8f61d6316db037f332..460036843530f41526b7139b73c204dba3cf9160 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingMiniBias/StrippingBadEvents.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingMiniBias/StrippingBadEvents.py
@@ -8,7 +8,6 @@
 # granted to it by virtue of its status as an Intergovernmental Organization  #
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
-from PhysSelPython.Wrappers import Selection
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 __author__ = 'Andrea Contu'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingMiniBias/StrippingMiniBias.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingMiniBias/StrippingMiniBias.py
index 7ba890fe41b117c0dcaaac7777296c741c397754..f791c6cd1cfac775c9b2357307a4044a5100eb87 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingMiniBias/StrippingMiniBias.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingMiniBias/StrippingMiniBias.py
@@ -8,7 +8,6 @@
 # granted to it by virtue of its status as an Intergovernmental Organization  #
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
-from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 __author__ = 'Patrick Koppenburg'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingQEE/DisplVertices_Utils.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingQEE/DisplVertices_Utils.py
index f9e3c9136e46dcf7697209e381ff7735b840ed2e..bcd9752464adf9657cb3a290918226a7d0f05341 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingQEE/DisplVertices_Utils.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingQEE/DisplVertices_Utils.py
@@ -14,12 +14,11 @@ Utilities for displaced vertex stripping: wrapper class around PatPV3D
 
 __all__ = ("SelectionFromAlgorithmWithTools", "SelectionPatPV3DWrapper")
 
-from GaudiConfUtils import isConfigurable
 
 from SelPy.utils import (UniquelyNamedObject, ClonableObject, SelectionBase, compatibleSequences,
-                         IncompatibleInputLocations, CloneCallable, makeOutputLocation, setOutputLocation)
+                         IncompatibleInputLocations, makeOutputLocation, setOutputLocation)
 
-from PhysSelPython.Wrappers import checkConfigurable, checkName
+from PhysSelPython.Wrappers import checkName
 
 
 def connectToRequiredSelections(selection, inputSetter):
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingQEE/StrippingA1MuMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingQEE/StrippingA1MuMu.py
old mode 100755
new mode 100644
index 91e62b0b649d88ac57d91a3cf24db5351e7b19de..281aebf4be79ceaf5c90e7533eb04d49847e5185
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingQEE/StrippingA1MuMu.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingQEE/StrippingA1MuMu.py
@@ -23,11 +23,9 @@ A_1 -> mu+ mu-, based on functionality from StrippingDiMuonNew by Jibo He.
 
 """
 
-from Gaudi.Configuration import *
-from LHCbKernel.Configuration import *
 
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
-from PhysSelPython.Wrappers import Selection, DataOnDemand, SimpleSelection
+from PhysSelPython.Wrappers import SimpleSelection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from GaudiKernel.SystemOfUnits import MeV
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingQEE/StrippingA2MuMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingQEE/StrippingA2MuMu.py
index 64c106858ef1dd3206b2083b5ea5e630aec55ae8..cd47529d168278a387e79f1f772ca7cf3b1d8040 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingQEE/StrippingA2MuMu.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingQEE/StrippingA2MuMu.py
@@ -22,7 +22,7 @@ from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from StandardParticles import StdAllLooseMuons, StdAllNoPIDsMuons
+from StandardParticles import StdAllLooseMuons
 from GaudiKernel.SystemOfUnits import GeV
 
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingQEE/StrippingA2MuMuSameSign.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingQEE/StrippingA2MuMuSameSign.py
index 5911c40e36b1e66721231826c818abbc79aed758..a89a6a8b5ff2bf6571b4fe0fcaeb93088567f2a5 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingQEE/StrippingA2MuMuSameSign.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingQEE/StrippingA2MuMuSameSign.py
@@ -22,7 +22,7 @@ from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from StandardParticles import StdAllLooseMuons, StdAllNoPIDsMuons
+from StandardParticles import StdAllLooseMuons
 from GaudiKernel.SystemOfUnits import GeV
 
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingQEE/StrippingB2LLP2HH.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingQEE/StrippingB2LLP2HH.py
index 073c098c3a38cbbfb2655b777880011ad219247a..179fe2f52ea095317c5a39508a99a578c806ae3a 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingQEE/StrippingB2LLP2HH.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingQEE/StrippingB2LLP2HH.py
@@ -18,13 +18,11 @@ __date__ = '25/01/2019'
 
 __all__ = ('B2LLPV0_sConf', 'default_config')
 
-from Gaudi.Configuration import *
 from StandardParticles import StdAllNoPIDsPions
 from PhysSelPython.Wrappers import CombineSelection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from GaudiKernel.SystemOfUnits import GeV
-from LoKiPhys.functions import SOURCE, SIZE
 
 default_config = {
     'NAME': 'B2LLPV0',
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingQEE/StrippingConvertedPhoton.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingQEE/StrippingConvertedPhoton.py
index 75d6970b1df2c63c192f20d524128d15f914343b..6a24e6a634b2578b9537332d82053d30b73013fd 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingQEE/StrippingConvertedPhoton.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingQEE/StrippingConvertedPhoton.py
@@ -23,7 +23,7 @@ __all__ = (
 
 from Gaudi.Configuration import *
 from CommonParticles.Utils import *
-from GaudiKernel.SystemOfUnits import MeV, GeV, mm
+from GaudiKernel.SystemOfUnits import MeV, mm
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
 from Configurables import (DiElectronMaker,
                            ProtoParticleCALOFilter,
@@ -31,9 +31,7 @@ from Configurables import (DiElectronMaker,
                            LoKi__VertexFitter,
                            )
 from PhysSelPython.Wrappers import (Selection,
-                                    SimpleSelection,
-                                    MergedSelection,
-                                    AutomaticData)
+                                    MergedSelection)
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingQEE/StrippingDY2MuMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingQEE/StrippingDY2MuMu.py
index 9c7c8a7706d666e3fac7a8f8316de58468cc8b74..6a28183b934ae8110dbdef65c4d96d44dd261b82 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingQEE/StrippingDY2MuMu.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingQEE/StrippingDY2MuMu.py
@@ -26,9 +26,8 @@ __author__ = ['J. Anderson']
 
 __all__ = 'DY2MuMuConf', 'default_config'
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-from PhysSelPython.Wrappers import Selection, SimpleSelection
+from PhysSelPython.Wrappers import SimpleSelection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from StandardParticles import StdAllLooseMuons
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingQEE/StrippingDY2ee.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingQEE/StrippingDY2ee.py
index a80a06710257e4a747b068f38b65eda9b6b0de8c..3a4d7395f7894461a94f0c47d79c1d2bc20d648e 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingQEE/StrippingDY2ee.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingQEE/StrippingDY2ee.py
@@ -20,9 +20,8 @@ __author__ = ['S.Bifani', 'D.Ward']
 
 __all__ = ('DY2eeConf', 'default_config')
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-from PhysSelPython.Wrappers import Selection, DataOnDemand
+from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from StandardParticles import StdAllNoPIDsElectrons
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingQEE/StrippingDisplJets.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingQEE/StrippingDisplJets.py
index 5fef3562a7eba983dc7ba2e37ee9b5a47fc6bebf..28c1bab64dafcce7d73fff3cdfe6a61833456218 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingQEE/StrippingDisplJets.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingQEE/StrippingDisplJets.py
@@ -9,8 +9,6 @@
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
 
-from Gaudi.Configuration import *
-from CommonParticles.Utils import *
 # from Configurables import FilterDesktop
 # from PhysSelPython.Wrappers import Selection, DataOnDemand, FilterSelection
 from StrippingConf.StrippingLine import StrippingLine
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingQEE/StrippingDisplVertices.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingQEE/StrippingDisplVertices.py
index 1ceed257a457950890e0fc33aaf7abc06342b70a..66be8a1f8712b367d96e50ebeb3d82892c0f2c1b 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingQEE/StrippingDisplVertices.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingQEE/StrippingDisplVertices.py
@@ -40,7 +40,6 @@ __all__ = ('DisplVerticesConf', 'default_config')
 
 from Gaudi.Configuration import *
 from GaudiKernel import SystemOfUnits as units
-from LHCbKernel.Configuration import DEBUG, VERBOSE
 
 import logging
 logger = logging.getLogger(__name__)
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingQEE/StrippingDitau.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingQEE/StrippingDitau.py
old mode 100755
new mode 100644
index fa049324f79a44e720a641aa2ed2cdc857f4435e..3e2dd3df509a4ead7bb1a73e4cccd6e5f2e99c0f
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingQEE/StrippingDitau.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingQEE/StrippingDitau.py
@@ -155,8 +155,7 @@ Derived from works of S.Farry & P. Ilten
 
 """
 
-import os
-from GaudiKernel.SystemOfUnits import MeV, GeV, micrometer
+from GaudiKernel.SystemOfUnits import GeV, MeV
 from PhysSelPython.Wrappers import Selection, SimpleSelection, PassThroughSelection, MergedSelection, AutomaticData
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
@@ -894,7 +893,7 @@ def Tuples():
 
     """
     import re
-    from DecayTreeTuple.Configuration import DecayTreeTuple, EventTuple
+    from DecayTreeTuple.Configuration import DecayTreeTuple
 
     seq = GaudiSequencer('TupleSeq')
     seq.ModeOR = True
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingQEE/StrippingExotica.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingQEE/StrippingExotica.py
old mode 100755
new mode 100644
index 6bc342e6673e7b1e6203b8260039fdde1761206c..6bb564d6b7bbd36c36350f55b005a51272e6ab12
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingQEE/StrippingExotica.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingQEE/StrippingExotica.py
@@ -34,7 +34,7 @@ Hlt2ExoticaEtaToDiEGamma
 from GaudiKernel.SystemOfUnits import MeV, GeV, mm, picosecond
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-from PhysSelPython.Wrappers import Selection, SimpleSelection, MergedSelection, AutomaticData
+from PhysSelPython.Wrappers import AutomaticData, SimpleSelection
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingQEE/StrippingFullDiJets.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingQEE/StrippingFullDiJets.py
index 0e20ce2d9fcbfbea2ea7828e4bd1f9db7eed9790..b2931713d0c65ae7ee7dfa387b7b5473c635eba4 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingQEE/StrippingFullDiJets.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingQEE/StrippingFullDiJets.py
@@ -9,14 +9,10 @@
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
 
-from Gaudi.Configuration import *
-from Configurables import FilterDesktop, CombineParticles, LoKi__VertexFitter
+from Configurables import CombineParticles, LoKi__VertexFitter
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from StandardParticles import StdJets
-from CommonParticles.Utils import *
-from Configurables import FilterJet
 from GaudiKernel.SystemOfUnits import GeV
 
 __author__ = "Xabier Cid Vidal", "Cedric Potterat", "William Barter"
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingQEE/StrippingGluinos.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingQEE/StrippingGluinos.py
index 0867cc3c369e7f5b06dfb5d1909d7eeda820e3f0..8070b81f174dd132e7ec9c150bbe87dc5befc9b9 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingQEE/StrippingGluinos.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingQEE/StrippingGluinos.py
@@ -10,11 +10,10 @@
 ###############################################################################
 from Configurables import FilterDesktop, JetVertexAlg
 from CommonParticles.Utils import *
-from LoKiPhys.functions import SOURCE, SIZE
 from GaudiKernel.SystemOfUnits import GeV
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import FilterSelection, PassThroughSelection, DataOnDemand
+from PhysSelPython.Wrappers import FilterSelection, PassThroughSelection
 from StandardParticles import StdJets
 from Gaudi.Configuration import *
 __author__ = ['Xabier Cid Vidal', 'Carlos Vazquez Sierra', 'Igor Kostiuk']
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingQEE/StrippingLFVExotica.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingQEE/StrippingLFVExotica.py
old mode 100755
new mode 100644
index 88da9dcd829a1905c1264408cac8e2e94c89b89f..fef9c145f071f0ab2fe36aeab16fc22bc5d9a283
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingQEE/StrippingLFVExotica.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingQEE/StrippingLFVExotica.py
@@ -174,7 +174,7 @@ def create_stdjets(strob, line_location, stdjets_name_ban):
         strob.StdJetsNoJetIDBan = [myconf1]
 
     # configure Data-On-Demand service
-    locations = updateDoD(myconf1)
+    updateDoD(myconf1)
 
 
 relInfoJetsVars = ["JETNOMU1PX", "JETNOMU1PY", "JETNOMU1PZ", "JETNOMU1PT", "JETNOMU1JETWIDTH", "JETNOMU1NNTAG", "JETNOMU1MNF", "JETNOMU2PX", "JETNOMU2PY", "JETNOMU2PZ", "JETNOMU2PT", "JETNOMU2JETWIDTH", "JETNOMU2NNTAG", "JETNOMU2MNF", "JETNOMU3PX", "JETNOMU3PY",
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingQEE/StrippingLLP2HH.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingQEE/StrippingLLP2HH.py
index a44e21b9d685dfdf71578f4a8c9db734abf73c01..b2b088c7863a076933f8b5770260224a4ca2b483 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingQEE/StrippingLLP2HH.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingQEE/StrippingLLP2HH.py
@@ -18,13 +18,11 @@ __date__ = '24/01/2019'
 
 __all__ = ('LLPV0_sConf', 'default_config')
 
-from Gaudi.Configuration import *
 from StandardParticles import StdAllNoPIDsPions
 from PhysSelPython.Wrappers import CombineSelection, PassThroughSelection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from GaudiKernel.SystemOfUnits import GeV
-from LoKiPhys.functions import SOURCE, SIZE
 
 default_config = {
     'NAME': 'LLPV0',
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingQEE/StrippingLLP2Jets.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingQEE/StrippingLLP2Jets.py
index 8619ba15a78cfb147e8f2c955611f8cdd44bd2ba..9c25c3202184e96ffba87e12971ec43ac9362246 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingQEE/StrippingLLP2Jets.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingQEE/StrippingLLP2Jets.py
@@ -18,7 +18,6 @@ __date__ = '25/01/2019'
 
 __all__ = ('LLP2Jets_sConf', 'default_config')
 
-from Gaudi.Configuration import *
 from Configurables import JetVertexAlg
 from StandardParticles import StdJets
 from CommonParticles.Utils import updateDoD
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingQEE/StrippingLLP2MuX.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingQEE/StrippingLLP2MuX.py
index 16654f3c9d1acc1925968a5d39f0087bea5086a7..f93bc4732424f6eaeb1951cb1a244ef0de7e8b5e 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingQEE/StrippingLLP2MuX.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingQEE/StrippingLLP2MuX.py
@@ -16,7 +16,6 @@ from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import AutomaticData, Selection
 from GaudiKernel import SystemOfUnits as units
-from LHCbKernel.Configuration import *
 __author__ = "Pieter David"
 __date__ = "2014-08-28"
 __all__ = ("LLP2MuXConf", "default_config")
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingQEE/StrippingLb2dp.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingQEE/StrippingLb2dp.py
old mode 100755
new mode 100644
index cf2bf7494c36f78187f495fe46a2fcfe068338e0..cbd7593f597ef30b0f56f7070b78fe66905549e5
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingQEE/StrippingLb2dp.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingQEE/StrippingLb2dp.py
@@ -23,15 +23,11 @@ __all__ = ('Lb2dpConf',
            )
 
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop
-from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays
 
-from StandardParticles import StdAllNoPIDsPions, StdAllNoPIDsProtons,  StdAllNoPIDsKaons
 from PhysSelPython.Wrappers import Selection, DataOnDemand, SimpleSelection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from Configurables import LoKi__VoidFilter as VoidFilter
 
 default_config = {
     'NAME': 'Lb2dp',
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingQEE/StrippingMicroDiJets.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingQEE/StrippingMicroDiJets.py
index 60a35abe10febcab0dcf2d24628e23b510f946b5..db8af2aecfab54badd7fd3305d3d0716cbe4802b 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingQEE/StrippingMicroDiJets.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingQEE/StrippingMicroDiJets.py
@@ -10,13 +10,12 @@
 ###############################################################################
 
 from Gaudi.Configuration import *
-from Configurables import FilterDesktop, CombineParticles, LoKi__VertexFitter
+from Configurables import CombineParticles
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from StandardParticles import StdJets
 from CommonParticles.Utils import *
-from Configurables import FilterJet, ClearDaughters
+from Configurables import ClearDaughters
 from GaudiKernel.SystemOfUnits import GeV
 
 __author__ = "Xabier Cid Vidal", "Cedric Potterat", "William Barter"
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingQEE/StrippingMuMuSS.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingQEE/StrippingMuMuSS.py
index 46e50bf48c5974152d914b654bd5b1fd74bb2b6e..130bda526520d302d34046bd7d905f2bb8920adf 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingQEE/StrippingMuMuSS.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingQEE/StrippingMuMuSS.py
@@ -26,7 +26,7 @@ __author__ = (
 )
 
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-from PhysSelPython.Wrappers import Selection, SimpleSelection
+from PhysSelPython.Wrappers import SimpleSelection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from StandardParticles import StdAllLooseMuons
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingQEE/StrippingSbarSCorrelations.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingQEE/StrippingSbarSCorrelations.py
index 63378eabc81bb7a2995cb94f8b8e7faad734f19d..33589834379b334e6b432982e264803ceb8d8308 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingQEE/StrippingSbarSCorrelations.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingQEE/StrippingSbarSCorrelations.py
@@ -21,10 +21,8 @@ Long tracks only
 from GaudiKernel.SystemOfUnits import MeV, GeV
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
-from StandardParticles import StdAllNoPIDsPions, StdTightKaons, StdAllNoPIDsProtons
+from PhysSelPython.Wrappers import DataOnDemand, Selection
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = ['Florin MACIUC']
 __date__ = '24/08/2013'
 __version__ = '$Revision: 1.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingQEE/StrippingStrangeBaryons.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingQEE/StrippingStrangeBaryons.py
index f3dd8ebdec4e50abd2bed892959740435ac5d9b5..2405f0e9c6f1695dd9f652d6aae992473b3135a2 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingQEE/StrippingStrangeBaryons.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingQEE/StrippingStrangeBaryons.py
@@ -18,14 +18,10 @@ Xi -> Lambda pi,   Omega -> Lambda K
 LLL DDL DDD
 '''
 
-from GaudiKernel.SystemOfUnits import MeV
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
-from CommonParticles import StdLooseLambda
-from StandardParticles import StdLoosePions, StdNoPIDsDownPions, StdLooseKaons, StdLooseDownKaons, StdLooseProtons, StdNoPIDsDownProtons
+from PhysSelPython.Wrappers import DataOnDemand, Selection
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = ['Mihai Straticiuc', 'Florin Maciuc', 'Nguyen Thi Dung']
 __date__ = '26/06/2012'
 __version__ = '$Revision: 0.3 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingQEE/StrippingStrangeBaryonsNoPID.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingQEE/StrippingStrangeBaryonsNoPID.py
index 668986b834d39169c5ae15803bf5d5fb33cff67b..208ab8bad23a5e36e2a0a609a82dd6ca2fc9d012 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingQEE/StrippingStrangeBaryonsNoPID.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingQEE/StrippingStrangeBaryonsNoPID.py
@@ -18,12 +18,10 @@ Xi -> Lambda pi,   Omega -> Lambda K
 LLL
 '''
 
-from GaudiKernel.SystemOfUnits import MeV
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
+from PhysSelPython.Wrappers import DataOnDemand, Selection
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = ['Florin Maciuc']
 __date__ = '13/01/2014'
 __version__ = '$Revision: 0.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingQEE/StrippingTaggedJets.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingQEE/StrippingTaggedJets.py
old mode 100755
new mode 100644
index 2205ce56dd85643e92bc55ab369b85378152951c..4927224c3710ed4cad5cd3baa918ec4b163f34f2
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingQEE/StrippingTaggedJets.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingQEE/StrippingTaggedJets.py
@@ -10,11 +10,10 @@
 ###############################################################################
 
 from Gaudi.Configuration import *
-from Configurables import FilterDesktop, CombineParticles, LoKi__VertexFitter
+from Configurables import CombineParticles, LoKi__VertexFitter
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from StandardParticles import StdJets
 from CommonParticles.Utils import *
 from Configurables import FilterJet
 from GaudiKernel.SystemOfUnits import GeV
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingQEE/StrippingW2nH.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingQEE/StrippingW2nH.py
index cc373f666cb49309b9f3e2efe0dae8e52ac260a4..22eacc1d77ba55838726dc481db0fa8f76e6bf1d 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingQEE/StrippingW2nH.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingQEE/StrippingW2nH.py
@@ -26,7 +26,6 @@ from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from StandardParticles import StdAllNoPIDsPions
 from GaudiKernel.SystemOfUnits import GeV
-from GaudiKernel.SystemOfUnits import MeV
 
 
 default_config = {
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingQEE/StrippingWJets.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingQEE/StrippingWJets.py
old mode 100755
new mode 100644
index 69b6940c49ad110ace21f32d3dbb3e2904580aed..a8dd17366932d60f3bf41f7c5c6503ba39ea6532
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingQEE/StrippingWJets.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingQEE/StrippingWJets.py
@@ -22,14 +22,12 @@ They are then cover a phasespace complementarily on each other.
 
 """
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
 from Configurables import CombineParticles, LoKi__VertexFitter
 from PhysSelPython.Wrappers import Selection, SimpleSelection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from StandardParticles import StdAllLooseMuons, StdAllNoPIDsElectrons, StdJets
-from CommonParticles.Utils import *
 from GaudiKernel.SystemOfUnits import GeV, MeV
 
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingQEE/StrippingWRareDecay.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingQEE/StrippingWRareDecay.py
index de1eaf98e07a599774f9667406768492a892a465..f599f543313af3af803cfd1ae503077a399fbebb 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingQEE/StrippingWRareDecay.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingQEE/StrippingWRareDecay.py
@@ -21,8 +21,7 @@ from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from GaudiKernel.SystemOfUnits import MeV, GeV, mm, picosecond
-from Gaudi.Configuration import *
+from GaudiKernel.SystemOfUnits import MeV, picosecond
 __author__ = ['Hang Yin', 'Qundong Han']
 __date__ = '11/29/2016'
 __version__ = '$Revision: 2.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingQEE/StrippingWe.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingQEE/StrippingWe.py
index 0820e8b431f0bb8891ac3f88f980c3fcbe0a181c..3e509fb26655db393ee396f8d85f74a24b0c62d7 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingQEE/StrippingWe.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingQEE/StrippingWe.py
@@ -21,7 +21,6 @@ We control: StdAllNoPIDsElectrons, PRS>50Mev & E_ECal/P>0.1 & E_HCal/P<0.05 & pT
 __all__ = 'WeConf', 'default_config'
 __author__ = 'S. Bifani', 'D. Ward'
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
 from PhysSelPython.Wrappers import SimpleSelection
 from StrippingConf.StrippingLine import StrippingLine
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingQEE/StrippingZ02ee.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingQEE/StrippingZ02ee.py
index e797011998c7d9201276f70cdabaa1b30ae4d70f..f6977308a75475dc2fd7e695d713190194177820 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingQEE/StrippingZ02ee.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingQEE/StrippingZ02ee.py
@@ -23,7 +23,6 @@ __all__ = (
     'default_config',
 )
 
-from Gaudi.Configuration import *
 from GaudiKernel.SystemOfUnits import GeV, MeV
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 from PhysSelPython.Wrappers import SimpleSelection
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingQEE/StrippingZ02nH.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingQEE/StrippingZ02nH.py
index 2f8d8eb612b1c353cf08c5e72ca77ae205eb7a72..35de5f4d789850497ba9aa5b71430ef065284077 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingQEE/StrippingZ02nH.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingQEE/StrippingZ02nH.py
@@ -26,7 +26,6 @@ from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from StandardParticles import StdAllNoPIDsPions
 from GaudiKernel.SystemOfUnits import GeV
-from GaudiKernel.SystemOfUnits import MeV
 
 
 default_config = {
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingQEE/StrippingZ0RareDecay.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingQEE/StrippingZ0RareDecay.py
index 57c2091f2ac6a4efcb43bd28c4251acba348f513..e181b28533d1769723804e5ccc2d55ce3dfbccea 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingQEE/StrippingZ0RareDecay.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingQEE/StrippingZ0RareDecay.py
@@ -22,8 +22,7 @@ __version__ = '$Revision: 2.0 $'
 
 __all__ = 'default_config', 'Z0RareDecayConf'
 
-from Gaudi.Configuration import *
-from GaudiKernel.SystemOfUnits import MeV, GeV, mm
+from GaudiKernel.SystemOfUnits import MeV
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
 from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
 from StrippingConf.StrippingLine import StrippingLine
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingQEE/depreciated/StrippingDijets.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingQEE/depreciated/StrippingDijets.py
index f0793d3411791797729ad540397e458f4646f78b..975321a6b30b00b6f80aee11878eb20ba9d16b84 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingQEE/depreciated/StrippingDijets.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingQEE/depreciated/StrippingDijets.py
@@ -15,8 +15,7 @@
 __all__ = ('DijetsConf',
            'default_config')
 
-from Gaudi.Configuration import *
-from GaudiKernel.SystemOfUnits import MeV, GeV, mm
+from GaudiKernel.SystemOfUnits import GeV, MeV
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingQEE/depreciated/StrippingHighPtTopoJets.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingQEE/depreciated/StrippingHighPtTopoJets.py
index 73ca61d9e7e0914a21b65e40361131e8f38c026d..6078cdec364615de35d547f813533d0a763afeef 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingQEE/depreciated/StrippingHighPtTopoJets.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingQEE/depreciated/StrippingHighPtTopoJets.py
@@ -21,8 +21,6 @@ __all__ = ('default_config', 'HighPtTopoJetsConf')
 # \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\#
 
 
-from Gaudi.Configuration import *
-from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from PhysSelPython.Wrappers import EventSelection
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingQEE/depreciated/StrippingJets.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingQEE/depreciated/StrippingJets.py
index 02e5fc43080729f2f38d0bc0bde65232a21f0202..55abf24d99577dcb8f10b30fda8803015b0c09f0 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingQEE/depreciated/StrippingJets.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingQEE/depreciated/StrippingJets.py
@@ -15,13 +15,11 @@
 __all__ = ('JetsConf',
            'default_config')
 
-from Gaudi.Configuration import *
-from GaudiKernel.SystemOfUnits import MeV, GeV, mm
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
+from GaudiKernel.SystemOfUnits import GeV, MeV
+from PhysSelPython.Wrappers import MergedSelection, Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
-from JetAccessories.JetMaker_Config import JetMakerConf
 from StandardParticles import StdJets, StdAllNoPIDsPions
 from Configurables import CombineParticles
 from Configurables import TopologicalTagging
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/Beauty2Charm_LoKiCuts.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/Beauty2Charm_LoKiCuts.py
index ce5265655cf518aa12121d3a5728d84c36da26cd..666cef80aacee423a071365fe7281c63e506e27d 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/Beauty2Charm_LoKiCuts.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/Beauty2Charm_LoKiCuts.py
@@ -10,11 +10,6 @@
 ###############################################################################
 # \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\#
 
-from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
-from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-from PhysSelPython.Wrappers import Selection, MergedSelection
-from StandardParticles import StdNoPIDsPions, StdNoPIDsKaons
 
 # \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\#
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingB02Lcmu_pKpi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingB02Lcmu_pKpi.py
index 3d6992fd337683bf5bcf97e994e4fd64705add4f..93bd54fbf8871329e8e7bcb95f7722d9913e1cff 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingB02Lcmu_pKpi.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingB02Lcmu_pKpi.py
@@ -14,7 +14,6 @@ from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = ['Nikita Beliy', 'Jibo He']
 __date__ = '28/11/2016'
 __version__ = '$Revision: 1.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingB23MuLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingB23MuLines.py
index a6e53abda621d1f1b0efe6185553c1b46aae67e6..15ea2076dcaea1a75c4fec8295e895be19887b4a 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingB23MuLines.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingB23MuLines.py
@@ -55,13 +55,11 @@ __all__ = ("B23MuLinesConf",
 
 #############################################################################
 
-from Gaudi.Configuration import *
-from Configurables import FilterDesktop, CombineParticles, DaVinci__N3BodyDecays
+from Configurables import DaVinci__N3BodyDecays
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 # from StrippingSelections.Utils import checkConfig
-from GaudiKernel.PhysicalConstants import c_light
 
 #############################################################################
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingB2EtaMuMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingB2EtaMuMu.py
index 121398b271451a2ef53c96b9cde3d79a68bd4d2e..9c2efbbacf4dc368cb7c6d742a93721b60444611 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingB2EtaMuMu.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingB2EtaMuMu.py
@@ -12,13 +12,12 @@
 B->etamumuselection
 '''
 
-from StandardParticles import StdAllNoPIDsMuons, StdAllLooseMuons
+from StandardParticles import StdAllNoPIDsMuons
 from StandardParticles import StdNoPIDsPions, StdLooseAllPhotons, StdLooseMergedPi0, StdLooseResolvedPi0
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand, SimpleSelection, MergedSelection
+from PhysSelPython.Wrappers import MergedSelection, Selection, SimpleSelection
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = ['Fred Blanc']
 __date__ = '26/01/2019'
 __version__ = '$Revision: 1.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingB2KLLXInclusive.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingB2KLLXInclusive.py
index a9d2ffd4e4d8d6444da6c3df3731248c13fce6e7..61a740d6b5d3d92a7f2015b59a5021738a7a2958 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingB2KLLXInclusive.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingB2KLLXInclusive.py
@@ -19,15 +19,12 @@ __all__ = ('B2KLLXInclusiveConf', 'default_config')
 Stripping selection for inclusively selected B->KmumuX decays.
 """
 
-from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop
+from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
 
 from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from LHCbKernel.Configuration import *  # check if needed
-from Configurables import SubstitutePID
-from Configurables import SubPIDMMFilter
 
 
 #################
@@ -333,7 +330,6 @@ class B2KLLXInclusiveConf(LineBuilder):
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         CombineDiMuon = CombineParticles()
         CombineDiMuon.DecayDescriptors = ["[B+ -> J/psi(1S) K+]cc"]
-        sel_name = "InclKLL"
         CombineDiMuon.MotherCut = self.InclKLLCut
         # choose
         leptons = self.InclLeptons
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingB2KstTauTau.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingB2KstTauTau.py
index 0e62fb1a13ae5f9586b34995cc3f4f00d8de7dee..a236059c8ca69aa4aaf625cf6925165cda17c83a 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingB2KstTauTau.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingB2KstTauTau.py
@@ -15,8 +15,7 @@ from StandardParticles import StdTightMuons
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, OfflineVertexFitter, DaVinci__N3BodyDecays
-from Gaudi.Configuration import *
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N3BodyDecays, FilterDesktop
 __author__ = [' G. Mancinelli, J. Serrano']
 __date__ = '15/08/2014'
 __version__ = '$Revision: 0.1 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingB2LLXBDT.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingB2LLXBDT.py
index 33ad8193f48b0db42c11b2b0fdb770bc37fa1794..b45675d8906a352a37b4bdd5ca92e02e5c6279bf 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingB2LLXBDT.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingB2LLXBDT.py
@@ -20,8 +20,6 @@ from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticle
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, MergedSelection
-from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays
-from Gaudi.Configuration import *
 __author__ = ['Jibo He']
 __date__ = '20/11/2015'
 __version__ = '$Revision: 1.0 $'
@@ -261,7 +259,7 @@ class B2LLXBDTConf(LineBuilder):
         """
         Kshort, both LL and DD
         """
-        from StandardParticles import StdLooseKsDD, StdLooseKsLL
+        from StandardParticles import StdLooseKsDD
 
         self.SelKsDD = self.createSubSel(OutputList=self.name + "SelKsDD",
                                          InputList=StdLooseKsDD,
@@ -297,7 +295,7 @@ class B2LLXBDTConf(LineBuilder):
         """
         Lambda, both LL and DD
         """
-        from StandardParticles import StdLooseLambdaDD, StdLooseLambdaLL
+        from StandardParticles import StdLooseLambdaDD
 
         self.SelLambdaDD = self.createSubSel(OutputList=self.name + "SelLambdaDD",
                                              InputList=StdLooseLambdaDD,
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingB2Lambda0ELines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingB2Lambda0ELines.py
index dcb376b6317e21a82d05511d6642d51a9139b1e0..beaae1e2b2d8fdb3ab6922b0b597f4f3735074b1 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingB2Lambda0ELines.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingB2Lambda0ELines.py
@@ -21,7 +21,6 @@ __all__ = ('B2Lambda0ELines',
            'default_config')
 
 from StandardParticles import StdLoosePions, StdLooseElectrons, StdNoPIDsDownElectrons, StdNoPIDsDownPions
-from Configurables import TisTosParticleTagger
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingB2Lambda0MuLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingB2Lambda0MuLines.py
index e758feafbbaf38bbf2c16b62697aeccc5044b5c0..8c8ebee90e957bb0642c7fb649a57f03d93eef97 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingB2Lambda0MuLines.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingB2Lambda0MuLines.py
@@ -21,7 +21,6 @@ __all__ = ('B2Lambda0MuLines',
            'default_config')
 
 from StandardParticles import StdLoosePions, StdLooseMuons, StdLooseDownMuons, StdNoPIDsDownPions
-from Configurables import TisTosParticleTagger
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingB2Lambda0MuOSLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingB2Lambda0MuOSLines.py
index 389b9bf695c2932c173a4ee768404acc14c2b153..4186a8554984cb039f3d149cda4700f95f9a9753 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingB2Lambda0MuOSLines.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingB2Lambda0MuOSLines.py
@@ -21,7 +21,6 @@ __all__ = ('B2Lambda0MuOSLines',
            'default_config')
 
 from StandardParticles import StdLoosePions, StdLooseMuons, StdLooseDownMuons, StdNoPIDsDownPions
-from Configurables import TisTosParticleTagger
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingB2Lambda0SSMuMu3PiLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingB2Lambda0SSMuMu3PiLines.py
index b829fcd48cd4d244f39b998208c83dfea4c65343..f47c81735abc7cb47558594658aaf83f1ca7bc36 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingB2Lambda0SSMuMu3PiLines.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingB2Lambda0SSMuMu3PiLines.py
@@ -21,7 +21,6 @@ __all__ = ('B2Lambda0SSMuMu3PiLines',
            'default_config')
 
 from StandardParticles import StdLoosePions, StdLooseMuons, StdLooseDownMuons, StdNoPIDsDownPions
-from Configurables import TisTosParticleTagger
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingB2MuMuMuMuLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingB2MuMuMuMuLines.py
index e8be535494b2f042b5e0ac87439ef9f4f7c4bd9d..e6a830521e3233715c6896a50d0ffe4616617755 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingB2MuMuMuMuLines.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingB2MuMuMuMuLines.py
@@ -19,7 +19,7 @@ from Beauty2Charm_LoKiCuts import LoKiCuts
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
-from Configurables import FilterDesktop, CombineParticles
+from Configurables import CombineParticles
 from Gaudi.Configuration import *
 __author__ = ['Diego Martinez Santos', 'Johannes Albrecht',
               'Konstantinos A. Petridis', 'Alexander Baranov']
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingB2XLL.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingB2XLL.py
old mode 100755
new mode 100644
index 893c8f7d24822aaf5128c145a0ea679b0efd25cc..54c9d8dbdf1774215b4f2574855ce20420b67924
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingB2XLL.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingB2XLL.py
@@ -10,9 +10,8 @@
 ###############################################################################
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection, AutomaticData
+from PhysSelPython.Wrappers import MergedSelection, Selection
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = 'Raja Nandakumar, Fergus Wilson, Stefania Ricciardi'
 __date__ = '04/11/2015'
 __version__ = '$Revision: 0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingB2XMuMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingB2XMuMu.py
index 9025207d02fbeeac1ba75e61e29706ad4d96e0d2..b89aef24e7a93c79addc371ccdea665995446fb7 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingB2XMuMu.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingB2XMuMu.py
@@ -19,7 +19,6 @@ __version__ = '$Revision: 1.2 $'
 __all__ = ('B2XMuMuConf', 'default_config')
 
 
-from Gaudi.Configuration import *
 from LHCbKernel.Configuration import *  # check if needed
 
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingB2XTau.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingB2XTau.py
index 89967ffc1bd10cb56544c7233004d1b229731f9c..9050443393da5af1c9abb3eee3ba2e1eda76009d 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingB2XTau.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingB2XTau.py
@@ -8,16 +8,13 @@
 # granted to it by virtue of its status as an Intergovernmental Organization  #
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
-from StandardParticles import StdAllLoosePions, StdAllNoPIDsPions
-from copy import deepcopy
 from StandardParticles import StdLooseKaons
-from StandardParticles import StdLoosePions, StdTightPions
-from StandardParticles import StdNoPIDsKaons, StdNoPIDsPions, StdTightMuons
+from StandardParticles import StdLoosePions
+from StandardParticles import StdNoPIDsPions, StdTightMuons
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, OfflineVertexFitter, DaVinci__N3BodyDecays
-from Gaudi.Configuration import *
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N3BodyDecays, FilterDesktop
 __author__ = ['G. Dujany, G. Mancinelli, J. Serrano']
 __date__ = '24/05/2010,15/01/2014, 19/10/2017'
 __version__ = '$Revision: 1.3 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingB2XTauMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingB2XTauMu.py
index 1539daf38aad3280d179e42101b30c7b9367dc90..3bf392ac2eb839b14fbb1f75d9e94e760e94edd9 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingB2XTauMu.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingB2XTauMu.py
@@ -25,8 +25,6 @@ __all__ = ('B2XTauMuConf',
            'default_config')
 
 
-from Gaudi.Configuration import *
-
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
 from PhysSelPython.Wrappers import Selection, MergedSelection
 from StrippingConf.StrippingLine import StrippingLine
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingB2XTauTau.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingB2XTauTau.py
index 4fcaf356c2071cae8a3b6be504e35eab73cf10ce..d2ac23a901190aa51d99a2548c6383a01f998521 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingB2XTauTau.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingB2XTauTau.py
@@ -14,8 +14,7 @@ from StandardParticles import StdNoPIDsPions, StdLoosePions
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand, SimpleSelection
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, OfflineVertexFitter, DaVinci__N3BodyDecays
-from Gaudi.Configuration import *
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N3BodyDecays, FilterDesktop
 __author__ = [' L. Pescatore', 'F. Blanc']
 __date__ = '28/09/2018'
 __version__ = '$Revision: 0.1$'
@@ -23,7 +22,6 @@ __version__ = '$Revision: 0.1$'
 # Stripping line for B->Htautau
 
 from GaudiKernel.SystemOfUnits import MeV
-from GaudiKernel.SystemOfUnits import mm
 
 """
   B->KstarTauTau, B->KTauTau, B->PhiTauTau, B->Eta'TauTau
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingBLVLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingBLVLines.py
index 8bf68933cf866f19e4931849021862745276afe7..a5196ce34b14f3f32b717e3c7fcb254e2f21f2fa 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingBLVLines.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingBLVLines.py
@@ -95,8 +95,7 @@ __all__ = ("BLVLinesConf",
 
 ###################################################################################################
 
-from Gaudi.Configuration import *
-from Configurables import FilterDesktop, CombineParticles, DaVinci__N3BodyDecays
+from Configurables import CombineParticles, DaVinci__N3BodyDecays
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingBd2KSLLX.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingBd2KSLLX.py
index 419b0f7505b9bb8f7a0008bd6bd040167c12c60a..54c987ef8b72fd7e148a11fb44cebadb12188639 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingBd2KSLLX.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingBd2KSLLX.py
@@ -10,9 +10,8 @@
 ###############################################################################
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection, AutomaticData
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, DaVinci__N3BodyDecays
-from Gaudi.Configuration import *
+from PhysSelPython.Wrappers import MergedSelection, Selection
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop
 __author__ = 'SB'
 __date__ = '08/10/2017'
 __version__ = '$Revision: 1 $'
@@ -47,15 +46,8 @@ class Bd2KSLLXConf(LineBuilder):
         mmXLine_name = name + "_mm"
         eeXLine_name = name + "_ee"
 
-        from StandardParticles import StdLoosePions as Pions
-        from StandardParticles import StdLooseKaons as Kaons
-        from StandardParticles import StdLooseKstar2Kpi as Kstars
-        from StandardParticles import StdLoosePhi2KK as Phis
         from StandardParticles import StdLooseKsLL as KshortsLL
         from StandardParticles import StdLooseKsDD as KshortsDD
-        from StandardParticles import StdLooseLambdaLL as LambdasLL
-        from StandardParticles import StdLooseLambdaDD as LambdasDD
-        from StandardParticles import StdLooseLambdastar2pK as Lambdastars
 
         SelKshortsLL = self._filterHadron(name="KshortsLLFor" + self._name,
                                           sel=KshortsLL,
@@ -64,12 +56,10 @@ class Bd2KSLLXConf(LineBuilder):
                                           sel=KshortsDD,
                                           params=config)
 
-        from StandardParticles import StdDiElectronFromTracks as DiElectronsFromTracks
         from StandardParticles import StdLooseDiElectron as DiElectrons
         from StandardParticles import StdLooseDiMuon as DiMuons
 
-        ElecID = "(PIDe > %(PIDe)s)" % config
-        MuonID = "(HASMUON)&(ISMUON)"
+        "(PIDe > %(PIDe)s)" % config
 
         DiElectronID = "(2 == NINTREE((ABSID==11)&(PIDe > %(PIDe)s)))" % config
         DiMuonID = "(2 == NINTREE((ABSID==13)&(HASMUON)&(ISMUON)))"
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingBd2eeKstarBDT.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingBd2eeKstarBDT.py
index 1a6b3547113e58f48bff1e36952cfc3fb4d30295..6776dcdf27807a56103010584c7a22734b4a8a3f 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingBd2eeKstarBDT.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingBd2eeKstarBDT.py
@@ -18,7 +18,6 @@ from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = ['Marie-Helene Schune', 'Jibo He']
 __date__ = '20/01/2012'
 __version__ = '$Revision: 1.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingBeauty2XGamma.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingBeauty2XGamma.py
index d21b9a25bc2714ed14237d6218c1dad601dc1240..05e9c9cf0af28c167f2cc98f655c56f432f3ea6b 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingBeauty2XGamma.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingBeauty2XGamma.py
@@ -12,7 +12,7 @@
 B-> X Gamma selections
 '''
 
-from StandardParticles import StdAllNoPIDsKaons, StdAllNoPIDsPions, StdLooseAllPhotons, StdLooseMergedPi0, StdLooseResolvedPi0, StdAllLooseGammaDD, StdAllLooseGammaLL, StdAllNoPIDsProtons
+from StandardParticles import StdAllLooseGammaDD, StdAllLooseGammaLL, StdAllNoPIDsPions, StdLooseAllPhotons, StdLooseMergedPi0, StdLooseResolvedPi0
 from Configurables import TisTosParticleTagger
 from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays as Combine4Particles
 from GaudiConfUtils.ConfigurableGenerators import DaVinci__N3BodyDecays as Combine3Particles
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingBs2MuMuGamma.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingBs2MuMuGamma.py
index 0cfb5425d7a51fe618e72a66a2e6e2062510e41d..f1f37c46035071eccb7cf880d283aafb532e0b8f 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingBs2MuMuGamma.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingBs2MuMuGamma.py
@@ -15,7 +15,7 @@ Authors: Meril Reboud, Jean-Francois Marchand
 """
 
 ########################################################################
-from StrippingUtils.Utils import LineBuilder, checkConfig
+from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Combine3BodySelection
 from StandardParticles import StdLooseMuons, StdLooseAllPhotons
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingBs2MuMuLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingBs2MuMuLines.py
index 28fab868cccc6d58e46553f2585cd743326a977c..8bf0a80a0ffc3aa0267bf6dfb6cc948d4a90331a 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingBs2MuMuLines.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingBs2MuMuLines.py
@@ -26,7 +26,7 @@ from Gaudi.Configuration import *
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
-from Configurables import FilterDesktop, CombineParticles
+from Configurables import CombineParticles
 from JetAccessories.JetMaker_Config import JetMakerConf
 from CommonParticles.Utils import *
 from Gaudi.Configuration import *
@@ -159,7 +159,7 @@ def create_stdjets(strob, line_location, stdjets_name_ban, stdjets_name_addb):
         strob.StdJetsNoJetIDBan = [myconf1]
 
     # configure Data-On-Demand service
-    locations = updateDoD(myconf1)
+    updateDoD(myconf1)
 
     myconf2 = JetMakerConf(stdjets_name_addb,
                            Inputs=['Phys/PFParticles/Particles', line_location],
@@ -173,7 +173,7 @@ def create_stdjets(strob, line_location, stdjets_name_ban, stdjets_name_addb):
         strob.StdJetsNoJetIDAddB = [myconf2]
 
     # configure Data-On-Demand service
-    locations = updateDoD(myconf2)
+    updateDoD(myconf2)
 
 ##########################################
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingBs2gammagamma.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingBs2gammagamma.py
index a19590514ce1912b186311ffed8d51783a633f9c..5dd7a2cdce789ca4b9dbc99b6ec9ffef3e98e01e 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingBs2gammagamma.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingBs2gammagamma.py
@@ -21,16 +21,11 @@ Exports the following stripping lines as instance data members:
 - Bs2gammagamma_NoConvWideLine  : wide line with 0 conversions
 '''
 
-from Configurables import (DiElectronMaker, ProtoParticleCALOFilter,
-                           ParticleTransporter, BremAdder)
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop  # , CombineParticles
-from CommonParticles import StdLooseAllPhotons
-from CommonParticles import StdAllLooseGammaConversion
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
 from Configurables import CombineParticles
-from Gaudi.Configuration import *
 __author__ = ['Sean Benson']
 __date__ = '2016/04/08'
 __version__ = '1.2'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingBs2st2KKMuX.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingBs2st2KKMuX.py
index 86d2fbe036d44821a158f2fba4fe7e558c1d3d55..22e9c5c994936c1db65ca0b5c70f9d8f5601bd3b 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingBs2st2KKMuX.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingBs2st2KKMuX.py
@@ -22,9 +22,8 @@ Stripping lines:
 from StandardParticles import StdLooseMuons, StdLooseKaons, StdAllLooseKaons, StdMassConstrainedJpsi2MuMu
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand
+from PhysSelPython.Wrappers import Selection
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = ['Jianchun Wang']
 __date__ = '03/22/2015'
 __version__ = '$Revision: 0.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingBu2LLK.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingBu2LLK.py
index ccdadc65103f0ad7d64540f186d2928a622eb079..c8fca833f5d7ccca659cabf968c9051df1adff6b 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingBu2LLK.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingBu2LLK.py
@@ -10,7 +10,7 @@
 ###############################################################################
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection, AutomaticData
+from PhysSelPython.Wrappers import DataOnDemand, MergedSelection, Selection
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, DaVinci__N3BodyDecays
 from Gaudi.Configuration import *
 __author__ = 'Patrick Koppenburg, Alex Shires, Thomas Blake, Luca Pescatore, Simone Bifani, Yasmine Amhis, Paula Alvarez Cartelle, Harry Cliff, Rafael Silva Coutinho, Guido Andreassi, Mick Mulder, Maarten van Veghel, John Smeaton, Vitalii Lisovskyi'
@@ -297,7 +297,6 @@ class Bu2LLKConf(LineBuilder):
         from StandardParticles import StdLoosePions as Pions
         from StandardParticles import StdLooseKaons as Kaons
         from StandardParticles import StdLooseProtons as Protons
-        from StandardParticles import StdAllLoosePions as AllPions
         from StandardParticles import StdAllLooseKaons as AllKaons
         from StandardParticles import StdAllLooseProtons as AllProtons
         from StandardParticles import StdLooseKstar2Kpi as Kstars
@@ -1520,7 +1519,6 @@ class Bu2LLKConf(LineBuilder):
         from StandardParticles import StdLooseMuons as Muons
         # from CommonParticles import StdLooseDetachedTau
         # Taus = DataOnDemand(Location = "Phys/StdLooseDetachedTau3pi/Particles")
-        from CommonParticles import StdTightDetachedTau
         Taus = DataOnDemand(Location="Phys/StdTightDetachedTau3pi/Particles")
 
         _DecayDescriptor = "[J/psi(1S) -> mu+ tau-]cc"
@@ -1675,7 +1673,6 @@ class Bu2LLKConf(LineBuilder):
 #####################################################
 
     def _storeInputBremPhotons(self, linename, outputlocprefix="Leptonic/Phys/", photonloc="Phys/StdVeryLooseAllPhotons/Particles"):
-        from PhysSelPython.Wrappers import FilterSelection, DataOnDemand, SelectionSequence
         from Configurables import (CopyParticles, ParticleCloner,
                                    ProtoParticleCloner, CaloHypoCloner,
                                    CaloClusterCloner)
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingBu2MajoLep.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingBu2MajoLep.py
index 5a96cdedd562ea723f6b2b20d6b2cf30f98f517f..850c2f87ccfaddc8f68a9b6e087f3f6d41cebbb1 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingBu2MajoLep.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingBu2MajoLep.py
@@ -19,12 +19,10 @@ __version__ = 'V0.9'
 __all__ = ('Bu2MajoLepConf',
            'default_config')
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
+from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from GaudiKernel.SystemOfUnits import *
 
 from StandardParticles import StdLooseMuons as Muons
 from StandardParticles import StdLoosePions as Pions
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingBu2MuNu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingBu2MuNu.py
index 19ce21e90e54ca7bc0f65d55187d37c95520c6d9..4163901dd65f50c70f659de9c335932f2c9649fa 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingBu2MuNu.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingBu2MuNu.py
@@ -25,12 +25,11 @@ __all__ = ('Bu2MuNuConf',
            'default_config')
 
 from Gaudi.Configuration import *
-from PhysSelPython.Wrappers import Selection, DataOnDemand
+from PhysSelPython.Wrappers import DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from StandardParticles import StdTightMuons, StdTightANNMuons
 from CommonParticles.Utils import *
-from Configurables import FilterDesktop, CombineParticles
+from Configurables import FilterDesktop
 from JetAccessories.JetMaker_Config import JetMakerConf
 
 default_name = 'Bu2MuNu'
@@ -72,7 +71,7 @@ def create_stdjets(strobj, line_location, stdjets_name_ban):
         strobj.StdJetsNoJetIDBan = [myconf1]
 
     # configure Data-On-Demand service
-    locations = updateDoD(myconf1)
+    updateDoD(myconf1)
 
 
 relInfoJetsVars = ["JETNOMU1PX", "JETNOMU1PY", "JETNOMU1PZ", "JETNOMU1PT", "JETNOMU1JETWIDTH", "JETNOMU1NNTAG", "JETNOMU1MNF", "JETNOMU2PX", "JETNOMU2PY", "JETNOMU2PZ", "JETNOMU2PT", "JETNOMU2JETWIDTH", "JETNOMU2NNTAG",
@@ -255,7 +254,7 @@ class Bu2MuNuConf(LineBuilder):
                                            JetIDCut=False).algorithms[0]
 
         # configure Data-On-Demand service
-        locations = updateDoD(StdJetsNoJetIDNoBan)
+        updateDoD(StdJetsNoJetIDNoBan)
 
         # add the jets with the specific banning
         create_stdjets(self, self.ControlLine.outputLocation(),
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingD23MuLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingD23MuLines.py
index 9d9153bde02604dd6518511524323b953c58b810..a119c6aadabeb6405ae23f48d28004723f035a3b 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingD23MuLines.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingD23MuLines.py
@@ -51,12 +51,11 @@ __all__ = ("D23MuLinesConf",
 #############################################################################
 
 from Gaudi.Configuration import *
-from Configurables import FilterDesktop, CombineParticles, DaVinci__N3BodyDecays
+from Configurables import DaVinci__N3BodyDecays
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 # from StrippingSelections.Utils import checkConfig
-from GaudiKernel.PhysicalConstants import c_light
 
 #############################################################################
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingDarkBoson.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingDarkBoson.py
index 754d0f38050b7a4694b6c0d51d824b1e808d61c3..e79bed1bf4d9ba4dcb692145cb4e20d25fe0063e 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingDarkBoson.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingDarkBoson.py
@@ -17,23 +17,18 @@ Author: M. Williams, D. Craik
 from Configurables import DiElectronMaker, ProtoParticleCALOFilter
 from GaudiConfUtils.ConfigurableGenerators import DaVinci__N3BodyDecays
 from CommonParticles.Utils import *
-from copy import deepcopy
 from Configurables import SubstitutePID
 from StandardParticles import StdAllLooseGammaLL, StdAllLooseGammaDD, \
     StdAllLooseElectrons, StdLooseAllPhotons  # , StdDiElectronFromTracks
 from Beauty2Charm_LoKiCuts import LoKiCuts
 from StandardParticles import StdAllNoPIDsPions, StdAllNoPIDsKaons, \
-    StdAllNoPIDsProtons, StdNoPIDsUpPions, StdAllLooseMuons, \
-    StdLooseDownMuons
-from Configurables import LoKi__VoidFilter
+    StdAllLooseMuons, StdLooseDownMuons
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import EventSelection
 from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
 from Gaudi.Configuration import *
-import re
 __author__ = ['Mike Williams', 'Dan Craik']
 
 moduleName = 'DarkBoson'
@@ -364,7 +359,7 @@ class DarkBosonConf(LineBuilder):
         mmDDX = makeX(
             'MuMuDD', default_config['XDD'], 'KS0 -> mu+ mu-', [muDX])
         kkX = makeX('KK', default_config['XLL'], 'KS0 -> K+ K-', [kX])
-        kkDDX = makeX('KKDD', default_config['XDD'], 'KS0 -> K+ K-', [kDX])
+        makeX('KKDD', default_config['XDD'], 'KS0 -> K+ K-', [kDX])
         pipiX = makeX(
             'PiPi', default_config['XLLhard'], 'KS0 -> pi+ pi-', [piX])
         pipiDDX = makeX(
@@ -419,7 +414,7 @@ class DarkBosonConf(LineBuilder):
             'PiPiSSDD', default_config['XDD'], '[KS0 -> pi+ pi+]cc', [piDX])
         preSS = default_config['Prescales']['SS']
 
-        preDD = default_config['Prescales']['DD']
+        default_config['Prescales']['DD']
         preKK = default_config['Prescales']['KK']
 
         j = makeJ(default_config['J'], [muJ])
@@ -630,7 +625,7 @@ class DarkBosonConf(LineBuilder):
         kst = filterKst()
         self._makeBLine('B2JKst', ['[B0 -> J/psi(1S) K*(892)0]cc'],
                         [j, kst], default_config['B2KX'])
-        rho = makeRho([piB])
+        makeRho([piB])
         # self._makeBLine('B2RhoX2MuMu',['B0 -> rho(770)0 KS0'],[rho,mmX],
         #                default_config['B2HHX'])
         # self._makeBLine('B2RhoX2MuMuDD',['B0 -> rho(770)0 KS0'],[rho,mmDDX],
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingDoubleSLForRX.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingDoubleSLForRX.py
index f7e5ccc228e7525247584f38f94bf53502f3cdea..3116bd40e9e8d6da906924d79ac8c85fabf37565 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingDoubleSLForRX.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingDoubleSLForRX.py
@@ -19,7 +19,6 @@ from GaudiConfUtils.ConfigurableGenerators import (CombineParticles,
                                                    DaVinci__N3BodyDecays)
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from Gaudi.Configuration import *
 __author__ = 'M. Kreps, T. Blake, D. Loh'
 __date__ = '10/11/2016'
 __version__ = '$Revision: 1.0$'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingHypb2L0HGamma.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingHypb2L0HGamma.py
index 83e2745fd58ace3d154d5c84e17588243850ee63..e33667deb325d3bc47009996d2c37915a3a42fd3 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingHypb2L0HGamma.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingHypb2L0HGamma.py
@@ -16,8 +16,8 @@ __all__ = ('Hypb2L0HGammaConf',
            'default_config', )
 
 from Gaudi.Configuration import *
-from Configurables import FilterDesktop, CombineParticles, TisTosParticleTagger
-from PhysSelPython.Wrappers import Selection, MergedSelection, DataOnDemand
+from Configurables import CombineParticles, FilterDesktop
+from PhysSelPython.Wrappers import DataOnDemand, Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from StandardParticles import StdLooseAllPhotons
@@ -495,7 +495,7 @@ def tisTosSelection(sel, TISTOSdict):
 
 
 def makevelotracks(name):
-    from Configurables import FastVeloTracking, TrackPrepareVelo, DecodeVeloRawBuffer, TrackEventFitter, TrackStateInitAlg,  TrackContainerCopy
+    from Configurables import FastVeloTracking, TrackContainerCopy, TrackStateInitAlg
     from TrackFitter.ConfiguredFitters import ConfiguredEventFitter
 
     MyFastVeloTracking = FastVeloTracking(
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingK0s2XXMuMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingK0s2XXMuMu.py
index 454c44356bf363573cfae8fad85f13e9b83e92ea..dc8a94331712da6fda2d902eeaadf4a4c7f30f0f 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingK0s2XXMuMu.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingK0s2XXMuMu.py
@@ -19,9 +19,7 @@ from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection
 from StandardParticles import StdAllLoosePions, StdAllLooseMuons
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-from GaudiKernel.PhysicalConstants import c_light
-from GaudiKernel.SystemOfUnits import MeV, m, mm, picosecond
-from Gaudi.Configuration import *
+from GaudiKernel.SystemOfUnits import MeV, mm, picosecond
 __author__ = ['Miguel Ramos Pernas']
 __date__ = '10/10/2017'
 __version__ = '$Revision: 0.00 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingKshort2Leptons.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingKshort2Leptons.py
index 67d107ee83706c36aa632cb5fa02a0f94c867573..22bd7388a2a3885597300244554f814dc453b243 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingKshort2Leptons.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingKshort2Leptons.py
@@ -20,7 +20,6 @@ from StandardParticles import StdAllNoPIDsElectrons
 from StandardParticles import StdNoPIDsUpPions
 from StandardParticles import StdAllNoPIDsPions
 from StandardParticles import StdAllLooseMuons
-from StandardParticles import StdAllNoPIDsMuons
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingKshort2MuMuMuMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingKshort2MuMuMuMu.py
index 86a943e5a6fb41852c6a9f29c92389947b9c890f..81ef82f2043ed504638103a44bd0a0e915d41771 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingKshort2MuMuMuMu.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingKshort2MuMuMuMu.py
@@ -15,15 +15,12 @@ derived, in large measure, from StrippingKshort2PiPiMuMu.py
 '''
 
 from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays
-from GaudiKernel.SystemOfUnits import MeV
-from StandardParticles import StdNoPIDsDownPions, StdLooseDownMuons
-from StandardParticles import StdAllLoosePions, StdAllLooseMuons, StdAllNoPIDsPions
-from StandardParticles import StdLoosePions, StdLooseMuons, StdNoPIDsPions
+from StandardParticles import StdLooseDownMuons
+from StandardParticles import StdAllLooseMuons
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
+from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
 __author__ = ['Mike Sokoloff']
 __date__ = '07 January 2014'
 __version__ = '$Revision: 0.1 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingKshort2PiPiMuMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingKshort2PiPiMuMu.py
index 0955f65fa0e2efdcb575b1c11a7ad439f53a1944..07b134c737342e2921702f4d74fa30eda7121cf9 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingKshort2PiPiMuMu.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingKshort2PiPiMuMu.py
@@ -10,15 +10,12 @@
 ###############################################################################
 
 from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays
-from GaudiKernel.SystemOfUnits import MeV
 from StandardParticles import StdNoPIDsDownPions, StdLooseDownMuons
-from StandardParticles import StdAllLoosePions, StdAllLooseMuons, StdAllNoPIDsPions
-from StandardParticles import StdLoosePions, StdLooseMuons, StdNoPIDsPions
+from StandardParticles import StdAllLooseMuons, StdAllLoosePions
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
+from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
 __author__ = ['Mike Sokoloff']
 __date__ = '25/10/2012'
 __version__ = '$Revision: 0.1 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingKshort2eePiPi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingKshort2eePiPi.py
index 5ac8f83630db4b9cf4e5a235dd3ceeb48b0a2a95..d8b95bcb790eaafc5b7c90a8f83fe5663eee0c11 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingKshort2eePiPi.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingKshort2eePiPi.py
@@ -23,7 +23,6 @@ from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection
 from GaudiConfUtils.ConfigurableGenerators import DaVinci__N3BodyDecays as Combine3Particles
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
-from Gaudi.Configuration import *
 __author__ = ['Carla Marin', 'Xabier Cid Vidal',  'Adrian Casais Vidal']
 __date__ = '23/02/2018'
 __version__ = '$2.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingLFVLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingLFVLines.py
index c3458781eb83744dc2820565a0f47b37b5fc2d0a..2e36db58ca9de1003ed6876cdfe53d8f1ccd6f4d 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingLFVLines.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingLFVLines.py
@@ -23,14 +23,12 @@ __all__ = ('LFVLinesConf',
            'default_config',
            )
 
-from Gaudi.Configuration import *
 # from Configurables import FilterDesktop, CombineParticles
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, DaVinci__N3BodyDecays
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N3BodyDecays
 from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from GaudiKernel.PhysicalConstants import c_light
-from GaudiKernel.SystemOfUnits import GeV, MeV, mm
+from GaudiKernel.SystemOfUnits import MeV, mm
 from copy import deepcopy
 #
 # Configure related info tools
@@ -1223,7 +1221,7 @@ class LFVLinesConf(LineBuilder):
         hemu_name = name+'B2heMu'
         pmu_name = name+'B2hMu'
         bu_name = name+'Bu2KJPsiee'
-        taumu_name = name+'B2TauMu'
+        name+'B2TauMu'
         htaumu_name = name+'B2hTauMu'
         muetap_gamma_name = name+'Tau2MuEtaP2pipig'
         muetap_pi_name = name+'Tau2MuEtaP2pipipi'
@@ -1716,7 +1714,6 @@ def makeB2TauMu(name):
         "& (BPVVDCHI2> 225)"\
         "& (BPVIPCHI2()< 25) "
 
-    from CommonParticles import StdLooseDetachedTau, StdLooseDipion
     _stdLooseMuons = DataOnDemand(Location="Phys/StdLooseMuons/Particles")
     _stdLooseDetachedTaus = DataOnDemand(
         Location="Phys/StdLooseDetachedTau3pi/Particles")
@@ -2356,7 +2353,6 @@ def makeB2hTauMu(name):
                           "& (BPVVDCHI2> 225)"\
                           "& (BPVIPCHI2()< 16) "  # maybe 16
 
-    from CommonParticles import StdLooseDetachedTau, StdLooseDipion
     _stdLooseMuons = DataOnDemand(Location="Phys/StdLooseMuons/Particles")
     _stdLooseDetachedTaus = DataOnDemand(
         Location="Phys/StdLooseDetachedTau3pi/Particles")
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingLb2L0Gamma.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingLb2L0Gamma.py
index 802119884510c53e5cf00d3e4788223b09ab5a71..bfcf8336af14cb0e5ff39ae2da6502181e9066d9 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingLb2L0Gamma.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingLb2L0Gamma.py
@@ -25,9 +25,6 @@ __date__ = "14.11.2016"
 __version__ = "2.0"
 __all__ = ("default_config", "StrippingLb2L0GammaConf")
 
-import os
-
-from Gaudi.Configuration import *
 
 from Configurables import CombineParticles
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
@@ -36,9 +33,7 @@ from PhysSelPython.Wrappers import Selection, MergedSelection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 
-from StandardParticles import StdAllNoPIDsPions, StdAllNoPIDsProtons
 from StandardParticles import StdLooseAllPhotons, StdAllLooseGammaDD, StdAllLooseGammaLL
-from StandardParticles import StdVeryLooseDetachedKst2Kpi
 from StandardParticles import StdLooseJpsi2MuMu
 
 default_config = {'NAME': 'Lb2L0Gamma',
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingLc23MuLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingLc23MuLines.py
index b2244bd7aa9f116d9783ce03a8fc1944cde17b39..3d97e939f7633e3e700dd756976cae1b815955f7 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingLc23MuLines.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingLc23MuLines.py
@@ -68,12 +68,11 @@ __all__ = ("Lc23MuLinesConf",
 ###################################################################################################
 
 from Gaudi.Configuration import *
-from Configurables import FilterDesktop, CombineParticles, DaVinci__N3BodyDecays, DaVinci__N4BodyDecays
+from Configurables import CombineParticles, DaVinci__N3BodyDecays, DaVinci__N4BodyDecays
 # from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from GaudiKernel.PhysicalConstants import c_light
 
 ###################################################################################################
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingPhiToKSKS.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingPhiToKSKS.py
index ff157859dd3877ab38f9cad234fb49a80418e50d..1a62ef5db16a204dc0a3d66d1fd1d1f75d4a04d4 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingPhiToKSKS.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingPhiToKSKS.py
@@ -23,8 +23,7 @@ from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from StandardParticles import StdAllLooseKaons, StdAllLooseMuons
-from Configurables import FitDecayTrees
-from PhysSelPython.Wrappers import AutomaticData, MergedSelection
+from PhysSelPython.Wrappers import MergedSelection
 
 __all__ = ('PhiToKSKSAllLinesConf',
            'TOSFilter',
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingRareNStrange.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingRareNStrange.py
index 95f70d0b641829f0a44259b730566f4c68fa1093..98b3814df4bee7388e334a0c9969c741474a9f63 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingRareNStrange.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingRareNStrange.py
@@ -10,9 +10,8 @@
 ###############################################################################
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection, AutomaticData
+from PhysSelPython.Wrappers import Selection
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = 'Diego Martinez Santos, Carlos Vazquez, Xabier Cid, Jessica Prisciandaro, Miguel Ramos Pernas'
 __date__ = '08/05/2015'
 __version__ = '$Revision: Not sure $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingRareStrange.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingRareStrange.py
index 6f7264e1db8f4045b2b139a11daa3e90056e3c44..bba73d994ee42cf94a9237f00597a4d7be7cc54d 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingRareStrange.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingRareStrange.py
@@ -59,15 +59,11 @@ __all__ = ('RareStrangeLinesConf',
 from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 from GaudiConfUtils.ConfigurableGenerators import DaVinci__N3BodyDecays as Combine3Particles
-from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays as Combine4Particles
-from CommonParticles import StdNoPIDsDownElectrons
 from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from GaudiKernel.PhysicalConstants import c_light
-from StandardParticles import (StdAllNoPIDsPions, StdNoPIDsDownPions,
-                               StdLoosePions, StdLooseDownMuons,
-                               StdLooseMergedPi0, StdLooseResolvedPi0, StdLooseDalitzPi0)
+from StandardParticles import (StdLooseMergedPi0, StdLooseResolvedPi0,
+                               StdLooseDalitzPi0)
 
 # from CommonParticles.StdLooseDalitzPi0 import (StdLoosePi02gee, StdLoosePi024e)
 
@@ -2786,7 +2782,7 @@ def makeLambdaPPiEE(name, config, inputs):
 
 
 def makevelotracks(name):
-    from Configurables import FastVeloTracking, TrackPrepareVelo, DecodeVeloRawBuffer, TrackEventFitter, TrackStateInitAlg,  TrackContainerCopy
+    from Configurables import FastVeloTracking, TrackContainerCopy, TrackStateInitAlg
     from TrackFitter.ConfiguredFitters import ConfiguredEventFitter
 
     MyFastVeloTracking = FastVeloTracking(
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingStrangeHadrons.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingStrangeHadrons.py
index 5c16fb7fd63ec1f15df76e17b03a96af7c5a4c61..e2488a937f3c160c5d1dc0bbb81310ee8ff58466 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingStrangeHadrons.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingStrangeHadrons.py
@@ -35,23 +35,12 @@ __all__ = ('default_config',
            'StrangeHadronsConf',
            )
 
-import os
 
-from Gaudi.Configuration import *
-
-from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-
-from GaudiConfUtils.ConfigurableGenerators import DaVinci__N3BodyDecays as Combine3Particles
-from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays as Combine4Particles
-from CommonParticles import StdNoPIDsDownElectrons
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
+from PhysSelPython.Wrappers import DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from GaudiKernel.PhysicalConstants import c_light
 from GaudiKernel.SystemOfUnits import MeV
 
-from StandardParticles import StdAllNoPIDsPions, StdLoosePions, StdLooseProtons, StdAllLoosePions, StdAllLooseMuons
-from StandardParticles import StdLooseAllPhotons
 ##
 from PhysConf.Selections import CombineSelection
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingStrangeSL.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingStrangeSL.py
index 5134ef5434ea3f244733fc6ac26485b868c228fb..26590be4ba73ad6710f007e7e831cea2a4a4b23a 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingStrangeSL.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingStrangeSL.py
@@ -36,23 +36,12 @@ __all__ = ('default_config',
            'StrangeSLConf',
            )
 
-import os
 
-from Gaudi.Configuration import *
-
-from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-
-from GaudiConfUtils.ConfigurableGenerators import DaVinci__N3BodyDecays as Combine3Particles
-from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays as Combine4Particles
-from CommonParticles import StdNoPIDsDownElectrons
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
+from PhysSelPython.Wrappers import DataOnDemand, Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from GaudiKernel.PhysicalConstants import c_light
 from GaudiKernel.SystemOfUnits import MeV
 
-from StandardParticles import StdAllNoPIDsPions, StdLoosePions, StdLooseProtons, StdAllLoosePions, StdAllLooseMuons, StdAllLooseElectrons
-from StandardParticles import StdLooseMergedPi0, StdLooseResolvedPi0, StdLooseDalitzPi0
 from PhysConf.Selections import CombineSelection
 
 default_config = {
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingTau23MuLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingTau23MuLines.py
index 6adb37dd06aeeb58dcd798447fe8b5ee90fa6e99..b2fa9b13c2441549d3939f19589727c3e261e09d 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingTau23MuLines.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingTau23MuLines.py
@@ -35,7 +35,6 @@ from GaudiConfUtils.ConfigurableGenerators import DaVinci__N5BodyDecays as Combi
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from GaudiKernel.PhysicalConstants import c_light
 
 default_config = {
     'NAME': 'Tau23Mu',
@@ -70,7 +69,7 @@ class Tau23MuLinesConf(LineBuilder):
         # checkConfig(Bs2MuMuLinesConf.__configuration_keys__,config)
 
         tau_name = name+'Tau23Mu'
-        ds23PiTIS_name = name+'Ds23PiTIS'
+        name+'Ds23PiTIS'
         ds23Pi_name = name+'Ds23Pi'
         ds2PhiPi_name = name+'Ds2PhiPi'
         tau25_name = name+'Tau25Mu'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingTau2LambdaMuLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingTau2LambdaMuLines.py
index 6f7caa01d008433cca4a3184d6bdfeb2a9bcd909..2e5401740f914b698345c335bfe29788f1e7ed2e 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingTau2LambdaMuLines.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingTau2LambdaMuLines.py
@@ -16,12 +16,10 @@ Exported symbols (use python help!):
    - 
 '''
 
-from GaudiKernel.PhysicalConstants import c_light
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
-from Configurables import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
+from Configurables import CombineParticles
 __author__ = ['Marcin Chrzaszcz']
 __date__ = '14/12/2012'
 __version__ = '$Revision: 1.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingZVTOP.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingZVTOP.py
index f4ee63f69c4320486335e4fa797004ccb36ecca4..6b5cbfa74e249908ea9e854e9c0f238ebdd2d9cf 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingZVTOP.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingRD/StrippingZVTOP.py
@@ -9,14 +9,12 @@
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
 from Configurables import TopoTauAlg, TopoVertexTool
-from StandardParticles import StdLooseKaons
-from StandardParticles import StdLoosePions, StdTightPions
-from StandardParticles import StdNoPIDsKaons, StdNoPIDsPions
+from StandardParticles import StdLoosePions
+from StandardParticles import StdNoPIDsPions
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, OfflineVertexFitter
-from Gaudi.Configuration import *
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop
 __author__ = ['Giampi Mancinelli', 'Julien Cogan', 'Justine Serrano']
 
 __date__ = '14/01/2014'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingSL/StrippingB23MuNu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingSL/StrippingB23MuNu.py
index 11d81c34fb0178677727235bc3bd636b83427207..97c4220c4e62f1a00d3c320d5f76806aba8c4c4a 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingSL/StrippingB23MuNu.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingSL/StrippingB23MuNu.py
@@ -19,15 +19,12 @@ __all__ = ('B23MuNuConf')
 Stripping selection for B to three muons and a neutrino.
 """
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop
 
-from PhysSelPython.Wrappers import Selection, AutomaticData, MergedSelection
+from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from LHCbKernel.Configuration import *  # check if needed
-from Configurables import SubstitutePID
-from Configurables import SubPIDMMFilter
 
 
 #################
@@ -161,15 +158,13 @@ class B23MuNuConf(LineBuilder):
         """
         Creates Jpsi as proxy for dimuon
         """
-        from PhysSelPython.Wrappers import AutomaticData, Selection, SelectionSequence, DataOnDemand, MergedSelection
+        from PhysSelPython.Wrappers import Selection
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         # from Configurables import CombineParticles
 
         CombineJpsi = CombineParticles(DecayDescriptors=["J/psi(1S) -> mu+ mu-", "[J/psi(1S) -> mu+ mu+]cc"],
                                        MotherCut="ALL")
 
-        sel_name = "Jpsi"
-
         from PhysSelPython.Wrappers import Selection
         SelJpsi = Selection("Sel_" + self.name + "_Jpsi", Algorithm=CombineJpsi,
                             RequiredSelections=[self.Muons])
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingSL/StrippingB2DMuForTauMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingSL/StrippingB2DMuForTauMu.py
index bbb6591f636c547192b1c9759ebfeedf27b88e2b..8bd9a436ea3d941e0b4ec5b3610d262206579753 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingSL/StrippingB2DMuForTauMu.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingSL/StrippingB2DMuForTauMu.py
@@ -18,12 +18,10 @@ __version__ = '$Revision: 2.0 $'
 
 from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from PhysSelPython.Wrappers import Selection, DataOnDemand
+from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from StandardParticles import StdLoosePions, StdAllLooseMuons, StdLooseKaons, StdLooseProtons, StdAllLoosePions, StdLooseMergedPi0, StdLooseResolvedPi0, StdAllNoPIDsMuons, StdLooseANNUpPions
-from Configurables import ConjugateNeutralPID
-from PhysSelPython.Wrappers import MergedSelection
+from StandardParticles import StdAllLooseMuons, StdAllNoPIDsMuons, StdLooseKaons, StdLoosePions, StdLooseProtons
 
 __all__ = ('B2DMuForTauMuconf',
            # 'makeb2DMuX',
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingSL/StrippingB2DMuNuX.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingSL/StrippingB2DMuNuX.py
index 5336bea5bd5d1a8013b026a62b999e808bf61eab..3736f86309ec24b62f81a2c483ee5e5d23d7fad9 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingSL/StrippingB2DMuNuX.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingSL/StrippingB2DMuNuX.py
@@ -13,14 +13,13 @@ __date__ = '23/07/2010'
 __version__ = '$Revision: 5.0 $'
 
 from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
+from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
 from PhysSelPython.Wrappers import Selection
-from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from StandardParticles import StdLoosePions, StdLooseMuons, StdLooseKaons, StdLooseProtons, StdLooseElectrons
 from StandardParticles import StdNoPIDsPions, StdNoPIDsKaons, StdNoPIDsProtons, StdNoPIDsMuons
 from StrippingB2DMuNuXUtils import *
-from GaudiKernel.SystemOfUnits import MeV, GeV, cm, mm
+from GaudiKernel.SystemOfUnits import GeV, MeV, mm
 
 __all__ = ('B2DMuNuXAllLinesConf',
            'default_config')
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingSL/StrippingB2DMuNuXUtils.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingSL/StrippingB2DMuNuXUtils.py
index 6130e13de2c5b9fe72cd44d5967aeceaa4452074..e91f29e3fa36cef61e702f06f89eb4418ddf4695 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingSL/StrippingB2DMuNuXUtils.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingSL/StrippingB2DMuNuXUtils.py
@@ -13,11 +13,9 @@ __date__ = '06/03/2015'
 __version__ = '$Revision: 0.0 $'
 
 from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
-from StrippingUtils.Utils import LineBuilder
-from StandardParticles import StdLoosePions, StdLooseMuons, StdLooseKaons, StdLooseProtons, StdNoPIDsPions, StdLooseElectrons, StdNoPIDsMuons
 
 
 def BtoDlnuLine(module_name,
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingSL/StrippingB2Dlnu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingSL/StrippingB2Dlnu.py
index 0c8d00bd94717af821926626f5446a85cb20a902..b05a05c95319c31661cfe61524eca70e234905c3 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingSL/StrippingB2Dlnu.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingSL/StrippingB2Dlnu.py
@@ -17,12 +17,10 @@ __version__ = '$Revision: 1.0 $'
 
 from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from PhysSelPython.Wrappers import Selection, DataOnDemand
+from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from StandardParticles import StdLoosePions, StdLooseMuons, StdLooseKaons, StdLooseProtons, StdAllLoosePions, StdLooseMergedPi0, StdLooseResolvedPi0, StdAllNoPIDsMuons, StdLooseANNUpPions, StdLooseElectrons
-from Configurables import ConjugateNeutralPID
-from PhysSelPython.Wrappers import MergedSelection
+from StandardParticles import StdAllNoPIDsMuons, StdLooseElectrons, StdLooseKaons, StdLooseMuons, StdLoosePions
 
 __all__ = ('B2DMuForLNuconf',
            # 'makeb2DMuX',
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingSL/StrippingB2Dst0MuNu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingSL/StrippingB2Dst0MuNu.py
index 3f6fd96ade4433b51152a37ee46ccbd072892fbe..e98d2b4850975113ec77abeed5a53c59a6ba950c 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingSL/StrippingB2Dst0MuNu.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingSL/StrippingB2Dst0MuNu.py
@@ -12,12 +12,11 @@ __author__ = ['Michel De Cian']
 __date__ = '12/12/2018'
 __version__ = '$Revision: 0.0 $'
 
-from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from PhysSelPython.Wrappers import Selection, DataOnDemand
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
+from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from StandardParticles import StdLoosePions, StdLooseMuons, StdLooseKaons, StdAllLoosePions, StdAllLooseElectrons, StdLooseResolvedPi0, StdLooseMergedPi0, StdLooseDalitzPi0
+from StandardParticles import StdAllLooseElectrons, StdLooseDalitzPi0, StdLooseKaons, StdLooseMergedPi0, StdLooseMuons, StdLoosePions, StdLooseResolvedPi0
 
 __all__ = ('B2Dst0MuNuAllLinesConf',
            'TOSFilter',
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingSL/StrippingB2DstMuNuIncl.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingSL/StrippingB2DstMuNuIncl.py
index 6abd041bf344194b0ad86747d5d5622ae5fdddf9..3a91f70e613b554c2c0d5b7095d89a8eb3c67f3d 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingSL/StrippingB2DstMuNuIncl.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingSL/StrippingB2DstMuNuIncl.py
@@ -12,9 +12,8 @@ __author__ = ['Mika Vesterinen']
 __date__ = '04/04/2015'
 __version__ = '$Revision: 0.0 $'
 
-from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from PhysSelPython.Wrappers import Selection, DataOnDemand
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
+from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from StandardParticles import StdLoosePions, StdLooseMuons, StdLooseKaons, StdAllLoosePions
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingSL/StrippingB2PPbarMuForTauMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingSL/StrippingB2PPbarMuForTauMu.py
index 1d97e42a98b40f8bef4d02281e5fd0b77ab45300..5eaa8cff0ccedf2007a0fc0b82bdb43f18bff30a 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingSL/StrippingB2PPbarMuForTauMu.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingSL/StrippingB2PPbarMuForTauMu.py
@@ -9,9 +9,7 @@
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
 
-import logging
 from StrippingUtils.Utils import LineBuilder
-from Gaudi.Configuration import *
 __author__ = ['Mark Smith']
 __date__ = '17/10/2016'
 __version__ = '$Revision: 1.0 $'
@@ -107,8 +105,6 @@ class B2PPbarMuForTauMuBuilder(LineBuilder):
     def __init__(self, name, config):
         LineBuilder.__init__(self, name, config)
 
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
-
         self.GECs = {"Code": "( recSummary(LHCb.RecSummary.nSPDhits,'Raw/Spd/Digits') < %(GEC_nSPDHits)s )" % config,
                      "Preambulo": ["from LoKiTracks.decorators import *"]}
 
@@ -437,7 +433,7 @@ class B2PPbarMuForTauMuBuilder(LineBuilder):
     ###### B->ppMuNu Signal ######
     def _bhad2PMuX_B(self):
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-        from PhysSelPython.Wrappers import Selection, MergedSelection
+        from PhysSelPython.Wrappers import Selection
 
         _pMu = CombineParticles(
             DecayDescriptors=self._config["DECAYS"], ReFitPVs=True)
@@ -454,7 +450,7 @@ class B2PPbarMuForTauMuBuilder(LineBuilder):
     ###### B->ppMuNu Signal for Topo Line ######
     def _bhad2PMuX_BTopo(self):
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-        from PhysSelPython.Wrappers import Selection, MergedSelection
+        from PhysSelPython.Wrappers import Selection
 
         _pMu = CombineParticles(
             DecayDescriptors=self._config["DECAYS"], ReFitPVs=True)
@@ -471,7 +467,7 @@ class B2PPbarMuForTauMuBuilder(LineBuilder):
     ###### B->ppMuNu Same-Sign protons ######
     def _bhad2PMuX_B_SS(self):
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-        from PhysSelPython.Wrappers import Selection, MergedSelection
+        from PhysSelPython.Wrappers import Selection
 
         _pMu = CombineParticles(
             DecayDescriptors=self._config["DECAYS"], ReFitPVs=True)
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingSL/StrippingB2XTauNu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingSL/StrippingB2XTauNu.py
index 7e086d88664dbe28a77ab80ac882b7a7014366c9..6ace30c6ea487c9ee422ba92f199da4e11ac0085 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingSL/StrippingB2XTauNu.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingSL/StrippingB2XTauNu.py
@@ -610,7 +610,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         self.__MakeB0d2DdoubleStar2PiDstar02GammaD0TauNuNonPhysTau__()
 
         from StrippingConf.StrippingLine import StrippingLine
-        from PhysSelPython.Wrappers import SelectionSequence
 
         # TisTos filter
         def filterTisTos(name, Input, myTisTosSpecs):
@@ -1365,7 +1364,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
 
         from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseJpsi2MuMu
 
         JpsiForBc = FilterDesktop(
             Code=self.totalJpsiCut
@@ -1384,7 +1382,7 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
 
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
+        from PhysSelPython.Wrappers import Selection
         from StandardParticles import StdLoosePions
 
         CombDdoubleStar02DstarPi = CombineParticles(
@@ -1405,7 +1403,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3pi/Particles')
@@ -1428,7 +1425,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3pi/Particles')
@@ -1453,7 +1449,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3pi/Particles')
@@ -1477,7 +1472,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTauNonPhys
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3piNonPhys/Particles')
@@ -1501,7 +1495,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3pi/Particles')
@@ -1526,7 +1519,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3pi/Particles')
@@ -1551,7 +1543,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTauNonPhys
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3piNonPhys/Particles')
@@ -1575,7 +1566,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3pi/Particles')
@@ -1600,7 +1590,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3pi/Particles')
@@ -1625,7 +1614,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTauNonPhys
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3piNonPhys/Particles')
@@ -1650,7 +1638,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3pi/Particles')
@@ -1674,7 +1661,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTauNonPhys
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3piNonPhys/Particles')
@@ -1698,7 +1684,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3pi/Particles')
@@ -1723,7 +1708,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3pi/Particles')
@@ -1748,7 +1732,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTauNonPhys
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3piNonPhys/Particles')
@@ -1773,7 +1756,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3pi/Particles')
@@ -1799,7 +1781,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3pi/Particles')
@@ -1823,7 +1804,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3pi/Particles')
@@ -1849,7 +1829,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3pi/Particles')
@@ -1874,7 +1853,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTauNonPhys
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3piNonPhys/Particles')
@@ -1900,7 +1878,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3pi/Particles')
@@ -1924,7 +1901,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3pi/Particles')
@@ -1947,7 +1923,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3pi/Particles')
@@ -1971,7 +1946,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3pi/Particles')
@@ -1995,7 +1969,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTauNonPhys
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3piNonPhys/Particles')
@@ -2019,7 +1992,7 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
 
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
+        from PhysSelPython.Wrappers import Selection
         from StandardParticles import StdLooseResolvedPi0
 
         CombDStar02Pi0D0 = CombineParticles(
@@ -2039,7 +2012,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3pi/Particles')
@@ -2062,7 +2034,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3pi/Particles')
@@ -2085,7 +2056,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3piNonPhys/Particles')
@@ -2108,7 +2078,7 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
 
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
+        from PhysSelPython.Wrappers import Selection
         from StandardParticles import StdLooseAllPhotons
 
         CombDStar02GammaD0 = CombineParticles(
@@ -2128,7 +2098,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3pi/Particles')
@@ -2151,7 +2120,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3pi/Particles')
@@ -2174,7 +2142,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3piNonPhys/Particles')
@@ -2196,7 +2163,7 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
 
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
+        from PhysSelPython.Wrappers import Selection
         from StandardParticles import StdLoosePions
 
         CombDdoubleStar2PiDstar02Pi0D0 = CombineParticles(
@@ -2216,7 +2183,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3pi/Particles')
@@ -2239,7 +2205,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3pi/Particles')
@@ -2262,7 +2227,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3piNonPhys/Particles')
@@ -2284,7 +2248,7 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
 
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
+        from PhysSelPython.Wrappers import Selection
         from StandardParticles import StdLoosePions
 
         CombDdoubleStar2PiDstar02GammaD0 = CombineParticles(
@@ -2304,7 +2268,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3pi/Particles')
@@ -2327,7 +2290,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3pi/Particles')
@@ -2350,7 +2312,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3piNonPhys/Particles')
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingSL/StrippingB2XuENu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingSL/StrippingB2XuENu.py
index 73ab1a2a4e2c0a0a1016fb4040cc2e6b7b36c884..b59084d7969d22b0c34cc4c7c11b62ae657ce530 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingSL/StrippingB2XuENu.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingSL/StrippingB2XuENu.py
@@ -9,9 +9,7 @@
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
 
-import logging
 from StrippingUtils.Utils import LineBuilder
-from Gaudi.Configuration import *
 __author__ = ['Phillip Urquijo, Alessandra Borgia', 'Michel De Cian']
 __date__ = '11/01/2019'
 __version__ = '$Revision: 1.6 $'
@@ -243,7 +241,7 @@ class B2XuENuBuilder(LineBuilder):
     def __init__(self, name, config):
         LineBuilder.__init__(self, name, config)
         self.config = config
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
+        from PhysSelPython.Wrappers import DataOnDemand
         self._stdVeryLooseKsLL = DataOnDemand(
             "Phys/StdVeryLooseKsLL/Particles")
         self._stdLooseKsLD = DataOnDemand("Phys/StdLooseKsLD/Particles")
@@ -734,7 +732,7 @@ class B2XuENuBuilder(LineBuilder):
 
     # Bs -> K*/Kspi e nu lines
     def _Kstar_line(self):
-        NoPS = self.config['NoPrescales']
+        self.config['NoPrescales']
         from StrippingConf.StrippingLine import StrippingLine
         return StrippingLine(self._name+'Bs2Kstar_Line', prescale=1.0,
                              FILTER=self.GECs,
@@ -1055,8 +1053,8 @@ class B2XuENuBuilder(LineBuilder):
         if self._KSSel is not None:
             return self._KSSel
 
-        from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
+        from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
+        from PhysSelPython.Wrappers import Selection
 
         _code = FilterDesktop(Code=self._NominalKsSelection() % self._config)
 
@@ -1141,7 +1139,6 @@ class B2XuENuBuilder(LineBuilder):
 
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection
-        from StandardParticles import StdLoosePions
 
         _rho770 = CombineParticles(
             DecayDescriptors=["rho(770)0 -> pi- pi+"],
@@ -1171,7 +1168,6 @@ class B2XuENuBuilder(LineBuilder):
 
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection
-        from StandardParticles import StdLoosePions
 
         _rho770NoPID = CombineParticles(
             DecayDescriptors=["rho(770)0 -> pi- pi+"],
@@ -1201,7 +1197,6 @@ class B2XuENuBuilder(LineBuilder):
 
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection
-        from StandardParticles import StdLoosePions
 
         _rho770WS = CombineParticles(
             DecayDescriptors=["[rho(770)0 -> pi+ pi+]cc"],
@@ -1229,7 +1224,6 @@ class B2XuENuBuilder(LineBuilder):
 
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection
-        from StandardParticles import StdLoosePions
 
         _rho770SB = CombineParticles(
             DecayDescriptors=["rho(770)0 -> pi+ pi-"],
@@ -1341,7 +1335,7 @@ class B2XuENuBuilder(LineBuilder):
 
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection
-        from StandardParticles import StdLoosePions, StdLooseElectrons
+        from StandardParticles import StdLoosePions
 
         _Ksh = CombineParticles(
             DecayDescriptor="KS0 -> e- pi+",
@@ -1369,7 +1363,7 @@ class B2XuENuBuilder(LineBuilder):
 
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection
-        from StandardParticles import StdLoosePions, StdLooseElectrons
+        from StandardParticles import StdLoosePions
 
         _Ksh = CombineParticles(
             DecayDescriptor="KS0 -> e+ pi-",
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingSL/StrippingB2XuMuNu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingSL/StrippingB2XuMuNu.py
index e990a0f5fca381288d278a31edfe8c4be451c2d9..7dbf8f670c004436033f2172b635cf83469f0692 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingSL/StrippingB2XuMuNu.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingSL/StrippingB2XuMuNu.py
@@ -9,9 +9,7 @@
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
 
-import logging
 from StrippingUtils.Utils import LineBuilder
-from Gaudi.Configuration import *
 __author__ = ['Phillip Urquijo, Alessandra Borgia', 'Michel De Cian']
 __date__ = '11/01/2019'
 __version__ = '$Revision: 1.6 $'
@@ -238,7 +236,7 @@ class B2XuMuNuBuilder(LineBuilder):
     def __init__(self, name, config):
         LineBuilder.__init__(self, name, config)
         self.config = config
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
+        from PhysSelPython.Wrappers import DataOnDemand
         self._stdVeryLooseKsLL = DataOnDemand(
             "Phys/StdVeryLooseKsLL/Particles")
         self._stdLooseKsLD = DataOnDemand("Phys/StdLooseKsLD/Particles")
@@ -733,7 +731,7 @@ class B2XuMuNuBuilder(LineBuilder):
 
     # Bs -> K*/Kspi mu nu lines
     def _Kstar_line(self):
-        NoPS = self.config['NoPrescales']
+        self.config['NoPrescales']
         from StrippingConf.StrippingLine import StrippingLine
         return StrippingLine(self._name+'Bs2Kstar_Line', prescale=1.0,
                              FILTER=self.GECs,
@@ -1052,8 +1050,8 @@ class B2XuMuNuBuilder(LineBuilder):
         if self._KSSel is not None:
             return self._KSSel
 
-        from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
+        from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
+        from PhysSelPython.Wrappers import Selection
 
         _code = FilterDesktop(Code=self._NominalKsSelection() % self._config)
 
@@ -1138,7 +1136,6 @@ class B2XuMuNuBuilder(LineBuilder):
 
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection
-        from StandardParticles import StdLoosePions
 
         _rho770 = CombineParticles(
             DecayDescriptors=["rho(770)0 -> pi- pi+"],
@@ -1168,7 +1165,6 @@ class B2XuMuNuBuilder(LineBuilder):
 
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection
-        from StandardParticles import StdLoosePions
 
         _rho770NoPID = CombineParticles(
             DecayDescriptors=["rho(770)0 -> pi- pi+"],
@@ -1198,7 +1194,6 @@ class B2XuMuNuBuilder(LineBuilder):
 
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection
-        from StandardParticles import StdLoosePions
 
         _rho770WS = CombineParticles(
             DecayDescriptors=["[rho(770)0 -> pi+ pi+]cc"],
@@ -1226,7 +1221,6 @@ class B2XuMuNuBuilder(LineBuilder):
 
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection
-        from StandardParticles import StdLoosePions
 
         _rho770SB = CombineParticles(
             DecayDescriptors=["rho(770)0 -> pi+ pi-"],
@@ -1338,7 +1332,7 @@ class B2XuMuNuBuilder(LineBuilder):
 
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection
-        from StandardParticles import StdLoosePions, StdLooseMuons
+        from StandardParticles import StdLoosePions
 
         _Ksh = CombineParticles(
             DecayDescriptor="KS0 -> mu- pi+",
@@ -1366,7 +1360,7 @@ class B2XuMuNuBuilder(LineBuilder):
 
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection
-        from StandardParticles import StdLoosePions, StdLooseMuons
+        from StandardParticles import StdLoosePions
 
         _Ksh = CombineParticles(
             DecayDescriptor="KS0 -> mu+ pi-",
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingSL/StrippingCharmFromBSemiForHadronAsy.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingSL/StrippingCharmFromBSemiForHadronAsy.py
index a80fcb301fa6917bd97160506a3b0a679ff40777..ddaec2925512363daba54947938f97bdafffeb41 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingSL/StrippingCharmFromBSemiForHadronAsy.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingSL/StrippingCharmFromBSemiForHadronAsy.py
@@ -25,8 +25,7 @@ from Configurables import FilterDesktop, CombineParticles
 from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from StandardParticles import StdAllLoosePions, StdLoosePions, StdLooseMuons, StdLooseKaons, StdLooseProtons
-from Configurables import TisTosParticleTagger
+from StandardParticles import StdLooseKaons, StdLooseMuons, StdLoosePions
 
 __all__ = ('CharmFromBSemiForHadronAsyAllLinesConf',
            'TOSFilter',
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingSL/StrippingLb2LcMuNuX_Lc2L0Pi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingSL/StrippingLb2LcMuNuX_Lc2L0Pi.py
index 074ba01a451ce4cf74c483e687d7a71c404d4adb..729f75ac3c69725569c584dc08bdd9610f2b693a 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingSL/StrippingLb2LcMuNuX_Lc2L0Pi.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingSL/StrippingLb2LcMuNuX_Lc2L0Pi.py
@@ -16,14 +16,13 @@ __author__ = ['Scott Ely']
 __date__ = '23/01/2019'
 __version__ = '$Revision: 1.0 $'
 
-from Gaudi.Configuration import *
 from Configurables import FilterDesktop, CombineParticles
-from PhysSelPython.Wrappers import Selection, DataOnDemand
+from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from StandardParticles import StdLoosePions, StdLooseMuons, StdLooseKaons, StdLooseProtons, StdLooseElectrons, StdVeryLooseLambdaLL
-from StandardParticles import StdNoPIDsPions, StdNoPIDsKaons, StdNoPIDsProtons, StdNoPIDsMuons
-from GaudiKernel.SystemOfUnits import MeV, GeV, cm, mm
+from StandardParticles import StdLooseMuons, StdLoosePions, StdVeryLooseLambdaLL
+from StandardParticles import StdNoPIDsMuons
+from GaudiKernel.SystemOfUnits import GeV, MeV, mm
 
 __all__ = ('Lb2LcMuNuX_Lc2L0PiConf', 'default_config')
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingSL/StrippingLb2pMuNuVub.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingSL/StrippingLb2pMuNuVub.py
index cd969d689449a9dc069bd745b4acbc62f683dfda..e74c7de20e90982142bcf10f66be4a6cb90689e6 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingSL/StrippingLb2pMuNuVub.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingSL/StrippingLb2pMuNuVub.py
@@ -9,9 +9,7 @@
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
 
-import logging
 from StrippingUtils.Utils import LineBuilder
-from Gaudi.Configuration import *
 __author__ = ['William Sutcliffe']
 __date__ = '19/01/2014'
 __version__ = '$Revision: 1.0 $'
@@ -137,8 +135,6 @@ class Lb2pMuNuVubBuilder(LineBuilder):
     def __init__(self, name, config):
         LineBuilder.__init__(self, name, config)
 
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
-
         self.GECs = {"Code": "( recSummaryTrack(LHCb.RecSummary.nLongTracks, TrLONG) < %(GEC_nLongTrk)s )" % config,
                      "Preambulo": ["from LoKiTracks.decorators import *"]}
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingSL/Strippingbhad2PMuX.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingSL/Strippingbhad2PMuX.py
index e89305332152e8ebc4ee1e72a7f10cd8d9d2dfae..f46738721f8dbfce869e840a1aa8cbb13c6fdd2f 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingSL/Strippingbhad2PMuX.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p1/StrippingSL/Strippingbhad2PMuX.py
@@ -9,9 +9,7 @@
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
 
-import logging
 from StrippingUtils.Utils import LineBuilder
-from Gaudi.Configuration import *
 __author__ = ['William Sutcliffe', 'Patrick Owen']
 __date__ = '02/12/2015'
 __version__ = '$Revision: 2.0 $'
@@ -132,8 +130,6 @@ class bhad2PMuXBuilder(LineBuilder):
     def __init__(self, name, config):
         LineBuilder.__init__(self, name, config)
 
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
-
         self.GECs = {"Code": "( recSummaryTrack(LHCb.RecSummary.nLongTracks, TrLONG) < %(GEC_nLongTrk)s )" % config,
                      "Preambulo": ["from LoKiTracks.decorators import *"]}
 
@@ -455,7 +451,7 @@ class bhad2PMuXBuilder(LineBuilder):
     ###### Lb->pMuNu High M_corr Opposite Sign ######
     def _bhad2PMuX_Lb(self):
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-        from PhysSelPython.Wrappers import Selection, MergedSelection
+        from PhysSelPython.Wrappers import Selection
 
         _pMu = CombineParticles(
             DecayDescriptors=self._config["DECAYS"], ReFitPVs=True)
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingB2CC/StrippingB2JpsiHH.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingB2CC/StrippingB2JpsiHH.py
index 8fdba29f0a96c73f62e3bac58ab9c2e15b2e5db7..e3ae4544669056ef7f03c5709d60510f6eef9f32 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingB2CC/StrippingB2JpsiHH.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingB2CC/StrippingB2JpsiHH.py
@@ -20,18 +20,10 @@ __date__ = '10/11/2016'
 
 __all__ = ('B2JpsiHHConf', 'default_config')
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from CommonParticles.Utils import updateDoD
-from StandardParticles import StdLoosePions
-from StandardParticles import StdLooseKaons
-from StandardParticles import StdLooseProtons
-from StandardParticles import StdAllLooseKaons
-from StandardParticles import StdAllLooseProtons
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
+from PhysSelPython.Wrappers import DataOnDemand, Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from GaudiKernel.SystemOfUnits import MeV
 
 default_config = {
     'NAME': 'B2JpsiHH',
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingB2CC/StrippingB2JpsiPi0.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingB2CC/StrippingB2JpsiPi0.py
index 90740f80b4fbe5d7cdd945fc3fb2a4331ac1e49d..170baf2fb63c5dbaab6735a4dbe697c61ed379a3 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingB2CC/StrippingB2JpsiPi0.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingB2CC/StrippingB2JpsiPi0.py
@@ -14,15 +14,10 @@ __version__ = '$Revision: 1.1$'
 
 __all__ = ('B2JpsiPi0Conf', 'default_config')
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from CommonParticles.Utils import updateDoD
-from StandardParticles import StdLooseResolvedPi0
-from StandardParticles import StdLooseMergedPi0
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
+from PhysSelPython.Wrappers import DataOnDemand, Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from GaudiKernel.SystemOfUnits import MeV
 
 default_config = {
     # The real name of the lines is BetaS, this is a reference this for the Settings.
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingB2CC/StrippingB2JpsiPi0_Run1.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingB2CC/StrippingB2JpsiPi0_Run1.py
index 3f5f0443aa9132ab2494cbb48813c4ad8991fc1b..1bf462e0083a2da3704b1f804d03b10239ecd920 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingB2CC/StrippingB2JpsiPi0_Run1.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingB2CC/StrippingB2JpsiPi0_Run1.py
@@ -14,15 +14,10 @@ __version__ = '$Revision: 1.2$'
 
 __all__ = ('B2JpsiPi0Conf_RI', 'default_config')
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from CommonParticles.Utils import updateDoD
-from StandardParticles import StdLooseResolvedPi0
-from StandardParticles import StdLooseMergedPi0
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
+from PhysSelPython.Wrappers import DataOnDemand, Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from GaudiKernel.SystemOfUnits import MeV
 
 default_config = {
     # The real name of the lines is BetaS, this is a reference this for the Settings.
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingB2CC/StrippingB2JpsiX0.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingB2CC/StrippingB2JpsiX0.py
index d93a42cce82d84a0ed23627a007cbaad6d469573..e15a04497fca1b721a890552c1359e732098a2be 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingB2CC/StrippingB2JpsiX0.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingB2CC/StrippingB2JpsiX0.py
@@ -20,18 +20,10 @@ __date__ = '22/01/2018'
 
 __all__ = ('B2JpsiX0Conf', 'default_config')
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from CommonParticles.Utils import updateDoD
-from StandardParticles import StdLoosePions
-from StandardParticles import StdLooseKaons
-from StandardParticles import StdLooseProtons
-from StandardParticles import StdAllLooseKaons
-from StandardParticles import StdAllLooseProtons
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
+from PhysSelPython.Wrappers import DataOnDemand, Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from GaudiKernel.SystemOfUnits import MeV
 
 default_config = {
     'NAME': 'B2JpsiX0',
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingB2CC/StrippingB2JpsiXforBeta_s.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingB2CC/StrippingB2JpsiXforBeta_s.py
index 523cdae393a5eaafcb013c51488bd213e0b0867a..e1c610266077a45330df6ee5d2d179deab4bdda5 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingB2CC/StrippingB2JpsiXforBeta_s.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingB2CC/StrippingB2JpsiXforBeta_s.py
@@ -26,16 +26,12 @@ __version__ = '$Revision: 4.0$'
 
 __all__ = ('B2JpsiXforBeta_sConf', 'default_config')
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from CommonParticles.Utils import updateDoD
 from StandardParticles import StdLoosePions
 from StandardParticles import StdLooseKaons
-from StandardParticles import StdAllLooseKaons
 from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from GaudiKernel.SystemOfUnits import MeV
 
 default_config = {
     'NAME': 'BetaS',
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingB2CC/StrippingBd2JpsieeKS.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingB2CC/StrippingBd2JpsieeKS.py
index b553711d64d89bc11f40ac43383517f536779ce6..2ca00a91b4fd73eb8d5af28f7937fd9a9c0e7ec0 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingB2CC/StrippingBd2JpsieeKS.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingB2CC/StrippingBd2JpsieeKS.py
@@ -8,16 +8,10 @@
 # granted to it by virtue of its status as an Intergovernmental Organization  #
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
-from GaudiKernel.SystemOfUnits import MeV
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
-from StandardParticles import StdAllLooseKaons
-from StandardParticles import StdLooseKaons
-from StandardParticles import StdLoosePions
-from CommonParticles.Utils import updateDoD
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = 'Ramon Niet'
 __date__ = '2014/10/23'
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingB2CC/StrippingBd2JpsieeKSFullDST.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingB2CC/StrippingBd2JpsieeKSFullDST.py
index 4c73451a58cef8538903ce8da801486bb748eb8b..0f5de6e613aed7291f6b1bb6805977096a4220ca 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingB2CC/StrippingBd2JpsieeKSFullDST.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingB2CC/StrippingBd2JpsieeKSFullDST.py
@@ -8,16 +8,10 @@
 # granted to it by virtue of its status as an Intergovernmental Organization  #
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
-from GaudiKernel.SystemOfUnits import MeV
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
-from StandardParticles import StdAllLooseKaons
-from StandardParticles import StdLooseKaons
-from StandardParticles import StdLoosePions
-from CommonParticles.Utils import updateDoD
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = 'Gerwin Meier'
 __date__ = '2019/08/12'
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingB2CC/StrippingBd2JpsieeKstar.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingB2CC/StrippingBd2JpsieeKstar.py
index 326fc7c342b5e8e69030f9e3aea12bdf3a65e950..b6ae6bfc4e2e904ff10e3e3ad1a791ff16f615cd 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingB2CC/StrippingBd2JpsieeKstar.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingB2CC/StrippingBd2JpsieeKstar.py
@@ -12,7 +12,6 @@ from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from Configurables import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = 'Artur Ukleja, Jibo He, Konrad Klimaszewski, Varvara Batozskaya'
 __date__ = '2019/01/22'
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingB2CC/StrippingBs2EtacPhiBDT.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingB2CC/StrippingBs2EtacPhiBDT.py
index b6e256eaa1235a84cbf3b68362eea9bf7f387897..30d69a2c110a19ab5a45303854da636781997f4f 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingB2CC/StrippingBs2EtacPhiBDT.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingB2CC/StrippingBs2EtacPhiBDT.py
@@ -17,7 +17,6 @@ from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
-from Gaudi.Configuration import *
 __author__ = ['Morgan Martin, Jibo He']
 __date__ = '20/08/2014'
 __version__ = '$Revision: 1.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingB2CC/StrippingBs2JpsieePhi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingB2CC/StrippingBs2JpsieePhi.py
index 933c2f46f93196ffa448a855cea7a82e5fca3652..ee8bf0cf2aad66cd3771f048a336fffb0ed8165d 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingB2CC/StrippingBs2JpsieePhi.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingB2CC/StrippingBs2JpsieePhi.py
@@ -12,7 +12,6 @@ from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from Configurables import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = 'Artur Ukleja, Jibo He, Konrad Klimaszewski'
 __date__ = '2011/03/01'
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingB2OC/Beauty2Charm_B2DXBuilder.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingB2OC/Beauty2Charm_B2DXBuilder.py
index 4837b0a432c56ee77aea8155db25430718414ee9..04c8a298f12306e527d3d76a0293573a09d67d96 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingB2OC/Beauty2Charm_B2DXBuilder.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingB2OC/Beauty2Charm_B2DXBuilder.py
@@ -12,11 +12,7 @@
 
 from copy import deepcopy
 from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-from PhysSelPython.Wrappers import Selection
-from Beauty2Charm_LoKiCuts import LoKiCuts
 from Beauty2Charm_Utils import *
-from Configurables import SubstitutePID
 
 # \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\#
 
@@ -1399,7 +1395,7 @@ class B2DXBuilder(object):
             'B2D0st2460D0Pi':
             ["B+ -> D*_2(2460)0 D0 pi+", "B- -> D*_2(2460)0 D0 pi-"]
         }
-        input = self.dst.dpi_2460_pid + self.d.kpi_pid + self.topoKaons_PID
+        self.dst.dpi_2460_pid + self.d.kpi_pid + self.topoKaons_PID
         inputs = {
             'B2D0st2460D0K':
             self.dst.dpi_2460_pid + self.d.kpi_pid + self.topoKaons_PID,
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingB2OC/Beauty2Charm_Bc2BXBuilder.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingB2OC/Beauty2Charm_Bc2BXBuilder.py
index 63ecc854364bae2f29d64ea2b95c3484988c7016..5bb9297a5c69f56bc7b9761489bf517623df7d3c 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingB2OC/Beauty2Charm_Bc2BXBuilder.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingB2OC/Beauty2Charm_Bc2BXBuilder.py
@@ -8,11 +8,9 @@
 # granted to it by virtue of its status as an Intergovernmental Organization  #
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
-from copy import deepcopy
 from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 from PhysSelPython.Wrappers import Selection, MergedSelection
-from Beauty2Charm_LoKiCuts import LoKiCuts
 from Beauty2Charm_Utils import *
 
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingB2OC/Beauty2Charm_Bc2DDBuilder.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingB2OC/Beauty2Charm_Bc2DDBuilder.py
index 17eda4547110606bb00b589ef9a9081a7ab985e7..44526bcd78bbc48eb6f8c6416c9eabdc38313ac4 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingB2OC/Beauty2Charm_Bc2DDBuilder.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingB2OC/Beauty2Charm_Bc2DDBuilder.py
@@ -11,10 +11,8 @@
 
 # \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\#
 
-from copy import deepcopy
 from Gaudi.Configuration import *
-from PhysSelPython.Wrappers import Selection, MergedSelection
-from Beauty2Charm_LoKiCuts import LoKiCuts
+from PhysSelPython.Wrappers import MergedSelection
 from Beauty2Charm_Utils import *
 # from Configurables import SubstitutePID
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingB2OC/Beauty2Charm_Bc2DXBuilder.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingB2OC/Beauty2Charm_Bc2DXBuilder.py
index af663b7592071fc14302f44aa5c2a5b5eb5608d2..7449f0734a1fbe2c6eafc03f67ed71d3bfd70c18 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingB2OC/Beauty2Charm_Bc2DXBuilder.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingB2OC/Beauty2Charm_Bc2DXBuilder.py
@@ -10,9 +10,6 @@
 ###############################################################################
 from copy import deepcopy
 from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-from PhysSelPython.Wrappers import Selection, MergedSelection
-from Beauty2Charm_LoKiCuts import LoKiCuts
 from Beauty2Charm_Utils import *
 
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingB2OC/Beauty2Charm_DBuilder.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingB2OC/Beauty2Charm_DBuilder.py
index b68548ee7cbf1a65c38743cd287babf14333673d..5b18c6b24da520630e58f2f2f1f209024f8f0c86 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingB2OC/Beauty2Charm_DBuilder.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingB2OC/Beauty2Charm_DBuilder.py
@@ -385,7 +385,6 @@ class DBuilder(object):
         # self.k3pi_ddx_pid = [filterSelection('D2k3pi_for_DDX',LoKiCuts(['VCHI2DOF','BPVVDCHI2'],config_for_ddx).code(),self.k3pi_pid)]
 
         # use this below
-        d_cf_noMassWin = d_cf
         d_cf = LoKiCuts.combine([d_cf, "in_range(%s,MM,%s)" % (d_min, d_max)])
         ds_cf = LoKiCuts.combine(
             [ds_cf, "in_range(%s,MM,%s)" % (ds_min, ds_max)])
@@ -2058,9 +2057,6 @@ class DBuilder(object):
 
     def _makeD2PhiMuNu(self, up=False):
         '''makes Ds->phi mu nu'''
-        decays = [['phi(1020)', 'mu+']]
-        min = '1125.13*MeV'
-        max = '2168.49*MeV'
         cpkk = CombineParticles(
             # ( hasTopoChild() )
             CombinationCut="ADAMASS('phi(1020)') < 150*MeV",
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingB2OC/Beauty2Charm_HHBuilder.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingB2OC/Beauty2Charm_HHBuilder.py
index 08f113046063b0225620e80b961f1c934caada99..83e86c72dbafe11cee4a83ba99c7328e94737144 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingB2OC/Beauty2Charm_HHBuilder.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingB2OC/Beauty2Charm_HHBuilder.py
@@ -10,7 +10,6 @@
 ###############################################################################
 # \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\#
 
-from copy import deepcopy
 from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 from PhysSelPython.Wrappers import Selection
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingB2OC/Beauty2Charm_HHHBuilder.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingB2OC/Beauty2Charm_HHHBuilder.py
index 7673d8fcabbf719d31d711cd2cf93068d1cc4a66..3e955dda832402d17b78c3aa269d144532889161 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingB2OC/Beauty2Charm_HHHBuilder.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingB2OC/Beauty2Charm_HHHBuilder.py
@@ -10,9 +10,8 @@
 ###############################################################################
 # \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\#
 
-from copy import deepcopy
 from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N3BodyDecays, DaVinci__N4BodyDecays
+from GaudiConfUtils.ConfigurableGenerators import DaVinci__N3BodyDecays, DaVinci__N4BodyDecays
 from PhysSelPython.Wrappers import Selection
 from Beauty2Charm_LoKiCuts import LoKiCuts
 from Beauty2Charm_Utils import *
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingB2OC/Beauty2Charm_Lb2XBuilder.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingB2OC/Beauty2Charm_Lb2XBuilder.py
index a95fd4d83fc33e695ace9fa85149b58331d450f2..6de0692b70aeb55bb248e9508f1ec10c7d6ff482 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingB2OC/Beauty2Charm_Lb2XBuilder.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingB2OC/Beauty2Charm_Lb2XBuilder.py
@@ -1649,7 +1649,7 @@ class Lb2XBuilder(object):
 
     def _makeX2LcKPiPiPi(self):
         '''Makes RS + WS Xib -> Lc HH + c.c.'''
-        pions = self.pions
+        self.pions
         kaons = self.kaons
         pipipi = self.hhh.pipipi
         config = deepcopy(self.config)
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingB2OC/Beauty2Charm_LoKiCuts.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingB2OC/Beauty2Charm_LoKiCuts.py
index 54540ea2a223d554a751b02cf83000df4f3aa076..0fd327f8d32075591c9ca0e2d4dd434636c0ab35 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingB2OC/Beauty2Charm_LoKiCuts.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingB2OC/Beauty2Charm_LoKiCuts.py
@@ -10,11 +10,6 @@
 ###############################################################################
 # \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\#
 
-from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
-from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-from PhysSelPython.Wrappers import Selection, MergedSelection
-from StandardParticles import StdNoPIDsPions, StdNoPIDsKaons
 
 # \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\#
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingB2OC/Beauty2Charm_Utils.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingB2OC/Beauty2Charm_Utils.py
index 7949e5482cf0df4296d969b96966d2057310c75b..84d6df19648bdd16451bbfa4a21be153c20799e4 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingB2OC/Beauty2Charm_Utils.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingB2OC/Beauty2Charm_Utils.py
@@ -10,13 +10,11 @@
 ###############################################################################
 # \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\#
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-from PhysSelPython.Wrappers import DataOnDemand, Selection, MergedSelection, VoidEventSelection
+from PhysSelPython.Wrappers import DataOnDemand, Selection, VoidEventSelection
 from Beauty2Charm_LoKiCuts import LoKiCuts
 from Configurables import SubstitutePID
-from Configurables import ConeJetProxyFilter
 
 # \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\#
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingB2OC/StrippingB2DDphi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingB2OC/StrippingB2DDphi.py
index b0f8982f1efb389032da5f7becb2881e3c005379..92ca95c2ea3f7c46766aedbc04dbbc34c9c0b8ef 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingB2OC/StrippingB2DDphi.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingB2OC/StrippingB2DDphi.py
@@ -15,8 +15,7 @@ Author: M. Martinelli
 Notes: Excited states are included by placing the line in FULL.DST
 '''
 from PhysSelPython.Wrappers import Selection, DataOnDemand
-from Configurables import FilterDesktop, CombineParticles, DaVinci__N4BodyDecays
-from GaudiConfUtils.ConfigurableGenerators import CombineParticles
+from Configurables import DaVinci__N4BodyDecays, FilterDesktop
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 __author__ = ['Maurizio Martinelli']
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingB2OC/StrippingB2DXD2HMuNu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingB2OC/StrippingB2DXD2HMuNu.py
index 1ec2da4c2510e23471f7b6705c96553b8a859931..0711ca38847920ce87122f8d2d18c51c0f73cfc2 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingB2OC/StrippingB2DXD2HMuNu.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingB2OC/StrippingB2DXD2HMuNu.py
@@ -12,13 +12,11 @@ __author__ = ['Wenbin Qian']
 __date__ = '09/11/2015'
 __version__ = '$Revision: 0.01 $'
 
-from Gaudi.Configuration import *
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, DaVinci__N4BodyDecays, DaVinci__N3BodyDecays
-from PhysSelPython.Wrappers import Selection, DataOnDemand
+from PhysSelPython.Wrappers import Selection
 from StandardParticles import StdLooseMuons, StdLoosePions, StdLooseKaons
-from GaudiKernel.SystemOfUnits import MeV, GeV, cm, mm
 
 __all__ = ('B2DXD2HMuNuBuilder',
            'default_config')
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingB2OC/StrippingB2nbody.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingB2OC/StrippingB2nbody.py
index 663bdbbf855c3d8d19dad3a29b6be667edaeedb9..04c84fc2dc39eb4b3d3d954f3c0083396e0c84fa 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingB2OC/StrippingB2nbody.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingB2OC/StrippingB2nbody.py
@@ -16,7 +16,6 @@ from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, MergedSelection, DataOnDemand, VoidEventSelection
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = ['Rudolf Oldeman']
 __date__ = '08/02/2011'
 __version__ = '$Revision: 1.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingB2OC/StrippingBeauty2Charm.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingB2OC/StrippingBeauty2Charm.py
index 249d2b625e9df294c06faa2ff3a4350ca2eb139b..8bc0995e7d8be51222d106250a7bc7214e9d74bb 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingB2OC/StrippingBeauty2Charm.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingB2OC/StrippingBeauty2Charm.py
@@ -28,11 +28,9 @@ from StandardParticles import (StdAllNoPIDsPions, StdAllNoPIDsKaons,
                                StdAllNoPIDsProtons, StdNoPIDsUpPions,
                                StdLooseMuons, StdNoPIDsUpKaons,
                                StdLooseResolvedPi0, StdLooseMergedPi0)
-from Configurables import LoKi__VoidFilter
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import EventSelection
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
+from PhysSelPython.Wrappers import MergedSelection, Selection
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
 from Gaudi.Configuration import *
 import re
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBandQ/StrippingB2Chic0KPi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBandQ/StrippingB2Chic0KPi.py
index 69e18721b3c6b45435046eaac0c9a79d5818b6da..030871800dfb7d9f6c18c93c207febaf3fad5cf8 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBandQ/StrippingB2Chic0KPi.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBandQ/StrippingB2Chic0KPi.py
@@ -17,7 +17,6 @@ from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
-from Gaudi.Configuration import *
 __author__ = ['Andrii Usachov']
 __date__ = '13/03/2018'
 __version__ = '$Revision: 1.2$'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBandQ/StrippingB2JpsiXforEM_s.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBandQ/StrippingB2JpsiXforEM_s.py
index d3aeeef75411f9cecca87053ee0faa991e8c7fd8..394fd7c3171d61beb9b93f762a890a248f2b190f 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBandQ/StrippingB2JpsiXforEM_s.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBandQ/StrippingB2JpsiXforEM_s.py
@@ -20,21 +20,11 @@ __version__ = '$Revision: 0.0 $'
 
 __all__ = ('B2JpsiXforEM_sConf', 'default_config')
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
 from Configurables import LoKi__PVReFitter, CombineParticles
-from CommonParticles.Utils import updateDoD
-from StandardParticles import StdLoosePions
-from StandardParticles import StdLooseKaons
-from StandardParticles import StdAllLooseKaons
-from StandardParticles import StdLooseResolvedPi0
-from StandardParticles import StdLooseMergedPi0
-from StandardParticles import StdNoPIDsPions
-from StandardParticles import StdLooseProtons
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
+from PhysSelPython.Wrappers import DataOnDemand, Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from GaudiKernel.SystemOfUnits import MeV
 
 default_config = {
     'NAME': 'B2JpsiXforEM',
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBandQ/StrippingBbbar2PhiPhi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBandQ/StrippingBbbar2PhiPhi.py
index 2c308991a8d9592619777fb7aad4c619a4a40437..fd4e526f5796889d5eb13efd1f1fca7adfbf4a97 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBandQ/StrippingBbbar2PhiPhi.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBandQ/StrippingBbbar2PhiPhi.py
@@ -21,12 +21,10 @@ confBbbar2PhiPhi = Bbbar2PhiPhiConf( name = 'Bbbar2PhiPhi', config = config_Bbba
 stream.appendLines( confBbbar2PhiPhi.lines() )
 '''
 
-from StandardParticles import StdNoPIDsProtons, StdNoPIDsPions, StdNoPIDsDownPions
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
+from PhysSelPython.Wrappers import DataOnDemand, Selection
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = ['Simone Stracka']
 __date__ = '10/03/2015'
 __all__ = (
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBandQ/StrippingBc2EtacMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBandQ/StrippingBc2EtacMu.py
index c0e64ca5c35b4aab42f067e70aaf18cbe0accaf2..ce1d72039c532c0cfe3bddf32096f808952b47a6 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBandQ/StrippingBc2EtacMu.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBandQ/StrippingBc2EtacMu.py
@@ -15,9 +15,8 @@ Module for B_c->eta_c mu
 
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand, AutomaticData
+from PhysSelPython.Wrappers import DataOnDemand, Selection
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = ['Valeriia Zhovkovska']
 __date__ = '15/03/2019'
 __version__ = '$Revision: 1.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBandQ/StrippingBc2EtacSL.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBandQ/StrippingBc2EtacSL.py
index 2d376003a4c6571aaa08defa85c4fe790ab35c60..4fa26a1cb105f28e64c752c38b40f8e46a55a8fc 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBandQ/StrippingBc2EtacSL.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBandQ/StrippingBc2EtacSL.py
@@ -23,9 +23,8 @@ B_c->eta_c tau, with eta_c->K_s K pi and tau->3pi
 
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand, AutomaticData
+from PhysSelPython.Wrappers import DataOnDemand, Selection
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = ['Valeriia Zhovkovska']
 __date__ = '24/06/2021'
 __version__ = '$Revision: 1.1 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBandQ/StrippingBc2JpsiHBDT.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBandQ/StrippingBc2JpsiHBDT.py
index d973f13d2bc8b32c5045776e5b5d3f96bc618e74..7b5a84a9de9b55f09a9ef0da7469b5cc113c4602 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBandQ/StrippingBc2JpsiHBDT.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBandQ/StrippingBc2JpsiHBDT.py
@@ -18,7 +18,6 @@ from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = ['Jibo He']
 __date__ = '02/11/2013'
 __version__ = '$Revision: 2.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBandQ/StrippingBc2JpsiMuXNew.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBandQ/StrippingBc2JpsiMuXNew.py
index 946bad8366ac6019498b9d14e89f0a8899cf70d4..bd156feb81f0deaaf2a07b14df76bcbbcdd03d5c 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBandQ/StrippingBc2JpsiMuXNew.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBandQ/StrippingBc2JpsiMuXNew.py
@@ -18,7 +18,6 @@ from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = ['Jibo He']
 __date__ = '02/09/2010'
 __version__ = '$Revision: 2.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBandQ/StrippingCC2DD.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBandQ/StrippingCC2DD.py
index 58f89513ddb6f5ae23ad89c616deb7d8f0c6f719..39a30438368c27a6a42f57688de187a8b1135e72 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBandQ/StrippingCC2DD.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBandQ/StrippingCC2DD.py
@@ -22,8 +22,7 @@ Module for construction of CC->D D, where CC is a particle decaying to D D
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 __author__ = ['Lucio Anderlini', 'Andrea Bizzeti']
 __date__ = '2015-12-01'
 __version__ = '$Revision: 0.4 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBandQ/StrippingCcbar2Baryons.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBandQ/StrippingCcbar2Baryons.py
index e5a87f652fa30a90026cc6172bb112eb157c1e0f..3e235742a82cc6b6eef181ba5871e7096a9e965d 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBandQ/StrippingCcbar2Baryons.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBandQ/StrippingCcbar2Baryons.py
@@ -20,7 +20,6 @@ stream.appendLines( [
 ])
 '''
 
-from StandardParticles import StdNoPIDsProtons, StdNoPIDsPions, StdNoPIDsDownPions
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBandQ/StrippingCcbar2KsKpi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBandQ/StrippingCcbar2KsKpi.py
index b6b5864ff95625b5e45b988663cfea44c0f42cdc..4fc4ffd7e775d5d46e7701adb4802707efae0b7c 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBandQ/StrippingCcbar2KsKpi.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBandQ/StrippingCcbar2KsKpi.py
@@ -18,9 +18,8 @@ Module for Charmonium->Ks K pi, including three lines
 
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand, AutomaticData
+from PhysSelPython.Wrappers import DataOnDemand, Selection
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = ['Valeriia Zhovkovska']
 __date__ = '07/03/2019'
 __version__ = '$Revision: 1.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBandQ/StrippingCcbar2LambdaLambda.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBandQ/StrippingCcbar2LambdaLambda.py
index 8ce57a0eb47c3385d8d6e68abe18bd6e59dabdd6..a92e180d7ab857844ebe8f02f80e01b0e6d59a97 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBandQ/StrippingCcbar2LambdaLambda.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBandQ/StrippingCcbar2LambdaLambda.py
@@ -18,14 +18,12 @@ Apply very loose P/PT cuts on proton and pions
 '''
 
 from StandardParticles import StdAllLoosePions,  StdAllLooseProtons
-from StandardParticles import StdLoosePions, StdNoPIDsDownPions, StdNoPIDsDownProtons
-from StandardParticles import StdNoPIDsProtons
-from GaudiKernel.SystemOfUnits import MeV, GeV, mm, picosecond
+from StandardParticles import StdNoPIDsDownPions, StdNoPIDsDownProtons
+from GaudiKernel.SystemOfUnits import GeV, MeV, mm
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = ['Andrii Usachov', 'Jinlin Fu', 'Ziyi Wang']
 __date__ = '20/06/2021'
 __version__ = '$Revision: 0.1 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBandQ/StrippingCcbar2LstLambda.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBandQ/StrippingCcbar2LstLambda.py
index 0c317712061ae5a153e89bd41b8390a4fc74e187..4937ef3626431e3998bb3086fe7c656fa4ec9e57 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBandQ/StrippingCcbar2LstLambda.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBandQ/StrippingCcbar2LstLambda.py
@@ -12,14 +12,10 @@
 Module for selecting Ccbar->LstLambda detached line, with loose PT, PID cuts. 
 '''
 
-from StandardParticles import StdAllLoosePions, StdAllLooseKaons
-from StandardParticles import StdLoosePions, StdNoPIDsDownPions, StdLooseKaons, StdLooseDownKaons
-from StandardParticles import StdNoPIDsProtons, StdNoPIDsKaons
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = ['Andrii Usachov']
 __date__ = '23/11/2017'
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBandQ/StrippingCcbar2LstLst.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBandQ/StrippingCcbar2LstLst.py
index cf2d3319f4c8d473c85741f08945e6d15bd1722b..fb7af606490052a513bd2a8433237fcbfca14aa4 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBandQ/StrippingCcbar2LstLst.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBandQ/StrippingCcbar2LstLst.py
@@ -12,12 +12,10 @@
 Module for selecting Ccbar->LstLst detached line, with loose PT, PID cuts. 
 '''
 
-from StandardParticles import StdNoPIDsProtons, StdNoPIDsKaons
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
+from PhysSelPython.Wrappers import DataOnDemand, Selection
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = ['Andrii Usachov']
 __date__ = '12/01/2017'
 
@@ -58,19 +56,19 @@ class Ccbar2LstLstConf(LineBuilder):
         self.name = name
         self.config = config
 
-        TRCHI2DOF = config['TRCHI2DOF']
-        KaonProbNNk = config['KaonProbNNk']
-        KaonPTSec = config['KaonPTSec']
-        ProtonProbNNp = config['ProtonProbNNp']
-        ProtonP = config['ProtonP']
-        ProtonPTSec = config['ProtonPTSec']
-        LstVtxChi2 = config['LstVtxChi2']
-        LstMinMass = config['LstMinMass']
-        LstMaxMass = config['LstMaxMass']
-        CombMaxMass = config['CombMaxMass']
-        CombMinMass = config['CombMinMass']
-        MaxMass = config['MaxMass']
-        MinMass = config['MinMass']
+        config['TRCHI2DOF']
+        config['KaonProbNNk']
+        config['KaonPTSec']
+        config['ProtonProbNNp']
+        config['ProtonP']
+        config['ProtonPTSec']
+        config['LstVtxChi2']
+        config['LstMinMass']
+        config['LstMaxMass']
+        config['CombMaxMass']
+        config['CombMinMass']
+        config['MaxMass']
+        config['MinMass']
 
         self.DetachedProtonForLst = self.createSubSel(OutputList="DetachedProtonForLst" + self.name,
                                                       InputList=DataOnDemand(
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBandQ/StrippingCcbar2PPPiPi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBandQ/StrippingCcbar2PPPiPi.py
index 28b6a56f5499cd8ecbce8b1d1e366f216f123073..91e5c78c655288eb933c6478d1eafcaee3904f84 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBandQ/StrippingCcbar2PPPiPi.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBandQ/StrippingCcbar2PPPiPi.py
@@ -12,12 +12,11 @@
 Module for selecting charmonium -> p pbar pi pi 
 '''
 
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
+from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
 from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
-from Gaudi.Configuration import *
 __author__ = ['Jibo He']
 __date__ = '12/11/2015'
 __version__ = '$Revision: 1.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBandQ/StrippingCcbar2PhiPhi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBandQ/StrippingCcbar2PhiPhi.py
index c21b9fa874a5dccb0d9c373c28e255bbe309ea95..101a8e21ba087c6c991fe35e18471728a0abe2e3 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBandQ/StrippingCcbar2PhiPhi.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBandQ/StrippingCcbar2PhiPhi.py
@@ -21,12 +21,10 @@ confCcbar2PhiPhi = Ccbar2PhiPhiConf( name = 'Ccbar2PhiPhi', config = config_Ccba
 stream.appendLines( confCcbar2PhiPhi.lines() )
 '''
 
-from StandardParticles import StdNoPIDsProtons, StdNoPIDsPions, StdNoPIDsDownPions
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
+from PhysSelPython.Wrappers import DataOnDemand, Selection
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = ['Jibo He']
 __date__ = '20/01/2012'
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBandQ/StrippingCcbar2PhiPhiDetached.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBandQ/StrippingCcbar2PhiPhiDetached.py
index 9cece8aa8a316b6c48d7062407ae3c5e4a4703e3..8d48d19f4b11b35402f710baec49d8b99bec7f11 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBandQ/StrippingCcbar2PhiPhiDetached.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBandQ/StrippingCcbar2PhiPhiDetached.py
@@ -15,12 +15,10 @@ Inherited from StrippingCcbar2PhiPhi.py; moved To FullDST
 
 '''
 
-from StandardParticles import StdNoPIDsProtons, StdNoPIDsPions, StdNoPIDsDownPions
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
+from PhysSelPython.Wrappers import DataOnDemand, Selection
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = ['Jibo He, Liupan An']
 __date__ = '11/01/2017'
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBandQ/StrippingCcbar2PhiPhiPiPi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBandQ/StrippingCcbar2PhiPhiPiPi.py
index 3255f0fb24ce2bf3d5dedf3d48901b1a3b7fdf4c..8ded03963ceb90126c111e3d53772e2529b17348 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBandQ/StrippingCcbar2PhiPhiPiPi.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBandQ/StrippingCcbar2PhiPhiPiPi.py
@@ -12,12 +12,11 @@
 Module for selecting charmonium -> phi phi pi pi 
 '''
 
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
+from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
 from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
-from Gaudi.Configuration import *
 __author__ = ['Andrii Usachov']
 __date__ = '10/04/2017'
 __version__ = '$Revision: 1.1 $'
@@ -60,12 +59,12 @@ class Ccbar2PhiPhiPiPiConf(LineBuilder):
         self.name = name
         self.config = config
 
-        PhiVtxChi2 = config['PhiVtxChi2']
-        PhiMassW = config['PhiMassW']
-        KaonPT = config['KaonPT']
-        TRCHI2DOF = config['TRCHI2DOF']
-        KaonProbNNk = config['KaonProbNNk']
-        KaonIPCHI2 = config['KaonIPCHI2']
+        config['PhiVtxChi2']
+        config['PhiMassW']
+        config['KaonPT']
+        config['TRCHI2DOF']
+        config['KaonProbNNk']
+        config['KaonIPCHI2']
 
         self.SelPions = self.createSubSel(OutputList=self.name + "SelPions",
                                           InputList=DataOnDemand(
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBandQ/StrippingCcbar2PpbarNew.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBandQ/StrippingCcbar2PpbarNew.py
index 7b897199b13de2dc141c8f7cbc7d68b45c57f609..247fee87e88715cbf6df1707199f9b596c0115a8 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBandQ/StrippingCcbar2PpbarNew.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBandQ/StrippingCcbar2PpbarNew.py
@@ -18,9 +18,8 @@ Module for Charmonium->p pbar, including three lines
 
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
+from PhysSelPython.Wrappers import Selection
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 __author__ = ['Jibo He']
 __date__ = '03/10/2010'
 __version__ = '$Revision: 1.2 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBandQ/StrippingChiCJPsiGammaConv.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBandQ/StrippingChiCJPsiGammaConv.py
index 0974ad33bc785e6c21ccfbd8abd76c1de3c8330d..13c82277579b4165c559b3e45a8dc8a26f329028 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBandQ/StrippingChiCJPsiGammaConv.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBandQ/StrippingChiCJPsiGammaConv.py
@@ -11,8 +11,7 @@
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
-from Configurables import FilterDesktop, CombineParticles, OfflineVertexFitter
-from Gaudi.Configuration import *
+from Configurables import CombineParticles, FilterDesktop
 __author__ = 'Edwige Tournefier'
 __date__ = '08/06/2012'
 __version__ = '$ 1.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBandQ/StrippingDiMuonForXsection.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBandQ/StrippingDiMuonForXsection.py
index 99d45c194f644de10f8a90371ed1079dcd2e147e..7ceb214bd70cc59ffa52391a7a3321cce9dba642 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBandQ/StrippingDiMuonForXsection.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBandQ/StrippingDiMuonForXsection.py
@@ -16,7 +16,6 @@ from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
-from Gaudi.Configuration import *
 __author__ = ['Jibo He']
 __date__ = '28/03/2012'
 __version__ = '$Revision: 1.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBandQ/StrippingDiMuonNew.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBandQ/StrippingDiMuonNew.py
index 7c60c2e0a15b0e700724dae73d54a428fd669c7a..dd539e9d69fb0fa229c32fd245d281db456c4fed 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBandQ/StrippingDiMuonNew.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBandQ/StrippingDiMuonNew.py
@@ -60,7 +60,6 @@ from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand, EventSelection
 from Configurables import LoKi__VoidFilter
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
-from Gaudi.Configuration import *
 __author__ = ['Jibo He']
 __date__ = '30/09/2010'
 __version__ = '$Revision: 1.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBandQ/StrippingEtap2pipimumu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBandQ/StrippingEtap2pipimumu.py
index f03d28c2c9530e818efb5b81288a8e6a209e3ccb..89f19ca3d73d076e07c224f3c29ffd9def76e9f2 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBandQ/StrippingEtap2pipimumu.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBandQ/StrippingEtap2pipimumu.py
@@ -13,9 +13,7 @@ from StandardParticles import StdAllLooseMuons, StdAllLoosePions, StdAllLooseKao
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, OfflineVertexFitter
-from Gaudi.Configuration import *
-from copy import copy
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop
 __author__ = ['Xabier Cid Vidal']
 # inspired by StrippingD2XMuMuSSConf, from Malcolm John, B. Viaud and O. Kochebina
 __date__ = '10/3/2020'
@@ -178,10 +176,10 @@ class StrippingEtap2pipimumuConf(LineBuilder):
 
         LineBuilder.__init__(self, name, config)
 
-        Ds2EtapLine_name = name+"_Ds2Etap"
-        Bu2EtapLine_name = name+"_Bu2Etap"
-        Ds2Phi3PiLine_name = name+"_Ds2Phi3Pi"
-        Bu2JPsiKLine_name = name+"_Bu2JPsiK"
+        name+"_Ds2Etap"
+        name+"_Bu2Etap"
+        name+"_Ds2Phi3Pi"
+        name+"_Bu2JPsiK"
 
         # 1 : Make pions and kaons
         selPionsEta = makeDaughters(
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBandQ/StrippingHeavyBaryons.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBandQ/StrippingHeavyBaryons.py
index 92ada56965cd1abcfbbc08effe25cf9e9723c757..5547236ca6930272e5d54f7e2525f36a05c695fc 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBandQ/StrippingHeavyBaryons.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBandQ/StrippingHeavyBaryons.py
@@ -12,14 +12,10 @@
 Stripping line for HeavyBaryons studies : Xi_b-, Xi_b0 and Omega_b-
 Author: Yasmine Amhis
 '''
-from GaudiKernel.SystemOfUnits import MeV
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
-from StandardParticles import StdAllLoosePions, StdAllLooseKaons
-from StandardParticles import StdLoosePions, StdNoPIDsDownPions, StdLooseKaons, StdLooseDownKaons
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = ['Yasmine Amhis', 'updated by Vitalii Lisovskyi']
 __date__ = '19/05/2011'
 __version__ = '$Revision: 1.5 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBandQ/StrippingInclusiveCharmBaryons.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBandQ/StrippingInclusiveCharmBaryons.py
index 9e29771ddaf4fc3cd785402e1a97d9d43b6606ea..de3a1066b5ee29dc0aabf9b3bd15eab9da0aee69 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBandQ/StrippingInclusiveCharmBaryons.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBandQ/StrippingInclusiveCharmBaryons.py
@@ -17,13 +17,10 @@ Author: M. Stahl
 Notes: Be creative!
 '''
 from PhysSelPython.Wrappers import Selection, AutomaticData
-import math
 from LoKiProtoParticles.decorators import *
 from LoKiArrayFunctors.decorators import *
 from LoKiPhys.decorators import *
-from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-from Configurables import FilterDesktop
-from PhysConf.Selections import FilterSelection, CombineSelection, Combine4BodySelection, Combine3BodySelection, LimitSelection, MergedSelection
+from PhysConf.Selections import Combine3BodySelection, Combine4BodySelection, FilterSelection, MergedSelection
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 __author__ = ['Marian Stahl']
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBandQ/StrippingInclusiveDoubleD.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBandQ/StrippingInclusiveDoubleD.py
index 9372dd979fd52cd3e9f34725fde38533be716847..9454a8ad63da11230bfbc141844adb02ff4b29ef 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBandQ/StrippingInclusiveDoubleD.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBandQ/StrippingInclusiveDoubleD.py
@@ -18,12 +18,9 @@ Author: M. Stahl
 Notes: Be creative!
 '''
 from PhysSelPython.Wrappers import Selection, AutomaticData
-import math
 from LoKiProtoParticles.decorators import *
 from LoKiArrayFunctors.decorators import *
 from LoKiPhys.decorators import *
-from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-from Configurables import FilterDesktop
 from PhysConf.Selections import FilterSelection, CombineSelection, Combine3BodySelection, MergedSelection
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBandQ/StrippingLb2EtacKp.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBandQ/StrippingLb2EtacKp.py
index fa5c47368a954e4a868152465451cab11bf405b2..2596756ef885be2fb8c43b99c5aaa99d162d6f07 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBandQ/StrippingLb2EtacKp.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBandQ/StrippingLb2EtacKp.py
@@ -17,7 +17,6 @@ from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
-from Gaudi.Configuration import *
 __author__ = ['Liming Zhang', 'Xuesong Liu']
 __date__ = '23/11/2016'
 __version__ = '$Revision: 2.0$'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBandQ/StrippingLb2L0X3872.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBandQ/StrippingLb2L0X3872.py
index 0ef3e6ee6ba74c285b56b587d2fc3c0e7803324b..c9b94fd994845c1188d78d325a6c685e4534a067 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBandQ/StrippingLb2L0X3872.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBandQ/StrippingLb2L0X3872.py
@@ -15,7 +15,6 @@ from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = 'Xijun Wang'
 __date__ = '2021-3-18'
 __version__ = 'Stripping28'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBandQ/StrippingOmegab2XicKpi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBandQ/StrippingOmegab2XicKpi.py
index 8a70403dd8fa18dfaddeb8195f9451277a91f501..d421f354b44c7aabc1d6b1a430c6eb0805291530 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBandQ/StrippingOmegab2XicKpi.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBandQ/StrippingOmegab2XicKpi.py
@@ -25,8 +25,7 @@ __all__ = ('Omegab2XicKpiConf',
            'makeOmegab2XicKpi',
            'default_config')
 
-from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBandQ/StrippingOmegabDecays.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBandQ/StrippingOmegabDecays.py
index 6cb9b0c8ab26d14b40905a6b266eb3f859e415cb..445c8816a29eef4ec56c715fd44e85bbab2a5a0f 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBandQ/StrippingOmegabDecays.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBandQ/StrippingOmegabDecays.py
@@ -26,8 +26,7 @@ __all__ = ('OmegabDecaysConf', 'makeXic', 'makeOmegac', 'makeXic0',
            'makeOmegab2Omegacpi', 'makeOmegab2Omegacpi0pi',
            'makeOmegab2Omegacgammapi', 'default_config')
 
-from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBandQ/StrippingPPMuMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBandQ/StrippingPPMuMu.py
index cfa93241546b8cb1958f0c080bce3ed3974eb196..1e28adc9f8419151808afa067316d7a0f98387fb 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBandQ/StrippingPPMuMu.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBandQ/StrippingPPMuMu.py
@@ -12,12 +12,11 @@
 Module for selecting Hc -> p pbar mu mu
 '''
 
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
+from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
 from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
-from Gaudi.Configuration import *
 __author__ = ['Liupan An']
 __date__ = '18/05/2017'
 __version__ = '$Revision: 1.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBandQ/StrippingXibc.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBandQ/StrippingXibc.py
index ed73d91a4d03fe2ff6427b7cd54ccc7ed18aeaa7..d0446cddfd42feba526eaf11c9d8cf13a4160779 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBandQ/StrippingXibc.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBandQ/StrippingXibc.py
@@ -47,17 +47,11 @@ __all__ = ('XibcBuilder'  # LineBuilder class specialization
            )
 
 
-from Gaudi.Configuration import *
-
 from Configurables import FilterDesktop, CombineParticles
 from PhysSelPython.Wrappers import Selection, AutomaticData, MergedSelection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 
-from CommonParticles.StdLooseLambda import StdLooseLambdaLL, StdLooseLambdaDD
-from GaudiKernel.SystemOfUnits import MeV, GeV, mm
-from Configurables import TisTosParticleTagger
-
 
 default_name = "Xibc"
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBandQ/StrippingXibcBDT.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBandQ/StrippingXibcBDT.py
index 5520ac91aac71eded5064eb9daf551c6b35891fe..28b1ca4c2d5b6567ed207d4b3cd2e8dcd52a9324 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBandQ/StrippingXibcBDT.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBandQ/StrippingXibcBDT.py
@@ -33,8 +33,6 @@ from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticle
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, MergedSelection, DataOnDemand
-from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays
-from Gaudi.Configuration import *
 __author__ = ['Jibo He']
 __date__ = '20/11/2016'
 __version__ = '$Revision: 1.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBandQ/StrippingXiccBDT.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBandQ/StrippingXiccBDT.py
index 0fda677dfb8d63acd803c2278c95da8b32d22700..7dde23cf7ee6e3329158f6ed2ef36ed1b1c5655c 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBandQ/StrippingXiccBDT.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBandQ/StrippingXiccBDT.py
@@ -30,9 +30,7 @@ Xicc+  -> D+ p+ K-
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, MergedSelection, DataOnDemand
-from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays
-from Gaudi.Configuration import *
+from PhysSelPython.Wrappers import DataOnDemand, Selection
 __author__ = ['Jibo He']
 __date__ = '20/11/2016'
 __version__ = '$Revision: 1.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBnoC/StrippingB24pLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBnoC/StrippingB24pLines.py
index db2b4d65bb393a5a34824d87b65ca2bcc983b9f0..a6b52e064494dc23ad635b49c2dc94e4e49e48a2 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBnoC/StrippingB24pLines.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBnoC/StrippingB24pLines.py
@@ -54,12 +54,10 @@ Exported symbols (use python help!):
    - 
 """
 
-from GaudiKernel.PhysicalConstants import c_light
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
-from Configurables import FilterDesktop, CombineParticles, DaVinci__N4BodyDecays
-from Gaudi.Configuration import *
+from Configurables import DaVinci__N4BodyDecays
 __author__ = ["Pietro Marino", "Oliver Gruenberg"]
 __date__ = "13.10.2017"
 __version__ = "$Revision: 3.0 $"
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBnoC/StrippingB2CharmlessInclusive.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBnoC/StrippingB2CharmlessInclusive.py
index 056df1189d8c6e124a4dcb4201ec68d8ac1fc40d..8ae9f04166a6ba66089d684f07c4dfc79cbbc333 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBnoC/StrippingB2CharmlessInclusive.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBnoC/StrippingB2CharmlessInclusive.py
@@ -16,9 +16,8 @@ from StandardParticles import StdLooseKsDD, StdLooseKsLL
 from StandardParticles import StdNoPIDsPions, StdLooseAllPhotons, StdLooseMergedPi0, StdLooseResolvedPi0
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand, SimpleSelection, MergedSelection
+from PhysSelPython.Wrappers import MergedSelection, Selection, SimpleSelection
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = ['Fred Blanc', 'Luca Pescatore']
 __date__ = '23/01/2019'
 __version__ = '$Revision: 3.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBnoC/StrippingB2HHBDT.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBnoC/StrippingB2HHBDT.py
index 79abd1433d68c905afd21b1351f2f1e6bf262fe2..766ad5b73bd949e01c06a43874566f2577422d8f 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBnoC/StrippingB2HHBDT.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBnoC/StrippingB2HHBDT.py
@@ -24,16 +24,13 @@ __all__ = ('B2HHBDTLines',
            'applyBDT',
            'default_config')
 
-from Gaudi.Configuration import *
 
-from GaudiKernel.SystemOfUnits import *
-
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 from StandardParticles import StdNoPIDsPions
 
 from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
-from StrippingUtils.Utils import LineBuilder, checkConfig
+from StrippingUtils.Utils import LineBuilder
 
 
 default_config = {
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBnoC/StrippingB2HHPi0.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBnoC/StrippingB2HHPi0.py
index 41030075a469c796d59ab39ed5a28a7259e9bfd5..e86c40013531bba411d27490eba92f97be414bac 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBnoC/StrippingB2HHPi0.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBnoC/StrippingB2HHPi0.py
@@ -27,9 +27,8 @@ __all__ = ('StrippingB2HHPi0Conf',
            'makeB2HHPi0M',
            'default_config')
 
-from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from PhysSelPython.Wrappers import Selection, DataOnDemand
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
+from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from StandardParticles import StdNoPIDsPions, StdLooseMergedPi0, StdLooseResolvedPi0
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBnoC/StrippingB2KShh.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBnoC/StrippingB2KShh.py
index f404e2a87328dc23eb64929a9a9f3cd002ddadcf..2dcd40aee03deb0e241de124f68de39f1abe783b 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBnoC/StrippingB2KShh.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBnoC/StrippingB2KShh.py
@@ -25,7 +25,6 @@ __version__ = 'Stripping24r1/Stripping26r1'
 __all__ = {'B2KShhConf',
            'default_config'}
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, DaVinci__N3BodyDecays
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBnoC/StrippingB2KShhh.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBnoC/StrippingB2KShhh.py
index f95cf109667b3401f5eb904c78285279c34d00b5..07d236ac77af02d637424d32f3f4e637192ba3e1 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBnoC/StrippingB2KShhh.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBnoC/StrippingB2KShhh.py
@@ -27,13 +27,13 @@ __all__ = ('B2KShhhConf',
 
 from Gaudi.Configuration import *
 
-from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N4BodyDecays
+from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays
 from StandardParticles import StdNoPIDsPions, StdNoPIDsKaons  # ipchi2 cut
 from StandardParticles import StdLooseKsDD, StdLooseKsLL
 
-from PhysSelPython.Wrappers import Selection, MergedSelection
+from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
-from StrippingUtils.Utils import LineBuilder, checkConfig
+from StrippingUtils.Utils import LineBuilder
 
 from Configurables import FilterDesktop
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBnoC/StrippingB2Ksthh.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBnoC/StrippingB2Ksthh.py
index 94a25a2714e9626cb22e6966b9ad7a1955d78eb9..a39998cb04eef71b62a1bf9337b6fb914d58a917 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBnoC/StrippingB2Ksthh.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBnoC/StrippingB2Ksthh.py
@@ -22,7 +22,6 @@ __version__ = 'Stripping26'
 __all__ = {'B2KsthhConf',
            'default_config'}
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
@@ -176,7 +175,7 @@ class B2KsthhConf(LineBuilder):
         _massCutHigh = "(AM<(5279+%s)*MeV)" % config['B_Mhigh']
         _aptCut = "(APT>%s*MeV)" % config['B_APTmin']
         _daugMedPtCut = "(ANUM(PT>%s*MeV)>=2)" % config['BDaug_MedPT_PT']
-        _daugMaxPtIPCut = "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['BDaug_MaxPT_IP']
+        "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['BDaug_MaxPT_IP']
         _daugPtSumCut = "((APT1+APT2+APT3)>%s*MeV)" % config['BDaug_PTsum']
 
         _combCuts = _aptCut
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBnoC/StrippingB2LambdapppLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBnoC/StrippingB2LambdapppLines.py
index 0ec9c6a5d1fcdda0149e8b14dea2ba22646ce64f..0ba12bf37a1af7f76282b079a6bb65d8b1d21f7e 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBnoC/StrippingB2LambdapppLines.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBnoC/StrippingB2LambdapppLines.py
@@ -23,7 +23,6 @@ __date__ = '05/02/2021'
 __version__ = 'Stripping29r2p2'
 __all__ = 'B2LambdapppLinesConf'
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
@@ -214,8 +213,8 @@ class B2LambdapppLinesConf(LineBuilder):
         _vtxCut = "(VFASPF(VCHI2)<%s)   " % config['Lambda_DD_VtxChi2']
         _fdChi2Cut = "(BPVVDCHI2>%s)" % config['Lambda_DD_FDChi2']
         _momCut = "(P>%s*MeV)" % config['Lambda_DD_Pmin']
-        _trkGhostProbCut1 = "(CHILDCUT((TRGHOSTPROB<%s),1))" % config['Trk_GhostProb']
-        _trkGhostProbCut2 = "(CHILDCUT((TRGHOSTPROB<%s),2))" % config['Trk_GhostProb']
+        "(CHILDCUT((TRGHOSTPROB<%s),1))" % config['Trk_GhostProb']
+        "(CHILDCUT((TRGHOSTPROB<%s),2))" % config['Trk_GhostProb']
 
         _allCuts = _momCut
         _allCuts += '&'+_massCut
@@ -270,8 +269,8 @@ class B2LambdapppLinesConf(LineBuilder):
         _vtxCut = "(VFASPF(VCHI2)<%s)   " % config['Lambda_DD_VtxChi2']
         _fdChi2Cut = "(BPVVDCHI2>%s)" % config['Lambda_DD_FDChi2']
         _momCut = "(P>%s*MeV)" % config['Lambda_DD_Pmin']
-        _trkGhostProbCut1 = "(CHILDCUT((TRGHOSTPROB<%s),1))" % config['Trk_GhostProb']
-        _trkGhostProbCut2 = "(CHILDCUT((TRGHOSTPROB<%s),2))" % config['Trk_GhostProb']
+        "(CHILDCUT((TRGHOSTPROB<%s),1))" % config['Trk_GhostProb']
+        "(CHILDCUT((TRGHOSTPROB<%s),2))" % config['Trk_GhostProb']
 
         _allCuts = _momCut
         _allCuts += '&'+_massCut
@@ -304,7 +303,7 @@ class B2LambdapppLinesConf(LineBuilder):
         _massCutHigh = "(AM<(5279+%s)*MeV)" % config['B0_Mhigh']
         _aptCut = "(APT>%s*MeV)" % config['B0_APTmin']
         _daugMedPtCut = "(ANUM(PT>%s*MeV)>=2)" % config['B0Daug_MedPT_PT']
-        _daugMaxPtIPCut = "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['B0Daug_MaxPT_IP']
+        "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['B0Daug_MaxPT_IP']
         _maxDocaChi2Cut = "(ACUTDOCACHI2(%s,''))" % config['B0Daug_DD_maxDocaChi2']
         _daugPtSumCut = "((APT1+APT2+APT3+APT4)>%s*MeV)" % config['B0Daug_DD_PTsum']
 
@@ -436,7 +435,7 @@ class B2LambdapppLinesConf(LineBuilder):
         _massCutHigh = "(AM<(5279+%s)*MeV)" % config['B0_Mhigh']
         _aptCut = "(APT>%s*MeV)" % config['B0_APTmin']
         _daugMedPtCut = "(ANUM(PT>%s*MeV)>=2)" % config['B0Daug_MedPT_PT']
-        _daugMaxPtIPCut = "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['B0Daug_MaxPT_IP']
+        "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['B0Daug_MaxPT_IP']
         _maxDocaChi2Cut = "(ACUTDOCACHI2(%s,''))" % config['B0Daug_LD_maxDocaChi2']
         _daugPtSumCut = "((APT1+APT2+APT3+APT4)>%s*MeV)" % config['B0Daug_LD_PTsum']
 
@@ -452,7 +451,7 @@ class B2LambdapppLinesConf(LineBuilder):
         _vtxChi2Cut = "(VFASPF(VCHI2)<%s)" % config['B0_VtxChi2']
         _diraCut = "(BPVDIRA>%s)" % config['B0_Dira']
         _ipChi2Cut = "(MIPCHI2DV(PRIMARY)<%s)" % config['B0_LD_IPCHI2wrtPV']
-        _fdCut = "(VFASPF(VMINVDDV(PRIMARY))>%s)" % config['B0_FDwrtPV']
+        "(VFASPF(VMINVDDV(PRIMARY))>%s)" % config['B0_FDwrtPV']
         _fdChi2Cut = "(BPVVDCHI2>%s)" % config['B0_LD_FDChi2']
 
         _motherCuts = _ptCut
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBnoC/StrippingB2TwoBaryons.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBnoC/StrippingB2TwoBaryons.py
index 8911a3d3bdc4a0add9f550c63095470ab59d4fef..93fef262a5bd7d8cd0abd1063e287bef85404e66 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBnoC/StrippingB2TwoBaryons.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBnoC/StrippingB2TwoBaryons.py
@@ -31,11 +31,10 @@ from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
 from StandardParticles import StdLooseProtons
 from StandardParticles import StdNoPIDsPions as Pions
-from CommonParticles.StdLooseLambda import StdLooseLambdaLL, StdLooseLambdaDD
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
-from StrippingUtils.Utils import LineBuilder, checkConfig
-from GaudiKernel.SystemOfUnits import MeV, GeV, mm, ns
+from StrippingUtils.Utils import LineBuilder
+from GaudiKernel.SystemOfUnits import GeV, MeV, mm
 
 default_config = {'NAME': 'B2TwoBaryons',
                   'WGs': ['BnoC'],
@@ -157,7 +156,7 @@ class B2TwoBaryonLines(LineBuilder):
 
         B2PPbarName = name + "B2PPbar"
 
-        B2PPSameSignName = name + "B2PPSameSign"
+        name + "B2PPSameSign"
 
         B2Lp_dd_name = name+'B2PLambdabarDD'
         B2Lp_ll_name = name+'B2PLambdabarLL'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBnoC/StrippingB2XEta.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBnoC/StrippingB2XEta.py
index e1adec50004bf9392e263cc5cb3ba465d4e08bf7..95fbd42162ff7cf67819bcb2ccbe2b4f88c30155 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBnoC/StrippingB2XEta.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBnoC/StrippingB2XEta.py
@@ -25,9 +25,7 @@ from StandardParticles import StdLoosePions as Pions
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, DaVinci__N3BodyDecays
-from PhysSelPython.Wrappers import DataOnDemand, Selection, SelectionSequence, MergedSelection
-from GaudiKernel import SystemOfUnits as Units
-from Gaudi.Configuration import *
+from PhysSelPython.Wrappers import DataOnDemand, MergedSelection, Selection
 __author__ = ['Timothy Williams']
 __date__ = '1/12/2016'
 __version__ = 'Stripping26r1'
@@ -564,7 +562,7 @@ class B2XEtaConf(LineBuilder):
         _trackCuts = _track_PT+'&'+_track_Chi2+'&'+_track_GPCut+'&'+_track_PIDCut
         _combCuts = _massCut+'&'+_docaCut
         _combCut12Doca = "ACHI2DOCA(1,2)<%s" % config['eta_DOCA']
-        _combCut12Vtx = "(VFASPF(VCHI2/VDOF)<%s)" % config['eta_vtxChi2']
+        "(VFASPF(VCHI2/VDOF)<%s)" % config['eta_vtxChi2']
         _combCut12 = _combCut12Doca
 
         # _eta3Pi=CombineParticles("eta3Pi",
@@ -592,7 +590,7 @@ class B2XEtaConf(LineBuilder):
         _trackCuts = _track_PT+'&'+_track_Chi2+'&'+_track_GPCut+'&'+_track_PIDCut
         _combCuts = _massCut+'&'+_docaCut
         _combCut12Doca = "ACHI2DOCA(1,2)<%s" % config['eta_prime_DOCA']
-        _combCut12Vtx = "(VFASPF(VCHI2/VDOF)<%s)" % config['eta_prime_vtxChi2']
+        "(VFASPF(VCHI2/VDOF)<%s)" % config['eta_prime_vtxChi2']
         _combCut12 = _combCut12Doca
 
         # _etap=CombineParticles("etap",
@@ -883,7 +881,7 @@ class B2XEtaConf(LineBuilder):
         _combCuts = _massCut+'&'+_docaCut
         _allCuts = _PTCut+'&'+_vtxCut+'&'+_diraCut+'&'+_IPChi2Cut
         _combCut12Doca = "ACHI2DOCA(1,2)<%s" % config['LbDaug_LL_maxDocaChi2']
-        _combCut12Vtx = "(VFASPF(VCHI2/VDOF)<%s)" % config['Lb_VtxChi2']
+        "(VFASPF(VCHI2/VDOF)<%s)" % config['Lb_VtxChi2']
         _combCut12 = _combCut12Doca
 
         _Lb2pKetap = DaVinci__N3BodyDecays(DecayDescriptor="[Lambda_b0 -> p+ K- eta_prime]cc",
@@ -921,7 +919,7 @@ class B2XEtaConf(LineBuilder):
         _combCuts = _massCut
         _allCuts = _PTCut+'&'+_IPChi2Cut+'&'+_vtxCut+'&'+_diraCut
         _combCut12Doca = "ACHI2DOCA(1,2)<%s" % config['LbDaug_LL_maxDocaChi2']
-        _combCut12Vtx = "(VFASPF(VCHI2/VDOF)<%s)" % config['Lb_VtxChi2']
+        "(VFASPF(VCHI2/VDOF)<%s)" % config['Lb_VtxChi2']
         _combCut12 = _combCut12Doca
 
         _Lb2pKeta3Pi = DaVinci__N3BodyDecays(DecayDescriptor="[Lambda_b0 -> p+ K- eta]cc",
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBnoC/StrippingB2a1Pi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBnoC/StrippingB2a1Pi.py
index 29c0766744b242c4ed1be4817cca727495bcb265..9f701cc986294843a275fb204128fb9f3c88fb1d 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBnoC/StrippingB2a1Pi.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBnoC/StrippingB2a1Pi.py
@@ -17,7 +17,6 @@ from Configurables import DaVinci__N4BodyDecays
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
-from Gaudi.Configuration import *
 __author__ = ['Daniel Vieira, Jibo He']
 __date__ = '01/12/2016'
 __version__ = '$Revision: 1.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBnoC/StrippingB2hhpipiPhsSpcCut.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBnoC/StrippingB2hhpipiPhsSpcCut.py
index 08e1d2943eafcfa9ad7d1764a6d5aab6ce3c9526..9fe5c82af0b14937c33c30fd9627961fa0731c0a 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBnoC/StrippingB2hhpipiPhsSpcCut.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBnoC/StrippingB2hhpipiPhsSpcCut.py
@@ -17,7 +17,6 @@ from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = ['Daniel Vieira']
 __date__ = '29/11/2018'
 __version__ = '$Revision: 1.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBnoC/StrippingB2pphh.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBnoC/StrippingB2pphh.py
old mode 100755
new mode 100644
index 3ca4b3b8698468a5e9192f982a9e957cc8f04fcd..5ffc4a205258784dd7d6fa4f2db5b17ae8cab900
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBnoC/StrippingB2pphh.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBnoC/StrippingB2pphh.py
@@ -25,16 +25,13 @@ __all__ = ('B2pphhConf',
            )
 
 
-from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop
+from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
 # from Configurables import DaVinci__N4BodyDecays
 from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays
 
-from StandardParticles import StdAllNoPIDsKaons, StdAllNoPIDsPions, StdAllNoPIDsProtons
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from Configurables import LoKi__VoidFilter as VoidFilter
 
 default_config = {
     'NAME': 'B2pphh',
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBnoC/StrippingBc2hhh_BnoC.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBnoC/StrippingBc2hhh_BnoC.py
index cc0952e7ed4c72dc5b618028ac8bc563928c126d..21b92fa5aab68df4d68f10c50e59c126b546bd31 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBnoC/StrippingBc2hhh_BnoC.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBnoC/StrippingBc2hhh_BnoC.py
@@ -23,13 +23,11 @@ Exported symbols (use python help!):
    - makeppK_excl  
 '''
 
-from Configurables import LoKi__VoidFilter as VoidFilter
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection
 import StandardParticles
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 __author__ = ['Alvaro Gomes', 'Adlene Hicheur']
 __date__ = '31/08/2014'
 __version__ = '$Revision: 1.5 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBnoC/StrippingBs2KKhh.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBnoC/StrippingBs2KKhh.py
index cc743704a31afe9960dc904fcabf1a694c0af26c..1f66a1746034805023be6fad668962c1444b5bf3 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBnoC/StrippingBs2KKhh.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBnoC/StrippingBs2KKhh.py
@@ -27,7 +27,6 @@ from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop
-from Gaudi.Configuration import *
 __author__ = ['Sean Benson', 'Adam Morris', 'Laurence Carson']
 __date__ = '22/11/2016'
 __version__ = '3.2'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBnoC/StrippingBs2KSKS_Run2.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBnoC/StrippingBs2KSKS_Run2.py
index 629ca8140bd72d6380100393e840bf791f2f2cd9..6afaa37fab4f411e76010a848c09d7d72e5a05d9 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBnoC/StrippingBs2KSKS_Run2.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBnoC/StrippingBs2KSKS_Run2.py
@@ -22,15 +22,11 @@ __date__ = '13/09/2016'
 __version__ = 'Run2'
 __all__ = {'Bs2KSKSConf', 'default_config'}
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
+from PhysSelPython.Wrappers import DataOnDemand, Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 
-from StandardParticles import StdNoPIDsPions as Pions
-from StandardParticles import StdNoPIDsDownPions as DownPions
-
 
 default_config = {
     'NAME': 'Bs2KSKS',
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBnoC/StrippingBs2Kst_0Kst_0.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBnoC/StrippingBs2Kst_0Kst_0.py
index 1792d39779b6c777714cf764c9c63f95a9aa76d3..ada24235be261d5f47f53047325233ba3176b326 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBnoC/StrippingBs2Kst_0Kst_0.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBnoC/StrippingBs2Kst_0Kst_0.py
@@ -19,11 +19,8 @@ Exported symbols (use python help!):
 
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, SelectionSequence, DataOnDemand
+from PhysSelPython.Wrappers import DataOnDemand, Selection
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-from CommonParticles.Utils import *
-from LHCbKernel.Configuration import *
-from Gaudi.Configuration import *
 __author__ = ['Brais Sanmartin Sedes']
 __date__ = '12/11/2015'
 __version__ = '5.1'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBnoC/StrippingBs2PhiKst0.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBnoC/StrippingBs2PhiKst0.py
index ceb8daa24373fc0cd210ec42fdbc56fd456f51e4..0c1ff7d620f2ef3058536bb8bbba7bedc35b168a 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBnoC/StrippingBs2PhiKst0.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBnoC/StrippingBs2PhiKst0.py
@@ -20,11 +20,8 @@ Exported symbols (use python help!):
 
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, SelectionSequence, DataOnDemand
+from PhysSelPython.Wrappers import DataOnDemand, Selection
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-from CommonParticles.Utils import *
-from LHCbKernel.Configuration import *
-from Gaudi.Configuration import *
 __author__ = ['Brais Sanmartin Sedes']
 __date__ = '01/12/2015'
 __version__ = '5.0'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBnoC/StrippingBs2PhiPhi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBnoC/StrippingBs2PhiPhi.py
index 0f280a3a06ba478759dc6e19bf80e278c15e5d40..1124dcdfd432c594fe79f1bc1e0b70fc24f9d21f 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBnoC/StrippingBs2PhiPhi.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBnoC/StrippingBs2PhiPhi.py
@@ -23,13 +23,10 @@ Exports the following stripping lines as instance data members:
 '''
 
 from StandardParticles import StdAllLooseANNKaons as MyLooseKaons
-from StandardParticles import StdLooseANNUpKaons as MyLooseUpKaons
-import StandardParticles
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
+from PhysSelPython.Wrappers import Selection
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 __author__ = ['Sean Benson']
 __date__ = '2013/08/15'
 __version__ = '3.0'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBnoC/StrippingBu2KSh.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBnoC/StrippingBu2KSh.py
index c20e2b517354f75fd95c5fdb10df32120f6a94ad..19a07b4fb4e96e5bfa5e548af2c1c8fb62036be0 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBnoC/StrippingBu2KSh.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBnoC/StrippingBu2KSh.py
@@ -23,7 +23,6 @@ __date__ = '16/12/2020'
 __version__ = 'Stripping28'
 __all__ = 'Bu2KShConf'
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
@@ -258,7 +257,7 @@ class Bu2KShConf(LineBuilder):
 
         _massCutLow = "(AM>(5279-%s)*MeV)" % config['B_Mlow']
         _massCutHigh = "(AM<(5279+%s)*MeV)" % config['B_Mhigh']
-        _daugMaxPtIPCut = "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['BDaug_MaxPT_IP']
+        "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['BDaug_MaxPT_IP']
         _daugPtSumCut = "((APT1+APT2)>%s*MeV)" % config['BDaug_DD_PTsum']
 
         _combCuts = _massCutLow
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBnoC/StrippingBu2Ksthh.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBnoC/StrippingBu2Ksthh.py
index 5a06d1502605fd2037a6b16043d5efb150ce86d5..032717bced65040c1e6edaf12520110a1398cd1d 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBnoC/StrippingBu2Ksthh.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBnoC/StrippingBu2Ksthh.py
@@ -23,7 +23,6 @@ __version__ = 'Stripping26'
 __all__ = {'Bu2KsthhConf',
            'default_config'}
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
@@ -302,7 +301,7 @@ class Bu2KsthhConf(LineBuilder):
         _massCutHigh = "(AM<(5279+%s)*MeV)" % config['B_Mhigh']
         _aptCut = "(APT>%s*MeV)" % config['B_APTmin']
         _daugMedPtCut = "(ANUM(PT>%s*MeV)>=2)" % config['BDaug_MedPT_PT']
-        _daugMaxPtIPCut = "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['BDaug_MaxPT_IP']
+        "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['BDaug_MaxPT_IP']
         _maxDocaChi2Cut = "(ACUTDOCACHI2(%s,''))" % config['BDaug_DD_maxDocaChi2']
         _daugPtSumCut = "((APT1+APT2+APT3)>%s*MeV)" % config['BDaug_DD_PTsum']
 
@@ -359,7 +358,7 @@ class Bu2KsthhConf(LineBuilder):
         _massCutHigh = "(AM<(5279+%s)*MeV)" % config['B_Mhigh']
         _aptCut = "(APT>%s*MeV)" % config['B_APTmin']
         _daugMedPtCut = "(ANUM(PT>%s*MeV)>=2)" % config['BDaug_MedPT_PT']
-        _daugMaxPtIPCut = "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['BDaug_MaxPT_IP']
+        "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['BDaug_MaxPT_IP']
         _maxDocaChi2Cut = "(ACUTDOCACHI2(%s,''))" % config['BDaug_LL_maxDocaChi2']
         _daugPtSumCut = "((APT1+APT2+APT3)>%s*MeV)" % config['BDaug_LL_PTsum']
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBnoC/StrippingBu2hhh.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBnoC/StrippingBu2hhh.py
index 890eba4692dbe06517c0d7aee8f51d320cca8a64..62ede4129b7f2bd6ff173b27d26ebf7e47e4e6ea 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBnoC/StrippingBu2hhh.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBnoC/StrippingBu2hhh.py
@@ -22,13 +22,11 @@ Exported symbols (use python help!):
    - makepph_incl
 '''
 
-from Configurables import LoKi__VoidFilter as VoidFilter
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection
 import StandardParticles
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 __author__ = ['Irina Nasteva', 'Jussara Miranda', 'Alvaro Gomes']
 __date__ = '19/05/2017'
 __version__ = 'Stripping29'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBnoC/StrippingBu2rho0rhoPlus.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBnoC/StrippingBu2rho0rhoPlus.py
index 6ff36ce6304e5d819eb96fe6ca06587bb1baa6cc..51df1d5067b9100ee67537610b0005b048a5d51f 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBnoC/StrippingBu2rho0rhoPlus.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBnoC/StrippingBu2rho0rhoPlus.py
@@ -21,7 +21,6 @@ from StrippingUtils.Utils import LineBuilder, checkConfig
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = "Jason E Andrews"
 __date__ = "26/11/2016"
 __version__ = "4.0"
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBnoC/StrippingButo5h.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBnoC/StrippingButo5h.py
index be4eeb8a2dc0617afde7aab5929540d3bc8d05c7..65e1b29f0dde00492a6a5432e53292b9bc4c81a7 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBnoC/StrippingButo5h.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBnoC/StrippingButo5h.py
@@ -23,13 +23,11 @@ Exported symbols (use python help!):
    - makeppKpipi_excl
 '''
 
-from Configurables import LoKi__VoidFilter as VoidFilter
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection
 import StandardParticles
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 __author__ = ['Luiz Gustavo de Oliveira',
               'Alvaro Gomes', 'Bruno Souza de Paula']
 __date__ = '22/Aug/2014'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBnoC/StrippingD2HHBDT.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBnoC/StrippingD2HHBDT.py
index 6bee345112d54e258044f31f0e7d809849b112f7..98ef43000bc5732a81fe2e10bace645263334787 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBnoC/StrippingD2HHBDT.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBnoC/StrippingD2HHBDT.py
@@ -23,14 +23,13 @@ __all__ = ('D2HHBDTLines',
            'makeD2HHBDT',
            'default_config')
 
-from Gaudi.Configuration import *
 
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
 from StandardParticles import StdNoPIDsKaons, StdAllNoPIDsPions
 
 from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
-from StrippingUtils.Utils import LineBuilder, checkConfig
+from StrippingUtils.Utils import LineBuilder
 
 
 default_config = {
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBnoC/StrippingHb2Charged2Body.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBnoC/StrippingHb2Charged2Body.py
index 11da99218434ae71c894fa73b708dca4ee60de5d..3b3424d2fb6688333e151f52793701a7a2c00dbe 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBnoC/StrippingHb2Charged2Body.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBnoC/StrippingHb2Charged2Body.py
@@ -23,14 +23,13 @@ __all__ = ('Hb2Charged2BodyLines',
            'makeB2Charged2Body',
            'default_config')
 
-from Gaudi.Configuration import *
 
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-from StandardParticles import StdNoPIDsPions, StdLooseProtons, StdLooseKaons
+from StandardParticles import StdNoPIDsPions
 
 from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
-from StrippingUtils.Utils import LineBuilder, checkConfig
+from StrippingUtils.Utils import LineBuilder
 
 
 default_config = {
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBnoC/StrippingHb2V0V0h.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBnoC/StrippingHb2V0V0h.py
index 6b1c9eb94b261dbc185e979f0314ffe2bd69f930..f3104c9b58e73817c70f7fa7e3d68a0b9ecf0860 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBnoC/StrippingHb2V0V0h.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBnoC/StrippingHb2V0V0h.py
@@ -22,7 +22,6 @@ __date__ = '10/02/2017'
 __version__ = 'Stripping28'
 __all__ = 'Hb2V0V0hConf'
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBnoC/StrippingLb2V0hh.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBnoC/StrippingLb2V0hh.py
index f63034e02f45426009146384bed4036d16056a26..e896944db6cf521ad12d86186f9bda930b5bfd87 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBnoC/StrippingLb2V0hh.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBnoC/StrippingLb2V0hh.py
@@ -25,7 +25,6 @@ __date__ = '11/01/2017'
 __version__ = 'Stripping28'
 __all__ = 'Lb2V0hhConf'
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
@@ -211,8 +210,8 @@ class Lb2V0hhConf(LineBuilder):
         _vtxCut = "(VFASPF(VCHI2)<%s)   " % config['Lambda_DD_VtxChi2']
         _fdChi2Cut = "(BPVVDCHI2>%s)" % config['Lambda_DD_FDChi2']
         _momCut = "(P>%s*MeV)" % config['Lambda_DD_Pmin']
-        _trkGhostProbCut1 = "(CHILDCUT((TRGHOSTPROB<%s),1))" % config['Trk_GhostProb']
-        _trkGhostProbCut2 = "(CHILDCUT((TRGHOSTPROB<%s),2))" % config['Trk_GhostProb']
+        "(CHILDCUT((TRGHOSTPROB<%s),1))" % config['Trk_GhostProb']
+        "(CHILDCUT((TRGHOSTPROB<%s),2))" % config['Trk_GhostProb']
 
         _allCuts = _momCut
         _allCuts += '&'+_massCut
@@ -268,8 +267,8 @@ class Lb2V0hhConf(LineBuilder):
         _vtxCut = "(VFASPF(VCHI2)<%s)   " % config['Lambda_DD_VtxChi2']
         _fdChi2Cut = "(BPVVDCHI2>%s)" % config['Lambda_DD_FDChi2']
         _momCut = "(P>%s*MeV)" % config['Lambda_DD_Pmin']
-        _trkGhostProbCut1 = "(CHILDCUT((TRGHOSTPROB<%s),1))" % config['Trk_GhostProb']
-        _trkGhostProbCut2 = "(CHILDCUT((TRGHOSTPROB<%s),2))" % config['Trk_GhostProb']
+        "(CHILDCUT((TRGHOSTPROB<%s),1))" % config['Trk_GhostProb']
+        "(CHILDCUT((TRGHOSTPROB<%s),2))" % config['Trk_GhostProb']
 
         _allCuts = _momCut
         _allCuts += '&'+_massCut
@@ -302,7 +301,7 @@ class Lb2V0hhConf(LineBuilder):
         _massCutHigh = "(AM<(5619+%s)*MeV)" % config['Lb_2bodyMhigh']
         _aptCut = "(APT>%s*MeV)" % config['Lb_APTmin']
         _daugMedPtCut = "(ANUM(PT>%s*MeV)>=2)" % config['LbDaug_MedPT_PT']
-        _daugMaxPtIPCut = "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP']
+        "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP']
         _maxDocaChi2Cut = "(ACUTDOCACHI2(%s,''))" % config['LbDaug_DD_maxDocaChi2']
         _daugPtSumCut = "(APT1>%s*MeV)" % config['Lbh_DD_PTMin']
 
@@ -353,7 +352,7 @@ class Lb2V0hhConf(LineBuilder):
         _massCutHigh = "(AM<(5619+%s)*MeV)" % config['Lb_Mhigh']
         _aptCut = "(APT>%s*MeV)" % config['Lb_APTmin']
         _daugMedPtCut = "(ANUM(PT>%s*MeV)>=2)" % config['LbDaug_MedPT_PT']
-        _daugMaxPtIPCut = "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP']
+        "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP']
         _maxDocaChi2Cut = "(ACUTDOCACHI2(%s,''))" % config['LbDaug_DD_maxDocaChi2']
         _daugPtSumCut = "((APT1+APT2+APT3)>%s*MeV)" % config['LbDaug_DD_PTsum']
 
@@ -369,7 +368,7 @@ class Lb2V0hhConf(LineBuilder):
         _vtxChi2Cut = "(VFASPF(VCHI2)<%s)" % config['Lb_VtxChi2']
         _diraCut = "(BPVDIRA>%s)" % config['Lb_DD_Dira']
         _ipChi2Cut = "(MIPCHI2DV(PRIMARY)<%s)" % config['Lb_DD_IPCHI2wrtPV']
-        _fdCut = "(VFASPF(VMINVDDV(PRIMARY))>%s)" % config['Lb_FDwrtPV']
+        "(VFASPF(VMINVDDV(PRIMARY))>%s)" % config['Lb_FDwrtPV']
         _fdChi2Cut = "(BPVVDCHI2>%s)" % config['Lb_DD_FDChi2']
 
         _motherCuts = _ptCut
@@ -541,7 +540,7 @@ class Lb2V0hhConf(LineBuilder):
         _massCutHigh = "(AM<(5619+%s)*MeV)" % config['Lb_2bodyMhigh']
         _aptCut = "(APT>%s*MeV)" % config['Lb_APTmin']
         _daugMedPtCut = "(ANUM(PT>%s*MeV)>=2)" % config['LbDaug_MedPT_PT']
-        _daugMaxPtIPCut = "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP']
+        "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP']
         _maxDocaChi2Cut = "(ACUTDOCACHI2(%s,''))" % config['LbDaug_LD_maxDocaChi2']
         _daugPtSumCut = "(APT1>%s*MeV)" % config['Lbh_LD_PTMin']
 
@@ -592,7 +591,7 @@ class Lb2V0hhConf(LineBuilder):
         _massCutHigh = "(AM<(5619+%s)*MeV)" % config['Lb_Mhigh']
         _aptCut = "(APT>%s*MeV)" % config['Lb_APTmin']
         _daugMedPtCut = "(ANUM(PT>%s*MeV)>=2)" % config['LbDaug_MedPT_PT']
-        _daugMaxPtIPCut = "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP']
+        "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP']
         _maxDocaChi2Cut = "(ACUTDOCACHI2(%s,''))" % config['LbDaug_LD_maxDocaChi2']
         _daugPtSumCut = "((APT1+APT2+APT3)>%s*MeV)" % config['LbDaug_LD_PTsum']
 
@@ -608,7 +607,7 @@ class Lb2V0hhConf(LineBuilder):
         _vtxChi2Cut = "(VFASPF(VCHI2)<%s)" % config['Lb_VtxChi2']
         _diraCut = "(BPVDIRA>%s)" % config['Lb_LD_Dira']
         _ipChi2Cut = "(MIPCHI2DV(PRIMARY)<%s)" % config['Lb_LD_IPCHI2wrtPV']
-        _fdCut = "(VFASPF(VMINVDDV(PRIMARY))>%s)" % config['Lb_FDwrtPV']
+        "(VFASPF(VMINVDDV(PRIMARY))>%s)" % config['Lb_FDwrtPV']
         _fdChi2Cut = "(BPVVDCHI2>%s)" % config['Lb_LD_FDChi2']
 
         _motherCuts = _ptCut
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBnoC/StrippingLb2V0pp.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBnoC/StrippingLb2V0pp.py
index d92d1478ca2c73294da21c0b6bc19613f859f611..c412d7f27a1feaee550033f21cd6465948758d57 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBnoC/StrippingLb2V0pp.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBnoC/StrippingLb2V0pp.py
@@ -24,7 +24,6 @@ __date__ = '06/01/2019'
 __version__ = 'Stripping29r2p1'
 __all__ = 'Lb2V0ppConf'
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
@@ -210,8 +209,8 @@ class Lb2V0ppConf(LineBuilder):
         _vtxCut = "(VFASPF(VCHI2)<%s)   " % config['Lambda_DD_VtxChi2']
         _fdChi2Cut = "(BPVVDCHI2>%s)" % config['Lambda_DD_FDChi2']
         _momCut = "(P>%s*MeV)" % config['Lambda_DD_Pmin']
-        _trkGhostProbCut1 = "(CHILDCUT((TRGHOSTPROB<%s),1))" % config['Trk_GhostProb']
-        _trkGhostProbCut2 = "(CHILDCUT((TRGHOSTPROB<%s),2))" % config['Trk_GhostProb']
+        "(CHILDCUT((TRGHOSTPROB<%s),1))" % config['Trk_GhostProb']
+        "(CHILDCUT((TRGHOSTPROB<%s),2))" % config['Trk_GhostProb']
 
         _allCuts = _momCut
         _allCuts += '&'+_massCut
@@ -266,8 +265,8 @@ class Lb2V0ppConf(LineBuilder):
         _vtxCut = "(VFASPF(VCHI2)<%s)   " % config['Lambda_DD_VtxChi2']
         _fdChi2Cut = "(BPVVDCHI2>%s)" % config['Lambda_DD_FDChi2']
         _momCut = "(P>%s*MeV)" % config['Lambda_DD_Pmin']
-        _trkGhostProbCut1 = "(CHILDCUT((TRGHOSTPROB<%s),1))" % config['Trk_GhostProb']
-        _trkGhostProbCut2 = "(CHILDCUT((TRGHOSTPROB<%s),2))" % config['Trk_GhostProb']
+        "(CHILDCUT((TRGHOSTPROB<%s),1))" % config['Trk_GhostProb']
+        "(CHILDCUT((TRGHOSTPROB<%s),2))" % config['Trk_GhostProb']
 
         _allCuts = _momCut
         _allCuts += '&'+_massCut
@@ -300,7 +299,7 @@ class Lb2V0ppConf(LineBuilder):
         _massCutHigh = "(AM<(5619+%s)*MeV)" % config['Lb_2bodyMhigh']
         _aptCut = "(APT>%s*MeV)" % config['Lb_APTmin']
         _daugMedPtCut = "(ANUM(PT>%s*MeV)>=2)" % config['LbDaug_MedPT_PT']
-        _daugMaxPtIPCut = "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP']
+        "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP']
         _maxDocaChi2Cut = "(ACUTDOCACHI2(%s,''))" % config['LbDaug_DD_maxDocaChi2']
         _daugPtSumCut = "(APT1>%s*MeV)" % config['Lbh_DD_PTMin']
 
@@ -351,7 +350,7 @@ class Lb2V0ppConf(LineBuilder):
         _massCutHigh = "(AM<(5619+%s)*MeV)" % config['Lb_Mhigh']
         _aptCut = "(APT>%s*MeV)" % config['Lb_APTmin']
         _daugMedPtCut = "(ANUM(PT>%s*MeV)>=2)" % config['LbDaug_MedPT_PT']
-        _daugMaxPtIPCut = "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP']
+        "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP']
         _maxDocaChi2Cut = "(ACUTDOCACHI2(%s,''))" % config['LbDaug_DD_maxDocaChi2']
         _daugPtSumCut = "((APT1+APT2+APT3)>%s*MeV)" % config['LbDaug_DD_PTsum']
 
@@ -540,7 +539,7 @@ class Lb2V0ppConf(LineBuilder):
         _massCutHigh = "(AM<(5619+%s)*MeV)" % config['Lb_2bodyMhigh']
         _aptCut = "(APT>%s*MeV)" % config['Lb_APTmin']
         _daugMedPtCut = "(ANUM(PT>%s*MeV)>=2)" % config['LbDaug_MedPT_PT']
-        _daugMaxPtIPCut = "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP']
+        "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP']
         _maxDocaChi2Cut = "(ACUTDOCACHI2(%s,''))" % config['LbDaug_LD_maxDocaChi2']
         _daugPtSumCut = "(APT1>%s*MeV)" % config['Lbh_LD_PTMin']
 
@@ -591,7 +590,7 @@ class Lb2V0ppConf(LineBuilder):
         _massCutHigh = "(AM<(5619+%s)*MeV)" % config['Lb_Mhigh']
         _aptCut = "(APT>%s*MeV)" % config['Lb_APTmin']
         _daugMedPtCut = "(ANUM(PT>%s*MeV)>=2)" % config['LbDaug_MedPT_PT']
-        _daugMaxPtIPCut = "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP']
+        "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP']
         _maxDocaChi2Cut = "(ACUTDOCACHI2(%s,''))" % config['LbDaug_LD_maxDocaChi2']
         _daugPtSumCut = "((APT1+APT2+APT3)>%s*MeV)" % config['LbDaug_LD_PTsum']
 
@@ -607,7 +606,7 @@ class Lb2V0ppConf(LineBuilder):
         _vtxChi2Cut = "(VFASPF(VCHI2)<%s)" % config['Lb_VtxChi2']
         _diraCut = "(BPVDIRA>%s)" % config['Lb_LD_Dira']
         _ipChi2Cut = "(MIPCHI2DV(PRIMARY)<%s)" % config['Lb_LD_IPCHI2wrtPV']
-        _fdCut = "(VFASPF(VMINVDDV(PRIMARY))>%s)" % config['Lb_FDwrtPV']
+        "(VFASPF(VMINVDDV(PRIMARY))>%s)" % config['Lb_FDwrtPV']
         _fdChi2Cut = "(BPVVDCHI2>%s)" % config['Lb_LD_FDChi2']
 
         _motherCuts = _ptCut
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBnoC/StrippingXb23ph.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBnoC/StrippingXb23ph.py
index 44ba838d436b418c4eaef7372eccd95c28426134..ef24837631cfc50b46aabe0cc7dba0c8cdeb66fd 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBnoC/StrippingXb23ph.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBnoC/StrippingXb23ph.py
@@ -22,7 +22,6 @@ from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, DaVinci__N4Body
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection
-from Gaudi.Configuration import *
 __author__ = ['Jinlin Fu', 'Maurizio Martinelli', 'Andrea Merli']
 __date__ = '12/11/2015'
 __version__ = 'v1r0'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBnoC/StrippingXb2p3h.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBnoC/StrippingXb2p3h.py
index d07d7e52c17b8a01201968b3a1b929751c31bc9d..2c10d1f20bf15892c5e8ef6a5861130250a0a8ae 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBnoC/StrippingXb2p3h.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBnoC/StrippingXb2p3h.py
@@ -22,7 +22,6 @@ from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, DaVinci__N4Body
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection
-from Gaudi.Configuration import *
 __author__ = ['Jan Mickelle V. Maratas', 'Stephane Monteil', 'Andrea Merli']
 __date__ = '01/04/2016'
 __version__ = 'v1r0'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBnoC/StrippingXb2p3h_raw.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBnoC/StrippingXb2p3h_raw.py
index 54b56a99649dbbae2fa5505485204b16e7c17175..7b8a9c8dd3a6a8c7980cb3157c119b8bb1331c8c 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBnoC/StrippingXb2p3h_raw.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBnoC/StrippingXb2p3h_raw.py
@@ -27,7 +27,6 @@ from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, DaVinci__N4Body
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection
-from Gaudi.Configuration import *
 __author__ = ['Gediminas Sarpis', 'Hendrik Jage']
 __date__ = '06/04/2021'
 __version__ = 'v1r0'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBnoC/StrippingXb2phh.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBnoC/StrippingXb2phh.py
index ae62ac803dcda11696229820fa7bcb3737c75114..35432dcb4a93cdbf47f1ec738735037534d82c07 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBnoC/StrippingXb2phh.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingBnoC/StrippingXb2phh.py
@@ -22,7 +22,6 @@ from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, DaVinci__N3Body
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection
-from Gaudi.Configuration import *
 __author__ = ['Jan Mickelle V. Maratas', 'Stephane Monteil', 'Thomas Latham']
 __date__ = '24/11/2016'
 __version__ = 'v1r0'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCalib/StrippingCharmFromBSemiForHadronAsy.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCalib/StrippingCharmFromBSemiForHadronAsy.py
index c458c3e6c38ed0b1337c2e69289afaa140b1e0f3..98fad852e24de6fd9dc371c05e6185a34f3863c8 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCalib/StrippingCharmFromBSemiForHadronAsy.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCalib/StrippingCharmFromBSemiForHadronAsy.py
@@ -19,14 +19,12 @@ __author__ = ['Mika Vesterinen']
 __date__ = '10/03/2013'
 __version__ = '$Revision: 0.0 $'
 
-from Gaudi.Configuration import *
 
 from Configurables import FilterDesktop, CombineParticles
 from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from StandardParticles import StdAllLoosePions, StdLoosePions, StdLooseMuons, StdLooseKaons, StdLooseProtons
-from Configurables import TisTosParticleTagger
+from StandardParticles import StdLooseKaons, StdLooseMuons, StdLoosePions
 
 __all__ = ('CharmFromBSemiForHadronAsyAllLinesConf',
            'TOSFilter',
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCalib/StrippingCharmFromBSemiForProtonPID.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCalib/StrippingCharmFromBSemiForProtonPID.py
index 6c6f284aa3e1a4515a633a71cb0e569c1bd4ad6f..4afa986a85d324f44e240132151f3ef9c83846fe 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCalib/StrippingCharmFromBSemiForProtonPID.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCalib/StrippingCharmFromBSemiForProtonPID.py
@@ -18,12 +18,11 @@ __author__ = ['Mika Vesterinen']
 __date__ = '19/03/2013'
 __version__ = '$Revision: 0.0 $'
 
-from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from StandardParticles import StdLoosePions, StdLooseMuons, StdLooseKaons, StdLooseProtons, StdNoPIDsProtons
+from StandardParticles import StdLooseKaons, StdLooseMuons, StdLoosePions, StdNoPIDsProtons
 
 __all__ = ('CharmFromBSemiForProtonPIDAllLinesConf',
            'default_config')
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCalib/StrippingD02KPiPi0.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCalib/StrippingD02KPiPi0.py
index b8f25c6552ad8b11e685418ec13a2ac622d2bef8..7fd939520aebcb1dc21eb98628f0836710acb20c 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCalib/StrippingD02KPiPi0.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCalib/StrippingD02KPiPi0.py
@@ -25,9 +25,8 @@ __all__ = ('StrippingD02KPiPi0Conf',
            'makeD02KPiPi0M',
            'default_config')
 
-from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from PhysSelPython.Wrappers import Selection, DataOnDemand
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
+from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from StandardParticles import StdTightPions, StdTightKaons, StdLooseMergedPi0, StdLooseResolvedPi0
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCalib/StrippingD02KPiPi0DalitzPartReco.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCalib/StrippingD02KPiPi0DalitzPartReco.py
index ac92a6c8cd5234f3436c2a8b2ed17b8fbf90700a..c14b9b11f394fd5c53a93657f063a53eb32b8e66 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCalib/StrippingD02KPiPi0DalitzPartReco.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCalib/StrippingD02KPiPi0DalitzPartReco.py
@@ -8,9 +8,7 @@
 # granted to it by virtue of its status as an Intergovernmental Organization  #
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
-import logging
 from StrippingUtils.Utils import LineBuilder
-from Gaudi.Configuration import *
 __author__ = ['Greg Ciezarek', 'Liang Sun', 'Adam Davis']
 __date__ = '18/05/2017'
 __version__ = '$Revision: 0.01 $'
@@ -75,7 +73,6 @@ class D2KPiPi0_PartRecoBuilder(LineBuilder):
     def __init__(self, name, config):
         LineBuilder.__init__(self, name, config)
         self._config = config
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
 
         # self.GECs = { "Code":"( recSummaryTrack(LHCb.RecSummary.nLongTracks, TrLONG) < %(GEC_nLongTrk)s )" % config,
         #              "Preambulo": ["from LoKiTracks.decorators import *"]}
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCalib/StrippingD0ForBXX.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCalib/StrippingD0ForBXX.py
index bd7db7dbc518eb886e4f9c11699b772d11dd126b..b5eea4d7cb0b283585ff2aa80e59a84aa67c7051 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCalib/StrippingD0ForBXX.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCalib/StrippingD0ForBXX.py
@@ -20,7 +20,7 @@ from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from StandardParticles import StdLoosePions, StdLooseKaons, StdLooseProtons, StdAllLoosePions
+from StandardParticles import StdAllLoosePions, StdLooseKaons, StdLoosePions
 
 
 name = 'confD0forBXX'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCalib/StrippingDst2D0Pi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCalib/StrippingDst2D0Pi.py
index fd6d090338e5fd9aaa38300be63ea3789a2bd377..c49382c89ecd6c23650df4eee0f2cea8c3862ddb 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCalib/StrippingDst2D0Pi.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCalib/StrippingDst2D0Pi.py
@@ -34,9 +34,8 @@ __all__ = ('StrippingDst2D0PiConf',
            'makeDst2D0Pi',
            'default_config')
 
-from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from PhysSelPython.Wrappers import Selection, DataOnDemand
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
+from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from StandardParticles import StdTightPions, StdTightKaons, StdLooseAllPhotons, StdNoPIDsPions, StdLooseEta2gg
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCalib/StrippingDstarD02hhPi0PartRecoForPhotonCalib.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCalib/StrippingDstarD02hhPi0PartRecoForPhotonCalib.py
index c047319a0d29671f7d4c7014634dc5022216c4b1..64e2e664295d9a3c9a8838dc88b17ef52239465f 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCalib/StrippingDstarD02hhPi0PartRecoForPhotonCalib.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCalib/StrippingDstarD02hhPi0PartRecoForPhotonCalib.py
@@ -33,15 +33,15 @@ from Gaudi.Configuration import *
 
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 from StandardParticles import StdAllNoPIDsPions, StdNoPIDsPions, StdNoPIDsKaons
-from StandardParticles import StdLooseAllPhotons, StdLooseResolvedPi0, StdLooseMergedPi0
+from StandardParticles import StdLooseAllPhotons
 
 from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
-from StrippingUtils.Utils import LineBuilder, checkConfig
+from StrippingUtils.Utils import LineBuilder
 
 from Configurables import FilterDesktop
 
-from GaudiKernel.SystemOfUnits import GeV, MeV, picosecond, mm
+from GaudiKernel.SystemOfUnits import GeV, MeV, picosecond
 
 default_config = {
     'NAME': 'DstarD2hhGammaCalib',
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCalib/StrippingElectronID.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCalib/StrippingElectronID.py
index 72e0b978a3903918cb2e81036f8a3395dc92c2ac..56eb58e212609824a2c911d14ada1ceb27e0fc98 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCalib/StrippingElectronID.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCalib/StrippingElectronID.py
@@ -23,9 +23,8 @@ stream.appendLines( [
 
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand
+from PhysSelPython.Wrappers import Selection
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = ['Jibo He', 'Vitalii Lisovskyi']
 __date__ = '21/06/2021'
 __version__ = '$Revision: 1.2 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCalib/StrippingElectronRecoEff.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCalib/StrippingElectronRecoEff.py
index c19ff961c1db5ef3bfbfb03a4d9133a4c8888bdf..bdb2892004f5f8e6c93bb551bb939895eca5eb63 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCalib/StrippingElectronRecoEff.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCalib/StrippingElectronRecoEff.py
@@ -17,17 +17,15 @@ from StandardParticles import StdAllLoosePions as Hlt2Pions
 from StandardParticles import StdAllLooseKaons as Hlt2Kaons
 from StandardParticles import StdNoPIDsElectrons as Hlt2Electrons
 from StandardParticles import StdNoPIDsMuons as Hlt2Muons
-from TrackFitter.ConfiguredFitters import (ConfiguredEventFitter,
-                                           ConfiguredForwardStraightLineEventFitter)
+from TrackFitter.ConfiguredFitters import ConfiguredEventFitter
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import DataOnDemand, MergedSelection
 from PhysConf.Selections import L0TOSSelection
 from PhysConf.Selections import Hlt1TOSSelection
 from PhysConf.Selections import Hlt2TOSSelection
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 from StrippingUtils.Utils import LineBuilder
-from GaudiKernel.SystemOfUnits import GeV, MeV, mm
+from GaudiKernel.SystemOfUnits import MeV, mm
 from Gaudi.Configuration import *
 __author__ = ['Adam Davis', 'Laurent Dufour', 'V. V. Gligorov']
 __date__ = '14/1/2018'
@@ -45,10 +43,9 @@ from PhysSelPython.Wrappers import Selection, Hlt1Selection, Hlt2Selection, L0Se
 from SelPy.utils import (UniquelyNamedObject,
                          ClonableObject,
                          SelectionBase)
-from Configurables import (DecodeVeloRawBuffer, FastVeloTracking, TrackPrepareVelo,
-                           NoPIDsParticleMaker, DataOnDemandSvc, ChargedProtoParticleMaker,
-                           PrTrackAssociator, DelegatingTrackSelector, TrackContainerCopy, TrackAssociator,
-                           TrackStateInitAlg, TrackStateInitTool)
+from Configurables import (FastVeloTracking, NoPIDsParticleMaker, DataOnDemandSvc,
+                           ChargedProtoParticleMaker, DelegatingTrackSelector, TrackContainerCopy,
+                           TrackStateInitAlg)
 
 default_config = {'NAME': 'ElectronRecoEff',
                   'WGs': ['Calib'],
@@ -287,7 +284,6 @@ class StrippingElectronRecoEffLines(LineBuilder):
     def __init__(self, name, config):
         LineBuilder.__init__(self, name, config)
 
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
         self._config = config
         self.name = name
 
@@ -571,7 +567,7 @@ class StrippingElectronRecoEffLines(LineBuilder):
         )
 
     def DetachedEEKPair(self, _name):
-        configuration = self._config["DetachedEEK"]
+        self._config["DetachedEEK"]
 
         _DetachedEEKPair = self.getCPForEEK("DetachedEEK")
         _DetachedEEKPair_Sel = Selection("SelEEK_for_"+_name,
@@ -591,7 +587,7 @@ class StrippingElectronRecoEffLines(LineBuilder):
         return line
 
     def DetachedEEKstarPair(self, _name):
-        configuration = self._config["DetachedEEKstar"]
+        self._config["DetachedEEKstar"]
 
         _DetachedEEKstarPair = self.getCPForEEK("DetachedEEKstar")
         _DetachedEEKstarPair_Sel = Selection("SelEEKstar_for_"+_name,
@@ -611,7 +607,7 @@ class StrippingElectronRecoEffLines(LineBuilder):
         return line
 
     def DetachedEEPhiPair(self, _name):
-        configuration = self._config["DetachedEEPhi"]
+        self._config["DetachedEEPhi"]
 
         _DetachedEEPhiPair = self.getCPForEEK("DetachedEEPhi")
         _DetachedEEPhiPair_Sel = Selection("SelEEPhi_for_"+_name,
@@ -882,7 +878,6 @@ class StrippingElectronRecoEffLines(LineBuilder):
     def MakeVeloTracks(self, prefilter):
         if self._config["DoVeloDecoding"]:
             from DAQSys.Decoders import DecoderDB
-            from DAQSys.DecoderClass import decodersForBank
             decs = []
             vdec = DecoderDB["DecodeVeloRawBuffer/createBothVeloClusters"]
             vdec.Active = True
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCalib/StrippingEta2MuMuGamma.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCalib/StrippingEta2MuMuGamma.py
index d630ed353d2eb2d94d19a56b244c69c9caf27e10..be5c53aa3ff42aae5af4ba267827e15e06181149 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCalib/StrippingEta2MuMuGamma.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCalib/StrippingEta2MuMuGamma.py
@@ -25,12 +25,10 @@ __all__ = ('StrippingEta2MuMuGammaConf',
            'makeMuMuGamma',
            'default_config')
 
-from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from PhysSelPython.Wrappers import Selection, DataOnDemand
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
+from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from StandardParticles import StdTightPions, StdTightKaons, StdLooseAllPhotons, StdNoPIDsPions, StdLooseEta2gg
 from StandardParticles import StdAllLooseGammaDD, StdAllLooseGammaLL, StdAllLooseMuons
 
 default_config = {
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCalib/StrippingJPsiForSL.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCalib/StrippingJPsiForSL.py
index 66d3cf569e7e3d642fb1e90689c09009970a9f91..f83a469f0d79f559f3b8f1ce7fa0a29617c07287 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCalib/StrippingJPsiForSL.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCalib/StrippingJPsiForSL.py
@@ -20,11 +20,10 @@ __version__ = '$Revision: 0.1 $'
 
 from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from PhysSelPython.Wrappers import Selection, DataOnDemand
+from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from StandardParticles import StdLoosePions, StdLooseMuons, StdLooseKaons, StdLooseProtons, StdNoPIDsPions, StdNoPIDsMuons, StdLooseMergedPi0, StdLooseResolvedPi0, StdLooseElectrons, StdNoPIDsKaons
-from Configurables import TisTosParticleTagger
+from StandardParticles import StdNoPIDsKaons, StdNoPIDsMuons
 
 __all__ = ('JPsiForSLAllLinesConf',
            'confdict')
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCalib/StrippingK23PiForDownstreamTrackEff.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCalib/StrippingK23PiForDownstreamTrackEff.py
index 5e95ecb40bf4a7b0d570152c6cb5a85c2e157431..9ea071dc760c1a4d2e8adb1bd47ddd464f85a7d1 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCalib/StrippingK23PiForDownstreamTrackEff.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCalib/StrippingK23PiForDownstreamTrackEff.py
@@ -14,10 +14,6 @@ one missing pion, using the corrected mass
 '''
 
 from StrippingUtils.Utils import LineBuilder
-from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = ['Michel De Cian']
 __date__ = '19/12/2018'
 __version__ = '$Revision: 1.0 $'
@@ -269,8 +265,8 @@ class K23PiForDownstreamTrackEffConf(LineBuilder):
         if self._dipionSelSSNarrowDownstream is not None:
             return self._dipionSelSSNarrowDownstream
 
-        from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
+        from GaudiConfUtils.ConfigurableGenerators import CombineParticles
+        from PhysSelPython.Wrappers import Selection
 
         _k2pipi = CombineParticles(
             DecayDescriptors=["[phi(1020) -> pi+ pi+]cc"],
@@ -293,8 +289,8 @@ class K23PiForDownstreamTrackEffConf(LineBuilder):
         if self._dipionSelSSNarrowLong is not None:
             return self._dipionSelSSNarrowLong
 
-        from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
+        from GaudiConfUtils.ConfigurableGenerators import CombineParticles
+        from PhysSelPython.Wrappers import Selection
 
         _k2pipi = CombineParticles(
             DecayDescriptors=["[phi(1020) -> pi+ pi+]cc"],
@@ -317,8 +313,8 @@ class K23PiForDownstreamTrackEffConf(LineBuilder):
         if self._dipionSelSSWide is not None:
             return self._dipionSelSSWide
 
-        from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
+        from GaudiConfUtils.ConfigurableGenerators import CombineParticles
+        from PhysSelPython.Wrappers import Selection
 
         _k2pipi = CombineParticles(
             DecayDescriptors=["[phi(1020) -> pi+ pi+]cc"],
@@ -342,8 +338,8 @@ class K23PiForDownstreamTrackEffConf(LineBuilder):
         if self._dipionSelOSNarrowDownstream is not None:
             return self._dipionSelOSNarrowDownstream
 
-        from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
+        from GaudiConfUtils.ConfigurableGenerators import CombineParticles
+        from PhysSelPython.Wrappers import Selection
 
         # Cut out the Kshort
         mCut = self._dipionSelectionNarrow() + " & (ADMASS('KS0') > 40)"
@@ -370,8 +366,8 @@ class K23PiForDownstreamTrackEffConf(LineBuilder):
         if self._dipionSelOSNarrowLong is not None:
             return self._dipionSelOSNarrowLong
 
-        from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
+        from GaudiConfUtils.ConfigurableGenerators import CombineParticles
+        from PhysSelPython.Wrappers import Selection
 
         # Cut out the Kshort
         mCut = self._dipionSelectionNarrow() + " & (ADMASS('KS0') > 40)"
@@ -398,8 +394,8 @@ class K23PiForDownstreamTrackEffConf(LineBuilder):
         if self._dipionSelOSWide is not None:
             return self._dipionSelOSWide
 
-        from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
+        from GaudiConfUtils.ConfigurableGenerators import CombineParticles
+        from PhysSelPython.Wrappers import Selection
 
         # Cut out the Kshort
         mCut = self._dipionSelectionWide() + " & (ADMASS('KS0') > 40)"
@@ -427,8 +423,8 @@ class K23PiForDownstreamTrackEffConf(LineBuilder):
         # if self._tripionSelDipionSS is not None:
         #   return self._tripionSelDipionSS
 
-        from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
+        from GaudiConfUtils.ConfigurableGenerators import CombineParticles
+        from PhysSelPython.Wrappers import Selection
 
         _k2pipipi = CombineParticles(
             DecayDescriptors=["[K+ -> phi(1020) pi-]cc"],
@@ -449,8 +445,8 @@ class K23PiForDownstreamTrackEffConf(LineBuilder):
         # if self._tripionSelDipionOS is not None:
         #   return self._tripionSelDipionOS
 
-        from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
+        from GaudiConfUtils.ConfigurableGenerators import CombineParticles
+        from PhysSelPython.Wrappers import Selection
 
         _k2pipipi = CombineParticles(
             DecayDescriptors=["[K+ -> phi(1020) pi+]cc"],
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCalib/StrippingLowPtMuID.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCalib/StrippingLowPtMuID.py
index e464daa38af084e2fe15b4361cf28811d5f35524..3d23ab459b03643fbc73c746b15dc3c53ffa71ed 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCalib/StrippingLowPtMuID.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCalib/StrippingLowPtMuID.py
@@ -19,12 +19,9 @@ largely cloned from line written by 'S.Furcas', 'G.Lanfranchi', 'M.Palutan', 'A.
 
 from StandardParticles import StdAllNoPIDsMuons
 from StrippingUtils.Utils import LineBuilder
-from Configurables import LoKi__Hybrid__CoreFactory as CoreFactory
-from Configurables import LoKi__VoidFilter as VoidFilter
-from PhysSelPython.Wrappers import DataOnDemand, Selection, SelectionSequence, MergedSelection
+from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 __author__ = ['G.Ciezarek', ]
 __date__ = '03/12/2015'
 __version__ = '$Revision: 1.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCalib/StrippingMuIDCalib.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCalib/StrippingMuIDCalib.py
index fa526c7de7798e9c785db1267e66b84f2fbda70c..5315ade7f441c7b2d725f402698ad8b2e8264931 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCalib/StrippingMuIDCalib.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCalib/StrippingMuIDCalib.py
@@ -22,15 +22,12 @@ lb = builder( 'MuIDCalib', config_params )
 
 '''
 
-from StandardParticles import StdAllNoPIDsKaons, StdAllNoPIDsMuons, StdAllNoPIDsPions, StdAllNoPIDsProtons
+from StandardParticles import StdAllNoPIDsMuons
 from StandardParticles import StdNoPIDsKaons, StdNoPIDsMuons, StdNoPIDsPions, StdNoPIDsProtons
 from StrippingUtils.Utils import LineBuilder
-from Configurables import LoKi__Hybrid__CoreFactory as CoreFactory
-from Configurables import LoKi__VoidFilter as VoidFilter
-from PhysSelPython.Wrappers import DataOnDemand, Selection, SelectionSequence, MergedSelection
+from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 __author__ = ['S.Furcas', 'G.Lanfranchi',
               'M.Palutan', 'A.Sarti', 'D.Milanes', 'MuID Team']
 __date__ = '23/08/2011'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCalib/StrippingNoPIDDstarWithD02RSKPi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCalib/StrippingNoPIDDstarWithD02RSKPi.py
index d2de08dbec94193a1a842401d5c2bbf7cb15672f..a43c58f879dc5fbfd3c8f5d9c3709d83caba97d9 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCalib/StrippingNoPIDDstarWithD02RSKPi.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCalib/StrippingNoPIDDstarWithD02RSKPi.py
@@ -13,10 +13,8 @@
 from StandardParticles import StdAllNoPIDsKaons, StdAllNoPIDsPions
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from LHCbKernel.Configuration import *
-from Gaudi.Configuration import *
+from PhysSelPython.Wrappers import Selection
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 __author__ = ['Philip Xing', 'Andrew Powell']
 __date__ = '23rd August 2012'
 __version__ = '$Revision: 7.0 $'
@@ -29,7 +27,7 @@ Configurable for the RICH calibration using D*+ -> pi+ D0( K- pi+).
 __all__ = ('NoPIDDstarWithD02RSKPiConf', 'default_config')
 
 
-from GaudiKernel.SystemOfUnits import mm, cm, MeV, GeV
+from GaudiKernel.SystemOfUnits import GeV, MeV
 # from Configurables import FilterDesktop, CombineParticles
 
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCalib/StrippingNoPIDDstarWithD02RSKPi_Brem.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCalib/StrippingNoPIDDstarWithD02RSKPi_Brem.py
index 23bbe71b41d1702d6293e9593e02c6febd2218b4..9232160ade3bbee50b593bf6d6993a3bfd5989ad 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCalib/StrippingNoPIDDstarWithD02RSKPi_Brem.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCalib/StrippingNoPIDDstarWithD02RSKPi_Brem.py
@@ -10,15 +10,12 @@
 ###############################################################################
 
 from CommonParticles.Utils import trackSelector, updateDoD
-from Configurables import NoPIDsParticleMaker, CombinedParticleMaker
-from Gaudi.Configuration import *
+from Configurables import NoPIDsParticleMaker
 from StandardParticles import StdAllNoPIDsKaons, StdAllNoPIDsPions, StdAllNoPIDsElectrons
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand, AutomaticData
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from LHCbKernel.Configuration import *
-from Gaudi.Configuration import *
+from PhysSelPython.Wrappers import AutomaticData, Selection
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 __author__ = 'Vitalii Lisovskyi'
 __date__ = '15/03/2021'
 __version__ = '$Revision: 0.0 $'
@@ -29,7 +26,7 @@ Configurable for the RICH calibration using D*+ -> pi+ D0( K- pi+) for hadron->e
 '''
 
 
-from GaudiKernel.SystemOfUnits import mm, cm, MeV, GeV
+from GaudiKernel.SystemOfUnits import GeV, MeV
 # from Configurables import FilterDesktop, CombineParticles
 
 
@@ -649,7 +646,7 @@ def brempion_PMaker(name,
                                        Particle='pion')
     algorithm_pi.AddBremPhotonTo = ['pi+']
     # configure the track selector
-    selector_pi = trackSelector(algorithm_pi)
+    trackSelector(algorithm_pi)
     # configure Data-On-Demand service
     updateDoD(algorithm_pi)
     # finally: define the symbol
@@ -694,7 +691,7 @@ def bremkaon_PMaker(name,
                                       Particle='kaon')
     algorithm_K.AddBremPhotonTo = ['K+']
     # configure the track selector
-    selector_K = trackSelector(algorithm_K)
+    trackSelector(algorithm_K)
     # configure Data-On-Demand service
     updateDoD(algorithm_K)
     # finally: define the symbol
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCalib/StrippingPIDCalib.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCalib/StrippingPIDCalib.py
index e82b56942c59e477e1ffb32c01de970afd9167d4..e6940ae61dbda7b537d24906799f4de48712e814 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCalib/StrippingPIDCalib.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCalib/StrippingPIDCalib.py
@@ -35,9 +35,7 @@ from Configurables import DaVinci__N3BodyDecays
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
 from Configurables import CombineParticles
-from Gaudi.Configuration import *
 __author__ = ['Lucio Anderlini']
 __date__ = '25/02/2015'
 __version__ = '$Revision: 1.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCalib/StrippingTrackEffD0ToKPi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCalib/StrippingTrackEffD0ToKPi.py
index c9b3c9d601a65f088de7340302fbce473317e417..ee9bc7b3c33e1df66f060255828429ab64903996 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCalib/StrippingTrackEffD0ToKPi.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCalib/StrippingTrackEffD0ToKPi.py
@@ -17,7 +17,7 @@ from Configurables import FilterDesktop, CombineParticles
 from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from StandardParticles import StdLooseKaons, StdLoosePions, StdAllLoosePions, StdAllNoPIDsPions
+from StandardParticles import StdAllLoosePions, StdLooseKaons, StdLoosePions
 from SelPy.utils import (UniquelyNamedObject,
                          ClonableObject,
                          SelectionBase)
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCalib/StrippingTrackEffDownMuon.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCalib/StrippingTrackEffDownMuon.py
old mode 100755
new mode 100644
index 02a389d2ce842d2ac2deac2f9caa869297babc56..ac589d4b1348cd5d250ce067700134d7879f4b9a
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCalib/StrippingTrackEffDownMuon.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCalib/StrippingTrackEffDownMuon.py
@@ -49,35 +49,27 @@ __all__ = ('StrippingTrackEffDownMuonConf',
 # FIXME Write includes in a cleaner way
 from Gaudi.Configuration import *
 from LHCbKernel.Configuration import *
-from DAQSys.DecoderClass import Decoder
 from Configurables import GaudiSequencer
 from Configurables import UnpackTrack, ChargedProtoParticleMaker, DelegatingTrackSelector, TrackSelector, BestPIDParticleMaker
-from TrackFitter.ConfiguredFitters import ConfiguredFit
 from Configurables import TrackStateInitAlg
 from StrippingConf.StrippingLine import StrippingLine
-from Configurables import ChargedProtoParticleAddMuonInfo, MuonIDAlgLite
+from Configurables import ChargedProtoParticleAddMuonInfo
 from MuonID import ConfiguredMuonIDs
 from Configurables import ChargedProtoCombineDLLsAlg, ProtoParticleMUONFilter
-from PhysSelPython.Wrappers import Selection, DataOnDemand
+from PhysSelPython.Wrappers import Selection
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
 from StandardParticles import StdLooseMuons
 
 from StrippingUtils.Utils import LineBuilder
-from Configurables import LoKi__VoidFilter
-from os import environ
 from Gaudi.Configuration import *
-import GaudiKernel.ProcessJobOptions
-from GaudiKernel.SystemOfUnits import mm
 
 from GaudiConfUtils.ConfigurableGenerators import TisTosParticleTagger
 from StandardParticles import StdAllLooseMuons
 from Configurables import GaudiSequencer
 from Configurables import TrackToDST
-from Configurables import TrackSys
 from Configurables import PatSeeding, PatSeedingTool, PatLongLivedTracking
-from PhysSelPython.Wrappers import AutomaticData
 # Get the fitters
-from TrackFitter.ConfiguredFitters import ConfiguredFit, ConfiguredFitSeed, ConfiguredFitDownstream
+from TrackFitter.ConfiguredFitters import ConfiguredFitDownstream
 from PatAlgorithms import PatAlgConf
 
 from SelPy.utils import (UniquelyNamedObject,
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCalib/StrippingTrackEffMuonTT.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCalib/StrippingTrackEffMuonTT.py
index 84b931c726b79044897787992617070caa220d92..aae7dfa49bb3687d2925d5d54a86204f51bd020c 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCalib/StrippingTrackEffMuonTT.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCalib/StrippingTrackEffMuonTT.py
@@ -65,11 +65,10 @@ __all__ = ('StrippingTrackEffMuonTTConf',
            'makeBJpsiKTrackEff',
            'filterHLT2ForBJpsiK')
 
-from Gaudi.Configuration import *
-from PhysSelPython.Wrappers import Selection, DataOnDemand, ChargedProtoParticleSelection
+from PhysSelPython.Wrappers import ChargedProtoParticleSelection, Selection
 from StrippingConf.StrippingLine import StrippingLine
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from StrippingUtils.Utils import LineBuilder, checkConfig
+from StrippingUtils.Utils import LineBuilder
 from StandardParticles import StdLooseKaons, StdLooseMuons, StdAllLooseMuons
 
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCalib/StrippingTrackEffVeloMuon.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCalib/StrippingTrackEffVeloMuon.py
index c7da7abeddda6483ce8d3b57a6b3083ee07bdafe..3f821c02445e084449fcec8a684ab687eb7dca9a 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCalib/StrippingTrackEffVeloMuon.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCalib/StrippingTrackEffVeloMuon.py
@@ -29,25 +29,17 @@
 from SelPy.utils import (UniquelyNamedObject,
                          ClonableObject,
                          SelectionBase)
-from Configurables import TrackEventCloneKiller, VeloMuonBuilder
-from Configurables import TrackStateInitAlg, TrackEventFitter, TrackPrepareVelo, TrackContainerCopy, Tf__PatVeloSpaceTool, StandaloneMuonRec
+from Configurables import VeloMuonBuilder
+from Configurables import StandaloneMuonRec, TrackPrepareVelo
 from Configurables import CombineParticles
-from Configurables import TrackKalmanFilter, TrackMasterExtrapolator
-from Configurables import TrackEventFitter, TrackMasterFitter
-from TrackFitter.ConfiguredFitters import ConfiguredFit
-from PhysSelPython.Wrappers import AutomaticData
-from Configurables import TrackSys
 from Configurables import GaudiSequencer
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, TisTosParticleTagger
 from StandardParticles import StdLooseMuons
 from StrippingUtils.Utils import LineBuilder
-from Configurables import TrackCloneFinder
 from StrippingConf.StrippingLine import StrippingLine
 from Configurables import FastVeloTracking
-from Configurables import ChargedProtoParticleMaker, NoPIDsParticleMaker, DataOnDemandSvc, DelegatingTrackSelector, TrackSelector, CombinedParticleMaker, BestPIDParticleMaker
-from PhysSelPython.Wrappers import Selection, SelectionSequence, DataOnDemand
-from LHCbKernel.Configuration import *
-from Gaudi.Configuration import *
+from Configurables import ChargedProtoParticleMaker, DataOnDemandSvc, DelegatingTrackSelector, NoPIDsParticleMaker, TrackSelector
+from PhysSelPython.Wrappers import Selection
 __author__ = ['Flavio Archilli']
 __date__ = '30/10/2019'
 __version__ = '$Revision: 0.1 $'
@@ -159,8 +151,6 @@ class StrippingTrackEffVeloMuonConf(LineBuilder):
 
         _config = self.config[confLine]
 
-        _pchargeCut = None
-        _tchargeCut = None
         _tagCharge = None
         _probeCharge = None
         _chargename = None
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingB2ppipiSigmacmm_Lcpi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingB2ppipiSigmacmm_Lcpi.py
index 316195569102a380d44bcad73ab40d9b4b2ffcc8..25cd049b1fac0d99feae2dbf2e80a306df5abcd1 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingB2ppipiSigmacmm_Lcpi.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingB2ppipiSigmacmm_Lcpi.py
@@ -31,12 +31,11 @@ __all__ = ('StrippingB2ppipiSigmacmm_Lcpi_Conf', 'makepifromSigmacmm', 'makeThre
            )
 
 from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, ConjugateNeutralPID, DaVinci__N3BodyDecays
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N3BodyDecays, FilterDesktop
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
-from StrippingUtils.Utils import checkConfig, LineBuilder
+from StrippingUtils.Utils import LineBuilder
 from GaudiKernel.SystemOfUnits import MeV, GeV, mm
-from copy import copy
 
 name = 'StrippingB2ppipiSigmacmm_Lcpi'
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingBs2st2pKpipipi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingBs2st2pKpipipi.py
index e71b5b307174aab16443a06ddea637e54f075fe7..41168201d309b7b385822ac32b1c7b78e38f4c15 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingBs2st2pKpipipi.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingBs2st2pKpipipi.py
@@ -23,7 +23,6 @@ from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, DaVinci__N4Body
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection
-from Gaudi.Configuration import *
 __author__ = ['Matt Rudolph']
 __date__ = '2021/3/14'
 __version__ = 'v1r0'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingChargedHyperons.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingChargedHyperons.py
index 920c9faefc12697a4686bb708606c7aefce7c812..1e9ecbdf32eac322732659ae13423893f4c17ced 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingChargedHyperons.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingChargedHyperons.py
@@ -21,13 +21,9 @@ __version__ = '$Revision: 1.0 $'
 __all__ = ('StrippingChargedHyperonsConf', 'default_config')
 
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from StandardParticles import StdLoosePions, StdNoPIDsDownPions, StdLooseKaons, StdLooseDownKaons
-from StandardParticles import StdAllLoosePions, StdAllLooseKaons
 
 from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
-from PhysSelPython.Wrappers import MultiSelectionSequence
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from GaudiKernel.SystemOfUnits import MeV, mm, picosecond
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingCharm2PPX.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingCharm2PPX.py
index 8f420ab23681879eda33d3f11a9c1854083e6f5d..1776621bc50d11dd212c17cc7c967c25e7570f68 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingCharm2PPX.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingCharm2PPX.py
@@ -26,7 +26,7 @@ __all__ = (
     'StrippingCharm2PPXConf'  # ???
 )
 
-from GaudiKernel.SystemOfUnits import MeV, GeV, mm, mrad
+from GaudiKernel.SystemOfUnits import GeV, MeV, mm
 from Configurables import CombineParticles, FilterDesktop
 # from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop, DaVinci__N3BodyDecays
 from StandardParticles import (
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingCharmForVub.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingCharmForVub.py
index addb5112d833323e807d80a2fcd5d1c6ef104d89..196b7aca8b732e4ce87cfa408c9240c9d4ca9fe8 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingCharmForVub.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingCharmForVub.py
@@ -31,9 +31,8 @@ __all__ = ('CharmForVubConf',
            'makeDstarD02HMuNu')
 
 from Gaudi.Configuration import *
-from Configurables import SubstitutePID
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
+from PhysSelPython.Wrappers import MergedSelection, Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from StandardParticles import StdLooseMuons, StdLooseKaons, StdAllLoosePions, StdLoosePions
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingCharmWeakDecays.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingCharmWeakDecays.py
index 62cf538da90f04787baab5c812393440f86c3b23..72c36178501074aeada4d5d7f91bd305c974ec78 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingCharmWeakDecays.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingCharmWeakDecays.py
@@ -28,7 +28,7 @@ __all__ = ('CharmWeakDecaysConf',
            'default_config')
 
 from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingCharmedBaryonSL.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingCharmedBaryonSL.py
index 24931ab9d9e4f2db134876059c877ad01d2e0341..1764c232d69c59740511c1a6933cde6d741fe511 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingCharmedBaryonSL.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingCharmedBaryonSL.py
@@ -37,16 +37,12 @@ __version__ = '$Revision: 0.1 $'
 __all__ = ('StrippingCharmedBaryonSL', 'default_config')
 
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from StandardParticles import StdLoosePions, StdNoPIDsDownPions, StdLooseKaons, StdLooseDownKaons
 from StandardParticles import StdAllLoosePions, StdAllLooseKaons, StdLooseMuons, StdAllLooseProtons
 from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
-from PhysSelPython.Wrappers import MultiSelectionSequence
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from GaudiKernel.SystemOfUnits import MeV, GeV, mm, picosecond
-import sys
+from GaudiKernel.SystemOfUnits import GeV, MeV, mm
 
 
 default_name = 'CharmedBaryonSL'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingD02KSKS.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingD02KSKS.py
index 048a0f735673d789716920a6b813f3734a817158..2e831b063d5dd66449d672d2c0c14659bb9d9210 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingD02KSKS.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingD02KSKS.py
@@ -25,9 +25,8 @@ __date__ = '15/05/2014'
 __version__ = 'Stripping23'
 __all__ = 'D02KSKSConf'
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
+from PhysSelPython.Wrappers import DataOnDemand, Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 
@@ -556,7 +555,7 @@ class D02KSKSConf(LineBuilder):
         _daughterCuts = "(TRGHOSTPROB <=%s )" % config['slowPi_LLL_TRGHOSTPROB']
 
         # 40
-        _vertexChi2_cut = "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_LL']
+        "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_LL']
 
         # 200
         _combCuts = "(ADAMASS('D*(2010)+') < %s*MeV)" % config['Dst_mass_LL']
@@ -593,7 +592,7 @@ class D02KSKSConf(LineBuilder):
         _daughterCuts = "(TRGHOSTPROB <=%s )" % config['slowPi_LLU_TRGHOSTPROB']
 
         # 40
-        _vertexChi2_cut = "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_LL']
+        "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_LL']
 
         # 200
         _combCuts = "(ADAMASS('D*(2010)+') < %s*MeV)" % config['Dst_mass_LL']
@@ -630,7 +629,7 @@ class D02KSKSConf(LineBuilder):
         _daughterCuts = "(TRGHOSTPROB <=%s )" % config['slowPi_LDL_TRGHOSTPROB']
 
         # 40
-        _vertexChi2_cut = "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_LD']
+        "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_LD']
 
         # 200
         _combCuts = "(ADAMASS('D*(2010)+') < %s*MeV)" % config['Dst_mass_LD']
@@ -667,7 +666,7 @@ class D02KSKSConf(LineBuilder):
         _daughterCuts = "(TRGHOSTPROB <=%s )" % config['slowPi_LDU_TRGHOSTPROB']
 
         # 40
-        _vertexChi2_cut = "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_LD']
+        "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_LD']
 
         # 200
         _combCuts = "(ADAMASS('D*(2010)+') < %s*MeV)" % config['Dst_mass_LD']
@@ -704,7 +703,7 @@ class D02KSKSConf(LineBuilder):
         _daughterCuts = "(TRGHOSTPROB <=%s )" % config['slowPi_DDL_TRGHOSTPROB']
 
         # 40
-        _vertexChi2_cut = "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_DD']
+        "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_DD']
 
         # 200
         _combCuts = "(ADAMASS('D*(2010)+') < %s*MeV)" % config['Dst_mass_DD']
@@ -741,7 +740,7 @@ class D02KSKSConf(LineBuilder):
         _daughterCuts = "(TRGHOSTPROB <=%s )" % config['slowPi_DDU_TRGHOSTPROB']
 
         # 40
-        _vertexChi2_cut = "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_DD']
+        "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_DD']
 
         # 200
         _combCuts = "(ADAMASS('D*(2010)+') < %s*MeV)" % config['Dst_mass_DD']
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingD2HHHKs.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingD2HHHKs.py
index e5639b90812290f4e2226c3b0c140285aa788b00..8b56f2ae08f0d364c45bed96aa90657daee77a7d 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingD2HHHKs.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingD2HHHKs.py
@@ -22,19 +22,18 @@ __version__ = '$Revision: 0.1 $'
 __all__ = ('D2HHHKsLines',
            'default_config')
 
-from Gaudi.Configuration import *
 
-from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N4BodyDecays
+from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays
 from StandardParticles import StdNoPIDsPions, StdNoPIDsKaons
 from StandardParticles import StdLooseKsDD, StdLooseKsLL
 
 from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
-from StrippingUtils.Utils import LineBuilder, checkConfig
+from StrippingUtils.Utils import LineBuilder
 
 from Configurables import FilterDesktop
 
-from GaudiKernel.SystemOfUnits import GeV, MeV, picosecond, mm
+from GaudiKernel.SystemOfUnits import MeV, mm, picosecond
 
 
 default_config = {
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingD2HHHPi0.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingD2HHHPi0.py
index 6083359069ac88d66ad4d2d0c3f6c4a785962da6..8557b0ed7b6ea3312ecd34ede82d7cbd720f6775 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingD2HHHPi0.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingD2HHHPi0.py
@@ -22,19 +22,18 @@ __version__ = '$Revision: 0.1 $'
 __all__ = ('D2HHHPi0Lines',
            'default_config')
 
-from Gaudi.Configuration import *
 
-from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N4BodyDecays
+from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays
 from StandardParticles import StdNoPIDsPions, StdNoPIDsKaons
 from StandardParticles import StdLooseResolvedPi0, StdLooseMergedPi0
 
 from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
-from StrippingUtils.Utils import LineBuilder, checkConfig
+from StrippingUtils.Utils import LineBuilder
 
 from Configurables import FilterDesktop
 
-from GaudiKernel.SystemOfUnits import GeV, MeV, picosecond, mm
+from GaudiKernel.SystemOfUnits import GeV, MeV, picosecond
 
 
 default_config = {
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingD2HMuNu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingD2HMuNu.py
index eacf772b484ddd36fae5781e3451f92b15a3cd88..efe5ef8931f1ac093eb21df5364224c7ac12261d 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingD2HMuNu.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingD2HMuNu.py
@@ -9,9 +9,7 @@
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
 
-import logging
 from StrippingUtils.Utils import LineBuilder
-from Gaudi.Configuration import *
 __author__ = ['Liang Sun', 'Adam Davis']
 __date__ = '03/19/2021'
 __version__ = '$Revision: 0.02 $'
@@ -97,7 +95,6 @@ class D2HLepNuBuilder(LineBuilder):
     def __init__(self, name, config):
         LineBuilder.__init__(self, name, config)
         self._config = config
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
 
         self.GECs = {"Code": "( recSummaryTrack(LHCb.RecSummary.nLongTracks, TrLONG) < %(GEC_nLongTrk)s )" % config,
                      "Preambulo": ["from LoKiTracks.decorators import *"]}
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingD2KPiPiMuNu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingD2KPiPiMuNu.py
index 7e19b796afb9529fe10c5a20b76141f6ff62f901..c3359cfd14f536eceeb83494769c53cfb7b8ed62 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingD2KPiPiMuNu.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingD2KPiPiMuNu.py
@@ -9,9 +9,7 @@
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
 
-import logging
 from StrippingUtils.Utils import LineBuilder
-from Gaudi.Configuration import *
 __author__ = ['Liang Sun']
 __date__ = '07/05/2019'
 __version__ = '$Revision: 0.01 $'
@@ -103,7 +101,6 @@ class D2KPiPiMuNuBuilder(LineBuilder):
     def __init__(self, name, config):
         LineBuilder.__init__(self, name, config)
         self._config = config
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
 
         self.GECs = {"Code": "( recSummaryTrack(LHCb.RecSummary.nLongTracks, TrLONG) < %(GEC_nLongTrk)s )" % config,
                      "Preambulo": ["from LoKiTracks.decorators import *"]}
@@ -200,7 +197,7 @@ class D2KPiPiMuNuBuilder(LineBuilder):
 
         from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
         from PhysSelPython.Wrappers import Selection
-        from StandardParticles import StdLooseMuons, StdAllLooseMuons, StdAllNoPIDsMuons
+        from StandardParticles import StdAllLooseMuons, StdAllNoPIDsMuons
         _mu = FilterDesktop(Code=self._NominalMuSelection() % self._config)
         _mupid = StdAllLooseMuons
         if self._config["NoPIDmu"]:
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingD2KS0H_conf.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingD2KS0H_conf.py
index d58964475590bc2e6571bcd929685425e3694bc1..e5b9f6c8683eaaab3109aca8686f163c2f08aef0 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingD2KS0H_conf.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingD2KS0H_conf.py
@@ -44,9 +44,9 @@ from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticle
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StandardParticles import StdLoosePions, StdLooseKaons
 from StrippingConf.StrippingLine import StrippingLine
-from StrippingUtils.Utils import LineBuilder, checkConfig
+from StrippingUtils.Utils import LineBuilder
 from Configurables import TisTosParticleTagger
-from GaudiKernel.SystemOfUnits import GeV, MeV, picosecond, mm
+from GaudiKernel.SystemOfUnits import MeV, mm, picosecond
 
 default_name = 'D2KS0H'
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingD2PiPi0.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingD2PiPi0.py
index d9497b537d62b4f47d50823fd91deba0eb2349fa..3ac31a1bcad019f7cd123dfa6682935c986f1026 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingD2PiPi0.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingD2PiPi0.py
@@ -33,7 +33,7 @@ __all__ = (
 
 )
 
-from GaudiKernel.SystemOfUnits import MeV, GeV, mrad, picosecond
+from GaudiKernel.SystemOfUnits import MeV, picosecond
 
 from StandardParticles import (
     StdAllNoPIDsKaons,
@@ -51,7 +51,7 @@ from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 
 # from Configurables import CombineParticles, FilterDesktop
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, ConjugateNeutralPID, DaVinci__N3BodyDecays
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N3BodyDecays
 
 default_config = {
     'D2Pi0H': {
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingD2XMuMuSS.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingD2XMuMuSS.py
index 6cb43802872df951b5676b3b0a91f42091655f73..f2ecc06f375c01960838df612bae449a097161ea 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingD2XMuMuSS.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingD2XMuMuSS.py
@@ -9,14 +9,13 @@
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
 
-from StandardParticles import StdAllLooseElectrons, StdAllNoPIDsElectrons
+from StandardParticles import StdAllLooseElectrons
 from StandardParticles import StdAllLooseKaons, StdAllLoosePions, StdAllLooseMuons, StdAllNoPIDsPions, StdAllNoPIDsKaons
-from StandardParticles import StdLooseKaons, StdLoosePions, StdLooseMuons, StdNoPIDsPions, StdNoPIDsKaons, StdLooseProtons, StdAllNoPIDsProtons
+from StandardParticles import StdAllNoPIDsProtons, StdLooseKaons, StdLooseMuons, StdLoosePions, StdLooseProtons
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, OfflineVertexFitter
-from Gaudi.Configuration import *
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop
 import copy
 __author__ = ['Malcolm John', 'B. Viaud', 'O. Kochebina']
 __date__ = '25/6/2012'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingD2hh.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingD2hh.py
index 51c213ed2d3c259435dcd6aef0631877156b6bb0..a370c49abb16101fe062f7fa9fd7c27efecb37e3 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingD2hh.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingD2hh.py
@@ -24,7 +24,6 @@ __all__ = ('D2hhBuilder',
 '''
 This file contains stripping lines for time-dependent two-body charm analyses of mixing, yCP, and A_Gamma
 '''
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
@@ -129,7 +128,7 @@ class D2hhBuilder(LineBuilder):
         stdNoPIDsPions = StdAllNoPIDsPions
 
         d2kpi_name = name+'PromptD2KPi'
-        d0RS_name = name+'PromptD0RS'
+        name+'PromptD0RS'
         d0WS_name = name+'PromptD0WS'
         d2kk_name = name+'PromptD2KK'
         d2pipi_name = name+'PromptD2PiPi'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingD2hhh_FTcalib.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingD2hhh_FTcalib.py
index 1ec2a52397a24a0cbc076e1b808944bfc5bf21da..eb622bead0fbe08c7b00587f38e94c60ed0a8ade 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingD2hhh_FTcalib.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingD2hhh_FTcalib.py
@@ -29,13 +29,10 @@ __version__ = '$Revision: 0.0 $'
 __all__ = ('D2hhhFTCalibConf',
            'makeStdD2hhhFT')
 
-from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
+from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from StandardParticles import (StdNoPIDsPions,
-                               StdTightKaons)
 
 name = "D2hhhFTCalib"
 # Cuts to be implemented vy the Stripping team in Stripping Settings
@@ -254,7 +251,6 @@ def globalEventCutFilter(name,
     if MaxTrSIZE == None:
         return None
 
-    from Configurables import LoKi__VoidFilter as VoidFilter
     from Configurables import LoKi__Hybrid__CoreFactory as CoreFactory
     modules = CoreFactory('CoreFactory').Modules
     for i in ['LoKiTracks.decorators']:
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingD2hhh_conf.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingD2hhh_conf.py
index 436d8a20ebfa69a07273b9fc952667e306a823fd..49374bf7789c8403fcf3e4660b179452634cef16 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingD2hhh_conf.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingD2hhh_conf.py
@@ -38,8 +38,7 @@ from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticle
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from StandardParticles import (StdNoPIDsPions,
-                               StdTightKaons)
+from StandardParticles import StdNoPIDsPions
 
 name = "D2hhh"
 # Cuts to be implemented vy the Stripping team in Stripping Settings
@@ -717,7 +716,6 @@ def globalEventCutFilter(name,
     if MaxTrSIZE == None:
         return None
 
-    from Configurables import LoKi__VoidFilter as VoidFilter
     from Configurables import LoKi__Hybrid__CoreFactory as CoreFactory
     modules = CoreFactory('CoreFactory').Modules
     for i in ['LoKiTracks.decorators']:
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingDstarD02xx.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingDstarD02xx.py
index ce2ac8d8facde4ad7816e78bcb9fd402160bb81a..e052e20eec4a83a6f489851d64e937c3ee00b05f 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingDstarD02xx.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingDstarD02xx.py
@@ -22,8 +22,7 @@ __all__ = ('StrippingDstarD02xxConf', 'combinetwobody', 'combineDstar', 'default
             where xx = {mu mu, pi pi, pi mu, k mu, ... }
             
 '''
-from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingDstarD0ToHHPi0.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingDstarD0ToHHPi0.py
index fd5188441bc83f651edf601e0fc081e5761b90a2..9f366f1a65e17dac9704f2cda14ac7c90073bb1d 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingDstarD0ToHHPi0.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingDstarD0ToHHPi0.py
@@ -17,13 +17,11 @@ Module for D* tagged D0 -> hhpi0.
 Supersedes StrippingDstarD2hhpi0
 """
 
-from Gaudi.Configuration import *
 from Configurables import FilterDesktop, CombineParticles, OfflineVertexFitter
 from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from StandardParticles import StdAllLoosePions, StdLoosePions, StdLooseKaons, StdLooseResolvedPi0, StdLooseMergedPi0
-from Configurables import TisTosParticleTagger
 
 __all__ = ('DstarD0ToHHPi0AllLinesBuilder',
            'DstarMaker',
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingDstarD2HHHH.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingDstarD2HHHH.py
index 79b905d65e08f76846da8aeebd29e1bd52022454..15c8bc47e0445328a0083162a53a4335865cca1b 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingDstarD2HHHH.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingDstarD2HHHH.py
@@ -22,16 +22,15 @@ __version__ = '$Revision: 1.0 $'
 __all__ = ('DstarD2HHHHLines',
            'default_config')
 
-from Gaudi.Configuration import *
 
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N4BodyDecays
 from StandardParticles import StdAllNoPIDsPions, StdNoPIDsPions, StdNoPIDsKaons
 
 from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
-from StrippingUtils.Utils import LineBuilder, checkConfig
+from StrippingUtils.Utils import LineBuilder
 
-from GaudiKernel.SystemOfUnits import GeV, MeV, picosecond, mm
+from GaudiKernel.SystemOfUnits import MeV, picosecond
 
 
 default_config = {
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingDstarD2KSHHPi0.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingDstarD2KSHHPi0.py
index bef9e3302843c26f34162c9fe043e91e2deefc77..bcfa561602e9ac949fda9edba160941b4c6f72fa 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingDstarD2KSHHPi0.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingDstarD2KSHHPi0.py
@@ -21,18 +21,17 @@ __version__ = '$Revision: 1.1 $'
 __all__ = ('DstarD2KSHHPi0Lines',
            'default_config')
 
-from Gaudi.Configuration import *
 
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N4BodyDecays
 from StandardParticles import StdAllNoPIDsPions, StdNoPIDsPions, StdNoPIDsKaons, StdLooseResolvedPi0, StdLooseMergedPi0, StdLooseKsDD, StdLooseKsLL
 
 from PhysSelPython.Wrappers import Selection, MergedSelection
 from StrippingConf.StrippingLine import StrippingLine
-from StrippingUtils.Utils import LineBuilder, checkConfig
+from StrippingUtils.Utils import LineBuilder
 
 from Configurables import FilterDesktop
 
-from GaudiKernel.SystemOfUnits import GeV, MeV, picosecond, mm
+from GaudiKernel.SystemOfUnits import MeV, mm, picosecond
 
 
 default_config = {
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingDstarD2KShh.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingDstarD2KShh.py
index 0446a490bf8b78aaa6a090c0170ee5d84241b931..8bb88c690db0782705ee07f1579b03266ff72d96 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingDstarD2KShh.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingDstarD2KShh.py
@@ -34,7 +34,6 @@ __all__ = ('DstarD2KShhBuilder',
            'makeD2KShh',
            'makeDstar')
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingDstarD2XGamma.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingDstarD2XGamma.py
index e7b224211810ea09aab099a5340dcc8c20dbd784..20835582f83db206c0f03a8161bb60b333bd4f72 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingDstarD2XGamma.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingDstarD2XGamma.py
@@ -32,7 +32,6 @@ __version__ = '$Revision: 0.5 $'
 __all__ = ('DstarD2XGammaLines',
            'default_config')
 
-from Gaudi.Configuration import *
 
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 from StandardParticles import StdAllNoPIDsPions, StdNoPIDsPions, StdNoPIDsKaons
@@ -40,11 +39,11 @@ from StandardParticles import StdLooseAllPhotons, StdAllLooseGammaLL, StdAllLoos
 
 from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
-from StrippingUtils.Utils import LineBuilder, checkConfig
+from StrippingUtils.Utils import LineBuilder
 
 from Configurables import FilterDesktop
 
-from GaudiKernel.SystemOfUnits import GeV, MeV, picosecond, mm
+from GaudiKernel.SystemOfUnits import GeV, MeV, picosecond
 
 default_config = {
     'NAME': 'DstarD2XGamma',
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingDstarPromptWithD02HHHH.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingDstarPromptWithD02HHHH.py
index 13343e4031d3c9fe7ad9b92cfb6f3c3fff754d98..22e9ffd46fd5a0b8ab4623cae0293fe3c10c129d 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingDstarPromptWithD02HHHH.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingDstarPromptWithD02HHHH.py
@@ -36,11 +36,10 @@ __version__ = '$Revision: 1.2 $'
 __all__ = ('DstarPromptWithD02HHHHConf', 'makeD02hhhh',
            'makePromptDstar', 'default_config')
 
-from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, ConjugateNeutralPID
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles, ConjugateNeutralPID
 from PhysSelPython.Wrappers import Selection, MergedSelection
 from StrippingConf.StrippingLine import StrippingLine
-from StrippingUtils.Utils import checkConfig, LineBuilder
+from StrippingUtils.Utils import LineBuilder
 from GaudiKernel.SystemOfUnits import MeV, GeV, mm
 from copy import copy
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingDstarPromptWithD02HHMuMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingDstarPromptWithD02HHMuMu.py
index e83ad60bb1ff3c30f6cfd21e7ea0e2fb6ead7646..a1c41727aab9df91366ea29963944e783d29f676 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingDstarPromptWithD02HHMuMu.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingDstarPromptWithD02HHMuMu.py
@@ -29,11 +29,10 @@ __version__ = '$Revision: 2.0 $'
 __all__ = ('DstarPromptWithD02HHLLConf', 'makeD02hhll',
            'makePromptDstar', 'default_config')
 
-from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, ConjugateNeutralPID
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles, ConjugateNeutralPID
 from PhysSelPython.Wrappers import Selection, MergedSelection
 from StrippingConf.StrippingLine import StrippingLine
-from StrippingUtils.Utils import checkConfig, LineBuilder
+from StrippingUtils.Utils import LineBuilder
 from GaudiKernel.SystemOfUnits import MeV, GeV, mm
 from copy import copy
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingExcitedDsSpectroscopy.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingExcitedDsSpectroscopy.py
index 6b08898929e9ee290d51640d43d073b4a548a98b..dadd6c5c25c094fb4e5dfdef695cd98af0384ee1 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingExcitedDsSpectroscopy.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingExcitedDsSpectroscopy.py
@@ -321,7 +321,6 @@ def globalEventCutFilter(name,
     if MaxTrSIZE == None:
         return None
 
-    from Configurables import LoKi__VoidFilter as VoidFilter
     from Configurables import LoKi__Hybrid__CoreFactory as CoreFactory
     modules = CoreFactory('CoreFactory').Modules
     for i in ['LoKiTracks.decorators']:
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingHc2V02H.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingHc2V02H.py
index c55a09ec52497f96d0d9333a1489935bbf3c3448..937669104501a4b75267fac361085e0e99535056 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingHc2V02H.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingHc2V02H.py
@@ -29,7 +29,7 @@ __all__ = (
 )
 
 from GaudiKernel.SystemOfUnits import MeV, GeV, mm, mrad
-from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop, DaVinci__N3BodyDecays
+from GaudiConfUtils.ConfigurableGenerators import DaVinci__N3BodyDecays, FilterDesktop
 # from StandardParticles import StdNoPIDsPions as InputPionsPiPi
 # from StandardParticles import StdNoPIDsKaons as InputKaons
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingHc2V03H.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingHc2V03H.py
index d3888168faa1cbed51e85b5dd40fa51f82370dcd..2c9fd008996a8b8f7f34cbf4a6617f8d731b378b 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingHc2V03H.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingHc2V03H.py
@@ -24,11 +24,9 @@ __date__ = '13/10/2017'
 __all__ = ('default_config', 'StrippingHc2V03HConf')
 
 from GaudiKernel.SystemOfUnits import MeV, GeV, mm, mrad
-from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop, DaVinci__N4BodyDecays
+from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays, FilterDesktop
 from StandardParticles import StdAllLoosePions as InputPions
 from StandardParticles import StdAllLooseKaons as InputKaons
-from StandardParticles import StdVeryLooseLambdaLL as InputLambdasLL
-from StandardParticles import StdLooseLambdaDD as InputLambdasDD
 
 from PhysSelPython.Wrappers import Selection, MergedSelection, DataOnDemand
 from StrippingUtils.Utils import LineBuilder
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingHc2V2H.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingHc2V2H.py
index 1cc1e18bb59332589773894f931054575d3bd57d..62f83f01a95c995d84514559ea3eb725d34e7335 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingHc2V2H.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingHc2V2H.py
@@ -29,8 +29,6 @@ from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDeskto
 from StandardParticles import StdNoPIDsDownPions as InputDownPions
 from StandardParticles import StdNoPIDsPions as InputPions
 from StandardParticles import StdNoPIDsKaons as InputKaons
-from StandardParticles import StdLooseLambdaLL as InputLambdasLL
-from StandardParticles import StdLooseLambdaDD as InputLambdasDD
 
 from PhysSelPython.Wrappers import Selection, MergedSelection, DataOnDemand
 from StrippingUtils.Utils import LineBuilder
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingHc2V3H.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingHc2V3H.py
index 8860909e6ec1c8f2862b43d64f75e5158a1c67e3..05d0ef19028d88f3cf40161b0e7b207226c117e3 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingHc2V3H.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingHc2V3H.py
@@ -31,8 +31,6 @@ from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDeskto
 from StandardParticles import StdNoPIDsDownPions as InputDownPions
 from StandardParticles import StdNoPIDsPions as InputPions
 from StandardParticles import StdNoPIDsKaons as InputKaons
-from StandardParticles import StdLooseLambdaLL as InputLambdasLL
-from StandardParticles import StdLooseLambdaDD as InputLambdasDD
 
 from PhysSelPython.Wrappers import Selection, MergedSelection, DataOnDemand
 from StrippingUtils.Utils import LineBuilder
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingKKPiPi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingKKPiPi.py
index cedaab2089da1034f1207a1c958ba82c6e694ba7..767a1fdbf50445fb204987a0cc70c2f97dfb5421 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingKKPiPi.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingKKPiPi.py
@@ -12,12 +12,11 @@
 Module for selecting [cs][ubar dbar] -> K+ K+ pi- pi-
 '''
 
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
+from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
 from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
-from Gaudi.Configuration import *
 __author__ = ['Mengzhen Wang']
 __date__ = '10/10/2017'
 __version__ = '$Revision: 1.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingLambdac2V03H.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingLambdac2V03H.py
index 8c19d9d3aeebd29855bd2d76b366fe9611b08aaf..9689bee39c9e7d84a61e56605ba3bb5f443ec5d1 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingLambdac2V03H.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingLambdac2V03H.py
@@ -27,7 +27,7 @@ __all__ = (
 )
 
 from GaudiKernel.SystemOfUnits import MeV, GeV, mm, mrad
-from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop, DaVinci__N4BodyDecays
+from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays, FilterDesktop
 from StandardParticles import StdNoPIDsPions as InputPions
 from StandardParticles import StdNoPIDsKaons as InputKaons
 from StandardParticles import StdLooseLambdaLL as InputLambdasLL
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingLambdacForNeutronPID.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingLambdacForNeutronPID.py
index ae08b01f2aa31c0c228ec259a500e8cc1745c997..a730881c70c46e14ca9ec93433ab423fefc51804 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingLambdacForNeutronPID.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingLambdacForNeutronPID.py
@@ -17,12 +17,10 @@ Exported selection makers: 'makeLc', 'makeSigmac', 'makeSigmacWS',
 
 """
 
-from GaudiKernel.PhysicalConstants import c_light
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 __author__ = ['Marco Pappagallo']
 __date__ = '17/03/2021'
 __version__ = '$Revision: 1.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingLc2L0LLpi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingLc2L0LLpi.py
index 0165e116e9da33c044fd297b7fa4c1090c6cbf39..0a027afeb1d2d303ea6a37758bc2b3bf4bb5f79d 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingLc2L0LLpi.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingLc2L0LLpi.py
@@ -12,17 +12,10 @@
 Module for selecting Lambda_c+->Lambda pi+
 '''
 
-from StandardParticles import (StdAllLoosePions, StdLooseProtons,
-                               StdLoosePions, StdNoPIDsUpPions)
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from StandardParticles import StdLooseAllPhotons, StdVeryLooseAllPhotons
-from Configurables import LoKi__VoidFilter
-from PhysSelPython.Wrappers import MergedSelection
-from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
-from Gaudi.Configuration import *
 __author__ = ['Guiyun Ding', 'Jiesheng Yu', 'Yuehong Xie']
 __date__ = '28/11/2016'
 __version__ = '$Revision: 2.0$'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingNeutralCBaryons.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingNeutralCBaryons.py
index 5cd5cf6bbca6fb372979b6519826d752a41a07f4..147241ad24ab468c7b7eb3cc624b5ea9b5b4e2e6 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingNeutralCBaryons.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingNeutralCBaryons.py
@@ -31,13 +31,9 @@ __version__ = '$Revision: 1.1 $'
 __all__ = ('StrippingNeutralCBaryonsConf', 'default_config')
 
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from StandardParticles import StdLoosePions, StdNoPIDsDownPions, StdLooseKaons, StdLooseDownKaons
-from StandardParticles import StdAllLoosePions, StdAllLooseKaons, StdAllLooseProtons
 
 from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
-from PhysSelPython.Wrappers import MultiSelectionSequence
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from GaudiKernel.SystemOfUnits import MeV, mm, picosecond
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingXcpToLambdaKSHp.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingXcpToLambdaKSHp.py
index 91757124df0a6c7aba56e01ec5212dc42c93a446..90176344c31ebcbf2d879f7e4fd54e3819a7d972 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingXcpToLambdaKSHp.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingXcpToLambdaKSHp.py
@@ -11,8 +11,6 @@
 """
 Exclusive lines for Xc+ -> Lambda0 KS0 h+
 """
-from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-from Configurables import FilterDesktop
 from PhysConf.Selections import FilterSelection, Combine3BodySelection, MergedSelection
 from PhysSelPython.Wrappers import AutomaticData
 from StrippingUtils.Utils import LineBuilder
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingXcpToXiPipHp.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingXcpToXiPipHp.py
index 8e47ddfa3566920bc32d53b21a332c5650139e6d..5a28d5b8ff5d02d3ec80f2e18a466d53f88f3cb1 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingXcpToXiPipHp.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingXcpToXiPipHp.py
@@ -13,10 +13,8 @@ Stripping lines for Xic+ -> Xi- pi+ pi+, Lc+ -> Xi- pi+ K+ and Xic+ -> Xi- pi+ K
 The lines are used to complement the inclusive Xi Turbo lines by adding
 Velo raw banks to study if the Xi- can be reconstructed as an upstream track.
 """
-from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-from Configurables import FilterDesktop
 from PhysConf.Selections import (
-    FilterSelection, CombineSelection, Combine3BodySelection, MergedSelection)
+    FilterSelection, CombineSelection, Combine3BodySelection)
 from PhysSelPython.Wrappers import AutomaticData
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingXic2HHH.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingXic2HHH.py
index e34807cd11d54a2a33e0a1189dffe5a4b8d17475..32300611aa84de3bdf0390670c07b3849c390e20 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingXic2HHH.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingXic2HHH.py
@@ -8,18 +8,15 @@
 # granted to it by virtue of its status as an Intergovernmental Organization  #
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
-from StandardParticles import StdNoPIDsPions, StdNoPIDsKaons, StdNoPIDsProtons, StdAllNoPIDsProtons
-from Configurables import TisTosParticleTagger
+from StandardParticles import StdNoPIDsKaons, StdNoPIDsPions, StdNoPIDsProtons
 from StrippingUtils.Utils import LineBuilder
-from PhysSelPython.Wrappers import MultiSelectionSequence
-from PhysSelPython.Wrappers import Selection, DataOnDemand, AutomaticData, MergedSelection
+from PhysSelPython.Wrappers import DataOnDemand, MergedSelection, Selection
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
 from Configurables import FilterDesktop, CombineParticles
 from LHCbKernel.Configuration import *
-from GaudiKernel.SystemOfUnits import MeV, mm, ns
+from GaudiKernel.SystemOfUnits import MeV, mm
 from StrippingConf.StrippingLine import StrippingLine
 from Gaudi.Configuration import *
-import re
 all
 ''' Xic+ and Theta+ lines Designed by Yury Shcheglov, Alexey Dzyuba, Nelya Sagidova to study Xic+ and Theta+ particles '''
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingXicToSigmaKPi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingXicToSigmaKPi.py
index 71b78eea79c254b8f1342818a4da5f885c3873cc..d6856b0e1d9b501ecb11f6e51aec7b5e300d7d50 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingXicToSigmaKPi.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingXicToSigmaKPi.py
@@ -15,7 +15,7 @@ Exclusive lines for Xic+ -> Sigma0 KS0 pi+, Xic0 -> Sigma0 K- pi+ and Xic+ -> Si
 from CommonParticles.Utils import updateDoD
 from GaudiKernel.SystemOfUnits import MeV
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-from Configurables import (FilterDesktop, ResolvedPi0Maker, PhotonMaker)
+from Configurables import (ResolvedPi0Maker, PhotonMaker)
 from PhysConf.Selections import (FilterSelection, Combine3BodySelection,
                                  MergedSelection, SimpleSelection)
 from PhysSelPython.Wrappers import AutomaticData
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingXicc.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingXicc.py
index 2468c2d79739511bfdefe170463aa125124d506e..45478d9be226dbd5e3fdd09b0ff769294d99d064 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingXicc.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingXicc.py
@@ -52,9 +52,6 @@ from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticle
 from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from StandardParticles import StdAllLoosePions, StdAllLooseKaons, StdAllLooseProtons
-from StandardParticles import StdLoosePions
-from CommonParticles.StdLooseLambda import StdLooseLambdaLL, StdLooseLambdaDD
 from GaudiKernel.SystemOfUnits import MeV, GeV, mm
 from Configurables import TisTosParticleTagger
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingXiccSL.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingXiccSL.py
index faf8ebc619815854fa1dcca7a1655993ad03ae57..f1cf537f12b708c5c91e53dc416c9da828c33eaf 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingXiccSL.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingCharm/StrippingXiccSL.py
@@ -37,17 +37,12 @@ __version__ = '$Revision: 0.2 $'
 __all__ = ('StrippingXiccSL', 'default_config')
 
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from StandardParticles import StdLoosePions, StdNoPIDsDownPions, StdLooseKaons, StdLooseDownKaons
-from StandardParticles import StdAllLoosePions, StdAllLooseKaons, StdLooseMuons, StdAllLooseProtons
 from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
-from PhysSelPython.Wrappers import MultiSelectionSequence
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from GaudiKernel.SystemOfUnits import MeV, GeV, mm, picosecond
+from GaudiKernel.SystemOfUnits import GeV, MeV, mm
 from Configurables import TisTosParticleTagger
-import sys
 
 
 default_name = 'XiccSL'
@@ -381,7 +376,7 @@ class StrippingXiccSL(LineBuilder):
         _strCutMoth_Zero = "(CHILD(VFASPF(VZ),1) - VFASPF(VZ) > %(Omegacc_Lc_delta_VZ_Min)s)" \
             "& (BPVDIRA > %(Omegacc_Zero_BPVDIRA_Min)s)" % self.config
 
-        _strCutMoth2 = _strChi2Moth2 + '&' + _strCutMoth
+        _strChi2Moth2 + '&' + _strCutMoth
         _strCutMoth2_Zero = _strChi2Moth2 + '&' + _strCutMoth_Zero
 
         ''' Stripping Omega_cc+ -> Omega_c0 mu+ '''
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingIFT/StrippingHeL2ppppi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingIFT/StrippingHeL2ppppi.py
index 8e3831dccd93ea545d6bf6f807d397dfcfde7b34..8a38168041b6b03e929ec6060a465f11bee1d413 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingIFT/StrippingHeL2ppppi.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingIFT/StrippingHeL2ppppi.py
@@ -22,7 +22,6 @@ from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, DaVinci__N4Body
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection
-from Gaudi.Configuration import *
 __author__ = ['Hendrik Jage', 'Gediminas Sarpis']
 __date__ = '19/03/2021'
 __version__ = 'v1r0'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingIFT/StrippingHeMedian.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingIFT/StrippingHeMedian.py
index 46870fe2fe39e2196a3ab3621968cdffd177e5e1..940b716b24722cacb37acba8ce977affa0d57d72 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingIFT/StrippingHeMedian.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingIFT/StrippingHeMedian.py
@@ -19,15 +19,12 @@ __version__ = 'v0r1'
 
 __all__ = ('HeMedianConf', 'default_config')
 
-from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
 
 from StandardParticles import StdAllNoPIDsProtons as Protons
-from PhysSelPython.Wrappers import Selection, DataOnDemand, SimpleSelection
+from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from Configurables import LoKi__VoidFilter as VoidFilter
 
 default_config = {
     'NAME': 'HeMedian',
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingIFT/StrippingHeNOverflows.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingIFT/StrippingHeNOverflows.py
index 6e86f2745180d1fa6f865250139d4f7d553895b6..2b79ea417fb63eeff1d14b5e6a3a086911223d6f 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingIFT/StrippingHeNOverflows.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingIFT/StrippingHeNOverflows.py
@@ -19,15 +19,12 @@ __version__ = 'v0r1'
 
 __all__ = ('HeNOverflowsConf', 'default_config')
 
-from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
 
 from StandardParticles import StdAllNoPIDsProtons as Protons
-from PhysSelPython.Wrappers import Selection, DataOnDemand, SimpleSelection
+from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from Configurables import LoKi__VoidFilter as VoidFilter
 
 default_config = {
     'NAME': 'HeNOverflows',
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingIFT/StrippingHeavyIonD02KPiPi0.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingIFT/StrippingHeavyIonD02KPiPi0.py
index 3e380b9342ba9bebae1a3195dcadf08a1b598fc9..8ffdf55b27ce401ff26b2fe355cc99597f755347 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingIFT/StrippingHeavyIonD02KPiPi0.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingIFT/StrippingHeavyIonD02KPiPi0.py
@@ -25,9 +25,8 @@ __all__ = ('StrippingHeavyIonD02KPiPi0Conf',
            'makeD02KPiPi0M',
            'default_config')
 
-from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from PhysSelPython.Wrappers import Selection, DataOnDemand
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
+from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from StandardParticles import StdTightPions, StdTightKaons, StdLooseMergedPi0, StdLooseResolvedPi0
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingIFT/StrippingHeavyIonDiMuon.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingIFT/StrippingHeavyIonDiMuon.py
index 7006c283f4dc99f27a96ed4a998d84e5b1ad4cd0..b23478e8ffe6a49582c92df2422aeacc0c7cf127 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingIFT/StrippingHeavyIonDiMuon.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingIFT/StrippingHeavyIonDiMuon.py
@@ -17,8 +17,7 @@ from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 from StandardParticles import StdAllLooseMuons
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand
-from Gaudi.Configuration import *
+from PhysSelPython.Wrappers import Selection
 __author__ = ['Emilie MAURICE']
 __date__ = ''
 __version__ = '$Revision: 2.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingIFT/StrippingHeavyIonDst2D0KPiForPID.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingIFT/StrippingHeavyIonDst2D0KPiForPID.py
index 4282eb3c7b386840ce3bb3a47569a6a981e3194c..c3ba0aa8f46df637625d1f88481903dd9414f15e 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingIFT/StrippingHeavyIonDst2D0KPiForPID.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingIFT/StrippingHeavyIonDst2D0KPiForPID.py
@@ -13,10 +13,8 @@
 from StandardParticles import StdAllNoPIDsKaons, StdAllNoPIDsPions
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from LHCbKernel.Configuration import *
-from Gaudi.Configuration import *
+from PhysSelPython.Wrappers import Selection
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 __author__ = ['Philip Xing', 'Andrew Powell']
 __date__ = '23rd August 2012'
 __version__ = '$Revision: 7.0 $'
@@ -36,7 +34,7 @@ Usage:
 __all__ = ('HeavyIonDst2D0KPiForPIDConf', 'default_config', "D0", "Dstar")
 
 
-from GaudiKernel.SystemOfUnits import mm, cm, MeV, GeV
+from GaudiKernel.SystemOfUnits import GeV, MeV
 # from Configurables import FilterDesktop, CombineParticles
 
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingIFT/StrippingHeavyIonOthercc.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingIFT/StrippingHeavyIonOthercc.py
index d762548461ded44c7162840ccf9c84cab20bd60b..d4ecc7b6f1705d691173810a8a986c9de46b53f4 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingIFT/StrippingHeavyIonOthercc.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingIFT/StrippingHeavyIonOthercc.py
@@ -17,8 +17,7 @@ from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 from StandardParticles import StdNoPIDsElectrons, StdLooseProtons, StdLooseMuons
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand
-from Gaudi.Configuration import *
+from PhysSelPython.Wrappers import Selection
 __author__ = ['Emilie MAURICE']
 __date__ = ''
 __version__ = '$Revision: 1.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingIFT/StrippingHeavyIonPIDCalib.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingIFT/StrippingHeavyIonPIDCalib.py
index df8b9c18c542aa0b4edb413fca9457fc1b99b7d4..9b8d406ef75205f110369c006e8f733db08aa179 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingIFT/StrippingHeavyIonPIDCalib.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingIFT/StrippingHeavyIonPIDCalib.py
@@ -37,7 +37,6 @@ from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
 from Gaudi.Configuration import *
 __author__ = ['Yanxi ZHANG']
 __date__ = '25/02/2015'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingIFT/StrippingHeavyIonTopology.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingIFT/StrippingHeavyIonTopology.py
index 19f3d03c95644de38c49321c5c0b7fb0636739e4..8308d72b5faed1731235c6cd48d682ca5b65d690 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingIFT/StrippingHeavyIonTopology.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingIFT/StrippingHeavyIonTopology.py
@@ -12,13 +12,9 @@
 Module for selecting specific topology
 '''
 
-from Configurables import FilterDesktop, CombineParticles
-from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-from StandardParticles import StdAllLooseMuons, StdAllLoosePions, StdAllNoPIDsPions, StdLoosePhotons
+from Configurables import FilterDesktop
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand
-from Gaudi.Configuration import *
 __author__ = ['Emilie MAURICE']
 __date__ = ''
 __version__ = '$Revision: 1.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingIFT/StrippingHeavyIonTrackEffDownMuon.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingIFT/StrippingHeavyIonTrackEffDownMuon.py
index 4b221c471786b20ec59036a3b26e4f2096a6eea3..bd21417c5bdd6eabcfe4b156766331a8bd76155f 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingIFT/StrippingHeavyIonTrackEffDownMuon.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingIFT/StrippingHeavyIonTrackEffDownMuon.py
@@ -43,34 +43,26 @@ __all__ = ('HeavyIonTrackEffDownMuonConf',
 # FIXME Write includes in a cleaner way
 from Gaudi.Configuration import *
 from LHCbKernel.Configuration import *
-from DAQSys.DecoderClass import Decoder
 from Configurables import GaudiSequencer
 from Configurables import UnpackTrack, ChargedProtoParticleMaker, DelegatingTrackSelector, TrackSelector, BestPIDParticleMaker
-from TrackFitter.ConfiguredFitters import ConfiguredFit
 from Configurables import TrackStateInitAlg
 from StrippingConf.StrippingLine import StrippingLine
-from Configurables import ChargedProtoParticleAddMuonInfo, MuonIDAlgLite
+from Configurables import ChargedProtoParticleAddMuonInfo
 from MuonID import ConfiguredMuonIDs
 from Configurables import ChargedProtoCombineDLLsAlg, ProtoParticleMUONFilter
-from PhysSelPython.Wrappers import Selection, DataOnDemand
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
+from PhysSelPython.Wrappers import Selection
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 
 from StrippingUtils.Utils import LineBuilder
-from Configurables import LoKi__VoidFilter
-from os import environ
 from Gaudi.Configuration import *
-import GaudiKernel.ProcessJobOptions
-from GaudiKernel.SystemOfUnits import mm
 
 from GaudiConfUtils.ConfigurableGenerators import TisTosParticleTagger
 from StandardParticles import StdAllLooseMuons
 from Configurables import GaudiSequencer
 from Configurables import TrackToDST
-from Configurables import TrackSys
 from Configurables import PatSeeding, PatSeedingTool, PatLongLivedTracking
-from PhysSelPython.Wrappers import AutomaticData
 # Get the fitters
-from TrackFitter.ConfiguredFitters import ConfiguredFit, ConfiguredFitSeed, ConfiguredFitDownstream
+from TrackFitter.ConfiguredFitters import ConfiguredFitDownstream
 from PatAlgorithms import PatAlgConf
 
 from SelPy.utils import (UniquelyNamedObject,
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingIFT/StrippingHeavyIonTrackEffMuonTT.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingIFT/StrippingHeavyIonTrackEffMuonTT.py
index d45ec02acda032c5c4f8402c30d1bc094a63cceb..e2e32a543831c9767d793bae28337b3992789b78 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingIFT/StrippingHeavyIonTrackEffMuonTT.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingIFT/StrippingHeavyIonTrackEffMuonTT.py
@@ -62,12 +62,11 @@ __all__ = ('HeavyIonTrackEffMuonTTConf',
            'makeBJpsiKTrackEff',
            'filterHLT2ForBJpsiK')
 
-from Gaudi.Configuration import *
-from PhysSelPython.Wrappers import Selection, DataOnDemand, ChargedProtoParticleSelection
+from PhysSelPython.Wrappers import ChargedProtoParticleSelection, Selection
 from StrippingConf.StrippingLine import StrippingLine
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from StrippingUtils.Utils import LineBuilder, checkConfig
-from StandardParticles import StdLooseKaons, StdLooseMuons, StdAllLooseMuons
+from StrippingUtils.Utils import LineBuilder
+from StandardParticles import StdAllLooseMuons, StdLooseKaons
 
 
 from Configurables import (MuonCombRec,
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingIFT/StrippingHeavyIonTrackEffVeloMuon.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingIFT/StrippingHeavyIonTrackEffVeloMuon.py
index c0bb11bf8fca29661adbf8ebd509a6eceec327a5..38f843265825d75998c1de6ae518bf039af67a84 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingIFT/StrippingHeavyIonTrackEffVeloMuon.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingIFT/StrippingHeavyIonTrackEffVeloMuon.py
@@ -40,17 +40,14 @@ __all__ = ('HeavyIonTrackEffVeloMuonConf',
            )
 
 
-from Gaudi.Configuration import *
-from LHCbKernel.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 # from Configurables import CombineParticles
-from PhysSelPython.Wrappers import Selection, SelectionSequence, DataOnDemand
-from Configurables import ChargedProtoParticleMaker, NoPIDsParticleMaker, DataOnDemandSvc, DelegatingTrackSelector, TrackSelector, CombinedParticleMaker, BestPIDParticleMaker
+from PhysSelPython.Wrappers import Selection
+from Configurables import ChargedProtoParticleMaker, DataOnDemandSvc, DelegatingTrackSelector, NoPIDsParticleMaker, TrackSelector
 from Configurables import FastVeloTracking
 
 from StrippingConf.StrippingLine import StrippingLine
-from Configurables import TrackStateInitAlg, TrackEventFitter, TrackPrepareVelo, TrackContainerCopy, Tf__PatVeloSpaceTool, StandaloneMuonRec
-from Configurables import TrackCloneFinder
+from Configurables import StandaloneMuonRec, TrackPrepareVelo
 from StrippingUtils.Utils import LineBuilder
 # changed from StdLooseMuons, yanxi
 from StandardParticles import StdAllLooseMuons
@@ -59,14 +56,9 @@ from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, TisTosParticleT
 # from Configurables import TisTosParticleTagger
 
 from Configurables import GaudiSequencer
-from Configurables import TrackSys
-from PhysSelPython.Wrappers import AutomaticData
 # Get the fitters
-from TrackFitter.ConfiguredFitters import ConfiguredFit
 
-from Configurables import TrackEventCloneKiller, VeloMuonBuilder
-from Configurables import TrackEventFitter, TrackMasterFitter
-from Configurables import TrackKalmanFilter, TrackMasterExtrapolator
+from Configurables import VeloMuonBuilder
 # from TrackFitter.ConfiguredFitters import ConfiguredFastFitter
 # from Configurables import TrackCloneFinder
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingIFT/StrippingLb2V0pphh.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingIFT/StrippingLb2V0pphh.py
index 3ee7aeb4f38f8798b68eecc011e8af5189ed2af7..e7e59c7c8ac1dca0c6c0a9e08e0c83725d6facc0 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingIFT/StrippingLb2V0pphh.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingIFT/StrippingLb2V0pphh.py
@@ -24,7 +24,6 @@ __date__ = '19/03/2021'
 __version__ = 'v1r0'
 __all__ = {'Lb2V0pphhConf', 'default_config'}
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
 from PhysSelPython.Wrappers import Selection, DataOnDemand, SimpleSelection
 from StrippingConf.StrippingLine import StrippingLine
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingIFT/StrippingLb2dpX.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingIFT/StrippingLb2dpX.py
index c5a28128f1c971f8267afd05042345d05e19e0d1..ad0fc42d4ffbb2955abf25f92475e3c4281e6d14 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingIFT/StrippingLb2dpX.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingIFT/StrippingLb2dpX.py
@@ -24,7 +24,6 @@ __all__ = ('Lb2dpXConf',
            )
 
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop
 
 from StandardParticles import StdAllNoPIDsPions as Pions
@@ -33,7 +32,6 @@ from StandardParticles import StdAllNoPIDsKaons as Kaons
 from PhysSelPython.Wrappers import Selection, SimpleSelection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from Configurables import LoKi__VoidFilter as VoidFilter
 
 default_config = {
     'NAME': 'Lb2dpX',
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingMiniBias/StrippingBadEvents.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingMiniBias/StrippingBadEvents.py
index 4d837a2f722d72d1c7683e8f61d6316db037f332..460036843530f41526b7139b73c204dba3cf9160 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingMiniBias/StrippingBadEvents.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingMiniBias/StrippingBadEvents.py
@@ -8,7 +8,6 @@
 # granted to it by virtue of its status as an Intergovernmental Organization  #
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
-from PhysSelPython.Wrappers import Selection
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 __author__ = 'Andrea Contu'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingMiniBias/StrippingMiniBias.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingMiniBias/StrippingMiniBias.py
index 7ba890fe41b117c0dcaaac7777296c741c397754..f791c6cd1cfac775c9b2357307a4044a5100eb87 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingMiniBias/StrippingMiniBias.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingMiniBias/StrippingMiniBias.py
@@ -8,7 +8,6 @@
 # granted to it by virtue of its status as an Intergovernmental Organization  #
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
-from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 __author__ = 'Patrick Koppenburg'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingQEE/DisplVertices_Utils.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingQEE/DisplVertices_Utils.py
index f9e3c9136e46dcf7697209e381ff7735b840ed2e..bcd9752464adf9657cb3a290918226a7d0f05341 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingQEE/DisplVertices_Utils.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingQEE/DisplVertices_Utils.py
@@ -14,12 +14,11 @@ Utilities for displaced vertex stripping: wrapper class around PatPV3D
 
 __all__ = ("SelectionFromAlgorithmWithTools", "SelectionPatPV3DWrapper")
 
-from GaudiConfUtils import isConfigurable
 
 from SelPy.utils import (UniquelyNamedObject, ClonableObject, SelectionBase, compatibleSequences,
-                         IncompatibleInputLocations, CloneCallable, makeOutputLocation, setOutputLocation)
+                         IncompatibleInputLocations, makeOutputLocation, setOutputLocation)
 
-from PhysSelPython.Wrappers import checkConfigurable, checkName
+from PhysSelPython.Wrappers import checkName
 
 
 def connectToRequiredSelections(selection, inputSetter):
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingQEE/StrippingA1MuMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingQEE/StrippingA1MuMu.py
old mode 100755
new mode 100644
index 91e62b0b649d88ac57d91a3cf24db5351e7b19de..281aebf4be79ceaf5c90e7533eb04d49847e5185
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingQEE/StrippingA1MuMu.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingQEE/StrippingA1MuMu.py
@@ -23,11 +23,9 @@ A_1 -> mu+ mu-, based on functionality from StrippingDiMuonNew by Jibo He.
 
 """
 
-from Gaudi.Configuration import *
-from LHCbKernel.Configuration import *
 
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
-from PhysSelPython.Wrappers import Selection, DataOnDemand, SimpleSelection
+from PhysSelPython.Wrappers import SimpleSelection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from GaudiKernel.SystemOfUnits import MeV
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingQEE/StrippingA2MuMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingQEE/StrippingA2MuMu.py
index 64c106858ef1dd3206b2083b5ea5e630aec55ae8..cd47529d168278a387e79f1f772ca7cf3b1d8040 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingQEE/StrippingA2MuMu.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingQEE/StrippingA2MuMu.py
@@ -22,7 +22,7 @@ from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from StandardParticles import StdAllLooseMuons, StdAllNoPIDsMuons
+from StandardParticles import StdAllLooseMuons
 from GaudiKernel.SystemOfUnits import GeV
 
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingQEE/StrippingA2MuMuSameSign.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingQEE/StrippingA2MuMuSameSign.py
index 5911c40e36b1e66721231826c818abbc79aed758..a89a6a8b5ff2bf6571b4fe0fcaeb93088567f2a5 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingQEE/StrippingA2MuMuSameSign.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingQEE/StrippingA2MuMuSameSign.py
@@ -22,7 +22,7 @@ from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from StandardParticles import StdAllLooseMuons, StdAllNoPIDsMuons
+from StandardParticles import StdAllLooseMuons
 from GaudiKernel.SystemOfUnits import GeV
 
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingQEE/StrippingALP2TauTau.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingQEE/StrippingALP2TauTau.py
index a5398df14e536d20fbd7844f5841009a5b4a5ecd..db69855d7696c5ca2cf73c0a13c8653f621c1eac 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingQEE/StrippingALP2TauTau.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingQEE/StrippingALP2TauTau.py
@@ -9,12 +9,10 @@
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
 
-from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, OfflineVertexFitter
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop
 from PhysSelPython.Wrappers import Selection, DataOnDemand, SimpleSelection
 from StrippingConf.StrippingLine import StrippingLine
 from GaudiKernel.SystemOfUnits import MeV, GeV, mm
-from CommonParticles import StdAllNoPIDsPions
 from StrippingUtils.Utils import LineBuilder
 
 '''
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingQEE/StrippingB2EHNLLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingQEE/StrippingB2EHNLLines.py
index 0a74c48c6421c6ba225775eef6c8f6c0caae34ea..a3e372506454305727e3814f5b881be54e8e1c07 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingQEE/StrippingB2EHNLLines.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingQEE/StrippingB2EHNLLines.py
@@ -28,9 +28,8 @@ __version__ = '$Revision: 2.0 $'
 
 __all__ = ('B2EHNLLines', 'default_config')
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from StandardParticles import StdAllNoPIDsPions, StdLoosePions, StdLooseMuons, StdLooseDownMuons, StdNoPIDsDownPions, StdLooseElectrons, StdNoPIDsDownElectrons
+from StandardParticles import StdLooseDownMuons, StdLooseElectrons, StdLooseMuons, StdLoosePions, StdNoPIDsDownElectrons, StdNoPIDsDownPions
 from PhysSelPython.Wrappers import CombineSelection, DataOnDemand, Selection, MergedSelection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingQEE/StrippingB2LLP2HH.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingQEE/StrippingB2LLP2HH.py
index 073c098c3a38cbbfb2655b777880011ad219247a..179fe2f52ea095317c5a39508a99a578c806ae3a 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingQEE/StrippingB2LLP2HH.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingQEE/StrippingB2LLP2HH.py
@@ -18,13 +18,11 @@ __date__ = '25/01/2019'
 
 __all__ = ('B2LLPV0_sConf', 'default_config')
 
-from Gaudi.Configuration import *
 from StandardParticles import StdAllNoPIDsPions
 from PhysSelPython.Wrappers import CombineSelection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from GaudiKernel.SystemOfUnits import GeV
-from LoKiPhys.functions import SOURCE, SIZE
 
 default_config = {
     'NAME': 'B2LLPV0',
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingQEE/StrippingB2MuHNLLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingQEE/StrippingB2MuHNLLines.py
index 1b9907eed90607183570f83ae0f41e52fc421408..ababbe64f50dd1ca13074c06e1006ca7144a37fc 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingQEE/StrippingB2MuHNLLines.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingQEE/StrippingB2MuHNLLines.py
@@ -28,9 +28,8 @@ __version__ = '$Revision: 2.0 $'
 
 __all__ = ('B2MuHNLLines', 'default_config')
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from StandardParticles import StdAllNoPIDsPions, StdLoosePions, StdLooseMuons, StdLooseDownMuons, StdNoPIDsDownPions, StdLooseElectrons, StdNoPIDsDownElectrons
+from StandardParticles import StdLooseDownMuons, StdLooseElectrons, StdLooseMuons, StdLoosePions, StdNoPIDsDownElectrons, StdNoPIDsDownPions
 from PhysSelPython.Wrappers import CombineSelection, DataOnDemand, Selection, MergedSelection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingQEE/StrippingConvertedPhoton.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingQEE/StrippingConvertedPhoton.py
index 75d6970b1df2c63c192f20d524128d15f914343b..6a24e6a634b2578b9537332d82053d30b73013fd 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingQEE/StrippingConvertedPhoton.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingQEE/StrippingConvertedPhoton.py
@@ -23,7 +23,7 @@ __all__ = (
 
 from Gaudi.Configuration import *
 from CommonParticles.Utils import *
-from GaudiKernel.SystemOfUnits import MeV, GeV, mm
+from GaudiKernel.SystemOfUnits import MeV, mm
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
 from Configurables import (DiElectronMaker,
                            ProtoParticleCALOFilter,
@@ -31,9 +31,7 @@ from Configurables import (DiElectronMaker,
                            LoKi__VertexFitter,
                            )
 from PhysSelPython.Wrappers import (Selection,
-                                    SimpleSelection,
-                                    MergedSelection,
-                                    AutomaticData)
+                                    MergedSelection)
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingQEE/StrippingDY2MuMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingQEE/StrippingDY2MuMu.py
index 9c7c8a7706d666e3fac7a8f8316de58468cc8b74..6a28183b934ae8110dbdef65c4d96d44dd261b82 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingQEE/StrippingDY2MuMu.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingQEE/StrippingDY2MuMu.py
@@ -26,9 +26,8 @@ __author__ = ['J. Anderson']
 
 __all__ = 'DY2MuMuConf', 'default_config'
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-from PhysSelPython.Wrappers import Selection, SimpleSelection
+from PhysSelPython.Wrappers import SimpleSelection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from StandardParticles import StdAllLooseMuons
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingQEE/StrippingDY2ee.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingQEE/StrippingDY2ee.py
index e1e5fb0bec27db97687652501ba17ba46baca814..25b226c2dcf544b3b1e376446c208bdd7c266ceb 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingQEE/StrippingDY2ee.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingQEE/StrippingDY2ee.py
@@ -20,9 +20,8 @@ __author__ = ['S.Bifani', 'D.Ward']
 
 __all__ = ('DY2eeConf', 'default_config')
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-from PhysSelPython.Wrappers import Selection, DataOnDemand
+from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from StandardParticles import StdAllNoPIDsElectrons
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingQEE/StrippingDisplVertices.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingQEE/StrippingDisplVertices.py
index 5b0be7ca6bf6610767d8a683238e401caadf2f20..ce06625eaa039ad6c4e22c1a114beaf965dbb3b8 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingQEE/StrippingDisplVertices.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingQEE/StrippingDisplVertices.py
@@ -40,7 +40,6 @@ __all__ = ('DisplVerticesConf', 'default_config')
 
 from Gaudi.Configuration import *
 from GaudiKernel import SystemOfUnits as units
-from LHCbKernel.Configuration import DEBUG, VERBOSE
 
 import logging
 logger = logging.getLogger(__name__)
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingQEE/StrippingDitau.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingQEE/StrippingDitau.py
old mode 100755
new mode 100644
index fa049324f79a44e720a641aa2ed2cdc857f4435e..3e2dd3df509a4ead7bb1a73e4cccd6e5f2e99c0f
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingQEE/StrippingDitau.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingQEE/StrippingDitau.py
@@ -155,8 +155,7 @@ Derived from works of S.Farry & P. Ilten
 
 """
 
-import os
-from GaudiKernel.SystemOfUnits import MeV, GeV, micrometer
+from GaudiKernel.SystemOfUnits import GeV, MeV
 from PhysSelPython.Wrappers import Selection, SimpleSelection, PassThroughSelection, MergedSelection, AutomaticData
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
@@ -894,7 +893,7 @@ def Tuples():
 
     """
     import re
-    from DecayTreeTuple.Configuration import DecayTreeTuple, EventTuple
+    from DecayTreeTuple.Configuration import DecayTreeTuple
 
     seq = GaudiSequencer('TupleSeq')
     seq.ModeOR = True
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingQEE/StrippingExotica.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingQEE/StrippingExotica.py
old mode 100755
new mode 100644
index 53d4e78dbc02f72bc606ac4946ac8b3d4ffca135..8fde59168275d4997d6cc3f329999fbc92fcaee8
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingQEE/StrippingExotica.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingQEE/StrippingExotica.py
@@ -30,7 +30,7 @@ Hlt2ExoticaPrmptDiMuonHighMass
 from GaudiKernel.SystemOfUnits import MeV, GeV, mm, picosecond
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-from PhysSelPython.Wrappers import Selection, SimpleSelection, MergedSelection, AutomaticData
+from PhysSelPython.Wrappers import AutomaticData, SimpleSelection
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingQEE/StrippingFullDiJets.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingQEE/StrippingFullDiJets.py
index 9f9b7b90a54554d0ddb97629f1717b25aa1ff1a4..cf5af4522353ef4302dda2251df7b6096c0bbf73 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingQEE/StrippingFullDiJets.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingQEE/StrippingFullDiJets.py
@@ -9,14 +9,10 @@
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
 
-from Gaudi.Configuration import *
-from Configurables import FilterDesktop, CombineParticles, LoKi__VertexFitter
+from Configurables import CombineParticles, LoKi__VertexFitter
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from StandardParticles import StdJets
-from CommonParticles.Utils import *
-from Configurables import FilterJet
 from GaudiKernel.SystemOfUnits import GeV
 
 __author__ = "Xabier Cid Vidal", "Cedric Potterat", "William Barter"
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingQEE/StrippingGluinos.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingQEE/StrippingGluinos.py
index 0867cc3c369e7f5b06dfb5d1909d7eeda820e3f0..8070b81f174dd132e7ec9c150bbe87dc5befc9b9 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingQEE/StrippingGluinos.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingQEE/StrippingGluinos.py
@@ -10,11 +10,10 @@
 ###############################################################################
 from Configurables import FilterDesktop, JetVertexAlg
 from CommonParticles.Utils import *
-from LoKiPhys.functions import SOURCE, SIZE
 from GaudiKernel.SystemOfUnits import GeV
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import FilterSelection, PassThroughSelection, DataOnDemand
+from PhysSelPython.Wrappers import FilterSelection, PassThroughSelection
 from StandardParticles import StdJets
 from Gaudi.Configuration import *
 __author__ = ['Xabier Cid Vidal', 'Carlos Vazquez Sierra', 'Igor Kostiuk']
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingQEE/StrippingLFVExotica.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingQEE/StrippingLFVExotica.py
old mode 100755
new mode 100644
index 88da9dcd829a1905c1264408cac8e2e94c89b89f..fef9c145f071f0ab2fe36aeab16fc22bc5d9a283
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingQEE/StrippingLFVExotica.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingQEE/StrippingLFVExotica.py
@@ -174,7 +174,7 @@ def create_stdjets(strob, line_location, stdjets_name_ban):
         strob.StdJetsNoJetIDBan = [myconf1]
 
     # configure Data-On-Demand service
-    locations = updateDoD(myconf1)
+    updateDoD(myconf1)
 
 
 relInfoJetsVars = ["JETNOMU1PX", "JETNOMU1PY", "JETNOMU1PZ", "JETNOMU1PT", "JETNOMU1JETWIDTH", "JETNOMU1NNTAG", "JETNOMU1MNF", "JETNOMU2PX", "JETNOMU2PY", "JETNOMU2PZ", "JETNOMU2PT", "JETNOMU2JETWIDTH", "JETNOMU2NNTAG", "JETNOMU2MNF", "JETNOMU3PX", "JETNOMU3PY",
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingQEE/StrippingLLP2HH.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingQEE/StrippingLLP2HH.py
index 00c3a16a5b5121112043a13bce9b73a6fc558213..f3d787247a298460c19f1c5cad9114e1b7b2343e 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingQEE/StrippingLLP2HH.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingQEE/StrippingLLP2HH.py
@@ -18,13 +18,11 @@ __date__ = '23/06/2021'
 
 __all__ = ('LLPV0_sConf', 'default_config')
 
-from Gaudi.Configuration import *
 from StandardParticles import StdAllNoPIDsPions
 from PhysSelPython.Wrappers import CombineSelection, PassThroughSelection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from GaudiKernel.SystemOfUnits import GeV, picosecond
-from LoKiPhys.functions import SOURCE, SIZE
 
 default_config = {
     'NAME': 'LLPV0',
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingQEE/StrippingLLP2Hadrons.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingQEE/StrippingLLP2Hadrons.py
index 4db1eeb4fc5effa1706b7725ce0ebd5c721b0060..3aec384d4ea923e83a375c12b704df908bf8ceef 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingQEE/StrippingLLP2Hadrons.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingQEE/StrippingLLP2Hadrons.py
@@ -14,10 +14,9 @@
 Stripping lines selecting scalar long-lived particles decaying to hadrons
 """
 
-from GaudiKernel.SystemOfUnits import MeV, GeV, mm, picosecond
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-from PhysSelPython.Wrappers import Selection, SimpleSelection, MergedSelection, AutomaticData
+from PhysSelPython.Wrappers import AutomaticData, MergedSelection, Selection
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingQEE/StrippingLLP2Jets.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingQEE/StrippingLLP2Jets.py
index 8619ba15a78cfb147e8f2c955611f8cdd44bd2ba..9c25c3202184e96ffba87e12971ec43ac9362246 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingQEE/StrippingLLP2Jets.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingQEE/StrippingLLP2Jets.py
@@ -18,7 +18,6 @@ __date__ = '25/01/2019'
 
 __all__ = ('LLP2Jets_sConf', 'default_config')
 
-from Gaudi.Configuration import *
 from Configurables import JetVertexAlg
 from StandardParticles import StdJets
 from CommonParticles.Utils import updateDoD
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingQEE/StrippingLLP2MuX.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingQEE/StrippingLLP2MuX.py
index 5e11c78ecc6608d63fed19b2c7da80329d8b6164..6aa23424c0d1301265496b3cb2b3aa90d102171f 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingQEE/StrippingLLP2MuX.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingQEE/StrippingLLP2MuX.py
@@ -16,7 +16,6 @@ from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import AutomaticData, Selection
 from GaudiKernel import SystemOfUnits as units
-from LHCbKernel.Configuration import *
 __author__ = "Pieter David"
 __date__ = "2014-08-28"
 __all__ = ("LLP2MuXConf", "default_config")
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingQEE/StrippingLambdaDecaysDM.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingQEE/StrippingLambdaDecaysDM.py
index bc00d02ab9e92a936cf638348bad0d0c5359e894..a5598540a06cde096db44bd5262255253d5b0e48 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingQEE/StrippingLambdaDecaysDM.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingQEE/StrippingLambdaDecaysDM.py
@@ -13,18 +13,14 @@
 Lines for searches on DM candidates produced from Lambda decays (arXiv:2101.02706).
 """
 
-from Gaudi.Configuration import *
-from LHCbKernel.Configuration import *
 
-from CommonParticles.Utils import *
-from CommonParticles import StdAllNoPIDsPions
 from StandardParticles import StdAllLooseKaons, StdAllLooseProtons, StdAllLoosePions
 
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from GaudiKernel.SystemOfUnits import MeV, picosecond, millimeter
+from GaudiKernel.SystemOfUnits import MeV, millimeter
 
 __author__ = ['Xabier Cid Vidal', 'Carlos Vazquez Sierra', 'Saul Lopez Solino']
 __date__ = '18/03/2021'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingQEE/StrippingLb2dp.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingQEE/StrippingLb2dp.py
old mode 100755
new mode 100644
index cf2bf7494c36f78187f495fe46a2fcfe068338e0..cbd7593f597ef30b0f56f7070b78fe66905549e5
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingQEE/StrippingLb2dp.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingQEE/StrippingLb2dp.py
@@ -23,15 +23,11 @@ __all__ = ('Lb2dpConf',
            )
 
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop
-from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays
 
-from StandardParticles import StdAllNoPIDsPions, StdAllNoPIDsProtons,  StdAllNoPIDsKaons
 from PhysSelPython.Wrappers import Selection, DataOnDemand, SimpleSelection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from Configurables import LoKi__VoidFilter as VoidFilter
 
 default_config = {
     'NAME': 'Lb2dp',
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingQEE/StrippingMicroDiJets.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingQEE/StrippingMicroDiJets.py
index bad4ad03547afb3eb1d9a6db8a0584899cd101c9..6334bd68bc3e5b0ba62caddeaae6ed5407bb4f92 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingQEE/StrippingMicroDiJets.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingQEE/StrippingMicroDiJets.py
@@ -10,13 +10,12 @@
 ###############################################################################
 
 from Gaudi.Configuration import *
-from Configurables import FilterDesktop, CombineParticles, LoKi__VertexFitter
+from Configurables import CombineParticles
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from StandardParticles import StdJets
 from CommonParticles.Utils import *
-from Configurables import FilterJet, ClearDaughters
+from Configurables import ClearDaughters
 from GaudiKernel.SystemOfUnits import GeV
 
 __author__ = "Xabier Cid Vidal", "Cedric Potterat", "William Barter"
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingQEE/StrippingMuMuSS.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingQEE/StrippingMuMuSS.py
index 2624678f1fc33a1d4e6229645bb86db4dda018d1..36fb89fcb7c0d8920bb6af3e43213c4dc04aa22c 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingQEE/StrippingMuMuSS.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingQEE/StrippingMuMuSS.py
@@ -26,7 +26,7 @@ __author__ = (
 )
 
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-from PhysSelPython.Wrappers import Selection, SimpleSelection
+from PhysSelPython.Wrappers import SimpleSelection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from StandardParticles import StdAllLooseMuons
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingQEE/StrippingSbarSCorrelations.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingQEE/StrippingSbarSCorrelations.py
index 578635fa7ef787c7ed772e61fa98a130acd5ab9f..9c45d8c730a8ea34174573f64728abd920769a54 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingQEE/StrippingSbarSCorrelations.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingQEE/StrippingSbarSCorrelations.py
@@ -21,10 +21,8 @@ Long tracks only
 from GaudiKernel.SystemOfUnits import MeV, GeV
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
-from StandardParticles import StdAllNoPIDsPions, StdTightKaons, StdAllNoPIDsProtons
+from PhysSelPython.Wrappers import DataOnDemand, Selection
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = ['Florin MACIUC']
 __date__ = '24/08/2013'
 __version__ = '$Revision: 1.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingQEE/StrippingStrangeBaryons.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingQEE/StrippingStrangeBaryons.py
index f3dd8ebdec4e50abd2bed892959740435ac5d9b5..2405f0e9c6f1695dd9f652d6aae992473b3135a2 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingQEE/StrippingStrangeBaryons.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingQEE/StrippingStrangeBaryons.py
@@ -18,14 +18,10 @@ Xi -> Lambda pi,   Omega -> Lambda K
 LLL DDL DDD
 '''
 
-from GaudiKernel.SystemOfUnits import MeV
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
-from CommonParticles import StdLooseLambda
-from StandardParticles import StdLoosePions, StdNoPIDsDownPions, StdLooseKaons, StdLooseDownKaons, StdLooseProtons, StdNoPIDsDownProtons
+from PhysSelPython.Wrappers import DataOnDemand, Selection
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = ['Mihai Straticiuc', 'Florin Maciuc', 'Nguyen Thi Dung']
 __date__ = '26/06/2012'
 __version__ = '$Revision: 0.3 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingQEE/StrippingStrangeBaryonsNoPID.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingQEE/StrippingStrangeBaryonsNoPID.py
index 668986b834d39169c5ae15803bf5d5fb33cff67b..208ab8bad23a5e36e2a0a609a82dd6ca2fc9d012 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingQEE/StrippingStrangeBaryonsNoPID.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingQEE/StrippingStrangeBaryonsNoPID.py
@@ -18,12 +18,10 @@ Xi -> Lambda pi,   Omega -> Lambda K
 LLL
 '''
 
-from GaudiKernel.SystemOfUnits import MeV
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
+from PhysSelPython.Wrappers import DataOnDemand, Selection
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = ['Florin Maciuc']
 __date__ = '13/01/2014'
 __version__ = '$Revision: 0.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingQEE/StrippingTaggedJets.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingQEE/StrippingTaggedJets.py
old mode 100755
new mode 100644
index 295b8a41d2618b3fecf00a4f5a1b7c033637686d..bb3326270087d013f8ced34035ee104c1c23848b
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingQEE/StrippingTaggedJets.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingQEE/StrippingTaggedJets.py
@@ -10,11 +10,10 @@
 ###############################################################################
 
 from Gaudi.Configuration import *
-from Configurables import FilterDesktop, CombineParticles, LoKi__VertexFitter
+from Configurables import CombineParticles, LoKi__VertexFitter
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from StandardParticles import StdJets
 from CommonParticles.Utils import *
 from Configurables import FilterJet
 from GaudiKernel.SystemOfUnits import GeV
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingQEE/StrippingW2nH.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingQEE/StrippingW2nH.py
index cc373f666cb49309b9f3e2efe0dae8e52ac260a4..22eacc1d77ba55838726dc481db0fa8f76e6bf1d 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingQEE/StrippingW2nH.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingQEE/StrippingW2nH.py
@@ -26,7 +26,6 @@ from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from StandardParticles import StdAllNoPIDsPions
 from GaudiKernel.SystemOfUnits import GeV
-from GaudiKernel.SystemOfUnits import MeV
 
 
 default_config = {
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingQEE/StrippingWJets.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingQEE/StrippingWJets.py
old mode 100755
new mode 100644
index ae80ec7c3f67ef962664ed45183a235fcd9c9d4f..48a0b2de2b4dc719b98a7a0de39e0eae96ed4f4f
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingQEE/StrippingWJets.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingQEE/StrippingWJets.py
@@ -22,14 +22,12 @@ They are then cover a phasespace complementarily on each other.
 
 """
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
 from Configurables import CombineParticles, LoKi__VertexFitter
 from PhysSelPython.Wrappers import Selection, SimpleSelection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from StandardParticles import StdAllLooseMuons, StdAllNoPIDsElectrons, StdJets
-from CommonParticles.Utils import *
 from GaudiKernel.SystemOfUnits import GeV, MeV
 
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingQEE/StrippingWRareDecay.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingQEE/StrippingWRareDecay.py
index de1eaf98e07a599774f9667406768492a892a465..f599f543313af3af803cfd1ae503077a399fbebb 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingQEE/StrippingWRareDecay.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingQEE/StrippingWRareDecay.py
@@ -21,8 +21,7 @@ from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from GaudiKernel.SystemOfUnits import MeV, GeV, mm, picosecond
-from Gaudi.Configuration import *
+from GaudiKernel.SystemOfUnits import MeV, picosecond
 __author__ = ['Hang Yin', 'Qundong Han']
 __date__ = '11/29/2016'
 __version__ = '$Revision: 2.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingQEE/StrippingWe.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingQEE/StrippingWe.py
index 0820e8b431f0bb8891ac3f88f980c3fcbe0a181c..3e509fb26655db393ee396f8d85f74a24b0c62d7 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingQEE/StrippingWe.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingQEE/StrippingWe.py
@@ -21,7 +21,6 @@ We control: StdAllNoPIDsElectrons, PRS>50Mev & E_ECal/P>0.1 & E_HCal/P<0.05 & pT
 __all__ = 'WeConf', 'default_config'
 __author__ = 'S. Bifani', 'D. Ward'
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
 from PhysSelPython.Wrappers import SimpleSelection
 from StrippingConf.StrippingLine import StrippingLine
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingQEE/StrippingZ02ee.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingQEE/StrippingZ02ee.py
index e797011998c7d9201276f70cdabaa1b30ae4d70f..f6977308a75475dc2fd7e695d713190194177820 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingQEE/StrippingZ02ee.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingQEE/StrippingZ02ee.py
@@ -23,7 +23,6 @@ __all__ = (
     'default_config',
 )
 
-from Gaudi.Configuration import *
 from GaudiKernel.SystemOfUnits import GeV, MeV
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 from PhysSelPython.Wrappers import SimpleSelection
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingQEE/StrippingZ02nH.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingQEE/StrippingZ02nH.py
index 2f8d8eb612b1c353cf08c5e72ca77ae205eb7a72..35de5f4d789850497ba9aa5b71430ef065284077 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingQEE/StrippingZ02nH.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingQEE/StrippingZ02nH.py
@@ -26,7 +26,6 @@ from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from StandardParticles import StdAllNoPIDsPions
 from GaudiKernel.SystemOfUnits import GeV
-from GaudiKernel.SystemOfUnits import MeV
 
 
 default_config = {
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingQEE/StrippingZ0RareDecay.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingQEE/StrippingZ0RareDecay.py
index 57c2091f2ac6a4efcb43bd28c4251acba348f513..e181b28533d1769723804e5ccc2d55ce3dfbccea 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingQEE/StrippingZ0RareDecay.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingQEE/StrippingZ0RareDecay.py
@@ -22,8 +22,7 @@ __version__ = '$Revision: 2.0 $'
 
 __all__ = 'default_config', 'Z0RareDecayConf'
 
-from Gaudi.Configuration import *
-from GaudiKernel.SystemOfUnits import MeV, GeV, mm
+from GaudiKernel.SystemOfUnits import MeV
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
 from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
 from StrippingConf.StrippingLine import StrippingLine
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingQEE/depreciated/StrippingDijets.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingQEE/depreciated/StrippingDijets.py
index f0793d3411791797729ad540397e458f4646f78b..975321a6b30b00b6f80aee11878eb20ba9d16b84 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingQEE/depreciated/StrippingDijets.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingQEE/depreciated/StrippingDijets.py
@@ -15,8 +15,7 @@
 __all__ = ('DijetsConf',
            'default_config')
 
-from Gaudi.Configuration import *
-from GaudiKernel.SystemOfUnits import MeV, GeV, mm
+from GaudiKernel.SystemOfUnits import GeV, MeV
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingQEE/depreciated/StrippingHighPtTopoJets.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingQEE/depreciated/StrippingHighPtTopoJets.py
index 73ca61d9e7e0914a21b65e40361131e8f38c026d..6078cdec364615de35d547f813533d0a763afeef 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingQEE/depreciated/StrippingHighPtTopoJets.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingQEE/depreciated/StrippingHighPtTopoJets.py
@@ -21,8 +21,6 @@ __all__ = ('default_config', 'HighPtTopoJetsConf')
 # \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\#
 
 
-from Gaudi.Configuration import *
-from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from PhysSelPython.Wrappers import EventSelection
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingQEE/depreciated/StrippingJets.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingQEE/depreciated/StrippingJets.py
index 02e5fc43080729f2f38d0bc0bde65232a21f0202..55abf24d99577dcb8f10b30fda8803015b0c09f0 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingQEE/depreciated/StrippingJets.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingQEE/depreciated/StrippingJets.py
@@ -15,13 +15,11 @@
 __all__ = ('JetsConf',
            'default_config')
 
-from Gaudi.Configuration import *
-from GaudiKernel.SystemOfUnits import MeV, GeV, mm
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
+from GaudiKernel.SystemOfUnits import GeV, MeV
+from PhysSelPython.Wrappers import MergedSelection, Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
-from JetAccessories.JetMaker_Config import JetMakerConf
 from StandardParticles import StdJets, StdAllNoPIDsPions
 from Configurables import CombineParticles
 from Configurables import TopologicalTagging
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/Beauty2Charm_LoKiCuts.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/Beauty2Charm_LoKiCuts.py
index ce5265655cf518aa12121d3a5728d84c36da26cd..666cef80aacee423a071365fe7281c63e506e27d 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/Beauty2Charm_LoKiCuts.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/Beauty2Charm_LoKiCuts.py
@@ -10,11 +10,6 @@
 ###############################################################################
 # \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\#
 
-from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
-from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-from PhysSelPython.Wrappers import Selection, MergedSelection
-from StandardParticles import StdNoPIDsPions, StdNoPIDsKaons
 
 # \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\#
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingB02Lcmu_pKpi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingB02Lcmu_pKpi.py
index 3d6992fd337683bf5bcf97e994e4fd64705add4f..93bd54fbf8871329e8e7bcb95f7722d9913e1cff 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingB02Lcmu_pKpi.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingB02Lcmu_pKpi.py
@@ -14,7 +14,6 @@ from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = ['Nikita Beliy', 'Jibo He']
 __date__ = '28/11/2016'
 __version__ = '$Revision: 1.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingB23MuLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingB23MuLines.py
index a6e53abda621d1f1b0efe6185553c1b46aae67e6..15ea2076dcaea1a75c4fec8295e895be19887b4a 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingB23MuLines.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingB23MuLines.py
@@ -55,13 +55,11 @@ __all__ = ("B23MuLinesConf",
 
 #############################################################################
 
-from Gaudi.Configuration import *
-from Configurables import FilterDesktop, CombineParticles, DaVinci__N3BodyDecays
+from Configurables import DaVinci__N3BodyDecays
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 # from StrippingSelections.Utils import checkConfig
-from GaudiKernel.PhysicalConstants import c_light
 
 #############################################################################
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingB2DibaryonMuMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingB2DibaryonMuMu.py
index 3244d01c63302e316fc5389d89d96ffeeae19328..7c9eae26a3a3acea16b7970f07b704ca3dec2abd 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingB2DibaryonMuMu.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingB2DibaryonMuMu.py
@@ -10,9 +10,8 @@
 ###############################################################################
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection, AutomaticData
+from PhysSelPython.Wrappers import MergedSelection, Selection
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, DaVinci__N3BodyDecays
-from Gaudi.Configuration import *
 __author__ = 'Vitalii Lisovskyi; based on Bu2LLK lines'
 __date__ = '04/09/2019'
 __version__ = '$Revision: 1 $'
@@ -112,7 +111,6 @@ class B2DibaryonMuMuConf(LineBuilder):
         # 2 : Make Dileptons
 
         from StandardParticles import StdLooseDiMuon as DiMuons
-        MuonID = "(HASMUON)&(ISMUON)"
         DiMuonID = "(2 == NINTREE((ABSID==13)&(HASMUON)&(ISMUON)))"
 
         SelDiMuon = self._filterDiLepton("SelDiMuonsFor" + self._name,
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingB2EtaMuMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingB2EtaMuMu.py
index b614d11a7b9702109f6bc31332fcc68aef2d3cd9..6a856fa995234718f36df2e31af89417225452fa 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingB2EtaMuMu.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingB2EtaMuMu.py
@@ -12,13 +12,12 @@
 B->etamumuselection
 '''
 
-from StandardParticles import StdAllNoPIDsMuons, StdAllLooseMuons
+from StandardParticles import StdAllNoPIDsMuons
 from StandardParticles import StdNoPIDsPions, StdLooseAllPhotons, StdLooseMergedPi0, StdLooseResolvedPi0
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand, SimpleSelection, MergedSelection
+from PhysSelPython.Wrappers import MergedSelection, Selection, SimpleSelection
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = ['Fred Blanc']
 __date__ = '04/09/2019'
 __version__ = '$Revision: 1.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingB2KLLXInclusive.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingB2KLLXInclusive.py
index a9d2ffd4e4d8d6444da6c3df3731248c13fce6e7..61a740d6b5d3d92a7f2015b59a5021738a7a2958 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingB2KLLXInclusive.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingB2KLLXInclusive.py
@@ -19,15 +19,12 @@ __all__ = ('B2KLLXInclusiveConf', 'default_config')
 Stripping selection for inclusively selected B->KmumuX decays.
 """
 
-from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop
+from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
 
 from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from LHCbKernel.Configuration import *  # check if needed
-from Configurables import SubstitutePID
-from Configurables import SubPIDMMFilter
 
 
 #################
@@ -333,7 +330,6 @@ class B2KLLXInclusiveConf(LineBuilder):
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         CombineDiMuon = CombineParticles()
         CombineDiMuon.DecayDescriptors = ["[B+ -> J/psi(1S) K+]cc"]
-        sel_name = "InclKLL"
         CombineDiMuon.MotherCut = self.InclKLLCut
         # choose
         leptons = self.InclLeptons
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingB2KSKSMuMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingB2KSKSMuMu.py
index 60fc5ccbd40bc95a884b69e2b2b8c7d93b722665..b1a382095c4fd701f38e4fcada71554ecba26858 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingB2KSKSMuMu.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingB2KSKSMuMu.py
@@ -10,9 +10,8 @@
 ###############################################################################
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection, AutomaticData
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, DaVinci__N3BodyDecays
-from Gaudi.Configuration import *
+from PhysSelPython.Wrappers import MergedSelection, Selection
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop
 __author__ = 'Vitalii Lisovskyi'
 __date__ = '18/06/2021'
 __version__ = '$Revision: 1 $'
@@ -72,7 +71,6 @@ class B2KSKSMuMuConf(LineBuilder):
         # Make Dileptons
 
         from StandardParticles import StdLooseDiMuon as DiMuons
-        MuonID = "(HASMUON)&(ISMUON)"
         DiMuonID = "(2 == NINTREE((ABSID==13)&(HASMUON)&(ISMUON)&(PROBNNmu>0.01)))"
 
         SelDiMuon = self._filterDiLepton("SelDiMuonsFor" + self._name,
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingB2KstTauTau.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingB2KstTauTau.py
index 0e62fb1a13ae5f9586b34995cc3f4f00d8de7dee..a236059c8ca69aa4aaf625cf6925165cda17c83a 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingB2KstTauTau.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingB2KstTauTau.py
@@ -15,8 +15,7 @@ from StandardParticles import StdTightMuons
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, OfflineVertexFitter, DaVinci__N3BodyDecays
-from Gaudi.Configuration import *
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N3BodyDecays, FilterDesktop
 __author__ = [' G. Mancinelli, J. Serrano']
 __date__ = '15/08/2014'
 __version__ = '$Revision: 0.1 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingB2LLXBDT.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingB2LLXBDT.py
index 33ad8193f48b0db42c11b2b0fdb770bc37fa1794..b45675d8906a352a37b4bdd5ca92e02e5c6279bf 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingB2LLXBDT.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingB2LLXBDT.py
@@ -20,8 +20,6 @@ from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticle
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, MergedSelection
-from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays
-from Gaudi.Configuration import *
 __author__ = ['Jibo He']
 __date__ = '20/11/2015'
 __version__ = '$Revision: 1.0 $'
@@ -261,7 +259,7 @@ class B2LLXBDTConf(LineBuilder):
         """
         Kshort, both LL and DD
         """
-        from StandardParticles import StdLooseKsDD, StdLooseKsLL
+        from StandardParticles import StdLooseKsDD
 
         self.SelKsDD = self.createSubSel(OutputList=self.name + "SelKsDD",
                                          InputList=StdLooseKsDD,
@@ -297,7 +295,7 @@ class B2LLXBDTConf(LineBuilder):
         """
         Lambda, both LL and DD
         """
-        from StandardParticles import StdLooseLambdaDD, StdLooseLambdaLL
+        from StandardParticles import StdLooseLambdaDD
 
         self.SelLambdaDD = self.createSubSel(OutputList=self.name + "SelLambdaDD",
                                              InputList=StdLooseLambdaDD,
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingB2LLXBDTSS.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingB2LLXBDTSS.py
index 6547c8d92952608cbce068992079d7eefcc9788f..9a503cdbdc4e4f4133951d4b663f5d7157875f5a 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingB2LLXBDTSS.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingB2LLXBDTSS.py
@@ -20,8 +20,6 @@ from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticle
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, MergedSelection
-from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays
-from Gaudi.Configuration import *
 __author__ = ['Jibo He', 'Yanting Fan', 'Angel Campoverde']
 __date__ = '17/06/2021'
 __version__ = '$Revision: 1.0 $'
@@ -228,7 +226,7 @@ class B2LLXBDTSSConf(LineBuilder):
         """
         Di letpons
         """
-        from StandardParticles import StdDiElectronFromTracks, StdLooseDiMuon, StdAllLooseANNElectrons, StdLooseDiMuonSameSign, StdAllLooseMuons
+        from StandardParticles import StdAllLooseANNElectrons, StdAllLooseMuons, StdLooseDiMuonSameSign
 
         self.SelDiElectron = self.createCombinationSel(OutputList=self.name + "SelDiElectron",
                                                        DecayDescriptor="[J/psi(1S) -> e+ e+]cc",
@@ -296,7 +294,7 @@ class B2LLXBDTSSConf(LineBuilder):
         """
         Kshort, both LL and DD
         """
-        from StandardParticles import StdLooseKsDD, StdLooseKsLL
+        from StandardParticles import StdLooseKsDD
 
         self.SelKsDD = self.createSubSel(OutputList=self.name + "SelKsDD",
                                          InputList=StdLooseKsDD,
@@ -332,7 +330,7 @@ class B2LLXBDTSSConf(LineBuilder):
         """
         Lambda, both LL and DD
         """
-        from StandardParticles import StdLooseLambdaDD, StdLooseLambdaLL
+        from StandardParticles import StdLooseLambdaDD
 
         self.SelLambdaDD = self.createSubSel(OutputList=self.name + "SelLambdaDD",
                                              InputList=StdLooseLambdaDD,
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingB2LLXBDT_Calib.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingB2LLXBDT_Calib.py
index 56119a8defd7314f20eac2f2f78263f57aa6849c..28e6f3608431fba0221fc067bd66c5cf7a6f355a 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingB2LLXBDT_Calib.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingB2LLXBDT_Calib.py
@@ -19,9 +19,7 @@ Note:
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, MergedSelection
-from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays
-from Gaudi.Configuration import *
+from PhysSelPython.Wrappers import Selection
 __author__ = ['Jibo He', 'Yanting Fan']
 __date__ = '10/03/2021'
 __version__ = '$Revision: 1.0 $'
@@ -194,7 +192,7 @@ class B2LLXBDT_CalibConf(LineBuilder):
         """
         Di letpons
         """
-        from StandardParticles import StdDiElectronFromTracks, StdLooseDiMuon, StdAllNoPIDsElectrons, StdAllNoPIDsMuons
+        from StandardParticles import StdAllNoPIDsElectrons, StdAllNoPIDsMuons
 
         self.SelDiElectron = self.createCombinationSel(OutputList=self.name + "SelDiElectron",
                                                        DecayDescriptor='J/psi(1S) -> e+ e-',
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingB2Lambda0ELines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingB2Lambda0ELines.py
index dcb376b6317e21a82d05511d6642d51a9139b1e0..beaae1e2b2d8fdb3ab6922b0b597f4f3735074b1 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingB2Lambda0ELines.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingB2Lambda0ELines.py
@@ -21,7 +21,6 @@ __all__ = ('B2Lambda0ELines',
            'default_config')
 
 from StandardParticles import StdLoosePions, StdLooseElectrons, StdNoPIDsDownElectrons, StdNoPIDsDownPions
-from Configurables import TisTosParticleTagger
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingB2Lambda0MuLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingB2Lambda0MuLines.py
index e758feafbbaf38bbf2c16b62697aeccc5044b5c0..8c8ebee90e957bb0642c7fb649a57f03d93eef97 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingB2Lambda0MuLines.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingB2Lambda0MuLines.py
@@ -21,7 +21,6 @@ __all__ = ('B2Lambda0MuLines',
            'default_config')
 
 from StandardParticles import StdLoosePions, StdLooseMuons, StdLooseDownMuons, StdNoPIDsDownPions
-from Configurables import TisTosParticleTagger
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingB2Lambda0MuOSLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingB2Lambda0MuOSLines.py
index 389b9bf695c2932c173a4ee768404acc14c2b153..4186a8554984cb039f3d149cda4700f95f9a9753 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingB2Lambda0MuOSLines.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingB2Lambda0MuOSLines.py
@@ -21,7 +21,6 @@ __all__ = ('B2Lambda0MuOSLines',
            'default_config')
 
 from StandardParticles import StdLoosePions, StdLooseMuons, StdLooseDownMuons, StdNoPIDsDownPions
-from Configurables import TisTosParticleTagger
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingB2Lambda0SSMuMu3PiLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingB2Lambda0SSMuMu3PiLines.py
index b829fcd48cd4d244f39b998208c83dfea4c65343..f47c81735abc7cb47558594658aaf83f1ca7bc36 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingB2Lambda0SSMuMu3PiLines.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingB2Lambda0SSMuMu3PiLines.py
@@ -21,7 +21,6 @@ __all__ = ('B2Lambda0SSMuMu3PiLines',
            'default_config')
 
 from StandardParticles import StdLoosePions, StdLooseMuons, StdLooseDownMuons, StdNoPIDsDownPions
-from Configurables import TisTosParticleTagger
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingB2MuMuMuMuLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingB2MuMuMuMuLines.py
index fa05d51ee2de3b49393863f88c1ea5b92412691c..290a038e170fc100b3d53f6d44d47d6e193f2ebd 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingB2MuMuMuMuLines.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingB2MuMuMuMuLines.py
@@ -21,7 +21,7 @@ from Beauty2Charm_LoKiCuts import LoKiCuts
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
-from Configurables import FilterDesktop, CombineParticles
+from Configurables import CombineParticles
 from Gaudi.Configuration import *
 __author__ = ['Diego Martinez Santos', 'Johannes Albrecht',
               'Konstantinos A. Petridis', 'Alexander Baranov']
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingB2OCMuMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingB2OCMuMu.py
index 85a7ae0f507641e942a8a8d127a0bfe50d047eb6..be3956da72885c84a4baf22412ecf87c0af293fa 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingB2OCMuMu.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingB2OCMuMu.py
@@ -9,14 +9,10 @@
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop  # as FilterDesktop_GC
-from GaudiKernel.SystemOfUnits import MeV
-from CommonParticles.Utils import updateDoD
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection, AutomaticData
-from Configurables import (ResolvedPi0Maker, PhotonMaker)
+from PhysSelPython.Wrappers import DataOnDemand, MergedSelection, Selection
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N3BodyDecays, DaVinci__N4BodyDecays
-from Gaudi.Configuration import *
 __author__ = 'Vitalii Lisovskyi'
 __date__ = '05/03/2021'
 __version__ = '$Revision: 0 $'
@@ -76,9 +72,7 @@ class B2OCMuMuConf(LineBuilder):
         BcLine_name = name+"Bc"
         BcNoPointLine_name = name+"BcNoPoint"
 
-        from StandardParticles import StdLoosePions as Pions
         from StandardParticles import StdLooseKaons as Kaons
-        from StandardParticles import StdLooseProtons as Protons
         from StandardParticles import StdAllNoPIDsPions as AllPions
         from StandardParticles import StdAllNoPIDsKaons as AllKaons
         from StandardParticles import StdAllNoPIDsProtons as AllProtons
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingB2XLL.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingB2XLL.py
old mode 100755
new mode 100644
index 893c8f7d24822aaf5128c145a0ea679b0efd25cc..54c9d8dbdf1774215b4f2574855ce20420b67924
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingB2XLL.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingB2XLL.py
@@ -10,9 +10,8 @@
 ###############################################################################
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection, AutomaticData
+from PhysSelPython.Wrappers import MergedSelection, Selection
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = 'Raja Nandakumar, Fergus Wilson, Stefania Ricciardi'
 __date__ = '04/11/2015'
 __version__ = '$Revision: 0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingB2XMuMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingB2XMuMu.py
index 018806639a8b82fc54e5d95d7cd845f454943b0a..e0f7a0afc6c02fc2f49bd755a2c0b78caaec7987 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingB2XMuMu.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingB2XMuMu.py
@@ -19,7 +19,6 @@ __version__ = '$Revision: 1.2 $'
 __all__ = ('B2XMuMuConf', 'default_config')
 
 
-from Gaudi.Configuration import *
 from LHCbKernel.Configuration import *  # check if needed
 
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingB2XMuTauMuonic.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingB2XMuTauMuonic.py
index 1273eebf7e8d1885ba9abc40fa20e1d3c391f3f5..822bfb329fc0e318ff8ade55ecd4efe9b18e20cb 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingB2XMuTauMuonic.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingB2XMuTauMuonic.py
@@ -22,8 +22,6 @@ __version__ = '$Revision: 0.0 $'
 
 __all__ = ('B2XMuTauMuonicConf', 'default_config')
 
-from Gaudi.Configuration import *
-from LHCbKernel.Configuration import *
 
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingB2XTau.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingB2XTau.py
index 89967ffc1bd10cb56544c7233004d1b229731f9c..9050443393da5af1c9abb3eee3ba2e1eda76009d 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingB2XTau.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingB2XTau.py
@@ -8,16 +8,13 @@
 # granted to it by virtue of its status as an Intergovernmental Organization  #
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
-from StandardParticles import StdAllLoosePions, StdAllNoPIDsPions
-from copy import deepcopy
 from StandardParticles import StdLooseKaons
-from StandardParticles import StdLoosePions, StdTightPions
-from StandardParticles import StdNoPIDsKaons, StdNoPIDsPions, StdTightMuons
+from StandardParticles import StdLoosePions
+from StandardParticles import StdNoPIDsPions, StdTightMuons
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, OfflineVertexFitter, DaVinci__N3BodyDecays
-from Gaudi.Configuration import *
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N3BodyDecays, FilterDesktop
 __author__ = ['G. Dujany, G. Mancinelli, J. Serrano']
 __date__ = '24/05/2010,15/01/2014, 19/10/2017'
 __version__ = '$Revision: 1.3 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingB2XTauMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingB2XTauMu.py
index 1539daf38aad3280d179e42101b30c7b9367dc90..3bf392ac2eb839b14fbb1f75d9e94e760e94edd9 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingB2XTauMu.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingB2XTauMu.py
@@ -25,8 +25,6 @@ __all__ = ('B2XTauMuConf',
            'default_config')
 
 
-from Gaudi.Configuration import *
-
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
 from PhysSelPython.Wrappers import Selection, MergedSelection
 from StrippingConf.StrippingLine import StrippingLine
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingB2XTauTau.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingB2XTauTau.py
index 44cd40b223f3cc0f18f50a09a1e6f2fad19f1ae6..f25de253e9360d45277265567601c6f09dd87a01 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingB2XTauTau.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingB2XTauTau.py
@@ -14,8 +14,7 @@ from StandardParticles import StdNoPIDsPions, StdLoosePions
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand, SimpleSelection
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, OfflineVertexFitter, DaVinci__N3BodyDecays
-from Gaudi.Configuration import *
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N3BodyDecays, FilterDesktop
 __author__ = [' L. Pescatore', 'F. Blanc']
 __date__ = '12/03/2019'
 __version__ = '$Revision: 0.1$'
@@ -23,7 +22,6 @@ __version__ = '$Revision: 0.1$'
 # Stripping line for B->Htautau
 
 from GaudiKernel.SystemOfUnits import MeV
-from GaudiKernel.SystemOfUnits import mm
 """
   B->KstarTauTau, B->KTauTau, B->PhiTauTau, B->Eta'TauTau
 """
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingB2XTauTauMuonic.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingB2XTauTauMuonic.py
index 8ce4944ccdbdd71ca39f7044dba39236880a5017..78d80371d2fdd0f4ab78c18f71e97947016836b2 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingB2XTauTauMuonic.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingB2XTauTauMuonic.py
@@ -23,8 +23,6 @@ __version__ = '$Revision: 0.1 $'
 
 __all__ = ('B2XTauTauMuonicConf', 'default_config')
 
-from Gaudi.Configuration import *
-from LHCbKernel.Configuration import *
 
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop, DaVinci__N3BodyDecays
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingBLVLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingBLVLines.py
index 8bf68933cf866f19e4931849021862745276afe7..a5196ce34b14f3f32b717e3c7fcb254e2f21f2fa 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingBLVLines.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingBLVLines.py
@@ -95,8 +95,7 @@ __all__ = ("BLVLinesConf",
 
 ###################################################################################################
 
-from Gaudi.Configuration import *
-from Configurables import FilterDesktop, CombineParticles, DaVinci__N3BodyDecays
+from Configurables import CombineParticles, DaVinci__N3BodyDecays
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingBaryonicLFV.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingBaryonicLFV.py
index a346ce2d29aade7bc06633bf054c0e8f5d5f1ccd..85c93efc5e1805384253264789630d08f7da5cad 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingBaryonicLFV.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingBaryonicLFV.py
@@ -32,14 +32,12 @@ __version__ = '$Revision: 0.0 $'
 __all__ = ('BaryonicLFVConf', 'default_config')
 
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import DaVinci__N3BodyDecays as Combine3Particles
 from GaudiConfUtils.ConfigurableGenerators import DaVinci__N5BodyDecays as Combine5Particles
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from GaudiKernel.PhysicalConstants import c_light
 
 default_config = {
     'NAME': 'BaryonicLFV',
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingBd2KSLLX.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingBd2KSLLX.py
index 419b0f7505b9bb8f7a0008bd6bd040167c12c60a..54c987ef8b72fd7e148a11fb44cebadb12188639 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingBd2KSLLX.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingBd2KSLLX.py
@@ -10,9 +10,8 @@
 ###############################################################################
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection, AutomaticData
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, DaVinci__N3BodyDecays
-from Gaudi.Configuration import *
+from PhysSelPython.Wrappers import MergedSelection, Selection
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop
 __author__ = 'SB'
 __date__ = '08/10/2017'
 __version__ = '$Revision: 1 $'
@@ -47,15 +46,8 @@ class Bd2KSLLXConf(LineBuilder):
         mmXLine_name = name + "_mm"
         eeXLine_name = name + "_ee"
 
-        from StandardParticles import StdLoosePions as Pions
-        from StandardParticles import StdLooseKaons as Kaons
-        from StandardParticles import StdLooseKstar2Kpi as Kstars
-        from StandardParticles import StdLoosePhi2KK as Phis
         from StandardParticles import StdLooseKsLL as KshortsLL
         from StandardParticles import StdLooseKsDD as KshortsDD
-        from StandardParticles import StdLooseLambdaLL as LambdasLL
-        from StandardParticles import StdLooseLambdaDD as LambdasDD
-        from StandardParticles import StdLooseLambdastar2pK as Lambdastars
 
         SelKshortsLL = self._filterHadron(name="KshortsLLFor" + self._name,
                                           sel=KshortsLL,
@@ -64,12 +56,10 @@ class Bd2KSLLXConf(LineBuilder):
                                           sel=KshortsDD,
                                           params=config)
 
-        from StandardParticles import StdDiElectronFromTracks as DiElectronsFromTracks
         from StandardParticles import StdLooseDiElectron as DiElectrons
         from StandardParticles import StdLooseDiMuon as DiMuons
 
-        ElecID = "(PIDe > %(PIDe)s)" % config
-        MuonID = "(HASMUON)&(ISMUON)"
+        "(PIDe > %(PIDe)s)" % config
 
         DiElectronID = "(2 == NINTREE((ABSID==11)&(PIDe > %(PIDe)s)))" % config
         DiMuonID = "(2 == NINTREE((ABSID==13)&(HASMUON)&(ISMUON)))"
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingBd2eeKstarBDT.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingBd2eeKstarBDT.py
index 1a6b3547113e58f48bff1e36952cfc3fb4d30295..6776dcdf27807a56103010584c7a22734b4a8a3f 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingBd2eeKstarBDT.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingBd2eeKstarBDT.py
@@ -18,7 +18,6 @@ from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = ['Marie-Helene Schune', 'Jibo He']
 __date__ = '20/01/2012'
 __version__ = '$Revision: 1.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingBeauty2MajoLep.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingBeauty2MajoLep.py
index 1c734bb1d50cad23296af38cdba5155be75087a1..61c847aced349d945e821dd2bde9314ce08d72fb 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingBeauty2MajoLep.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingBeauty2MajoLep.py
@@ -19,12 +19,10 @@ __version__ = 'V0.2'
 __all__ = ('Beauty2MajoLepConf',
            'default_config')
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
+from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from GaudiKernel.SystemOfUnits import *
 
 from StandardParticles import StdAllNoPIDsMuons as Muons
 from StandardParticles import StdAllNoPIDsPions as Pions
@@ -424,7 +422,7 @@ class Beauty2MajoLepConf(LineBuilder):
     def makeMu(self, name, config):
         # define all the cuts
         _bachPtCut = "(PT>%s*MeV)" % config['Lep_PTmin']
-        _bachIPChi2Cut = "(MIPCHI2DV(PRIMARY) > %s)" % config['Lep_IPChi2min']
+        "(MIPCHI2DV(PRIMARY) > %s)" % config['Lep_IPChi2min']
         _trkGPCut = "(TRGHOSTPROB<%s)" % config['Trk_GhostProb']
         _pidMuon = '(ISMUON)'
 
@@ -860,7 +858,7 @@ class Beauty2MajoLepConf(LineBuilder):
 
         _massCutHigh = "(AM<(%s*MeV))" % config['Majo_AMhigh']
         _docaCut = "(ADOCACHI2CUT(%s, ''))" % config['Majo_DocaChi2']
-        _massCutLow = "(AM>(%s*MeV))" % config['Majo_AMlow']
+        "(AM>(%s*MeV))" % config['Majo_AMlow']
 
         _combCuts = _massCutHigh + '&'+_docaCut
 
@@ -893,7 +891,7 @@ class Beauty2MajoLepConf(LineBuilder):
 
         _massCutHigh = "(AM<(%s*MeV))" % config['Majo_AMhigh']
         _docaCut = "(ADOCACHI2CUT(%s, ''))" % config['Majo_DocaChi2']
-        _massCutLow = "(AM>(%s*MeV))" % config['Majo_AMlow']
+        "(AM>(%s*MeV))" % config['Majo_AMlow']
         _combCuts = _massCutHigh + '&'+_docaCut
 
         _ptCut = "(PT>%s*MeV)" % config['Majo_PTmin']
@@ -1111,7 +1109,7 @@ class Beauty2MajoLepConf(LineBuilder):
 
         _massCutLow = "(AM>(%s*MeV))" % config['AM_Mlow']
         _massCutHigh = "(AM<(%s*MeV))" % config['AM_Mhigh']
-        _docaCut = "(ADOCACHI2CUT(%s, ''))" % config['Majo_DocaChi2']
+        "(ADOCACHI2CUT(%s, ''))" % config['Majo_DocaChi2']
 
         _combCuts = _massCutLow+'&'+_massCutHigh
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingBeauty2XGamma.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingBeauty2XGamma.py
index d21b9a25bc2714ed14237d6218c1dad601dc1240..05e9c9cf0af28c167f2cc98f655c56f432f3ea6b 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingBeauty2XGamma.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingBeauty2XGamma.py
@@ -12,7 +12,7 @@
 B-> X Gamma selections
 '''
 
-from StandardParticles import StdAllNoPIDsKaons, StdAllNoPIDsPions, StdLooseAllPhotons, StdLooseMergedPi0, StdLooseResolvedPi0, StdAllLooseGammaDD, StdAllLooseGammaLL, StdAllNoPIDsProtons
+from StandardParticles import StdAllLooseGammaDD, StdAllLooseGammaLL, StdAllNoPIDsPions, StdLooseAllPhotons, StdLooseMergedPi0, StdLooseResolvedPi0
 from Configurables import TisTosParticleTagger
 from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays as Combine4Particles
 from GaudiConfUtils.ConfigurableGenerators import DaVinci__N3BodyDecays as Combine3Particles
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingBs2MuMuGamma.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingBs2MuMuGamma.py
index 0cfb5425d7a51fe618e72a66a2e6e2062510e41d..f1f37c46035071eccb7cf880d283aafb532e0b8f 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingBs2MuMuGamma.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingBs2MuMuGamma.py
@@ -15,7 +15,7 @@ Authors: Meril Reboud, Jean-Francois Marchand
 """
 
 ########################################################################
-from StrippingUtils.Utils import LineBuilder, checkConfig
+from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Combine3BodySelection
 from StandardParticles import StdLooseMuons, StdLooseAllPhotons
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingBs2MuMuLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingBs2MuMuLines.py
index 28fab868cccc6d58e46553f2585cd743326a977c..8bf0a80a0ffc3aa0267bf6dfb6cc948d4a90331a 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingBs2MuMuLines.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingBs2MuMuLines.py
@@ -26,7 +26,7 @@ from Gaudi.Configuration import *
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
-from Configurables import FilterDesktop, CombineParticles
+from Configurables import CombineParticles
 from JetAccessories.JetMaker_Config import JetMakerConf
 from CommonParticles.Utils import *
 from Gaudi.Configuration import *
@@ -159,7 +159,7 @@ def create_stdjets(strob, line_location, stdjets_name_ban, stdjets_name_addb):
         strob.StdJetsNoJetIDBan = [myconf1]
 
     # configure Data-On-Demand service
-    locations = updateDoD(myconf1)
+    updateDoD(myconf1)
 
     myconf2 = JetMakerConf(stdjets_name_addb,
                            Inputs=['Phys/PFParticles/Particles', line_location],
@@ -173,7 +173,7 @@ def create_stdjets(strob, line_location, stdjets_name_ban, stdjets_name_addb):
         strob.StdJetsNoJetIDAddB = [myconf2]
 
     # configure Data-On-Demand service
-    locations = updateDoD(myconf2)
+    updateDoD(myconf2)
 
 ##########################################
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingBs2gammagamma.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingBs2gammagamma.py
index c9930debcb2ccccce2049ad31333cbad37dedf9b..6a5687b6925e10b4b0d3db8e5eb980c03ae5ffdf 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingBs2gammagamma.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingBs2gammagamma.py
@@ -21,16 +21,11 @@ Exports the following stripping lines as instance data members:
 - Bs2gammagamma_NoConvWideLine  : wide line with 0 conversions
 '''
 
-from Configurables import (DiElectronMaker, ProtoParticleCALOFilter,
-                           ParticleTransporter, BremAdder)
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop  # , CombineParticles
-from CommonParticles import StdLooseAllPhotons
-from CommonParticles import StdAllLooseGammaConversion
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
 from Configurables import CombineParticles
-from Gaudi.Configuration import *
 __author__ = ['Sean Benson']
 __date__ = '2016/04/08'
 __version__ = '1.2'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingBs2st2KKMuX.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingBs2st2KKMuX.py
index 86d2fbe036d44821a158f2fba4fe7e558c1d3d55..22e9c5c994936c1db65ca0b5c70f9d8f5601bd3b 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingBs2st2KKMuX.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingBs2st2KKMuX.py
@@ -22,9 +22,8 @@ Stripping lines:
 from StandardParticles import StdLooseMuons, StdLooseKaons, StdAllLooseKaons, StdMassConstrainedJpsi2MuMu
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand
+from PhysSelPython.Wrappers import Selection
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = ['Jianchun Wang']
 __date__ = '03/22/2015'
 __version__ = '$Revision: 0.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingBu2LLK.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingBu2LLK.py
index 1389759595e92bafa372681f8efb4b4b0b010b83..80bf866570af75a51beac3d3bc5214c97aed49f3 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingBu2LLK.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingBu2LLK.py
@@ -10,7 +10,7 @@
 ###############################################################################
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection, AutomaticData
+from PhysSelPython.Wrappers import DataOnDemand, MergedSelection, Selection
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, DaVinci__N3BodyDecays, DaVinci__N5BodyDecays
 from Gaudi.Configuration import *
 __author__ = 'Patrick Koppenburg, Alex Shires, Thomas Blake, Luca Pescatore, Simone Bifani, Yasmine Amhis, Paula Alvarez Cartelle, Harry Cliff, Rafael Silva Coutinho, Guido Andreassi, Mick Mulder, Maarten van Veghel, John Smeaton, Vitalii Lisovskyi, Biplab Dey'
@@ -1733,7 +1733,6 @@ class Bu2LLKConf(LineBuilder):
         from StandardParticles import StdLooseMuons as Muons
         # from CommonParticles import StdLooseDetachedTau
         # Taus = DataOnDemand(Location = "Phys/StdLooseDetachedTau3pi/Particles")
-        from CommonParticles import StdTightDetachedTau
         Taus = DataOnDemand(Location="Phys/StdTightDetachedTau3pi/Particles")
 
         _DecayDescriptor = "[J/psi(1S) -> mu+ tau-]cc"
@@ -2080,7 +2079,6 @@ class Bu2LLKConf(LineBuilder):
 #################################################################################################################################
 
     def _storeInputBremPhotons(self, linename, outputlocprefix="Leptonic/Phys/", photonloc="Phys/StdVeryLooseAllPhotons/Particles"):
-        from PhysSelPython.Wrappers import FilterSelection, DataOnDemand, SelectionSequence
         from Configurables import (CopyParticles, ParticleCloner,
                                    ProtoParticleCloner, CaloHypoCloner,
                                    CaloClusterCloner)
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingBu2MajoLep.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingBu2MajoLep.py
index 5a96cdedd562ea723f6b2b20d6b2cf30f98f517f..850c2f87ccfaddc8f68a9b6e087f3f6d41cebbb1 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingBu2MajoLep.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingBu2MajoLep.py
@@ -19,12 +19,10 @@ __version__ = 'V0.9'
 __all__ = ('Bu2MajoLepConf',
            'default_config')
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
+from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from GaudiKernel.SystemOfUnits import *
 
 from StandardParticles import StdLooseMuons as Muons
 from StandardParticles import StdLoosePions as Pions
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingBu2MuNu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingBu2MuNu.py
index 19ce21e90e54ca7bc0f65d55187d37c95520c6d9..4163901dd65f50c70f659de9c335932f2c9649fa 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingBu2MuNu.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingBu2MuNu.py
@@ -25,12 +25,11 @@ __all__ = ('Bu2MuNuConf',
            'default_config')
 
 from Gaudi.Configuration import *
-from PhysSelPython.Wrappers import Selection, DataOnDemand
+from PhysSelPython.Wrappers import DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from StandardParticles import StdTightMuons, StdTightANNMuons
 from CommonParticles.Utils import *
-from Configurables import FilterDesktop, CombineParticles
+from Configurables import FilterDesktop
 from JetAccessories.JetMaker_Config import JetMakerConf
 
 default_name = 'Bu2MuNu'
@@ -72,7 +71,7 @@ def create_stdjets(strobj, line_location, stdjets_name_ban):
         strobj.StdJetsNoJetIDBan = [myconf1]
 
     # configure Data-On-Demand service
-    locations = updateDoD(myconf1)
+    updateDoD(myconf1)
 
 
 relInfoJetsVars = ["JETNOMU1PX", "JETNOMU1PY", "JETNOMU1PZ", "JETNOMU1PT", "JETNOMU1JETWIDTH", "JETNOMU1NNTAG", "JETNOMU1MNF", "JETNOMU2PX", "JETNOMU2PY", "JETNOMU2PZ", "JETNOMU2PT", "JETNOMU2JETWIDTH", "JETNOMU2NNTAG",
@@ -255,7 +254,7 @@ class Bu2MuNuConf(LineBuilder):
                                            JetIDCut=False).algorithms[0]
 
         # configure Data-On-Demand service
-        locations = updateDoD(StdJetsNoJetIDNoBan)
+        updateDoD(StdJetsNoJetIDNoBan)
 
         # add the jets with the specific banning
         create_stdjets(self, self.ControlLine.outputLocation(),
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingD23MuLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingD23MuLines.py
index 9d9153bde02604dd6518511524323b953c58b810..a119c6aadabeb6405ae23f48d28004723f035a3b 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingD23MuLines.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingD23MuLines.py
@@ -51,12 +51,11 @@ __all__ = ("D23MuLinesConf",
 #############################################################################
 
 from Gaudi.Configuration import *
-from Configurables import FilterDesktop, CombineParticles, DaVinci__N3BodyDecays
+from Configurables import DaVinci__N3BodyDecays
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 # from StrippingSelections.Utils import checkConfig
-from GaudiKernel.PhysicalConstants import c_light
 
 #############################################################################
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingDarkBoson.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingDarkBoson.py
index 754d0f38050b7a4694b6c0d51d824b1e808d61c3..e79bed1bf4d9ba4dcb692145cb4e20d25fe0063e 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingDarkBoson.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingDarkBoson.py
@@ -17,23 +17,18 @@ Author: M. Williams, D. Craik
 from Configurables import DiElectronMaker, ProtoParticleCALOFilter
 from GaudiConfUtils.ConfigurableGenerators import DaVinci__N3BodyDecays
 from CommonParticles.Utils import *
-from copy import deepcopy
 from Configurables import SubstitutePID
 from StandardParticles import StdAllLooseGammaLL, StdAllLooseGammaDD, \
     StdAllLooseElectrons, StdLooseAllPhotons  # , StdDiElectronFromTracks
 from Beauty2Charm_LoKiCuts import LoKiCuts
 from StandardParticles import StdAllNoPIDsPions, StdAllNoPIDsKaons, \
-    StdAllNoPIDsProtons, StdNoPIDsUpPions, StdAllLooseMuons, \
-    StdLooseDownMuons
-from Configurables import LoKi__VoidFilter
+    StdAllLooseMuons, StdLooseDownMuons
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import EventSelection
 from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
 from Gaudi.Configuration import *
-import re
 __author__ = ['Mike Williams', 'Dan Craik']
 
 moduleName = 'DarkBoson'
@@ -364,7 +359,7 @@ class DarkBosonConf(LineBuilder):
         mmDDX = makeX(
             'MuMuDD', default_config['XDD'], 'KS0 -> mu+ mu-', [muDX])
         kkX = makeX('KK', default_config['XLL'], 'KS0 -> K+ K-', [kX])
-        kkDDX = makeX('KKDD', default_config['XDD'], 'KS0 -> K+ K-', [kDX])
+        makeX('KKDD', default_config['XDD'], 'KS0 -> K+ K-', [kDX])
         pipiX = makeX(
             'PiPi', default_config['XLLhard'], 'KS0 -> pi+ pi-', [piX])
         pipiDDX = makeX(
@@ -419,7 +414,7 @@ class DarkBosonConf(LineBuilder):
             'PiPiSSDD', default_config['XDD'], '[KS0 -> pi+ pi+]cc', [piDX])
         preSS = default_config['Prescales']['SS']
 
-        preDD = default_config['Prescales']['DD']
+        default_config['Prescales']['DD']
         preKK = default_config['Prescales']['KK']
 
         j = makeJ(default_config['J'], [muJ])
@@ -630,7 +625,7 @@ class DarkBosonConf(LineBuilder):
         kst = filterKst()
         self._makeBLine('B2JKst', ['[B0 -> J/psi(1S) K*(892)0]cc'],
                         [j, kst], default_config['B2KX'])
-        rho = makeRho([piB])
+        makeRho([piB])
         # self._makeBLine('B2RhoX2MuMu',['B0 -> rho(770)0 KS0'],[rho,mmX],
         #                default_config['B2HHX'])
         # self._makeBLine('B2RhoX2MuMuDD',['B0 -> rho(770)0 KS0'],[rho,mmDDX],
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingDoubleSLForRX.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingDoubleSLForRX.py
index f7e5ccc228e7525247584f38f94bf53502f3cdea..3116bd40e9e8d6da906924d79ac8c85fabf37565 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingDoubleSLForRX.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingDoubleSLForRX.py
@@ -19,7 +19,6 @@ from GaudiConfUtils.ConfigurableGenerators import (CombineParticles,
                                                    DaVinci__N3BodyDecays)
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from Gaudi.Configuration import *
 __author__ = 'M. Kreps, T. Blake, D. Loh'
 __date__ = '10/11/2016'
 __version__ = '$Revision: 1.0$'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingHypb2L0HGamma.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingHypb2L0HGamma.py
index 83e2745fd58ace3d154d5c84e17588243850ee63..e33667deb325d3bc47009996d2c37915a3a42fd3 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingHypb2L0HGamma.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingHypb2L0HGamma.py
@@ -16,8 +16,8 @@ __all__ = ('Hypb2L0HGammaConf',
            'default_config', )
 
 from Gaudi.Configuration import *
-from Configurables import FilterDesktop, CombineParticles, TisTosParticleTagger
-from PhysSelPython.Wrappers import Selection, MergedSelection, DataOnDemand
+from Configurables import CombineParticles, FilterDesktop
+from PhysSelPython.Wrappers import DataOnDemand, Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from StandardParticles import StdLooseAllPhotons
@@ -495,7 +495,7 @@ def tisTosSelection(sel, TISTOSdict):
 
 
 def makevelotracks(name):
-    from Configurables import FastVeloTracking, TrackPrepareVelo, DecodeVeloRawBuffer, TrackEventFitter, TrackStateInitAlg,  TrackContainerCopy
+    from Configurables import FastVeloTracking, TrackContainerCopy, TrackStateInitAlg
     from TrackFitter.ConfiguredFitters import ConfiguredEventFitter
 
     MyFastVeloTracking = FastVeloTracking(
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingK0s2XXMuMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingK0s2XXMuMu.py
index 454c44356bf363573cfae8fad85f13e9b83e92ea..dc8a94331712da6fda2d902eeaadf4a4c7f30f0f 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingK0s2XXMuMu.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingK0s2XXMuMu.py
@@ -19,9 +19,7 @@ from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection
 from StandardParticles import StdAllLoosePions, StdAllLooseMuons
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-from GaudiKernel.PhysicalConstants import c_light
-from GaudiKernel.SystemOfUnits import MeV, m, mm, picosecond
-from Gaudi.Configuration import *
+from GaudiKernel.SystemOfUnits import MeV, mm, picosecond
 __author__ = ['Miguel Ramos Pernas']
 __date__ = '10/10/2017'
 __version__ = '$Revision: 0.00 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingKshort2Leptons.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingKshort2Leptons.py
index 83456277a05a2d15a84b3c40618055fab95e052a..d92e0c670b0be9bdf5477406d71070e64f531e88 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingKshort2Leptons.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingKshort2Leptons.py
@@ -11,7 +11,6 @@
 from SelPy.utils import (UniquelyNamedObject,
                          ClonableObject,
                          SelectionBase)
-from itertools import product
 from Configurables import ChargedProtoParticleMaker, NoPIDsParticleMaker, DelegatingTrackSelector, CombineParticles, LoKi__VertexFitter
 from CommonParticles.Utils import *
 from StandardParticles import StdNoPIDsUpElectrons
@@ -23,11 +22,9 @@ from StandardParticles import StdNoPIDsDownPions
 from StandardParticles import StdAllNoPIDsPions
 from StandardParticles import StdLooseDownMuons
 from StandardParticles import StdAllLooseMuons
-from StandardParticles import StdAllNoPIDsMuons
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection
-from GaudiConfUtils.ConfigurableGenerators import DaVinci__N3BodyDecays as Combine3Particles
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
 from Gaudi.Configuration import *
 __author__ = ['Adrian Casais Vidal', 'Carla Marin',
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingKshort2MuMuMuMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingKshort2MuMuMuMu.py
index 86a943e5a6fb41852c6a9f29c92389947b9c890f..81ef82f2043ed504638103a44bd0a0e915d41771 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingKshort2MuMuMuMu.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingKshort2MuMuMuMu.py
@@ -15,15 +15,12 @@ derived, in large measure, from StrippingKshort2PiPiMuMu.py
 '''
 
 from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays
-from GaudiKernel.SystemOfUnits import MeV
-from StandardParticles import StdNoPIDsDownPions, StdLooseDownMuons
-from StandardParticles import StdAllLoosePions, StdAllLooseMuons, StdAllNoPIDsPions
-from StandardParticles import StdLoosePions, StdLooseMuons, StdNoPIDsPions
+from StandardParticles import StdLooseDownMuons
+from StandardParticles import StdAllLooseMuons
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
+from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
 __author__ = ['Mike Sokoloff']
 __date__ = '07 January 2014'
 __version__ = '$Revision: 0.1 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingKshort2PiPiMuMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingKshort2PiPiMuMu.py
index 0955f65fa0e2efdcb575b1c11a7ad439f53a1944..07b134c737342e2921702f4d74fa30eda7121cf9 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingKshort2PiPiMuMu.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingKshort2PiPiMuMu.py
@@ -10,15 +10,12 @@
 ###############################################################################
 
 from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays
-from GaudiKernel.SystemOfUnits import MeV
 from StandardParticles import StdNoPIDsDownPions, StdLooseDownMuons
-from StandardParticles import StdAllLoosePions, StdAllLooseMuons, StdAllNoPIDsPions
-from StandardParticles import StdLoosePions, StdLooseMuons, StdNoPIDsPions
+from StandardParticles import StdAllLooseMuons, StdAllLoosePions
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
+from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
 __author__ = ['Mike Sokoloff']
 __date__ = '25/10/2012'
 __version__ = '$Revision: 0.1 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingKshort2eePiPi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingKshort2eePiPi.py
index 45b59c0fd9ae49240a75a9caff9e2ff006af5fa5..832334778db6e7c5c42f3ac70aab3b7cd6ca4026 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingKshort2eePiPi.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingKshort2eePiPi.py
@@ -16,7 +16,6 @@ from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection
 from GaudiConfUtils.ConfigurableGenerators import DaVinci__N3BodyDecays as Combine3Particles
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
-from Gaudi.Configuration import *
 __author__ = ['Carla Marin']
 __date__ = '23/11/2016'
 __version__ = '$1.1 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingLFVLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingLFVLines.py
index 4a7726e9b33f8cb67d0e0e1c4052c9f7f01e78b5..279eff2f3e813fb4043b2104ebb0bf7955e48339 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingLFVLines.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingLFVLines.py
@@ -23,14 +23,12 @@ __all__ = ('LFVLinesConf',
            'default_config',
            )
 
-from Gaudi.Configuration import *
 # from Configurables import FilterDesktop, CombineParticles
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, DaVinci__N3BodyDecays
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N3BodyDecays
 from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from GaudiKernel.PhysicalConstants import c_light
-from GaudiKernel.SystemOfUnits import GeV, MeV, mm
+from GaudiKernel.SystemOfUnits import MeV, mm
 from copy import deepcopy
 #
 # Configure related info tools
@@ -1284,7 +1282,7 @@ class LFVLinesConf(LineBuilder):
         hemu_name = name+'B2heMu'
         pmu_name = name+'B2hMu'
         bu_name = name+'Bu2KJPsiee'
-        taumu_name = name+'B2TauMu'
+        name+'B2TauMu'
         htaumu_name = name+'B2hTauMu'
         muetap_gamma_name = name+'Tau2MuEtaP2pipig'
         muetap_pi_name = name+'Tau2MuEtaP2pipipi'
@@ -1778,7 +1776,6 @@ def makeB2TauMu(name):
         "& (BPVVDCHI2> 225)"\
         "& (BPVIPCHI2()< 25) "
 
-    from CommonParticles import StdLooseDetachedTau, StdLooseDipion
     _stdLooseMuons = DataOnDemand(Location="Phys/StdLooseMuons/Particles")
     _stdLooseDetachedTaus = DataOnDemand(
         Location="Phys/StdLooseDetachedTau3pi/Particles")
@@ -2418,7 +2415,6 @@ def makeB2hTauMu(name):
                           "& (BPVVDCHI2> 225)"\
                           "& (BPVIPCHI2()< 16) "  # maybe 16
 
-    from CommonParticles import StdLooseDetachedTau, StdLooseDipion
     _stdLooseMuons = DataOnDemand(Location="Phys/StdLooseMuons/Particles")
     _stdLooseDetachedTaus = DataOnDemand(
         Location="Phys/StdLooseDetachedTau3pi/Particles")
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingLb2L0Gamma.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingLb2L0Gamma.py
index 802119884510c53e5cf00d3e4788223b09ab5a71..bfcf8336af14cb0e5ff39ae2da6502181e9066d9 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingLb2L0Gamma.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingLb2L0Gamma.py
@@ -25,9 +25,6 @@ __date__ = "14.11.2016"
 __version__ = "2.0"
 __all__ = ("default_config", "StrippingLb2L0GammaConf")
 
-import os
-
-from Gaudi.Configuration import *
 
 from Configurables import CombineParticles
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
@@ -36,9 +33,7 @@ from PhysSelPython.Wrappers import Selection, MergedSelection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 
-from StandardParticles import StdAllNoPIDsPions, StdAllNoPIDsProtons
 from StandardParticles import StdLooseAllPhotons, StdAllLooseGammaDD, StdAllLooseGammaLL
-from StandardParticles import StdVeryLooseDetachedKst2Kpi
 from StandardParticles import StdLooseJpsi2MuMu
 
 default_config = {'NAME': 'Lb2L0Gamma',
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingLc23MuLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingLc23MuLines.py
index b2244bd7aa9f116d9783ce03a8fc1944cde17b39..3d97e939f7633e3e700dd756976cae1b815955f7 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingLc23MuLines.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingLc23MuLines.py
@@ -68,12 +68,11 @@ __all__ = ("Lc23MuLinesConf",
 ###################################################################################################
 
 from Gaudi.Configuration import *
-from Configurables import FilterDesktop, CombineParticles, DaVinci__N3BodyDecays, DaVinci__N4BodyDecays
+from Configurables import CombineParticles, DaVinci__N3BodyDecays, DaVinci__N4BodyDecays
 # from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from GaudiKernel.PhysicalConstants import c_light
 
 ###################################################################################################
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingMultiLepton.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingMultiLepton.py
index afbfe24d38ca0ad99bb80d52c8473be1c8076e1a..c83aa90e0286b93a0882a2d1617fe54f9de8d006 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingMultiLepton.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingMultiLepton.py
@@ -12,8 +12,8 @@ from CommonParticles.Utils import *
 from GaudiKernel.SystemOfUnits import *
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection, AutomaticData
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, DaVinci__N3BodyDecays, DaVinci__N4BodyDecays, DaVinci__N5BodyDecays, DaVinci__N6BodyDecays
+from PhysSelPython.Wrappers import DataOnDemand, MergedSelection, Selection
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N3BodyDecays, DaVinci__N4BodyDecays, FilterDesktop
 from Gaudi.Configuration import *
 __author__ = 'Vitalii Lisovskyi'
 __date__ = '05/03/2021'
@@ -100,14 +100,11 @@ class MultiLeptonConf(LineBuilder):
         Jpsi2Mu3EDetLine_name = name+'_Jpsi2Mu3EDetached'
         Jpsi2Mu3EPromptLine_name = name+'_Jpsi2Mu3EPrompt'
 
-        from StandardParticles import StdLoosePions as Pions
         from StandardParticles import StdLooseKaons as Kaons
-        from StandardParticles import StdLooseProtons as Protons
         from StandardParticles import StdVeryLooseKsLL as KshortsLL
         from StandardParticles import StdLooseKsDD as KshortsDD
         from StandardParticles import StdVeryLooseLambdaLL as LambdasLL
         from StandardParticles import StdLooseLambdaDD as LambdasDD
-        from StandardParticles import StdLooseLambdaLD as LambdasLD
         from StandardParticles import StdLoosePhi2KK as Phi2KK
         from StandardParticles import StdLooseKstar2Kpi as KstartoKpi
         from StandardParticles import StdLooseLambdastar2pK as Lstar
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingPhiToKSKS.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingPhiToKSKS.py
index ff157859dd3877ab38f9cad234fb49a80418e50d..1a62ef5db16a204dc0a3d66d1fd1d1f75d4a04d4 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingPhiToKSKS.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingPhiToKSKS.py
@@ -23,8 +23,7 @@ from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from StandardParticles import StdAllLooseKaons, StdAllLooseMuons
-from Configurables import FitDecayTrees
-from PhysSelPython.Wrappers import AutomaticData, MergedSelection
+from PhysSelPython.Wrappers import MergedSelection
 
 __all__ = ('PhiToKSKSAllLinesConf',
            'TOSFilter',
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingRareBaryonicMuMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingRareBaryonicMuMu.py
index e3c0eaddce01018392bdba4b396503b925c88a07..51ba747a021efc15c1337eff37065053e6f7babf 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingRareBaryonicMuMu.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingRareBaryonicMuMu.py
@@ -12,11 +12,10 @@ from GaudiKernel.SystemOfUnits import MeV
 from CommonParticles.Utils import updateDoD
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection, AutomaticData
+from PhysSelPython.Wrappers import AutomaticData, MergedSelection, Selection
 from Configurables import (ResolvedPi0Maker, PhotonMaker)
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N3BodyDecays, DaVinci__N4BodyDecays
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop as FilterDesktop_GC
-from Gaudi.Configuration import *
 __author__ = 'Vitalii Lisovskyi'
 __date__ = '26/02/2021'
 __version__ = '$Revision: 0 $'
@@ -343,7 +342,6 @@ class RareBaryonicMuMuConf(LineBuilder):
         # 2 : Make Dileptons
 
         from StandardParticles import StdLooseDiMuon as DiMuons
-        MuonID = "(HASMUON)&(ISMUON)"
         DiMuonID = "(2 == NINTREE((ABSID==13)&(HASMUON)&(ISMUON)))"
         DiElectronID = "(2 == NINTREE((ABSID==11)&(PIDe>0)))"
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingRareNStrange.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingRareNStrange.py
index a24627bc3e07197df367fefe4a22da371088d698..ff85ddd9295400d397f4543aa160622a121c5a9b 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingRareNStrange.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingRareNStrange.py
@@ -10,9 +10,8 @@
 ###############################################################################
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection, AutomaticData
+from PhysSelPython.Wrappers import Selection
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = 'Diego Martinez Santos, Carlos Vazquez, Xabier Cid, Jessica Prisciandaro'
 __date__ = '08/05/2015'
 __version__ = '$Revision: Not sure $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingRareStrange.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingRareStrange.py
index 6f7264e1db8f4045b2b139a11daa3e90056e3c44..bba73d994ee42cf94a9237f00597a4d7be7cc54d 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingRareStrange.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingRareStrange.py
@@ -59,15 +59,11 @@ __all__ = ('RareStrangeLinesConf',
 from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 from GaudiConfUtils.ConfigurableGenerators import DaVinci__N3BodyDecays as Combine3Particles
-from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays as Combine4Particles
-from CommonParticles import StdNoPIDsDownElectrons
 from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from GaudiKernel.PhysicalConstants import c_light
-from StandardParticles import (StdAllNoPIDsPions, StdNoPIDsDownPions,
-                               StdLoosePions, StdLooseDownMuons,
-                               StdLooseMergedPi0, StdLooseResolvedPi0, StdLooseDalitzPi0)
+from StandardParticles import (StdLooseMergedPi0, StdLooseResolvedPi0,
+                               StdLooseDalitzPi0)
 
 # from CommonParticles.StdLooseDalitzPi0 import (StdLoosePi02gee, StdLoosePi024e)
 
@@ -2786,7 +2782,7 @@ def makeLambdaPPiEE(name, config, inputs):
 
 
 def makevelotracks(name):
-    from Configurables import FastVeloTracking, TrackPrepareVelo, DecodeVeloRawBuffer, TrackEventFitter, TrackStateInitAlg,  TrackContainerCopy
+    from Configurables import FastVeloTracking, TrackContainerCopy, TrackStateInitAlg
     from TrackFitter.ConfiguredFitters import ConfiguredEventFitter
 
     MyFastVeloTracking = FastVeloTracking(
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingSb2PKMuXPi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingSb2PKMuXPi.py
index 1a58f8ff04bce6f56de5c4ab5c3629cf15490947..c9a1d99c746dfb072966681ef100532dfcb168de 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingSb2PKMuXPi.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingSb2PKMuXPi.py
@@ -12,9 +12,8 @@
 
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, MergedSelection, AutomaticData
+from PhysSelPython.Wrappers import MergedSelection, Selection
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = "Dan Thompson; based on combination of Bu2LLK lines and Bs2st2KKMuXLine"
 __date__ = "14/06/2021"
 __version__ = "$Revision: 1$"
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingStrangeHadrons.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingStrangeHadrons.py
index 5c16fb7fd63ec1f15df76e17b03a96af7c5a4c61..e2488a937f3c160c5d1dc0bbb81310ee8ff58466 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingStrangeHadrons.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingStrangeHadrons.py
@@ -35,23 +35,12 @@ __all__ = ('default_config',
            'StrangeHadronsConf',
            )
 
-import os
 
-from Gaudi.Configuration import *
-
-from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-
-from GaudiConfUtils.ConfigurableGenerators import DaVinci__N3BodyDecays as Combine3Particles
-from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays as Combine4Particles
-from CommonParticles import StdNoPIDsDownElectrons
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
+from PhysSelPython.Wrappers import DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from GaudiKernel.PhysicalConstants import c_light
 from GaudiKernel.SystemOfUnits import MeV
 
-from StandardParticles import StdAllNoPIDsPions, StdLoosePions, StdLooseProtons, StdAllLoosePions, StdAllLooseMuons
-from StandardParticles import StdLooseAllPhotons
 ##
 from PhysConf.Selections import CombineSelection
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingStrangeSL.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingStrangeSL.py
index 5134ef5434ea3f244733fc6ac26485b868c228fb..26590be4ba73ad6710f007e7e831cea2a4a4b23a 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingStrangeSL.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingStrangeSL.py
@@ -36,23 +36,12 @@ __all__ = ('default_config',
            'StrangeSLConf',
            )
 
-import os
 
-from Gaudi.Configuration import *
-
-from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-
-from GaudiConfUtils.ConfigurableGenerators import DaVinci__N3BodyDecays as Combine3Particles
-from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays as Combine4Particles
-from CommonParticles import StdNoPIDsDownElectrons
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
+from PhysSelPython.Wrappers import DataOnDemand, Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from GaudiKernel.PhysicalConstants import c_light
 from GaudiKernel.SystemOfUnits import MeV
 
-from StandardParticles import StdAllNoPIDsPions, StdLoosePions, StdLooseProtons, StdAllLoosePions, StdAllLooseMuons, StdAllLooseElectrons
-from StandardParticles import StdLooseMergedPi0, StdLooseResolvedPi0, StdLooseDalitzPi0
 from PhysConf.Selections import CombineSelection
 
 default_config = {
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingTau23MuLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingTau23MuLines.py
index d2bc92f6cce7f5bd010c90bfbed1d26ec6298dc4..f76088d68ebb79ec8363df3707e480e3955aa4fe 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingTau23MuLines.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingTau23MuLines.py
@@ -36,7 +36,6 @@ from GaudiConfUtils.ConfigurableGenerators import DaVinci__N5BodyDecays as Combi
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from GaudiKernel.PhysicalConstants import c_light
 
 default_config = {
     'NAME': 'Tau23Mu',
@@ -74,7 +73,7 @@ class Tau23MuLinesConf(LineBuilder):
         tau_name = name+'Tau23Mu'
         tau_name_DST = name+'Tau23Mu_DST'
         tau_name_DST_3mu = name+'Tau23Mu_DST_3mu'
-        ds23PiTIS_name = name+'Ds23PiTIS'
+        name+'Ds23PiTIS'
         ds23Pi_name = name+'Ds23Pi'
         ds2PhiPi_name = name+'Ds2PhiPi'
         ds2PhiPi_name_DST = name+'Ds2PhiPi_DST'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingTau2LambdaMuLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingTau2LambdaMuLines.py
index 6f7caa01d008433cca4a3184d6bdfeb2a9bcd909..2e5401740f914b698345c335bfe29788f1e7ed2e 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingTau2LambdaMuLines.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingTau2LambdaMuLines.py
@@ -16,12 +16,10 @@ Exported symbols (use python help!):
    - 
 '''
 
-from GaudiKernel.PhysicalConstants import c_light
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
-from Configurables import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
+from Configurables import CombineParticles
 __author__ = ['Marcin Chrzaszcz']
 __date__ = '14/12/2012'
 __version__ = '$Revision: 1.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingZVTOP.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingZVTOP.py
index f4ee63f69c4320486335e4fa797004ccb36ecca4..6b5cbfa74e249908ea9e854e9c0f238ebdd2d9cf 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingZVTOP.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingRD/StrippingZVTOP.py
@@ -9,14 +9,12 @@
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
 from Configurables import TopoTauAlg, TopoVertexTool
-from StandardParticles import StdLooseKaons
-from StandardParticles import StdLoosePions, StdTightPions
-from StandardParticles import StdNoPIDsKaons, StdNoPIDsPions
+from StandardParticles import StdLoosePions
+from StandardParticles import StdNoPIDsPions
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, OfflineVertexFitter
-from Gaudi.Configuration import *
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop
 __author__ = ['Giampi Mancinelli', 'Julien Cogan', 'Justine Serrano']
 
 __date__ = '14/01/2014'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingSL/StrippingB23MuNu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingSL/StrippingB23MuNu.py
index 73f06f15243522a9ee6fbe3cdad49e8549ea82f5..b59d48fb8b976f7da0abc2b960db7c139bd1f7d6 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingSL/StrippingB23MuNu.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingSL/StrippingB23MuNu.py
@@ -19,15 +19,12 @@ __all__ = ('B23MuNuConf', 'default_config')
 Stripping selection for B to three muons and a neutrino.
 """
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop
 
-from PhysSelPython.Wrappers import Selection, AutomaticData, MergedSelection
+from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from LHCbKernel.Configuration import *  # check if needed
-from Configurables import SubstitutePID
-from Configurables import SubPIDMMFilter
 
 
 #################
@@ -282,7 +279,6 @@ class B23MuNuConf(LineBuilder):
         )
 
         # specify leptons to identify the muon candidate
-        RelInfoTools_fake_mumue = RelInfoTools_fake
         # RelInfoTools_fake_mumue[0] = { "Type" : "RelInfoMuonIDPlus",
         #                     "Variables" : ["MU_BDT"],
         #                     "DaughterLocations"  : {
@@ -416,15 +412,13 @@ class B23MuNuConf(LineBuilder):
         """
         Creates Jpsi as proxy for dimuon
         """
-        from PhysSelPython.Wrappers import AutomaticData, Selection, SelectionSequence, DataOnDemand, MergedSelection
+        from PhysSelPython.Wrappers import Selection
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         # from Configurables import CombineParticles
 
         CombineJpsi = CombineParticles(DecayDescriptors=["J/psi(1S) -> mu+ mu-", "[J/psi(1S) -> mu+ mu+]cc"],
                                        MotherCut="ALL")
 
-        sel_name = "Jpsi"
-
         from PhysSelPython.Wrappers import Selection
         SelJpsi = Selection("Sel_" + self.name + "_Jpsi", Algorithm=CombineJpsi,
                             RequiredSelections=[self.Muons])
@@ -434,15 +428,13 @@ class B23MuNuConf(LineBuilder):
         """
         Creates Jpsi as proxy for dielectron
         """
-        from PhysSelPython.Wrappers import AutomaticData, Selection, SelectionSequence, DataOnDemand, MergedSelection
+        from PhysSelPython.Wrappers import Selection
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         # from Configurables import CombineParticles
 
         CombineJpsi = CombineParticles(DecayDescriptors=["J/psi(1S) -> e+ e-", "[J/psi(1S) -> e+ e+]cc"],
                                        MotherCut="ALL")
 
-        sel_name = "Jpsi"
-
         from PhysSelPython.Wrappers import Selection
         SelJpsi = Selection("Sel_" + self.name + "_Jpsiee", Algorithm=CombineJpsi,
                             RequiredSelections=[self.Electrons])
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingSL/StrippingB2DMuForTauMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingSL/StrippingB2DMuForTauMu.py
index bbb6591f636c547192b1c9759ebfeedf27b88e2b..8bd9a436ea3d941e0b4ec5b3610d262206579753 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingSL/StrippingB2DMuForTauMu.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingSL/StrippingB2DMuForTauMu.py
@@ -18,12 +18,10 @@ __version__ = '$Revision: 2.0 $'
 
 from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from PhysSelPython.Wrappers import Selection, DataOnDemand
+from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from StandardParticles import StdLoosePions, StdAllLooseMuons, StdLooseKaons, StdLooseProtons, StdAllLoosePions, StdLooseMergedPi0, StdLooseResolvedPi0, StdAllNoPIDsMuons, StdLooseANNUpPions
-from Configurables import ConjugateNeutralPID
-from PhysSelPython.Wrappers import MergedSelection
+from StandardParticles import StdAllLooseMuons, StdAllNoPIDsMuons, StdLooseKaons, StdLoosePions, StdLooseProtons
 
 __all__ = ('B2DMuForTauMuconf',
            # 'makeb2DMuX',
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingSL/StrippingB2DMuNuX.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingSL/StrippingB2DMuNuX.py
index 51c5a39b0e68d79ff13fd973b9049f68df623cb8..3ffd86fc01b71b7801c6bd140f16f695e248450c 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingSL/StrippingB2DMuNuX.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingSL/StrippingB2DMuNuX.py
@@ -13,14 +13,13 @@ __date__ = '23/07/2010'
 __version__ = '$Revision: 5.0 $'
 
 from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
+from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
 from PhysSelPython.Wrappers import Selection
-from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from StandardParticles import StdLoosePions, StdLooseMuons, StdLooseKaons, StdLooseProtons, StdLooseElectrons
 from StandardParticles import StdNoPIDsPions, StdNoPIDsKaons, StdNoPIDsProtons, StdNoPIDsMuons
 from StrippingB2DMuNuXUtils import *
-from GaudiKernel.SystemOfUnits import MeV, GeV, cm, mm
+from GaudiKernel.SystemOfUnits import GeV, MeV, mm
 
 __all__ = ('B2DMuNuXAllLinesConf',
            'default_config')
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingSL/StrippingB2DMuNuXUtils.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingSL/StrippingB2DMuNuXUtils.py
index 34c3af4e61a9d753aa459abad0af31e3fe01da0e..efaa9d2a15bbc424b459896d227733451f06e069 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingSL/StrippingB2DMuNuXUtils.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingSL/StrippingB2DMuNuXUtils.py
@@ -13,11 +13,9 @@ __date__ = '06/03/2015'
 __version__ = '$Revision: 0.0 $'
 
 from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
-from StrippingUtils.Utils import LineBuilder
-from StandardParticles import StdLoosePions, StdLooseMuons, StdLooseKaons, StdLooseProtons, StdNoPIDsPions, StdLooseElectrons, StdNoPIDsMuons
 
 
 def BtoDlnuLine(module_name,
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingSL/StrippingB2Dlnu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingSL/StrippingB2Dlnu.py
index 0c8d00bd94717af821926626f5446a85cb20a902..b05a05c95319c31661cfe61524eca70e234905c3 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingSL/StrippingB2Dlnu.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingSL/StrippingB2Dlnu.py
@@ -17,12 +17,10 @@ __version__ = '$Revision: 1.0 $'
 
 from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from PhysSelPython.Wrappers import Selection, DataOnDemand
+from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from StandardParticles import StdLoosePions, StdLooseMuons, StdLooseKaons, StdLooseProtons, StdAllLoosePions, StdLooseMergedPi0, StdLooseResolvedPi0, StdAllNoPIDsMuons, StdLooseANNUpPions, StdLooseElectrons
-from Configurables import ConjugateNeutralPID
-from PhysSelPython.Wrappers import MergedSelection
+from StandardParticles import StdAllNoPIDsMuons, StdLooseElectrons, StdLooseKaons, StdLooseMuons, StdLoosePions
 
 __all__ = ('B2DMuForLNuconf',
            # 'makeb2DMuX',
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingSL/StrippingB2Dst0MuNu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingSL/StrippingB2Dst0MuNu.py
index 3f6fd96ade4433b51152a37ee46ccbd072892fbe..e98d2b4850975113ec77abeed5a53c59a6ba950c 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingSL/StrippingB2Dst0MuNu.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingSL/StrippingB2Dst0MuNu.py
@@ -12,12 +12,11 @@ __author__ = ['Michel De Cian']
 __date__ = '12/12/2018'
 __version__ = '$Revision: 0.0 $'
 
-from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from PhysSelPython.Wrappers import Selection, DataOnDemand
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
+from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from StandardParticles import StdLoosePions, StdLooseMuons, StdLooseKaons, StdAllLoosePions, StdAllLooseElectrons, StdLooseResolvedPi0, StdLooseMergedPi0, StdLooseDalitzPi0
+from StandardParticles import StdAllLooseElectrons, StdLooseDalitzPi0, StdLooseKaons, StdLooseMergedPi0, StdLooseMuons, StdLoosePions, StdLooseResolvedPi0
 
 __all__ = ('B2Dst0MuNuAllLinesConf',
            'TOSFilter',
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingSL/StrippingB2DstMuNuIncl.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingSL/StrippingB2DstMuNuIncl.py
index 6abd041bf344194b0ad86747d5d5622ae5fdddf9..3a91f70e613b554c2c0d5b7095d89a8eb3c67f3d 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingSL/StrippingB2DstMuNuIncl.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingSL/StrippingB2DstMuNuIncl.py
@@ -12,9 +12,8 @@ __author__ = ['Mika Vesterinen']
 __date__ = '04/04/2015'
 __version__ = '$Revision: 0.0 $'
 
-from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from PhysSelPython.Wrappers import Selection, DataOnDemand
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
+from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from StandardParticles import StdLoosePions, StdLooseMuons, StdLooseKaons, StdAllLoosePions
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingSL/StrippingB2Invis.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingSL/StrippingB2Invis.py
index 59745cf95a2bca024482d13cbd55b7e541adc062..8839d6b97306b18d1dbfbdbbe8f6ad75be31223c 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingSL/StrippingB2Invis.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingSL/StrippingB2Invis.py
@@ -15,12 +15,7 @@ __version__ = '$Revision: 0.0 $'
 These are some lines for measuring the BF of Lc->pKpi and Ds->KKpi
 """
 
-from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from PhysSelPython.Wrappers import Selection, DataOnDemand
-from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from StandardParticles import StdLoosePions, StdLooseMuons, StdLooseKaons, StdAllLoosePions
 
 __all__ = ('B2InvisAllLinesConf',
            'default_config')
@@ -267,7 +262,7 @@ class B2InvisAllLinesConf(LineBuilder):
     ##### B+ Filter #####
     def _BpFilter(self):
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-        from PhysSelPython.Wrappers import Selection, MergedSelection
+        from PhysSelPython.Wrappers import Selection
 
         _XuPi = CombineParticles(
             DecayDescriptors=["[B+ -> Delta++ pi-]cc"], ReFitPVs=True)
@@ -284,7 +279,7 @@ class B2InvisAllLinesConf(LineBuilder):
     ##### B+ same-sign Filter #####
     def _Bp_SSFilter(self):
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-        from PhysSelPython.Wrappers import Selection, MergedSelection
+        from PhysSelPython.Wrappers import Selection
 
         _XuPi = CombineParticles(
             DecayDescriptors=["[B+ -> Delta++ pi+]cc"], ReFitPVs=True)
@@ -301,7 +296,7 @@ class B2InvisAllLinesConf(LineBuilder):
     ##### B+ fake proton Filter #####
     def _Bp_fakeP_Filter(self):
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-        from PhysSelPython.Wrappers import Selection, MergedSelection
+        from PhysSelPython.Wrappers import Selection
 
         _XuPi = CombineParticles(
             DecayDescriptors=["[B+ -> Delta++ pi-]cc"], ReFitPVs=True)
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingSL/StrippingB2PPbarMuForTauMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingSL/StrippingB2PPbarMuForTauMu.py
index ab951b0dfdbe3c2477ad4d89c79ee826f8481641..94a83f33e4ac596cf3fc5d5e11a0581d31138c26 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingSL/StrippingB2PPbarMuForTauMu.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingSL/StrippingB2PPbarMuForTauMu.py
@@ -9,9 +9,7 @@
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
 
-import logging
 from StrippingUtils.Utils import LineBuilder
-from Gaudi.Configuration import *
 __author__ = ['Mark Smith']
 __date__ = '17/10/2016'
 __version__ = '$Revision: 1.0 $'
@@ -107,8 +105,6 @@ class B2PPbarMuForTauMuBuilder(LineBuilder):
     def __init__(self, name, config):
         LineBuilder.__init__(self, name, config)
 
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
-
         self.GECs = {"Code": "( recSummary(LHCb.RecSummary.nSPDhits,'Raw/Spd/Digits') < %(GEC_nSPDHits)s )" % config,
                      "Preambulo": ["from LoKiTracks.decorators import *"]}
 
@@ -448,7 +444,7 @@ class B2PPbarMuForTauMuBuilder(LineBuilder):
     ###### B->ppMuNu Signal ######
     def _bhad2PMuX_B(self):
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-        from PhysSelPython.Wrappers import Selection, MergedSelection
+        from PhysSelPython.Wrappers import Selection
 
         _pMu = CombineParticles(
             DecayDescriptors=self._config["DECAYS"], ReFitPVs=True)
@@ -465,7 +461,7 @@ class B2PPbarMuForTauMuBuilder(LineBuilder):
     ###### B->ppMuNu Signal for Topo Line ######
     def _bhad2PMuX_BTopo(self):
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-        from PhysSelPython.Wrappers import Selection, MergedSelection
+        from PhysSelPython.Wrappers import Selection
 
         _pMu = CombineParticles(
             DecayDescriptors=self._config["DECAYS"], ReFitPVs=True)
@@ -482,7 +478,7 @@ class B2PPbarMuForTauMuBuilder(LineBuilder):
     ###### B->ppMuNu Same-Sign protons ######
     def _bhad2PMuX_B_SS(self):
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-        from PhysSelPython.Wrappers import Selection, MergedSelection
+        from PhysSelPython.Wrappers import Selection
 
         _pMu = CombineParticles(
             DecayDescriptors=self._config["DECAYS"], ReFitPVs=True)
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingSL/StrippingB2XTauNu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingSL/StrippingB2XTauNu.py
index 27a551c0cc74fe90670dcf8b6c0c1e819d4b7bd3..4a7e33c3bb5ed47f37817f68d2d2bf8c8021dda7 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingSL/StrippingB2XTauNu.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingSL/StrippingB2XTauNu.py
@@ -762,7 +762,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         self.__MakeB0d2DdoubleStar2PiDstar02GammaD0TauNuNonPhysTau__()
 
         from StrippingConf.StrippingLine import StrippingLine
-        from PhysSelPython.Wrappers import SelectionSequence
 
         # TisTos filter
         def filterTisTos(name, Input, myTisTosSpecs):
@@ -1633,7 +1632,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
     def __MakeTau23pi__(self):
 
         from PhysSelPython.Wrappers import DataOnDemand
-        from CommonParticles import StdLooseDetachedTauNoPID
 
         self.tau23piSel = DataOnDemand(Location=self.tau_path)
 
@@ -1699,7 +1697,7 @@ class B2XTauNuAllLinesConf(LineBuilder):
     def __FilterD02K3pi__(self):
 
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
+        from PhysSelPython.Wrappers import Selection
         from StandardParticles import StdLoosePions, StdLooseKaons
 
         CombD02K3pi = CombineParticles(
@@ -1720,7 +1718,7 @@ class B2XTauNuAllLinesConf(LineBuilder):
     def __FilterD02K3piForDst__(self):
 
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
+        from PhysSelPython.Wrappers import Selection
         from StandardParticles import StdLoosePions, StdLooseKaons
 
         CombD02K3piForDst = CombineParticles(
@@ -1741,7 +1739,7 @@ class B2XTauNuAllLinesConf(LineBuilder):
     def __FilterDstarD02K3pi__(self):
 
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
+        from PhysSelPython.Wrappers import Selection
         from StandardParticles import StdAllLoosePions
 
         CombDstar2piD02K3pi = CombineParticles(
@@ -1759,7 +1757,7 @@ class B2XTauNuAllLinesConf(LineBuilder):
     def __FilterDstarD02K3piWS__(self):
 
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
+        from PhysSelPython.Wrappers import Selection
         from StandardParticles import StdAllLoosePions
 
         CombDstar2piD02K3piWS = CombineParticles(
@@ -1850,7 +1848,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
 
         from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseJpsi2MuMu
 
         JpsiForBc = FilterDesktop(
             Code=self.totalJpsiCut
@@ -1869,7 +1866,7 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
 
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
+        from PhysSelPython.Wrappers import Selection
         from StandardParticles import StdLoosePions
 
         CombDdoubleStar02DstarPi = CombineParticles(
@@ -1889,8 +1886,7 @@ class B2XTauNuAllLinesConf(LineBuilder):
         [B0 -> D*- tau+]cc
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
+        from PhysSelPython.Wrappers import Selection
 
         # MyStdLooseDetachedTau = DataOnDemand(Location = 'Phys/StdLooseDetachedTau3pi/Particles')
         # MyStdLooseDetachedTau = DataOnDemand(Location = self.tau_path)
@@ -1914,8 +1910,7 @@ class B2XTauNuAllLinesConf(LineBuilder):
         [B0 -> D*- tau+ with wrong sign pion in the D*]cc
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
+        from PhysSelPython.Wrappers import Selection
 
         # MyStdLooseDetachedTau = DataOnDemand(Location = 'Phys/StdLooseDetachedTau3pi/Particles')
         # MyStdLooseDetachedTau = DataOnDemand(Location = self.tau_path)
@@ -1941,8 +1936,7 @@ class B2XTauNuAllLinesConf(LineBuilder):
         use of wrong charge combination is useful for background subtraction
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
+        from PhysSelPython.Wrappers import Selection
 
         # MyStdLooseDetachedTau = DataOnDemand(Location = 'Phys/StdLooseDetachedTau3pi/Particles')
         # MyStdLooseDetachedTau = DataOnDemand(Location = self.tau_path)
@@ -1968,7 +1962,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTauNonPhys
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3piNonPhys/Particles')
@@ -1992,8 +1985,7 @@ class B2XTauNuAllLinesConf(LineBuilder):
         [B0 -> D*- tau+ with wrong sign pion in the D*]cc
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
+        from PhysSelPython.Wrappers import Selection
 
         # MyStdLooseDetachedTau = DataOnDemand(Location = 'Phys/StdLooseDetachedTau3pi/Particles')
         # MyStdLooseDetachedTau = DataOnDemand(Location = self.tau_path)
@@ -2018,8 +2010,7 @@ class B2XTauNuAllLinesConf(LineBuilder):
         [B0 -> D*-(->D0(->K3pi) pi-) tau+]cc
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
+        from PhysSelPython.Wrappers import Selection
 
         # MyStdLooseDetachedTau = DataOnDemand(Location = 'Phys/StdLooseDetachedTau3pi/Particles')
         # MyStdLooseDetachedTau = DataOnDemand(Location = self.tau_path)
@@ -2045,8 +2036,7 @@ class B2XTauNuAllLinesConf(LineBuilder):
         [B0 -> D*-(->D0(->K3pi) pi-) tau+ with wrong sign pion in the D*]cc
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
+        from PhysSelPython.Wrappers import Selection
 
         # MyStdLooseDetachedTau = DataOnDemand(Location = 'Phys/StdLooseDetachedTau3pi/Particles')
         # MyStdLooseDetachedTau = DataOnDemand(Location = self.tau_path)
@@ -2072,8 +2062,7 @@ class B2XTauNuAllLinesConf(LineBuilder):
         [B0 -> D*-(->D0(->K3pi) pi-) tau+ with wrong sign pion in the D*]cc
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
+        from PhysSelPython.Wrappers import Selection
 
         # MyStdLooseDetachedTau = DataOnDemand(Location = 'Phys/StdLooseDetachedTau3pi/Particles')
         # MyStdLooseDetachedTau = DataOnDemand(Location = self.tau_path)
@@ -2100,8 +2089,7 @@ class B2XTauNuAllLinesConf(LineBuilder):
         use of wrong charge combination is useful for background subtraction
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
+        from PhysSelPython.Wrappers import Selection
 
         # MyStdLooseDetachedTau = DataOnDemand(Location = 'Phys/StdLooseDetachedTau3pi/Particles')
         # MyStdLooseDetachedTau = DataOnDemand(Location = self.tau_path)
@@ -2129,7 +2117,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTauNonPhys
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3piNonPhys/Particles')
@@ -2155,8 +2142,7 @@ class B2XTauNuAllLinesConf(LineBuilder):
         [B- -> D0(->K3pi) tau-]cc
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
+        from PhysSelPython.Wrappers import Selection
 
         # MyStdLooseDetachedTau = DataOnDemand(Location = 'Phys/StdLooseDetachedTau3pi/Particles')
         # MyStdLooseDetachedTau = DataOnDemand(Location = self.tau_path)
@@ -2183,8 +2169,7 @@ class B2XTauNuAllLinesConf(LineBuilder):
         use of wrong charge combination is useful for background subtraction
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
+        from PhysSelPython.Wrappers import Selection
 
         # MyStdLooseDetachedTau = DataOnDemand(Location = 'Phys/StdLooseDetachedTau3pi/Particles')
         # MyStdLooseDetachedTau = DataOnDemand(Location = self.tau_path)
@@ -2213,7 +2198,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTauNonPhys
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3piNonPhys/Particles')
@@ -2241,8 +2225,7 @@ class B2XTauNuAllLinesConf(LineBuilder):
         [B0 -> D- tau+]cc
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
+        from PhysSelPython.Wrappers import Selection
 
         # MyStdLooseDetachedTau = DataOnDemand(Location = 'Phys/StdLooseDetachedTau3pi/Particles')
         # MyStdLooseDetachedTau = DataOnDemand(Location = self.tau_path)
@@ -2268,8 +2251,7 @@ class B2XTauNuAllLinesConf(LineBuilder):
         use of wrong charge combination is useful for background subtraction
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
+        from PhysSelPython.Wrappers import Selection
 
         # MyStdLooseDetachedTau = DataOnDemand(Location = 'Phys/StdLooseDetachedTau3pi/Particles')
         # MyStdLooseDetachedTau = DataOnDemand(Location = self.tau_path)
@@ -2296,7 +2278,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTauNonPhys
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3piNonPhys/Particles')
@@ -2320,8 +2301,7 @@ class B2XTauNuAllLinesConf(LineBuilder):
         [B- -> D0 tau-]cc
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
+        from PhysSelPython.Wrappers import Selection
 
         # MyStdLooseDetachedTau = DataOnDemand(Location = 'Phys/StdLooseDetachedTau3pi/Particles')
         # MyStdLooseDetachedTau = DataOnDemand(Location = self.tau_path)
@@ -2347,8 +2327,7 @@ class B2XTauNuAllLinesConf(LineBuilder):
         use of wrong charge combination is useful for background subtraction
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
+        from PhysSelPython.Wrappers import Selection
 
         # MyStdLooseDetachedTau = DataOnDemand(Location = 'Phys/StdLooseDetachedTau3pi/Particles')
         # MyStdLooseDetachedTau = DataOnDemand(Location = self.tau_path)
@@ -2376,7 +2355,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTauNonPhys
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3piNonPhys/Particles')
@@ -2401,8 +2379,7 @@ class B2XTauNuAllLinesConf(LineBuilder):
         [B_c+ -> J/psi(1S) tau+]cc
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
+        from PhysSelPython.Wrappers import Selection
 
         # MyStdLooseDetachedTau = DataOnDemand(Location = 'Phys/StdLooseDetachedTau3pi/Particles')
         # MyStdLooseDetachedTau = DataOnDemand(Location = self.tau_path)
@@ -2428,7 +2405,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTauNonPhys
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3piNonPhys/Particles')
@@ -2452,8 +2428,7 @@ class B2XTauNuAllLinesConf(LineBuilder):
         [B_s0 -> D_s- tau+]cc
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
+        from PhysSelPython.Wrappers import Selection
 
         # MyStdLooseDetachedTau = DataOnDemand(Location = 'Phys/StdLooseDetachedTau3pi/Particles')
         # MyStdLooseDetachedTau = DataOnDemand(Location = self.tau_path)
@@ -2479,8 +2454,7 @@ class B2XTauNuAllLinesConf(LineBuilder):
         use of wrong charge combination is useful for background subtraction
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
+        from PhysSelPython.Wrappers import Selection
 
         # MyStdLooseDetachedTau = DataOnDemand(Location = 'Phys/StdLooseDetachedTau3pi/Particles')
         # MyStdLooseDetachedTau = DataOnDemand(Location = self.tau_path)
@@ -2507,7 +2481,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTauNonPhys
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3piNonPhys/Particles')
@@ -2532,8 +2505,7 @@ class B2XTauNuAllLinesConf(LineBuilder):
         [Lambda_b0 -> Lambda_c+ tau-]cc
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
+        from PhysSelPython.Wrappers import Selection
 
         # MyStdLooseDetachedTau = DataOnDemand(Location = 'Phys/StdLooseDetachedTau3pi/Particles')
         # MyStdLooseDetachedTau = DataOnDemand(Location = self.tau_path)
@@ -2561,8 +2533,7 @@ class B2XTauNuAllLinesConf(LineBuilder):
         use of wrong charge combination is useful for background subtraction
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
+        from PhysSelPython.Wrappers import Selection
 
         # MyStdLooseDetachedTau = DataOnDemand(Location = 'Phys/StdLooseDetachedTau3pi/Particles')
         # MyStdLooseDetachedTau = DataOnDemand(Location = self.tau_path)
@@ -2588,8 +2559,7 @@ class B2XTauNuAllLinesConf(LineBuilder):
         [Lambda_b0 -> p+ tau-]cc
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
+        from PhysSelPython.Wrappers import Selection
 
         # MyStdLooseDetachedTau = DataOnDemand(Location = 'Phys/StdLooseDetachedTau3pi/Particles')
         # MyStdLooseDetachedTau = DataOnDemand(Location = self.tau_path)
@@ -2614,8 +2584,7 @@ class B2XTauNuAllLinesConf(LineBuilder):
         use of wrong charge combination is useful for background subtraction
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
+        from PhysSelPython.Wrappers import Selection
 
         # MyStdLooseDetachedTau = DataOnDemand(Location = 'Phys/StdLooseDetachedTau3pi/Particles')
         # MyStdLooseDetachedTau = DataOnDemand(Location = self.tau_path)
@@ -2641,7 +2610,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTauNonPhys
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3piNonPhys/Particles')
@@ -2668,8 +2636,7 @@ class B2XTauNuAllLinesConf(LineBuilder):
         use of inverted vertex cut only first, should boost the overall efficiency
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
+        from PhysSelPython.Wrappers import Selection
 
         # MyStdLooseDetachedTau = DataOnDemand(Location = 'Phys/StdLooseDetachedTau3pi/Particles')
         # MyStdLooseDetachedTau = DataOnDemand(Location = self.tau_path)
@@ -2695,8 +2662,7 @@ class B2XTauNuAllLinesConf(LineBuilder):
         use of inverted vertex cut only first, should boost the overall efficiency
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
+        from PhysSelPython.Wrappers import Selection
 
         # MyStdLooseDetachedTau = DataOnDemand(Location = 'Phys/StdLooseDetachedTau3pi/Particles')
         # MyStdLooseDetachedTau = DataOnDemand(Location = self.tau_path)
@@ -2720,8 +2686,7 @@ class B2XTauNuAllLinesConf(LineBuilder):
         Also useful for studying background in B0 -> D* tau nu when pi- from D** decay is missed
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
+        from PhysSelPython.Wrappers import Selection
 
         # MyStdLooseDetachedTau = DataOnDemand(Location = 'Phys/StdLooseDetachedTau3pi/Particles')
         # MyStdLooseDetachedTau = DataOnDemand(Location = self.tau_path)
@@ -2746,8 +2711,7 @@ class B2XTauNuAllLinesConf(LineBuilder):
         Also useful for studying WS background in B0 -> D* tau nu when pi+ from D** decay is missed
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
+        from PhysSelPython.Wrappers import Selection
 
         # MyStdLooseDetachedTau = DataOnDemand(Location = 'Phys/StdLooseDetachedTau3pi/Particles')
         # MyStdLooseDetachedTau = DataOnDemand(Location = self.tau_path)
@@ -2773,7 +2737,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTauNonPhys
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3piNonPhys/Particles')
@@ -2798,7 +2761,7 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
 
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
+        from PhysSelPython.Wrappers import Selection
         from StandardParticles import StdLooseResolvedPi0
 
         CombDStar02Pi0D0 = CombineParticles(
@@ -2817,8 +2780,7 @@ class B2XTauNuAllLinesConf(LineBuilder):
         [B- -> D*0 tau-]cc
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
+        from PhysSelPython.Wrappers import Selection
 
         # MyStdLooseDetachedTau = DataOnDemand(Location = 'Phys/StdLooseDetachedTau3pi/Particles')
         # MyStdLooseDetachedTau = DataOnDemand(Location = self.tau_path)
@@ -2842,8 +2804,7 @@ class B2XTauNuAllLinesConf(LineBuilder):
         use of wrong charge combination is useful for background subtraction
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
+        from PhysSelPython.Wrappers import Selection
 
         # MyStdLooseDetachedTau = DataOnDemand(Location = 'Phys/StdLooseDetachedTau3pi/Particles')
         # MyStdLooseDetachedTau = DataOnDemand(Location = self.tau_path)
@@ -2868,7 +2829,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3piNonPhys/Particles')
@@ -2892,7 +2852,7 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
 
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
+        from PhysSelPython.Wrappers import Selection
         from StandardParticles import StdLooseAllPhotons
 
         CombDStar02GammaD0 = CombineParticles(
@@ -2911,8 +2871,7 @@ class B2XTauNuAllLinesConf(LineBuilder):
         [B- -> D*0 tau-]cc
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
+        from PhysSelPython.Wrappers import Selection
 
         # MyStdLooseDetachedTau = DataOnDemand(Location = 'Phys/StdLooseDetachedTau3pi/Particles')
         # MyStdLooseDetachedTau = DataOnDemand(Location = self.tau_path)
@@ -2936,8 +2895,7 @@ class B2XTauNuAllLinesConf(LineBuilder):
         use of wrong charge combination is useful for background subtraction
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
+        from PhysSelPython.Wrappers import Selection
 
         # MyStdLooseDetachedTau = DataOnDemand(Location = 'Phys/StdLooseDetachedTau3pi/Particles')
         # MyStdLooseDetachedTau = DataOnDemand(Location = self.tau_path)
@@ -2962,7 +2920,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3piNonPhys/Particles')
@@ -2985,7 +2942,7 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
 
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
+        from PhysSelPython.Wrappers import Selection
         from StandardParticles import StdLoosePions
 
         CombDdoubleStar2PiDstar02Pi0D0 = CombineParticles(
@@ -3004,8 +2961,7 @@ class B2XTauNuAllLinesConf(LineBuilder):
         [B0 -> (D_1(2420)- -> D*0 pi-) tau+]cc
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
+        from PhysSelPython.Wrappers import Selection
 
         # MyStdLooseDetachedTau = DataOnDemand(Location = 'Phys/StdLooseDetachedTau3pi/Particles')
         # MyStdLooseDetachedTau = DataOnDemand(Location = self.tau_path)
@@ -3029,8 +2985,7 @@ class B2XTauNuAllLinesConf(LineBuilder):
         use of wrong charge combination is useful for background subtraction
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
+        from PhysSelPython.Wrappers import Selection
 
         # MyStdLooseDetachedTau = DataOnDemand(Location = 'Phys/StdLooseDetachedTau3pi/Particles')
         # MyStdLooseDetachedTau = DataOnDemand(Location = self.tau_path)
@@ -3055,7 +3010,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3piNonPhys/Particles')
@@ -3078,7 +3032,7 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
 
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
+        from PhysSelPython.Wrappers import Selection
         from StandardParticles import StdLoosePions
 
         CombDdoubleStar2PiDstar02GammaD0 = CombineParticles(
@@ -3097,8 +3051,7 @@ class B2XTauNuAllLinesConf(LineBuilder):
         [B0 -> (D_1(2420)- -> D*0 pi-) tau+]cc
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
+        from PhysSelPython.Wrappers import Selection
 
         # MyStdLooseDetachedTau = DataOnDemand(Location = 'Phys/StdLooseDetachedTau3pi/Particles')
         # MyStdLooseDetachedTau = DataOnDemand(Location = self.tau_path)
@@ -3122,8 +3075,7 @@ class B2XTauNuAllLinesConf(LineBuilder):
         use of wrong charge combination is useful for background subtraction
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
+        from PhysSelPython.Wrappers import Selection
 
         # MyStdLooseDetachedTau = DataOnDemand(Location = 'Phys/StdLooseDetachedTau3pi/Particles')
         # MyStdLooseDetachedTau = DataOnDemand(Location = self.tau_path)
@@ -3148,7 +3100,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3piNonPhys/Particles')
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingSL/StrippingB2XuENu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingSL/StrippingB2XuENu.py
index 73ab1a2a4e2c0a0a1016fb4040cc2e6b7b36c884..b59084d7969d22b0c34cc4c7c11b62ae657ce530 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingSL/StrippingB2XuENu.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingSL/StrippingB2XuENu.py
@@ -9,9 +9,7 @@
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
 
-import logging
 from StrippingUtils.Utils import LineBuilder
-from Gaudi.Configuration import *
 __author__ = ['Phillip Urquijo, Alessandra Borgia', 'Michel De Cian']
 __date__ = '11/01/2019'
 __version__ = '$Revision: 1.6 $'
@@ -243,7 +241,7 @@ class B2XuENuBuilder(LineBuilder):
     def __init__(self, name, config):
         LineBuilder.__init__(self, name, config)
         self.config = config
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
+        from PhysSelPython.Wrappers import DataOnDemand
         self._stdVeryLooseKsLL = DataOnDemand(
             "Phys/StdVeryLooseKsLL/Particles")
         self._stdLooseKsLD = DataOnDemand("Phys/StdLooseKsLD/Particles")
@@ -734,7 +732,7 @@ class B2XuENuBuilder(LineBuilder):
 
     # Bs -> K*/Kspi e nu lines
     def _Kstar_line(self):
-        NoPS = self.config['NoPrescales']
+        self.config['NoPrescales']
         from StrippingConf.StrippingLine import StrippingLine
         return StrippingLine(self._name+'Bs2Kstar_Line', prescale=1.0,
                              FILTER=self.GECs,
@@ -1055,8 +1053,8 @@ class B2XuENuBuilder(LineBuilder):
         if self._KSSel is not None:
             return self._KSSel
 
-        from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
+        from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
+        from PhysSelPython.Wrappers import Selection
 
         _code = FilterDesktop(Code=self._NominalKsSelection() % self._config)
 
@@ -1141,7 +1139,6 @@ class B2XuENuBuilder(LineBuilder):
 
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection
-        from StandardParticles import StdLoosePions
 
         _rho770 = CombineParticles(
             DecayDescriptors=["rho(770)0 -> pi- pi+"],
@@ -1171,7 +1168,6 @@ class B2XuENuBuilder(LineBuilder):
 
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection
-        from StandardParticles import StdLoosePions
 
         _rho770NoPID = CombineParticles(
             DecayDescriptors=["rho(770)0 -> pi- pi+"],
@@ -1201,7 +1197,6 @@ class B2XuENuBuilder(LineBuilder):
 
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection
-        from StandardParticles import StdLoosePions
 
         _rho770WS = CombineParticles(
             DecayDescriptors=["[rho(770)0 -> pi+ pi+]cc"],
@@ -1229,7 +1224,6 @@ class B2XuENuBuilder(LineBuilder):
 
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection
-        from StandardParticles import StdLoosePions
 
         _rho770SB = CombineParticles(
             DecayDescriptors=["rho(770)0 -> pi+ pi-"],
@@ -1341,7 +1335,7 @@ class B2XuENuBuilder(LineBuilder):
 
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection
-        from StandardParticles import StdLoosePions, StdLooseElectrons
+        from StandardParticles import StdLoosePions
 
         _Ksh = CombineParticles(
             DecayDescriptor="KS0 -> e- pi+",
@@ -1369,7 +1363,7 @@ class B2XuENuBuilder(LineBuilder):
 
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection
-        from StandardParticles import StdLoosePions, StdLooseElectrons
+        from StandardParticles import StdLoosePions
 
         _Ksh = CombineParticles(
             DecayDescriptor="KS0 -> e+ pi-",
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingSL/StrippingB2XuMuNu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingSL/StrippingB2XuMuNu.py
index e990a0f5fca381288d278a31edfe8c4be451c2d9..7dbf8f670c004436033f2172b635cf83469f0692 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingSL/StrippingB2XuMuNu.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingSL/StrippingB2XuMuNu.py
@@ -9,9 +9,7 @@
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
 
-import logging
 from StrippingUtils.Utils import LineBuilder
-from Gaudi.Configuration import *
 __author__ = ['Phillip Urquijo, Alessandra Borgia', 'Michel De Cian']
 __date__ = '11/01/2019'
 __version__ = '$Revision: 1.6 $'
@@ -238,7 +236,7 @@ class B2XuMuNuBuilder(LineBuilder):
     def __init__(self, name, config):
         LineBuilder.__init__(self, name, config)
         self.config = config
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
+        from PhysSelPython.Wrappers import DataOnDemand
         self._stdVeryLooseKsLL = DataOnDemand(
             "Phys/StdVeryLooseKsLL/Particles")
         self._stdLooseKsLD = DataOnDemand("Phys/StdLooseKsLD/Particles")
@@ -733,7 +731,7 @@ class B2XuMuNuBuilder(LineBuilder):
 
     # Bs -> K*/Kspi mu nu lines
     def _Kstar_line(self):
-        NoPS = self.config['NoPrescales']
+        self.config['NoPrescales']
         from StrippingConf.StrippingLine import StrippingLine
         return StrippingLine(self._name+'Bs2Kstar_Line', prescale=1.0,
                              FILTER=self.GECs,
@@ -1052,8 +1050,8 @@ class B2XuMuNuBuilder(LineBuilder):
         if self._KSSel is not None:
             return self._KSSel
 
-        from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
+        from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
+        from PhysSelPython.Wrappers import Selection
 
         _code = FilterDesktop(Code=self._NominalKsSelection() % self._config)
 
@@ -1138,7 +1136,6 @@ class B2XuMuNuBuilder(LineBuilder):
 
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection
-        from StandardParticles import StdLoosePions
 
         _rho770 = CombineParticles(
             DecayDescriptors=["rho(770)0 -> pi- pi+"],
@@ -1168,7 +1165,6 @@ class B2XuMuNuBuilder(LineBuilder):
 
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection
-        from StandardParticles import StdLoosePions
 
         _rho770NoPID = CombineParticles(
             DecayDescriptors=["rho(770)0 -> pi- pi+"],
@@ -1198,7 +1194,6 @@ class B2XuMuNuBuilder(LineBuilder):
 
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection
-        from StandardParticles import StdLoosePions
 
         _rho770WS = CombineParticles(
             DecayDescriptors=["[rho(770)0 -> pi+ pi+]cc"],
@@ -1226,7 +1221,6 @@ class B2XuMuNuBuilder(LineBuilder):
 
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection
-        from StandardParticles import StdLoosePions
 
         _rho770SB = CombineParticles(
             DecayDescriptors=["rho(770)0 -> pi+ pi-"],
@@ -1338,7 +1332,7 @@ class B2XuMuNuBuilder(LineBuilder):
 
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection
-        from StandardParticles import StdLoosePions, StdLooseMuons
+        from StandardParticles import StdLoosePions
 
         _Ksh = CombineParticles(
             DecayDescriptor="KS0 -> mu- pi+",
@@ -1366,7 +1360,7 @@ class B2XuMuNuBuilder(LineBuilder):
 
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection
-        from StandardParticles import StdLoosePions, StdLooseMuons
+        from StandardParticles import StdLoosePions
 
         _Ksh = CombineParticles(
             DecayDescriptor="KS0 -> mu+ pi-",
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingSL/StrippingBc2Bs.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingSL/StrippingBc2Bs.py
index 1bdf953d398e2ed7c1c42abd95ddfd10e490f159..7dc32cd71d120411a2c771133e9bdd016807954d 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingSL/StrippingBc2Bs.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingSL/StrippingBc2Bs.py
@@ -11,9 +11,7 @@
 __author__ = ['Adam Davis']
 __date__ = '12/03/2021'
 __version__ = '$Revision: 1.0 $'
-from Gaudi.Configuration import *
 from StrippingUtils.Utils import LineBuilder
-import logging
 
 """
 Selections for Bc -> Bs X
@@ -144,7 +142,6 @@ class Bc2BsBuilder(LineBuilder):
     def __init__(self, name, config):
         LineBuilder.__init__(self, name, config)
         self.config = config
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
         # GECs for # long tracks
         self.GECs = {"Code": "( recSummaryTrack(LHCb.RecSummary.nLongTracks, TrLONG) < %(GEC_nLongTrk)s )" % config,
                      "Preambulo": ["from LoKiTracks.decorators import *"]}
@@ -463,7 +460,6 @@ class Bc2BsBuilder(LineBuilder):
             return self._Ds2KKpiSel
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection
-        from StandardParticles import StdAllLoosePions, StdAllLooseKaons
 
         _Ds2KKpi = CombineParticles(
             DecayDescriptors=["[D_s+ -> K+ K- pi+]cc"],
@@ -486,7 +482,6 @@ class Bc2BsBuilder(LineBuilder):
 
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection
-        from StandardParticles import StdAllLoosePions, StdAllLooseKaons
 
         _Phi2KK = CombineParticles(
             DecayDescriptors=["phi(1020) -> K+ K-"],
@@ -508,7 +503,6 @@ class Bc2BsBuilder(LineBuilder):
 
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection
-        from StandardParticles import StdAllLooseMuons
 
         _Jpsi2mumu = CombineParticles(
             DecayDescriptors=["J/psi(1S) -> mu+ mu-"],
@@ -553,7 +547,6 @@ class Bc2BsBuilder(LineBuilder):
 
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection
-        from StandardParticles import StdAllLoosePions
 
         _Bs2DsPi = CombineParticles(
             DecayDescriptors=["[ B_s0 -> D_s- pi+ ]cc",
@@ -576,7 +569,6 @@ class Bc2BsBuilder(LineBuilder):
 
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection
-        from StandardParticles import StdAllLooseKaons
 
         _Bs2DsK = CombineParticles(
             DecayDescriptors=["[ B_s0 -> D_s- K+ ]cc", "[B_s0 -> D_s+ K+]cc"],
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingSL/StrippingCharmFromBSemiForHadronAsy.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingSL/StrippingCharmFromBSemiForHadronAsy.py
index a80fcb301fa6917bd97160506a3b0a679ff40777..ddaec2925512363daba54947938f97bdafffeb41 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingSL/StrippingCharmFromBSemiForHadronAsy.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingSL/StrippingCharmFromBSemiForHadronAsy.py
@@ -25,8 +25,7 @@ from Configurables import FilterDesktop, CombineParticles
 from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from StandardParticles import StdAllLoosePions, StdLoosePions, StdLooseMuons, StdLooseKaons, StdLooseProtons
-from Configurables import TisTosParticleTagger
+from StandardParticles import StdLooseKaons, StdLooseMuons, StdLoosePions
 
 __all__ = ('CharmFromBSemiForHadronAsyAllLinesConf',
            'TOSFilter',
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingSL/StrippingLb2LcMuNuX_Lc2L0Pi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingSL/StrippingLb2LcMuNuX_Lc2L0Pi.py
index 827fcbc76e3e951b79048e280c55f4b9d1a24165..230adf6c801b1d0b8445131c844c55c702a3469f 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingSL/StrippingLb2LcMuNuX_Lc2L0Pi.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingSL/StrippingLb2LcMuNuX_Lc2L0Pi.py
@@ -16,14 +16,13 @@ __author__ = ['Scott Ely']
 __date__ = '23/01/2019'
 __version__ = '$Revision: 1.0 $'
 
-from Gaudi.Configuration import *
 from Configurables import FilterDesktop, CombineParticles
-from PhysSelPython.Wrappers import Selection, DataOnDemand
+from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from StandardParticles import StdLoosePions, StdLooseMuons, StdLooseKaons, StdLooseProtons, StdLooseElectrons, StdVeryLooseLambdaLL, StdLooseLambdaLL, StdLooseLambdaDD
-from StandardParticles import StdNoPIDsPions, StdNoPIDsKaons, StdNoPIDsProtons, StdNoPIDsMuons
-from GaudiKernel.SystemOfUnits import MeV, GeV, cm, mm
+from StandardParticles import StdLooseLambdaDD, StdLooseMuons, StdLoosePions, StdVeryLooseLambdaLL
+from StandardParticles import StdNoPIDsMuons
+from GaudiKernel.SystemOfUnits import GeV, MeV, mm
 
 __all__ = ('Lb2LcMuNuX_Lc2L0PiConf', 'default_config')
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingSL/StrippingLb2pMuNuVub.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingSL/StrippingLb2pMuNuVub.py
index cd969d689449a9dc069bd745b4acbc62f683dfda..e74c7de20e90982142bcf10f66be4a6cb90689e6 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingSL/StrippingLb2pMuNuVub.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingSL/StrippingLb2pMuNuVub.py
@@ -9,9 +9,7 @@
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
 
-import logging
 from StrippingUtils.Utils import LineBuilder
-from Gaudi.Configuration import *
 __author__ = ['William Sutcliffe']
 __date__ = '19/01/2014'
 __version__ = '$Revision: 1.0 $'
@@ -137,8 +135,6 @@ class Lb2pMuNuVubBuilder(LineBuilder):
     def __init__(self, name, config):
         LineBuilder.__init__(self, name, config)
 
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
-
         self.GECs = {"Code": "( recSummaryTrack(LHCb.RecSummary.nLongTracks, TrLONG) < %(GEC_nLongTrk)s )" % config,
                      "Preambulo": ["from LoKiTracks.decorators import *"]}
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingSL/StrippingSemilepISR.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingSL/StrippingSemilepISR.py
index 9003d470acd7115962091a7193ffb0bd6a6fa9c8..9d2d80fb96c93bb8fdbd3557b03ab8a7cc70090c 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingSL/StrippingSemilepISR.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingSL/StrippingSemilepISR.py
@@ -26,7 +26,7 @@ from StrippingUtils.Utils import LineBuilder
 from StandardParticles import StdLoosePions, StdLooseMuons, StdLooseKaons, StdLooseProtons, StdLooseElectrons
 from StandardParticles import StdNoPIDsPions, StdNoPIDsKaons, StdNoPIDsProtons, StdNoPIDsMuons
 # from StrippingSemilepISRUtils import *
-from GaudiKernel.SystemOfUnits import MeV, GeV, cm, mm
+from GaudiKernel.SystemOfUnits import GeV, MeV, mm
 from CommonParticles.Utils import *
 
 __all__ = ('SemilepISRAllLinesConf',
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingSL/Strippingbhad2PMuX.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingSL/Strippingbhad2PMuX.py
index e89305332152e8ebc4ee1e72a7f10cd8d9d2dfae..f46738721f8dbfce869e840a1aa8cbb13c6fdd2f 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingSL/Strippingbhad2PMuX.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping34r0p2/StrippingSL/Strippingbhad2PMuX.py
@@ -9,9 +9,7 @@
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
 
-import logging
 from StrippingUtils.Utils import LineBuilder
-from Gaudi.Configuration import *
 __author__ = ['William Sutcliffe', 'Patrick Owen']
 __date__ = '02/12/2015'
 __version__ = '$Revision: 2.0 $'
@@ -132,8 +130,6 @@ class bhad2PMuXBuilder(LineBuilder):
     def __init__(self, name, config):
         LineBuilder.__init__(self, name, config)
 
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
-
         self.GECs = {"Code": "( recSummaryTrack(LHCb.RecSummary.nLongTracks, TrLONG) < %(GEC_nLongTrk)s )" % config,
                      "Preambulo": ["from LoKiTracks.decorators import *"]}
 
@@ -455,7 +451,7 @@ class bhad2PMuXBuilder(LineBuilder):
     ###### Lb->pMuNu High M_corr Opposite Sign ######
     def _bhad2PMuX_Lb(self):
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-        from PhysSelPython.Wrappers import Selection, MergedSelection
+        from PhysSelPython.Wrappers import Selection
 
         _pMu = CombineParticles(
             DecayDescriptors=self._config["DECAYS"], ReFitPVs=True)
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingB2CC/StrippingB2JpsiHH.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingB2CC/StrippingB2JpsiHH.py
index 426a15a03fdb410fd33fba1d83ccac165f4c345b..ea80a2693083b0dd305af119c0794a0a03dd0088 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingB2CC/StrippingB2JpsiHH.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingB2CC/StrippingB2JpsiHH.py
@@ -20,18 +20,10 @@ __date__ = '10/11/2016'
 
 __all__ = ('B2JpsiHHConf', 'default_config')
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from CommonParticles.Utils import updateDoD
-from StandardParticles import StdLoosePions
-from StandardParticles import StdLooseKaons
-from StandardParticles import StdLooseProtons
-from StandardParticles import StdAllLooseKaons
-from StandardParticles import StdAllLooseProtons
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
+from PhysSelPython.Wrappers import DataOnDemand, Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from GaudiKernel.SystemOfUnits import MeV
 
 default_config = {
     'NAME': 'B2JpsiHH',
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingB2CC/StrippingB2JpsiPi0.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingB2CC/StrippingB2JpsiPi0.py
index 90740f80b4fbe5d7cdd945fc3fb2a4331ac1e49d..170baf2fb63c5dbaab6735a4dbe697c61ed379a3 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingB2CC/StrippingB2JpsiPi0.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingB2CC/StrippingB2JpsiPi0.py
@@ -14,15 +14,10 @@ __version__ = '$Revision: 1.1$'
 
 __all__ = ('B2JpsiPi0Conf', 'default_config')
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from CommonParticles.Utils import updateDoD
-from StandardParticles import StdLooseResolvedPi0
-from StandardParticles import StdLooseMergedPi0
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
+from PhysSelPython.Wrappers import DataOnDemand, Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from GaudiKernel.SystemOfUnits import MeV
 
 default_config = {
     # The real name of the lines is BetaS, this is a reference this for the Settings.
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingB2CC/StrippingB2JpsiPi0_Run1.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingB2CC/StrippingB2JpsiPi0_Run1.py
index 3f5f0443aa9132ab2494cbb48813c4ad8991fc1b..1bf462e0083a2da3704b1f804d03b10239ecd920 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingB2CC/StrippingB2JpsiPi0_Run1.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingB2CC/StrippingB2JpsiPi0_Run1.py
@@ -14,15 +14,10 @@ __version__ = '$Revision: 1.2$'
 
 __all__ = ('B2JpsiPi0Conf_RI', 'default_config')
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from CommonParticles.Utils import updateDoD
-from StandardParticles import StdLooseResolvedPi0
-from StandardParticles import StdLooseMergedPi0
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
+from PhysSelPython.Wrappers import DataOnDemand, Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from GaudiKernel.SystemOfUnits import MeV
 
 default_config = {
     # The real name of the lines is BetaS, this is a reference this for the Settings.
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingB2CC/StrippingB2JpsiX0.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingB2CC/StrippingB2JpsiX0.py
index d93a42cce82d84a0ed23627a007cbaad6d469573..e15a04497fca1b721a890552c1359e732098a2be 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingB2CC/StrippingB2JpsiX0.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingB2CC/StrippingB2JpsiX0.py
@@ -20,18 +20,10 @@ __date__ = '22/01/2018'
 
 __all__ = ('B2JpsiX0Conf', 'default_config')
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from CommonParticles.Utils import updateDoD
-from StandardParticles import StdLoosePions
-from StandardParticles import StdLooseKaons
-from StandardParticles import StdLooseProtons
-from StandardParticles import StdAllLooseKaons
-from StandardParticles import StdAllLooseProtons
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
+from PhysSelPython.Wrappers import DataOnDemand, Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from GaudiKernel.SystemOfUnits import MeV
 
 default_config = {
     'NAME': 'B2JpsiX0',
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingB2CC/StrippingB2JpsiXforBeta_s.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingB2CC/StrippingB2JpsiXforBeta_s.py
index f249942b6e70534073a342298d7e41c294d2ac84..83cfcf7fbfeca7d7da85f9148f6fff86360c328b 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingB2CC/StrippingB2JpsiXforBeta_s.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingB2CC/StrippingB2JpsiXforBeta_s.py
@@ -26,16 +26,12 @@ __version__ = '$Revision: 4.0$'
 
 __all__ = ('B2JpsiXforBeta_sConf', 'default_config')
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from CommonParticles.Utils import updateDoD
 from StandardParticles import StdLoosePions
 from StandardParticles import StdLooseKaons
-from StandardParticles import StdAllLooseKaons
 from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from GaudiKernel.SystemOfUnits import MeV
 
 default_config = {
     'NAME': 'BetaS',
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingB2CC/StrippingBd2JpsieeKS.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingB2CC/StrippingBd2JpsieeKS.py
index 447acfd66a8a888ea16f056888b1b5a41ccee167..ccac3244d5f71227250f84d9c5d0c485845ab5b3 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingB2CC/StrippingBd2JpsieeKS.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingB2CC/StrippingBd2JpsieeKS.py
@@ -8,16 +8,10 @@
 # granted to it by virtue of its status as an Intergovernmental Organization  #
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
-from GaudiKernel.SystemOfUnits import MeV
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
-from StandardParticles import StdAllLooseKaons
-from StandardParticles import StdLooseKaons
-from StandardParticles import StdLoosePions
-from CommonParticles.Utils import updateDoD
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = 'Ramon Niet'
 __date__ = '2014/10/23'
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingB2CC/StrippingBd2JpsieeKstar.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingB2CC/StrippingBd2JpsieeKstar.py
index 2f212b3648b3a956f93594588b6f5fd1a345b725..8ce24bba33857f9f52e405dfb33b6f4cfbc72be8 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingB2CC/StrippingBd2JpsieeKstar.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingB2CC/StrippingBd2JpsieeKstar.py
@@ -12,7 +12,6 @@ from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from Configurables import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = 'Artur Ukleja, Jibo He, Konrad Klimaszewski, Varvara Batozskaya'
 __date__ = '2019/01/22'
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingB2CC/StrippingBs2EtacPhiBDT.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingB2CC/StrippingBs2EtacPhiBDT.py
index b6e256eaa1235a84cbf3b68362eea9bf7f387897..30d69a2c110a19ab5a45303854da636781997f4f 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingB2CC/StrippingBs2EtacPhiBDT.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingB2CC/StrippingBs2EtacPhiBDT.py
@@ -17,7 +17,6 @@ from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
-from Gaudi.Configuration import *
 __author__ = ['Morgan Martin, Jibo He']
 __date__ = '20/08/2014'
 __version__ = '$Revision: 1.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingB2CC/StrippingBs2JpsieePhi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingB2CC/StrippingBs2JpsieePhi.py
index 933c2f46f93196ffa448a855cea7a82e5fca3652..ee8bf0cf2aad66cd3771f048a336fffb0ed8165d 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingB2CC/StrippingBs2JpsieePhi.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingB2CC/StrippingBs2JpsieePhi.py
@@ -12,7 +12,6 @@ from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from Configurables import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = 'Artur Ukleja, Jibo He, Konrad Klimaszewski'
 __date__ = '2011/03/01'
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingB2OC/Beauty2Charm_B2DXBuilder.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingB2OC/Beauty2Charm_B2DXBuilder.py
index 2d1c9d69a292481caadad4c128dc90547777bf58..d86ed2e85c6a4d8cd4220bde92edd4e1f99e0d84 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingB2OC/Beauty2Charm_B2DXBuilder.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingB2OC/Beauty2Charm_B2DXBuilder.py
@@ -12,11 +12,7 @@
 
 from copy import deepcopy
 from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-from PhysSelPython.Wrappers import Selection
-from Beauty2Charm_LoKiCuts import LoKiCuts
 from Beauty2Charm_Utils import *
-from Configurables import SubstitutePID
 
 # \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\#
 
@@ -1090,7 +1086,7 @@ class B2DXBuilder(object):
                                     "B- -> D*_2(2460)0 D0 K-"],
                   'B2D0st2460D0Pi': ["B+ -> D*_2(2460)0 D0 pi+",
                                      "B- -> D*_2(2460)0 D0 pi-"]}
-        input = self.dst.dpi_2460_pid+self.d.kpi_pid+self.topoKaons_PID
+        self.dst.dpi_2460_pid+self.d.kpi_pid+self.topoKaons_PID
         inputs = {'B2D0st2460D0K': self.dst.dpi_2460_pid+self.d.kpi_pid+self.topoKaons_PID,
                   'B2D0st2460D0Pi': self.dst.dpi_2460_pid+self.d.kpi_pid+self.topoPions_PID}
         rs = makeB2XSels(decays, '', inputs, self.config)
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingB2OC/Beauty2Charm_Bc2BXBuilder.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingB2OC/Beauty2Charm_Bc2BXBuilder.py
index 63ecc854364bae2f29d64ea2b95c3484988c7016..5bb9297a5c69f56bc7b9761489bf517623df7d3c 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingB2OC/Beauty2Charm_Bc2BXBuilder.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingB2OC/Beauty2Charm_Bc2BXBuilder.py
@@ -8,11 +8,9 @@
 # granted to it by virtue of its status as an Intergovernmental Organization  #
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
-from copy import deepcopy
 from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 from PhysSelPython.Wrappers import Selection, MergedSelection
-from Beauty2Charm_LoKiCuts import LoKiCuts
 from Beauty2Charm_Utils import *
 
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingB2OC/Beauty2Charm_Bc2DDBuilder.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingB2OC/Beauty2Charm_Bc2DDBuilder.py
index 17eda4547110606bb00b589ef9a9081a7ab985e7..44526bcd78bbc48eb6f8c6416c9eabdc38313ac4 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingB2OC/Beauty2Charm_Bc2DDBuilder.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingB2OC/Beauty2Charm_Bc2DDBuilder.py
@@ -11,10 +11,8 @@
 
 # \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\#
 
-from copy import deepcopy
 from Gaudi.Configuration import *
-from PhysSelPython.Wrappers import Selection, MergedSelection
-from Beauty2Charm_LoKiCuts import LoKiCuts
+from PhysSelPython.Wrappers import MergedSelection
 from Beauty2Charm_Utils import *
 # from Configurables import SubstitutePID
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingB2OC/Beauty2Charm_Bc2DXBuilder.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingB2OC/Beauty2Charm_Bc2DXBuilder.py
index 6f6b41a5a8d8e6494ece3c8a144bcc57574870b7..4965e7a83f1b9871f219ab719abb3e950ee03bbd 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingB2OC/Beauty2Charm_Bc2DXBuilder.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingB2OC/Beauty2Charm_Bc2DXBuilder.py
@@ -10,9 +10,6 @@
 ###############################################################################
 from copy import deepcopy
 from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-from PhysSelPython.Wrappers import Selection, MergedSelection
-from Beauty2Charm_LoKiCuts import LoKiCuts
 from Beauty2Charm_Utils import *
 
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingB2OC/Beauty2Charm_DBuilder.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingB2OC/Beauty2Charm_DBuilder.py
index d4740efb1cda30fc3ac5cdfb96c40d12fe5606f3..c4e957ea4c19356392178500bc0038fb77f701cb 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingB2OC/Beauty2Charm_DBuilder.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingB2OC/Beauty2Charm_DBuilder.py
@@ -321,7 +321,6 @@ class DBuilder(object):
         # self.k3pi_ddx_pid = [filterSelection('D2k3pi_for_DDX',LoKiCuts(['VCHI2DOF','BPVVDCHI2'],config_for_ddx).code(),self.k3pi_pid)]
 
         # use this below
-        d_cf_noMassWin = d_cf
         d_cf = LoKiCuts.combine([d_cf, "in_range(%s,MM,%s)" % (d_min, d_max)])
         ds_cf = LoKiCuts.combine(
             [ds_cf, "in_range(%s,MM,%s)" % (ds_min, ds_max)])
@@ -1820,9 +1819,6 @@ class DBuilder(object):
 
     def _makeD2PhiMuNu(self, up=False):
         '''makes Ds->phi mu nu'''
-        decays = [['phi(1020)', 'mu+']]
-        min = '1125.13*MeV'
-        max = '2168.49*MeV'
         cpkk = CombineParticles(CombinationCut="ADAMASS('phi(1020)') < 150*MeV",  # ( hasTopoChild() )
                                 MotherCut='(VFASPF(VCHI2/VDOF) < 10)',
                                 DaughtersCuts={'K+': '(PIDK>-10)'},
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingB2OC/Beauty2Charm_HHBuilder.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingB2OC/Beauty2Charm_HHBuilder.py
index ac91c76ab1a16bdd9e6da4a8f26964aba8913d00..2a73dd8afc3d6f2f1e9b68b60ae7b3dd4bb6654c 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingB2OC/Beauty2Charm_HHBuilder.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingB2OC/Beauty2Charm_HHBuilder.py
@@ -10,7 +10,6 @@
 ###############################################################################
 # \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\#
 
-from copy import deepcopy
 from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 from PhysSelPython.Wrappers import Selection
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingB2OC/Beauty2Charm_HHHBuilder.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingB2OC/Beauty2Charm_HHHBuilder.py
index 4ca95e738689e28e73bea3eb642ac88f607712a1..28ca931f76590f11cdabcf62760db4c23769a749 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingB2OC/Beauty2Charm_HHHBuilder.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingB2OC/Beauty2Charm_HHHBuilder.py
@@ -10,9 +10,8 @@
 ###############################################################################
 # \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\#
 
-from copy import deepcopy
 from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N3BodyDecays
+from GaudiConfUtils.ConfigurableGenerators import DaVinci__N3BodyDecays
 from PhysSelPython.Wrappers import Selection
 from Beauty2Charm_LoKiCuts import LoKiCuts
 from Beauty2Charm_Utils import *
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingB2OC/Beauty2Charm_Lb2XBuilder.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingB2OC/Beauty2Charm_Lb2XBuilder.py
index b7be9235f35813eff39c035e1cb6714db9d90ca1..45e5b0dd4789b8e7ff6c046e70b87ec2e5b19c66 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingB2OC/Beauty2Charm_Lb2XBuilder.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingB2OC/Beauty2Charm_Lb2XBuilder.py
@@ -1333,7 +1333,7 @@ class Lb2XBuilder(object):
 
     def _makeX2LcKPiPiPi(self):
         '''Makes RS + WS Xib -> Lc HH + c.c.'''
-        pions = self.pions
+        self.pions
         kaons = self.kaons
         pipipi = self.hhh.pipipi
         config = deepcopy(self.config)
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingB2OC/Beauty2Charm_LoKiCuts.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingB2OC/Beauty2Charm_LoKiCuts.py
index 54540ea2a223d554a751b02cf83000df4f3aa076..0fd327f8d32075591c9ca0e2d4dd434636c0ab35 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingB2OC/Beauty2Charm_LoKiCuts.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingB2OC/Beauty2Charm_LoKiCuts.py
@@ -10,11 +10,6 @@
 ###############################################################################
 # \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\#
 
-from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
-from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-from PhysSelPython.Wrappers import Selection, MergedSelection
-from StandardParticles import StdNoPIDsPions, StdNoPIDsKaons
 
 # \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\#
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingB2OC/Beauty2Charm_Utils.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingB2OC/Beauty2Charm_Utils.py
index 1fe78df7c079a95de0d4ea880934703d735084c0..4a7f7a1c5fd4d4c38087b77dfd87eb04fa363095 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingB2OC/Beauty2Charm_Utils.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingB2OC/Beauty2Charm_Utils.py
@@ -10,13 +10,11 @@
 ###############################################################################
 # \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\#
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-from PhysSelPython.Wrappers import DataOnDemand, Selection, MergedSelection, VoidEventSelection
+from PhysSelPython.Wrappers import DataOnDemand, Selection, VoidEventSelection
 from Beauty2Charm_LoKiCuts import LoKiCuts
 from Configurables import SubstitutePID
-from Configurables import ConeJetProxyFilter
 
 # \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\#
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingB2OC/StrippingB2DDphi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingB2OC/StrippingB2DDphi.py
index b0f8982f1efb389032da5f7becb2881e3c005379..92ca95c2ea3f7c46766aedbc04dbbc34c9c0b8ef 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingB2OC/StrippingB2DDphi.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingB2OC/StrippingB2DDphi.py
@@ -15,8 +15,7 @@ Author: M. Martinelli
 Notes: Excited states are included by placing the line in FULL.DST
 '''
 from PhysSelPython.Wrappers import Selection, DataOnDemand
-from Configurables import FilterDesktop, CombineParticles, DaVinci__N4BodyDecays
-from GaudiConfUtils.ConfigurableGenerators import CombineParticles
+from Configurables import DaVinci__N4BodyDecays, FilterDesktop
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 __author__ = ['Maurizio Martinelli']
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingB2OC/StrippingB2DXD2HMuNu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingB2OC/StrippingB2DXD2HMuNu.py
index 0c33c7610ceda08cc07fbbc35c72e2186d8d5d81..d01564ec9dde10135fe1fc2b84e567d131876e4c 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingB2OC/StrippingB2DXD2HMuNu.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingB2OC/StrippingB2DXD2HMuNu.py
@@ -12,13 +12,11 @@ __author__ = ['Wenbin Qian']
 __date__ = '09/11/2015'
 __version__ = '$Revision: 0.01 $'
 
-from Gaudi.Configuration import *
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, DaVinci__N4BodyDecays, DaVinci__N3BodyDecays
-from PhysSelPython.Wrappers import Selection, DataOnDemand
+from PhysSelPython.Wrappers import Selection
 from StandardParticles import StdLooseMuons, StdLoosePions, StdLooseKaons
-from GaudiKernel.SystemOfUnits import MeV, GeV, cm, mm
 
 __all__ = ('B2DXD2HMuNuBuilder',
            'default_config')
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingB2OC/StrippingB2nbody.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingB2OC/StrippingB2nbody.py
index 663bdbbf855c3d8d19dad3a29b6be667edaeedb9..04c84fc2dc39eb4b3d3d954f3c0083396e0c84fa 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingB2OC/StrippingB2nbody.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingB2OC/StrippingB2nbody.py
@@ -16,7 +16,6 @@ from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, MergedSelection, DataOnDemand, VoidEventSelection
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = ['Rudolf Oldeman']
 __date__ = '08/02/2011'
 __version__ = '$Revision: 1.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingB2OC/StrippingBeauty2Charm.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingB2OC/StrippingBeauty2Charm.py
index 4d5f2c9be463ca2124ea2f2d0afc00614c46a995..3742d441c292d70cce6002696220883629d7fe34 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingB2OC/StrippingBeauty2Charm.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingB2OC/StrippingBeauty2Charm.py
@@ -28,11 +28,9 @@ from Beauty2Charm_HHHBuilder import *
 from Beauty2Charm_HHBuilder import *
 from Beauty2Charm_DBuilder import *
 from StandardParticles import StdLooseAllPhotons, StdVeryLooseAllPhotons
-from Configurables import LoKi__VoidFilter
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import EventSelection
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
+from PhysSelPython.Wrappers import MergedSelection, Selection
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
 from Gaudi.Configuration import *
 import re
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBandQ/StrippingB2Chic0KPi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBandQ/StrippingB2Chic0KPi.py
index 69e18721b3c6b45435046eaac0c9a79d5818b6da..030871800dfb7d9f6c18c93c207febaf3fad5cf8 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBandQ/StrippingB2Chic0KPi.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBandQ/StrippingB2Chic0KPi.py
@@ -17,7 +17,6 @@ from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
-from Gaudi.Configuration import *
 __author__ = ['Andrii Usachov']
 __date__ = '13/03/2018'
 __version__ = '$Revision: 1.2$'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBandQ/StrippingB2JpsiXforEM_s.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBandQ/StrippingB2JpsiXforEM_s.py
index d3aeeef75411f9cecca87053ee0faa991e8c7fd8..394fd7c3171d61beb9b93f762a890a248f2b190f 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBandQ/StrippingB2JpsiXforEM_s.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBandQ/StrippingB2JpsiXforEM_s.py
@@ -20,21 +20,11 @@ __version__ = '$Revision: 0.0 $'
 
 __all__ = ('B2JpsiXforEM_sConf', 'default_config')
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
 from Configurables import LoKi__PVReFitter, CombineParticles
-from CommonParticles.Utils import updateDoD
-from StandardParticles import StdLoosePions
-from StandardParticles import StdLooseKaons
-from StandardParticles import StdAllLooseKaons
-from StandardParticles import StdLooseResolvedPi0
-from StandardParticles import StdLooseMergedPi0
-from StandardParticles import StdNoPIDsPions
-from StandardParticles import StdLooseProtons
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
+from PhysSelPython.Wrappers import DataOnDemand, Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from GaudiKernel.SystemOfUnits import MeV
 
 default_config = {
     'NAME': 'B2JpsiXforEM',
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBandQ/StrippingBbbar2PhiPhi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBandQ/StrippingBbbar2PhiPhi.py
index 2c308991a8d9592619777fb7aad4c619a4a40437..fd4e526f5796889d5eb13efd1f1fca7adfbf4a97 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBandQ/StrippingBbbar2PhiPhi.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBandQ/StrippingBbbar2PhiPhi.py
@@ -21,12 +21,10 @@ confBbbar2PhiPhi = Bbbar2PhiPhiConf( name = 'Bbbar2PhiPhi', config = config_Bbba
 stream.appendLines( confBbbar2PhiPhi.lines() )
 '''
 
-from StandardParticles import StdNoPIDsProtons, StdNoPIDsPions, StdNoPIDsDownPions
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
+from PhysSelPython.Wrappers import DataOnDemand, Selection
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = ['Simone Stracka']
 __date__ = '10/03/2015'
 __all__ = (
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBandQ/StrippingBc2JpsiHBDT.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBandQ/StrippingBc2JpsiHBDT.py
index d973f13d2bc8b32c5045776e5b5d3f96bc618e74..7b5a84a9de9b55f09a9ef0da7469b5cc113c4602 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBandQ/StrippingBc2JpsiHBDT.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBandQ/StrippingBc2JpsiHBDT.py
@@ -18,7 +18,6 @@ from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = ['Jibo He']
 __date__ = '02/11/2013'
 __version__ = '$Revision: 2.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBandQ/StrippingBc2JpsiMuXNew.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBandQ/StrippingBc2JpsiMuXNew.py
index 946bad8366ac6019498b9d14e89f0a8899cf70d4..bd156feb81f0deaaf2a07b14df76bcbbcdd03d5c 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBandQ/StrippingBc2JpsiMuXNew.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBandQ/StrippingBc2JpsiMuXNew.py
@@ -18,7 +18,6 @@ from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = ['Jibo He']
 __date__ = '02/09/2010'
 __version__ = '$Revision: 2.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBandQ/StrippingCC2DD.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBandQ/StrippingCC2DD.py
index 58f89513ddb6f5ae23ad89c616deb7d8f0c6f719..39a30438368c27a6a42f57688de187a8b1135e72 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBandQ/StrippingCC2DD.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBandQ/StrippingCC2DD.py
@@ -22,8 +22,7 @@ Module for construction of CC->D D, where CC is a particle decaying to D D
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 __author__ = ['Lucio Anderlini', 'Andrea Bizzeti']
 __date__ = '2015-12-01'
 __version__ = '$Revision: 0.4 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBandQ/StrippingCcbar2Baryons.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBandQ/StrippingCcbar2Baryons.py
index e5a87f652fa30a90026cc6172bb112eb157c1e0f..3e235742a82cc6b6eef181ba5871e7096a9e965d 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBandQ/StrippingCcbar2Baryons.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBandQ/StrippingCcbar2Baryons.py
@@ -20,7 +20,6 @@ stream.appendLines( [
 ])
 '''
 
-from StandardParticles import StdNoPIDsProtons, StdNoPIDsPions, StdNoPIDsDownPions
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBandQ/StrippingCcbar2LambdaLambda.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBandQ/StrippingCcbar2LambdaLambda.py
index 627203da22f81a94eda9c6247ea6c2a1fb128927..283be918e66c410e5d5d0c9fd13effb397d4b70b 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBandQ/StrippingCcbar2LambdaLambda.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBandQ/StrippingCcbar2LambdaLambda.py
@@ -12,14 +12,10 @@
 Module for selecting Ccbar->LambdaLambda detached line, with loose PT, PID cuts. 
 '''
 
-from StandardParticles import StdAllLoosePions
-from StandardParticles import StdLoosePions, StdNoPIDsDownPions
-from StandardParticles import StdNoPIDsProtons
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = ['Andrii Usachov']
 __date__ = '27/01/2019'
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBandQ/StrippingCcbar2LstLambda.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBandQ/StrippingCcbar2LstLambda.py
index 0c317712061ae5a153e89bd41b8390a4fc74e187..4937ef3626431e3998bb3086fe7c656fa4ec9e57 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBandQ/StrippingCcbar2LstLambda.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBandQ/StrippingCcbar2LstLambda.py
@@ -12,14 +12,10 @@
 Module for selecting Ccbar->LstLambda detached line, with loose PT, PID cuts. 
 '''
 
-from StandardParticles import StdAllLoosePions, StdAllLooseKaons
-from StandardParticles import StdLoosePions, StdNoPIDsDownPions, StdLooseKaons, StdLooseDownKaons
-from StandardParticles import StdNoPIDsProtons, StdNoPIDsKaons
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = ['Andrii Usachov']
 __date__ = '23/11/2017'
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBandQ/StrippingCcbar2LstLst.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBandQ/StrippingCcbar2LstLst.py
index cf2d3319f4c8d473c85741f08945e6d15bd1722b..fb7af606490052a513bd2a8433237fcbfca14aa4 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBandQ/StrippingCcbar2LstLst.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBandQ/StrippingCcbar2LstLst.py
@@ -12,12 +12,10 @@
 Module for selecting Ccbar->LstLst detached line, with loose PT, PID cuts. 
 '''
 
-from StandardParticles import StdNoPIDsProtons, StdNoPIDsKaons
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
+from PhysSelPython.Wrappers import DataOnDemand, Selection
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = ['Andrii Usachov']
 __date__ = '12/01/2017'
 
@@ -58,19 +56,19 @@ class Ccbar2LstLstConf(LineBuilder):
         self.name = name
         self.config = config
 
-        TRCHI2DOF = config['TRCHI2DOF']
-        KaonProbNNk = config['KaonProbNNk']
-        KaonPTSec = config['KaonPTSec']
-        ProtonProbNNp = config['ProtonProbNNp']
-        ProtonP = config['ProtonP']
-        ProtonPTSec = config['ProtonPTSec']
-        LstVtxChi2 = config['LstVtxChi2']
-        LstMinMass = config['LstMinMass']
-        LstMaxMass = config['LstMaxMass']
-        CombMaxMass = config['CombMaxMass']
-        CombMinMass = config['CombMinMass']
-        MaxMass = config['MaxMass']
-        MinMass = config['MinMass']
+        config['TRCHI2DOF']
+        config['KaonProbNNk']
+        config['KaonPTSec']
+        config['ProtonProbNNp']
+        config['ProtonP']
+        config['ProtonPTSec']
+        config['LstVtxChi2']
+        config['LstMinMass']
+        config['LstMaxMass']
+        config['CombMaxMass']
+        config['CombMinMass']
+        config['MaxMass']
+        config['MinMass']
 
         self.DetachedProtonForLst = self.createSubSel(OutputList="DetachedProtonForLst" + self.name,
                                                       InputList=DataOnDemand(
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBandQ/StrippingCcbar2PPPiPi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBandQ/StrippingCcbar2PPPiPi.py
index 28b6a56f5499cd8ecbce8b1d1e366f216f123073..91e5c78c655288eb933c6478d1eafcaee3904f84 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBandQ/StrippingCcbar2PPPiPi.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBandQ/StrippingCcbar2PPPiPi.py
@@ -12,12 +12,11 @@
 Module for selecting charmonium -> p pbar pi pi 
 '''
 
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
+from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
 from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
-from Gaudi.Configuration import *
 __author__ = ['Jibo He']
 __date__ = '12/11/2015'
 __version__ = '$Revision: 1.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBandQ/StrippingCcbar2PhiPhi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBandQ/StrippingCcbar2PhiPhi.py
index c21b9fa874a5dccb0d9c373c28e255bbe309ea95..101a8e21ba087c6c991fe35e18471728a0abe2e3 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBandQ/StrippingCcbar2PhiPhi.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBandQ/StrippingCcbar2PhiPhi.py
@@ -21,12 +21,10 @@ confCcbar2PhiPhi = Ccbar2PhiPhiConf( name = 'Ccbar2PhiPhi', config = config_Ccba
 stream.appendLines( confCcbar2PhiPhi.lines() )
 '''
 
-from StandardParticles import StdNoPIDsProtons, StdNoPIDsPions, StdNoPIDsDownPions
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
+from PhysSelPython.Wrappers import DataOnDemand, Selection
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = ['Jibo He']
 __date__ = '20/01/2012'
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBandQ/StrippingCcbar2PhiPhiDetached.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBandQ/StrippingCcbar2PhiPhiDetached.py
index 9cece8aa8a316b6c48d7062407ae3c5e4a4703e3..8d48d19f4b11b35402f710baec49d8b99bec7f11 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBandQ/StrippingCcbar2PhiPhiDetached.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBandQ/StrippingCcbar2PhiPhiDetached.py
@@ -15,12 +15,10 @@ Inherited from StrippingCcbar2PhiPhi.py; moved To FullDST
 
 '''
 
-from StandardParticles import StdNoPIDsProtons, StdNoPIDsPions, StdNoPIDsDownPions
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
+from PhysSelPython.Wrappers import DataOnDemand, Selection
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = ['Jibo He, Liupan An']
 __date__ = '11/01/2017'
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBandQ/StrippingCcbar2PhiPhiPiPi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBandQ/StrippingCcbar2PhiPhiPiPi.py
index 3255f0fb24ce2bf3d5dedf3d48901b1a3b7fdf4c..8ded03963ceb90126c111e3d53772e2529b17348 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBandQ/StrippingCcbar2PhiPhiPiPi.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBandQ/StrippingCcbar2PhiPhiPiPi.py
@@ -12,12 +12,11 @@
 Module for selecting charmonium -> phi phi pi pi 
 '''
 
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
+from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
 from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
-from Gaudi.Configuration import *
 __author__ = ['Andrii Usachov']
 __date__ = '10/04/2017'
 __version__ = '$Revision: 1.1 $'
@@ -60,12 +59,12 @@ class Ccbar2PhiPhiPiPiConf(LineBuilder):
         self.name = name
         self.config = config
 
-        PhiVtxChi2 = config['PhiVtxChi2']
-        PhiMassW = config['PhiMassW']
-        KaonPT = config['KaonPT']
-        TRCHI2DOF = config['TRCHI2DOF']
-        KaonProbNNk = config['KaonProbNNk']
-        KaonIPCHI2 = config['KaonIPCHI2']
+        config['PhiVtxChi2']
+        config['PhiMassW']
+        config['KaonPT']
+        config['TRCHI2DOF']
+        config['KaonProbNNk']
+        config['KaonIPCHI2']
 
         self.SelPions = self.createSubSel(OutputList=self.name + "SelPions",
                                           InputList=DataOnDemand(
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBandQ/StrippingCcbar2PpbarNew.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBandQ/StrippingCcbar2PpbarNew.py
index ee8963df34aa184b52ef4e748c679800cc8ef52e..85282982e0396ca96b5935ba315d5b23bee0ba45 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBandQ/StrippingCcbar2PpbarNew.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBandQ/StrippingCcbar2PpbarNew.py
@@ -18,9 +18,8 @@ Module for Charmonium->p pbar, including three lines
 
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
+from PhysSelPython.Wrappers import Selection
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 __author__ = ['Jibo He']
 __date__ = '03/10/2010'
 __version__ = '$Revision: 1.2 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBandQ/StrippingChiCJPsiGammaConv.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBandQ/StrippingChiCJPsiGammaConv.py
index 0974ad33bc785e6c21ccfbd8abd76c1de3c8330d..13c82277579b4165c559b3e45a8dc8a26f329028 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBandQ/StrippingChiCJPsiGammaConv.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBandQ/StrippingChiCJPsiGammaConv.py
@@ -11,8 +11,7 @@
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
-from Configurables import FilterDesktop, CombineParticles, OfflineVertexFitter
-from Gaudi.Configuration import *
+from Configurables import CombineParticles, FilterDesktop
 __author__ = 'Edwige Tournefier'
 __date__ = '08/06/2012'
 __version__ = '$ 1.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBandQ/StrippingDiMuonForXsection.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBandQ/StrippingDiMuonForXsection.py
index 99d45c194f644de10f8a90371ed1079dcd2e147e..7ceb214bd70cc59ffa52391a7a3321cce9dba642 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBandQ/StrippingDiMuonForXsection.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBandQ/StrippingDiMuonForXsection.py
@@ -16,7 +16,6 @@ from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
-from Gaudi.Configuration import *
 __author__ = ['Jibo He']
 __date__ = '28/03/2012'
 __version__ = '$Revision: 1.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBandQ/StrippingDiMuonNew.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBandQ/StrippingDiMuonNew.py
index 7c60c2e0a15b0e700724dae73d54a428fd669c7a..dd539e9d69fb0fa229c32fd245d281db456c4fed 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBandQ/StrippingDiMuonNew.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBandQ/StrippingDiMuonNew.py
@@ -60,7 +60,6 @@ from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand, EventSelection
 from Configurables import LoKi__VoidFilter
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
-from Gaudi.Configuration import *
 __author__ = ['Jibo He']
 __date__ = '30/09/2010'
 __version__ = '$Revision: 1.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBandQ/StrippingEtap2pipimumu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBandQ/StrippingEtap2pipimumu.py
index d3d1d1ace791be2cf505fc6059dff04cd92af55b..af48f7c83025956348c7d9b1611c8e902321aa5f 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBandQ/StrippingEtap2pipimumu.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBandQ/StrippingEtap2pipimumu.py
@@ -13,9 +13,7 @@ from StandardParticles import StdAllLooseMuons, StdAllLoosePions, StdAllLooseKao
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, OfflineVertexFitter
-from Gaudi.Configuration import *
-from copy import copy
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop
 __author__ = ['Xabier Cid Vidal']
 # inspired by StrippingD2XMuMuSSConf, from Malcolm John, B. Viaud and O. Kochebina
 __date__ = '25/1/2019'
@@ -149,10 +147,10 @@ class StrippingEtap2pipimumuConf(LineBuilder):
 
         LineBuilder.__init__(self, name, config)
 
-        Ds2EtapLine_name = name+"_Ds2Etap"
-        Bu2EtapLine_name = name+"_Bu2Etap"
-        Ds2Phi3PiLine_name = name+"_Ds2Phi3Pi"
-        Bu2JPsiKLine_name = name+"_Bu2JPsiK"
+        name+"_Ds2Etap"
+        name+"_Bu2Etap"
+        name+"_Ds2Phi3Pi"
+        name+"_Bu2JPsiK"
 
         # 1 : Make pions and kaons
         selPionsEta = makeDaughters(
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBandQ/StrippingHeavyBaryons.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBandQ/StrippingHeavyBaryons.py
index fdc48e45e9d8cddbdbd0c89c4f67663a329603f3..500f8829198f1352b6129c8bf22fff77d3f04e68 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBandQ/StrippingHeavyBaryons.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBandQ/StrippingHeavyBaryons.py
@@ -12,14 +12,10 @@
 Stripping line for HeavyBaryons studies : Xi_b-, Xi_b0 and Omega_b-
 Author: Yasmine Amhis
 '''
-from GaudiKernel.SystemOfUnits import MeV
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
-from StandardParticles import StdAllLoosePions, StdAllLooseKaons
-from StandardParticles import StdLoosePions, StdNoPIDsDownPions, StdLooseKaons, StdLooseDownKaons
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = ['Yasmine Amhis']
 __date__ = '19/05/2011'
 __version__ = '$Revision: 1.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBandQ/StrippingInclusiveCharmBaryons.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBandQ/StrippingInclusiveCharmBaryons.py
index 201c096247b241236a2ac4156fecd55babf00dd3..5b13bff30a6f8279c85e884ed961904aa89e38d3 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBandQ/StrippingInclusiveCharmBaryons.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBandQ/StrippingInclusiveCharmBaryons.py
@@ -17,13 +17,10 @@ Author: M. Stahl
 Notes: Be creative!
 '''
 from PhysSelPython.Wrappers import Selection, AutomaticData
-import math
 from LoKiProtoParticles.decorators import *
 from LoKiArrayFunctors.decorators import *
 from LoKiPhys.decorators import *
-from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-from Configurables import FilterDesktop
-from PhysConf.Selections import FilterSelection, CombineSelection, Combine4BodySelection, Combine3BodySelection, LimitSelection, MergedSelection
+from PhysConf.Selections import Combine3BodySelection, Combine4BodySelection, FilterSelection, MergedSelection
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 __author__ = ['Marian Stahl']
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBandQ/StrippingInclusiveDoubleD.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBandQ/StrippingInclusiveDoubleD.py
index a06a38a50584fac39714125ffd40ab9e15ade044..6feefa7e6c9dc9308b80bba2c991944f64e4fafb 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBandQ/StrippingInclusiveDoubleD.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBandQ/StrippingInclusiveDoubleD.py
@@ -18,13 +18,10 @@ Author: M. Stahl
 Notes: Be creative!
 '''
 from PhysSelPython.Wrappers import Selection, AutomaticData
-import math
 from LoKiProtoParticles.decorators import *
 from LoKiArrayFunctors.decorators import *
 from LoKiPhys.decorators import *
-from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-from Configurables import FilterDesktop
-from PhysConf.Selections import FilterSelection, CombineSelection, Combine4BodySelection, Combine3BodySelection, LimitSelection, MergedSelection
+from PhysConf.Selections import Combine3BodySelection, Combine4BodySelection, CombineSelection, FilterSelection, MergedSelection
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 __author__ = ['Marian Stahl']
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBandQ/StrippingLb2EtacKp.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBandQ/StrippingLb2EtacKp.py
index 55d3c83ddc36e31f40d92545ba06d3c99b11dcce..860ca3a5a0957521bcd7a48d6e0a5073d1e24017 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBandQ/StrippingLb2EtacKp.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBandQ/StrippingLb2EtacKp.py
@@ -17,7 +17,6 @@ from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
-from Gaudi.Configuration import *
 __author__ = ['Liming Zhang', 'Xuesong Liu']
 __date__ = '23/11/2016'
 __version__ = '$Revision: 2.0$'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBandQ/StrippingOmegabDecays.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBandQ/StrippingOmegabDecays.py
index 10321ae5335297f63b4b8b2f71c70f7293172c1a..4002bd8ca389c38c15dddd1c90f1046ac80538f9 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBandQ/StrippingOmegabDecays.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBandQ/StrippingOmegabDecays.py
@@ -32,8 +32,7 @@ __all__ = ('OmegabDecaysConf',
            'makeOmegab2Omegacgammapi',
            'default_config')
 
-from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBandQ/StrippingPPMuMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBandQ/StrippingPPMuMu.py
index cfa93241546b8cb1958f0c080bce3ed3974eb196..1e28adc9f8419151808afa067316d7a0f98387fb 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBandQ/StrippingPPMuMu.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBandQ/StrippingPPMuMu.py
@@ -12,12 +12,11 @@
 Module for selecting Hc -> p pbar mu mu
 '''
 
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
+from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
 from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
-from Gaudi.Configuration import *
 __author__ = ['Liupan An']
 __date__ = '18/05/2017'
 __version__ = '$Revision: 1.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBandQ/StrippingXibc.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBandQ/StrippingXibc.py
index ed73d91a4d03fe2ff6427b7cd54ccc7ed18aeaa7..d0446cddfd42feba526eaf11c9d8cf13a4160779 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBandQ/StrippingXibc.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBandQ/StrippingXibc.py
@@ -47,17 +47,11 @@ __all__ = ('XibcBuilder'  # LineBuilder class specialization
            )
 
 
-from Gaudi.Configuration import *
-
 from Configurables import FilterDesktop, CombineParticles
 from PhysSelPython.Wrappers import Selection, AutomaticData, MergedSelection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 
-from CommonParticles.StdLooseLambda import StdLooseLambdaLL, StdLooseLambdaDD
-from GaudiKernel.SystemOfUnits import MeV, GeV, mm
-from Configurables import TisTosParticleTagger
-
 
 default_name = "Xibc"
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBandQ/StrippingXibcBDT.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBandQ/StrippingXibcBDT.py
index 5520ac91aac71eded5064eb9daf551c6b35891fe..28b1ca4c2d5b6567ed207d4b3cd2e8dcd52a9324 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBandQ/StrippingXibcBDT.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBandQ/StrippingXibcBDT.py
@@ -33,8 +33,6 @@ from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticle
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, MergedSelection, DataOnDemand
-from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays
-from Gaudi.Configuration import *
 __author__ = ['Jibo He']
 __date__ = '20/11/2016'
 __version__ = '$Revision: 1.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBandQ/StrippingXiccBDT.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBandQ/StrippingXiccBDT.py
index 0fda677dfb8d63acd803c2278c95da8b32d22700..7dde23cf7ee6e3329158f6ed2ef36ed1b1c5655c 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBandQ/StrippingXiccBDT.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBandQ/StrippingXiccBDT.py
@@ -30,9 +30,7 @@ Xicc+  -> D+ p+ K-
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, MergedSelection, DataOnDemand
-from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays
-from Gaudi.Configuration import *
+from PhysSelPython.Wrappers import DataOnDemand, Selection
 __author__ = ['Jibo He']
 __date__ = '20/11/2016'
 __version__ = '$Revision: 1.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBnoC/StrippingB24pLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBnoC/StrippingB24pLines.py
index fed91323554dd309e9a4137174eba46ba8676d87..2c744f40e0299eacf7acf157af33557db0eec23d 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBnoC/StrippingB24pLines.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBnoC/StrippingB24pLines.py
@@ -54,12 +54,10 @@ Exported symbols (use python help!):
    - 
 """
 
-from GaudiKernel.PhysicalConstants import c_light
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
-from Configurables import FilterDesktop, CombineParticles, DaVinci__N4BodyDecays
-from Gaudi.Configuration import *
+from Configurables import DaVinci__N4BodyDecays
 __author__ = ["Pietro Marino", "Oliver Gruenberg"]
 __date__ = "13.10.2017"
 __version__ = "$Revision: 3.0 $"
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBnoC/StrippingB2CharmlessInclusive.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBnoC/StrippingB2CharmlessInclusive.py
index 056df1189d8c6e124a4dcb4201ec68d8ac1fc40d..8ae9f04166a6ba66089d684f07c4dfc79cbbc333 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBnoC/StrippingB2CharmlessInclusive.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBnoC/StrippingB2CharmlessInclusive.py
@@ -16,9 +16,8 @@ from StandardParticles import StdLooseKsDD, StdLooseKsLL
 from StandardParticles import StdNoPIDsPions, StdLooseAllPhotons, StdLooseMergedPi0, StdLooseResolvedPi0
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand, SimpleSelection, MergedSelection
+from PhysSelPython.Wrappers import MergedSelection, Selection, SimpleSelection
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = ['Fred Blanc', 'Luca Pescatore']
 __date__ = '23/01/2019'
 __version__ = '$Revision: 3.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBnoC/StrippingB2HHBDT.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBnoC/StrippingB2HHBDT.py
index 58ec12b040a0d920e656286d4bfc1dda9cf9a73f..e6d9ba6ae39bf426ebdfb99b036c32ac4554915e 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBnoC/StrippingB2HHBDT.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBnoC/StrippingB2HHBDT.py
@@ -24,16 +24,13 @@ __all__ = ('B2HHBDTLines',
            'applyBDT',
            'default_config')
 
-from Gaudi.Configuration import *
 
-from GaudiKernel.SystemOfUnits import *
-
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 from StandardParticles import StdNoPIDsPions
 
 from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
-from StrippingUtils.Utils import LineBuilder, checkConfig
+from StrippingUtils.Utils import LineBuilder
 
 
 default_config = {
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBnoC/StrippingB2HHPi0.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBnoC/StrippingB2HHPi0.py
index bb255a96ff5e37e3059e4fd6df5cfadc8cfb0b7a..f8813f46fcbbc60b4f1ff068547e0ee3c7d07454 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBnoC/StrippingB2HHPi0.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBnoC/StrippingB2HHPi0.py
@@ -27,9 +27,8 @@ __all__ = ('StrippingB2HHPi0Conf',
            'makeB2HHPi0M',
            'default_config')
 
-from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from PhysSelPython.Wrappers import Selection, DataOnDemand
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
+from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from StandardParticles import StdNoPIDsPions, StdLooseMergedPi0, StdLooseResolvedPi0
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBnoC/StrippingB2KShh.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBnoC/StrippingB2KShh.py
index f404e2a87328dc23eb64929a9a9f3cd002ddadcf..2dcd40aee03deb0e241de124f68de39f1abe783b 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBnoC/StrippingB2KShh.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBnoC/StrippingB2KShh.py
@@ -25,7 +25,6 @@ __version__ = 'Stripping24r1/Stripping26r1'
 __all__ = {'B2KShhConf',
            'default_config'}
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, DaVinci__N3BodyDecays
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBnoC/StrippingB2KShhh.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBnoC/StrippingB2KShhh.py
index f95cf109667b3401f5eb904c78285279c34d00b5..07d236ac77af02d637424d32f3f4e637192ba3e1 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBnoC/StrippingB2KShhh.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBnoC/StrippingB2KShhh.py
@@ -27,13 +27,13 @@ __all__ = ('B2KShhhConf',
 
 from Gaudi.Configuration import *
 
-from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N4BodyDecays
+from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays
 from StandardParticles import StdNoPIDsPions, StdNoPIDsKaons  # ipchi2 cut
 from StandardParticles import StdLooseKsDD, StdLooseKsLL
 
-from PhysSelPython.Wrappers import Selection, MergedSelection
+from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
-from StrippingUtils.Utils import LineBuilder, checkConfig
+from StrippingUtils.Utils import LineBuilder
 
 from Configurables import FilterDesktop
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBnoC/StrippingB2Ksthh.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBnoC/StrippingB2Ksthh.py
index 94a25a2714e9626cb22e6966b9ad7a1955d78eb9..a39998cb04eef71b62a1bf9337b6fb914d58a917 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBnoC/StrippingB2Ksthh.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBnoC/StrippingB2Ksthh.py
@@ -22,7 +22,6 @@ __version__ = 'Stripping26'
 __all__ = {'B2KsthhConf',
            'default_config'}
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
@@ -176,7 +175,7 @@ class B2KsthhConf(LineBuilder):
         _massCutHigh = "(AM<(5279+%s)*MeV)" % config['B_Mhigh']
         _aptCut = "(APT>%s*MeV)" % config['B_APTmin']
         _daugMedPtCut = "(ANUM(PT>%s*MeV)>=2)" % config['BDaug_MedPT_PT']
-        _daugMaxPtIPCut = "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['BDaug_MaxPT_IP']
+        "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['BDaug_MaxPT_IP']
         _daugPtSumCut = "((APT1+APT2+APT3)>%s*MeV)" % config['BDaug_PTsum']
 
         _combCuts = _aptCut
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBnoC/StrippingB2TwoBaryons.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBnoC/StrippingB2TwoBaryons.py
index 8911a3d3bdc4a0add9f550c63095470ab59d4fef..93fef262a5bd7d8cd0abd1063e287bef85404e66 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBnoC/StrippingB2TwoBaryons.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBnoC/StrippingB2TwoBaryons.py
@@ -31,11 +31,10 @@ from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
 from StandardParticles import StdLooseProtons
 from StandardParticles import StdNoPIDsPions as Pions
-from CommonParticles.StdLooseLambda import StdLooseLambdaLL, StdLooseLambdaDD
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
-from StrippingUtils.Utils import LineBuilder, checkConfig
-from GaudiKernel.SystemOfUnits import MeV, GeV, mm, ns
+from StrippingUtils.Utils import LineBuilder
+from GaudiKernel.SystemOfUnits import GeV, MeV, mm
 
 default_config = {'NAME': 'B2TwoBaryons',
                   'WGs': ['BnoC'],
@@ -157,7 +156,7 @@ class B2TwoBaryonLines(LineBuilder):
 
         B2PPbarName = name + "B2PPbar"
 
-        B2PPSameSignName = name + "B2PPSameSign"
+        name + "B2PPSameSign"
 
         B2Lp_dd_name = name+'B2PLambdabarDD'
         B2Lp_ll_name = name+'B2PLambdabarLL'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBnoC/StrippingB2XEta.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBnoC/StrippingB2XEta.py
index e1adec50004bf9392e263cc5cb3ba465d4e08bf7..95fbd42162ff7cf67819bcb2ccbe2b4f88c30155 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBnoC/StrippingB2XEta.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBnoC/StrippingB2XEta.py
@@ -25,9 +25,7 @@ from StandardParticles import StdLoosePions as Pions
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, DaVinci__N3BodyDecays
-from PhysSelPython.Wrappers import DataOnDemand, Selection, SelectionSequence, MergedSelection
-from GaudiKernel import SystemOfUnits as Units
-from Gaudi.Configuration import *
+from PhysSelPython.Wrappers import DataOnDemand, MergedSelection, Selection
 __author__ = ['Timothy Williams']
 __date__ = '1/12/2016'
 __version__ = 'Stripping26r1'
@@ -564,7 +562,7 @@ class B2XEtaConf(LineBuilder):
         _trackCuts = _track_PT+'&'+_track_Chi2+'&'+_track_GPCut+'&'+_track_PIDCut
         _combCuts = _massCut+'&'+_docaCut
         _combCut12Doca = "ACHI2DOCA(1,2)<%s" % config['eta_DOCA']
-        _combCut12Vtx = "(VFASPF(VCHI2/VDOF)<%s)" % config['eta_vtxChi2']
+        "(VFASPF(VCHI2/VDOF)<%s)" % config['eta_vtxChi2']
         _combCut12 = _combCut12Doca
 
         # _eta3Pi=CombineParticles("eta3Pi",
@@ -592,7 +590,7 @@ class B2XEtaConf(LineBuilder):
         _trackCuts = _track_PT+'&'+_track_Chi2+'&'+_track_GPCut+'&'+_track_PIDCut
         _combCuts = _massCut+'&'+_docaCut
         _combCut12Doca = "ACHI2DOCA(1,2)<%s" % config['eta_prime_DOCA']
-        _combCut12Vtx = "(VFASPF(VCHI2/VDOF)<%s)" % config['eta_prime_vtxChi2']
+        "(VFASPF(VCHI2/VDOF)<%s)" % config['eta_prime_vtxChi2']
         _combCut12 = _combCut12Doca
 
         # _etap=CombineParticles("etap",
@@ -883,7 +881,7 @@ class B2XEtaConf(LineBuilder):
         _combCuts = _massCut+'&'+_docaCut
         _allCuts = _PTCut+'&'+_vtxCut+'&'+_diraCut+'&'+_IPChi2Cut
         _combCut12Doca = "ACHI2DOCA(1,2)<%s" % config['LbDaug_LL_maxDocaChi2']
-        _combCut12Vtx = "(VFASPF(VCHI2/VDOF)<%s)" % config['Lb_VtxChi2']
+        "(VFASPF(VCHI2/VDOF)<%s)" % config['Lb_VtxChi2']
         _combCut12 = _combCut12Doca
 
         _Lb2pKetap = DaVinci__N3BodyDecays(DecayDescriptor="[Lambda_b0 -> p+ K- eta_prime]cc",
@@ -921,7 +919,7 @@ class B2XEtaConf(LineBuilder):
         _combCuts = _massCut
         _allCuts = _PTCut+'&'+_IPChi2Cut+'&'+_vtxCut+'&'+_diraCut
         _combCut12Doca = "ACHI2DOCA(1,2)<%s" % config['LbDaug_LL_maxDocaChi2']
-        _combCut12Vtx = "(VFASPF(VCHI2/VDOF)<%s)" % config['Lb_VtxChi2']
+        "(VFASPF(VCHI2/VDOF)<%s)" % config['Lb_VtxChi2']
         _combCut12 = _combCut12Doca
 
         _Lb2pKeta3Pi = DaVinci__N3BodyDecays(DecayDescriptor="[Lambda_b0 -> p+ K- eta]cc",
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBnoC/StrippingB2a1Pi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBnoC/StrippingB2a1Pi.py
index 29c0766744b242c4ed1be4817cca727495bcb265..9f701cc986294843a275fb204128fb9f3c88fb1d 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBnoC/StrippingB2a1Pi.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBnoC/StrippingB2a1Pi.py
@@ -17,7 +17,6 @@ from Configurables import DaVinci__N4BodyDecays
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
-from Gaudi.Configuration import *
 __author__ = ['Daniel Vieira, Jibo He']
 __date__ = '01/12/2016'
 __version__ = '$Revision: 1.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBnoC/StrippingB2hhpipiPhsSpcCut.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBnoC/StrippingB2hhpipiPhsSpcCut.py
index 08e1d2943eafcfa9ad7d1764a6d5aab6ce3c9526..9fe5c82af0b14937c33c30fd9627961fa0731c0a 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBnoC/StrippingB2hhpipiPhsSpcCut.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBnoC/StrippingB2hhpipiPhsSpcCut.py
@@ -17,7 +17,6 @@ from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = ['Daniel Vieira']
 __date__ = '29/11/2018'
 __version__ = '$Revision: 1.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBnoC/StrippingB2pphh.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBnoC/StrippingB2pphh.py
old mode 100755
new mode 100644
index 782d89e7466f93f490e15dd1095ac153359b502b..99d5b7265b684f2c69cc962f37bc4fe0b20ac220
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBnoC/StrippingB2pphh.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBnoC/StrippingB2pphh.py
@@ -25,16 +25,13 @@ __all__ = ('B2pphhConf',
            )
 
 
-from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop
+from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
 # from Configurables import DaVinci__N4BodyDecays
 from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays
 
-from StandardParticles import StdAllNoPIDsKaons, StdAllNoPIDsPions, StdAllNoPIDsProtons
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from Configurables import LoKi__VoidFilter as VoidFilter
 
 default_config = {
     'NAME': 'B2pphh',
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBnoC/StrippingBc2hhh_BnoC.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBnoC/StrippingBc2hhh_BnoC.py
index cc0952e7ed4c72dc5b618028ac8bc563928c126d..21b92fa5aab68df4d68f10c50e59c126b546bd31 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBnoC/StrippingBc2hhh_BnoC.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBnoC/StrippingBc2hhh_BnoC.py
@@ -23,13 +23,11 @@ Exported symbols (use python help!):
    - makeppK_excl  
 '''
 
-from Configurables import LoKi__VoidFilter as VoidFilter
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection
 import StandardParticles
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 __author__ = ['Alvaro Gomes', 'Adlene Hicheur']
 __date__ = '31/08/2014'
 __version__ = '$Revision: 1.5 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBnoC/StrippingBs2KKhh.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBnoC/StrippingBs2KKhh.py
index c9b61ca022f83746560bd95dce95d56ab056c7d1..03011c3e32fb079bbbaa6b9d424d8c8b718c76bb 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBnoC/StrippingBs2KKhh.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBnoC/StrippingBs2KKhh.py
@@ -30,7 +30,6 @@ from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop
-from Gaudi.Configuration import *
 __author__ = ['Sean Benson', 'Adam Morris', 'Laurence Carson',
               'Emmy Pauline Maria Gabriel' 'Markus Roehrken']
 __date__ = '22/11/2016'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBnoC/StrippingBs2KSKS_Run2.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBnoC/StrippingBs2KSKS_Run2.py
index 629ca8140bd72d6380100393e840bf791f2f2cd9..6afaa37fab4f411e76010a848c09d7d72e5a05d9 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBnoC/StrippingBs2KSKS_Run2.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBnoC/StrippingBs2KSKS_Run2.py
@@ -22,15 +22,11 @@ __date__ = '13/09/2016'
 __version__ = 'Run2'
 __all__ = {'Bs2KSKSConf', 'default_config'}
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
+from PhysSelPython.Wrappers import DataOnDemand, Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 
-from StandardParticles import StdNoPIDsPions as Pions
-from StandardParticles import StdNoPIDsDownPions as DownPions
-
 
 default_config = {
     'NAME': 'Bs2KSKS',
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBnoC/StrippingBs2Kst_0Kst_0.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBnoC/StrippingBs2Kst_0Kst_0.py
index 6179c70e7f0f16586cd5a958eb2131e9f13bf1ad..7345868ade6e0cebd873ec58d7ea07808efe59f9 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBnoC/StrippingBs2Kst_0Kst_0.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBnoC/StrippingBs2Kst_0Kst_0.py
@@ -22,11 +22,8 @@ Rate estimated on 100K events using a 2017 data sample is: 0.027%
 
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, SelectionSequence, DataOnDemand
+from PhysSelPython.Wrappers import DataOnDemand, Selection
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-from CommonParticles.Utils import *
-from LHCbKernel.Configuration import *
-from Gaudi.Configuration import *
 __author__ = ['Brais Sanmartin Sedes']
 __date__ = '12/11/2015'
 __version__ = '5.1'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBnoC/StrippingBs2PhiKst0.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBnoC/StrippingBs2PhiKst0.py
index ceb8daa24373fc0cd210ec42fdbc56fd456f51e4..0c1ff7d620f2ef3058536bb8bbba7bedc35b168a 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBnoC/StrippingBs2PhiKst0.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBnoC/StrippingBs2PhiKst0.py
@@ -20,11 +20,8 @@ Exported symbols (use python help!):
 
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, SelectionSequence, DataOnDemand
+from PhysSelPython.Wrappers import DataOnDemand, Selection
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-from CommonParticles.Utils import *
-from LHCbKernel.Configuration import *
-from Gaudi.Configuration import *
 __author__ = ['Brais Sanmartin Sedes']
 __date__ = '01/12/2015'
 __version__ = '5.0'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBnoC/StrippingBs2PhiPhi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBnoC/StrippingBs2PhiPhi.py
index 0f280a3a06ba478759dc6e19bf80e278c15e5d40..1124dcdfd432c594fe79f1bc1e0b70fc24f9d21f 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBnoC/StrippingBs2PhiPhi.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBnoC/StrippingBs2PhiPhi.py
@@ -23,13 +23,10 @@ Exports the following stripping lines as instance data members:
 '''
 
 from StandardParticles import StdAllLooseANNKaons as MyLooseKaons
-from StandardParticles import StdLooseANNUpKaons as MyLooseUpKaons
-import StandardParticles
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
+from PhysSelPython.Wrappers import Selection
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 __author__ = ['Sean Benson']
 __date__ = '2013/08/15'
 __version__ = '3.0'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBnoC/StrippingBu2Ksthh.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBnoC/StrippingBu2Ksthh.py
index 5a06d1502605fd2037a6b16043d5efb150ce86d5..032717bced65040c1e6edaf12520110a1398cd1d 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBnoC/StrippingBu2Ksthh.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBnoC/StrippingBu2Ksthh.py
@@ -23,7 +23,6 @@ __version__ = 'Stripping26'
 __all__ = {'Bu2KsthhConf',
            'default_config'}
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
@@ -302,7 +301,7 @@ class Bu2KsthhConf(LineBuilder):
         _massCutHigh = "(AM<(5279+%s)*MeV)" % config['B_Mhigh']
         _aptCut = "(APT>%s*MeV)" % config['B_APTmin']
         _daugMedPtCut = "(ANUM(PT>%s*MeV)>=2)" % config['BDaug_MedPT_PT']
-        _daugMaxPtIPCut = "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['BDaug_MaxPT_IP']
+        "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['BDaug_MaxPT_IP']
         _maxDocaChi2Cut = "(ACUTDOCACHI2(%s,''))" % config['BDaug_DD_maxDocaChi2']
         _daugPtSumCut = "((APT1+APT2+APT3)>%s*MeV)" % config['BDaug_DD_PTsum']
 
@@ -359,7 +358,7 @@ class Bu2KsthhConf(LineBuilder):
         _massCutHigh = "(AM<(5279+%s)*MeV)" % config['B_Mhigh']
         _aptCut = "(APT>%s*MeV)" % config['B_APTmin']
         _daugMedPtCut = "(ANUM(PT>%s*MeV)>=2)" % config['BDaug_MedPT_PT']
-        _daugMaxPtIPCut = "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['BDaug_MaxPT_IP']
+        "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['BDaug_MaxPT_IP']
         _maxDocaChi2Cut = "(ACUTDOCACHI2(%s,''))" % config['BDaug_LL_maxDocaChi2']
         _daugPtSumCut = "((APT1+APT2+APT3)>%s*MeV)" % config['BDaug_LL_PTsum']
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBnoC/StrippingBu2hhh.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBnoC/StrippingBu2hhh.py
index 890eba4692dbe06517c0d7aee8f51d320cca8a64..62ede4129b7f2bd6ff173b27d26ebf7e47e4e6ea 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBnoC/StrippingBu2hhh.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBnoC/StrippingBu2hhh.py
@@ -22,13 +22,11 @@ Exported symbols (use python help!):
    - makepph_incl
 '''
 
-from Configurables import LoKi__VoidFilter as VoidFilter
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection
 import StandardParticles
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 __author__ = ['Irina Nasteva', 'Jussara Miranda', 'Alvaro Gomes']
 __date__ = '19/05/2017'
 __version__ = 'Stripping29'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBnoC/StrippingBu2rho0rhoPlus.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBnoC/StrippingBu2rho0rhoPlus.py
index 6ff36ce6304e5d819eb96fe6ca06587bb1baa6cc..51df1d5067b9100ee67537610b0005b048a5d51f 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBnoC/StrippingBu2rho0rhoPlus.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBnoC/StrippingBu2rho0rhoPlus.py
@@ -21,7 +21,6 @@ from StrippingUtils.Utils import LineBuilder, checkConfig
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = "Jason E Andrews"
 __date__ = "26/11/2016"
 __version__ = "4.0"
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBnoC/StrippingButo5h.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBnoC/StrippingButo5h.py
index be4eeb8a2dc0617afde7aab5929540d3bc8d05c7..65e1b29f0dde00492a6a5432e53292b9bc4c81a7 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBnoC/StrippingButo5h.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBnoC/StrippingButo5h.py
@@ -23,13 +23,11 @@ Exported symbols (use python help!):
    - makeppKpipi_excl
 '''
 
-from Configurables import LoKi__VoidFilter as VoidFilter
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection
 import StandardParticles
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 __author__ = ['Luiz Gustavo de Oliveira',
               'Alvaro Gomes', 'Bruno Souza de Paula']
 __date__ = '22/Aug/2014'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBnoC/StrippingD2HHBDT.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBnoC/StrippingD2HHBDT.py
index 6bee345112d54e258044f31f0e7d809849b112f7..98ef43000bc5732a81fe2e10bace645263334787 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBnoC/StrippingD2HHBDT.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBnoC/StrippingD2HHBDT.py
@@ -23,14 +23,13 @@ __all__ = ('D2HHBDTLines',
            'makeD2HHBDT',
            'default_config')
 
-from Gaudi.Configuration import *
 
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
 from StandardParticles import StdNoPIDsKaons, StdAllNoPIDsPions
 
 from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
-from StrippingUtils.Utils import LineBuilder, checkConfig
+from StrippingUtils.Utils import LineBuilder
 
 
 default_config = {
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBnoC/StrippingHb2Charged2Body.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBnoC/StrippingHb2Charged2Body.py
index 11da99218434ae71c894fa73b708dca4ee60de5d..3b3424d2fb6688333e151f52793701a7a2c00dbe 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBnoC/StrippingHb2Charged2Body.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBnoC/StrippingHb2Charged2Body.py
@@ -23,14 +23,13 @@ __all__ = ('Hb2Charged2BodyLines',
            'makeB2Charged2Body',
            'default_config')
 
-from Gaudi.Configuration import *
 
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-from StandardParticles import StdNoPIDsPions, StdLooseProtons, StdLooseKaons
+from StandardParticles import StdNoPIDsPions
 
 from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
-from StrippingUtils.Utils import LineBuilder, checkConfig
+from StrippingUtils.Utils import LineBuilder
 
 
 default_config = {
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBnoC/StrippingHb2V0V0h.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBnoC/StrippingHb2V0V0h.py
index 6b1c9eb94b261dbc185e979f0314ffe2bd69f930..f3104c9b58e73817c70f7fa7e3d68a0b9ecf0860 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBnoC/StrippingHb2V0V0h.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBnoC/StrippingHb2V0V0h.py
@@ -22,7 +22,6 @@ __date__ = '10/02/2017'
 __version__ = 'Stripping28'
 __all__ = 'Hb2V0V0hConf'
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBnoC/StrippingLb2V0hh.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBnoC/StrippingLb2V0hh.py
index f63034e02f45426009146384bed4036d16056a26..e896944db6cf521ad12d86186f9bda930b5bfd87 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBnoC/StrippingLb2V0hh.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBnoC/StrippingLb2V0hh.py
@@ -25,7 +25,6 @@ __date__ = '11/01/2017'
 __version__ = 'Stripping28'
 __all__ = 'Lb2V0hhConf'
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
@@ -211,8 +210,8 @@ class Lb2V0hhConf(LineBuilder):
         _vtxCut = "(VFASPF(VCHI2)<%s)   " % config['Lambda_DD_VtxChi2']
         _fdChi2Cut = "(BPVVDCHI2>%s)" % config['Lambda_DD_FDChi2']
         _momCut = "(P>%s*MeV)" % config['Lambda_DD_Pmin']
-        _trkGhostProbCut1 = "(CHILDCUT((TRGHOSTPROB<%s),1))" % config['Trk_GhostProb']
-        _trkGhostProbCut2 = "(CHILDCUT((TRGHOSTPROB<%s),2))" % config['Trk_GhostProb']
+        "(CHILDCUT((TRGHOSTPROB<%s),1))" % config['Trk_GhostProb']
+        "(CHILDCUT((TRGHOSTPROB<%s),2))" % config['Trk_GhostProb']
 
         _allCuts = _momCut
         _allCuts += '&'+_massCut
@@ -268,8 +267,8 @@ class Lb2V0hhConf(LineBuilder):
         _vtxCut = "(VFASPF(VCHI2)<%s)   " % config['Lambda_DD_VtxChi2']
         _fdChi2Cut = "(BPVVDCHI2>%s)" % config['Lambda_DD_FDChi2']
         _momCut = "(P>%s*MeV)" % config['Lambda_DD_Pmin']
-        _trkGhostProbCut1 = "(CHILDCUT((TRGHOSTPROB<%s),1))" % config['Trk_GhostProb']
-        _trkGhostProbCut2 = "(CHILDCUT((TRGHOSTPROB<%s),2))" % config['Trk_GhostProb']
+        "(CHILDCUT((TRGHOSTPROB<%s),1))" % config['Trk_GhostProb']
+        "(CHILDCUT((TRGHOSTPROB<%s),2))" % config['Trk_GhostProb']
 
         _allCuts = _momCut
         _allCuts += '&'+_massCut
@@ -302,7 +301,7 @@ class Lb2V0hhConf(LineBuilder):
         _massCutHigh = "(AM<(5619+%s)*MeV)" % config['Lb_2bodyMhigh']
         _aptCut = "(APT>%s*MeV)" % config['Lb_APTmin']
         _daugMedPtCut = "(ANUM(PT>%s*MeV)>=2)" % config['LbDaug_MedPT_PT']
-        _daugMaxPtIPCut = "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP']
+        "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP']
         _maxDocaChi2Cut = "(ACUTDOCACHI2(%s,''))" % config['LbDaug_DD_maxDocaChi2']
         _daugPtSumCut = "(APT1>%s*MeV)" % config['Lbh_DD_PTMin']
 
@@ -353,7 +352,7 @@ class Lb2V0hhConf(LineBuilder):
         _massCutHigh = "(AM<(5619+%s)*MeV)" % config['Lb_Mhigh']
         _aptCut = "(APT>%s*MeV)" % config['Lb_APTmin']
         _daugMedPtCut = "(ANUM(PT>%s*MeV)>=2)" % config['LbDaug_MedPT_PT']
-        _daugMaxPtIPCut = "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP']
+        "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP']
         _maxDocaChi2Cut = "(ACUTDOCACHI2(%s,''))" % config['LbDaug_DD_maxDocaChi2']
         _daugPtSumCut = "((APT1+APT2+APT3)>%s*MeV)" % config['LbDaug_DD_PTsum']
 
@@ -369,7 +368,7 @@ class Lb2V0hhConf(LineBuilder):
         _vtxChi2Cut = "(VFASPF(VCHI2)<%s)" % config['Lb_VtxChi2']
         _diraCut = "(BPVDIRA>%s)" % config['Lb_DD_Dira']
         _ipChi2Cut = "(MIPCHI2DV(PRIMARY)<%s)" % config['Lb_DD_IPCHI2wrtPV']
-        _fdCut = "(VFASPF(VMINVDDV(PRIMARY))>%s)" % config['Lb_FDwrtPV']
+        "(VFASPF(VMINVDDV(PRIMARY))>%s)" % config['Lb_FDwrtPV']
         _fdChi2Cut = "(BPVVDCHI2>%s)" % config['Lb_DD_FDChi2']
 
         _motherCuts = _ptCut
@@ -541,7 +540,7 @@ class Lb2V0hhConf(LineBuilder):
         _massCutHigh = "(AM<(5619+%s)*MeV)" % config['Lb_2bodyMhigh']
         _aptCut = "(APT>%s*MeV)" % config['Lb_APTmin']
         _daugMedPtCut = "(ANUM(PT>%s*MeV)>=2)" % config['LbDaug_MedPT_PT']
-        _daugMaxPtIPCut = "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP']
+        "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP']
         _maxDocaChi2Cut = "(ACUTDOCACHI2(%s,''))" % config['LbDaug_LD_maxDocaChi2']
         _daugPtSumCut = "(APT1>%s*MeV)" % config['Lbh_LD_PTMin']
 
@@ -592,7 +591,7 @@ class Lb2V0hhConf(LineBuilder):
         _massCutHigh = "(AM<(5619+%s)*MeV)" % config['Lb_Mhigh']
         _aptCut = "(APT>%s*MeV)" % config['Lb_APTmin']
         _daugMedPtCut = "(ANUM(PT>%s*MeV)>=2)" % config['LbDaug_MedPT_PT']
-        _daugMaxPtIPCut = "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP']
+        "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP']
         _maxDocaChi2Cut = "(ACUTDOCACHI2(%s,''))" % config['LbDaug_LD_maxDocaChi2']
         _daugPtSumCut = "((APT1+APT2+APT3)>%s*MeV)" % config['LbDaug_LD_PTsum']
 
@@ -608,7 +607,7 @@ class Lb2V0hhConf(LineBuilder):
         _vtxChi2Cut = "(VFASPF(VCHI2)<%s)" % config['Lb_VtxChi2']
         _diraCut = "(BPVDIRA>%s)" % config['Lb_LD_Dira']
         _ipChi2Cut = "(MIPCHI2DV(PRIMARY)<%s)" % config['Lb_LD_IPCHI2wrtPV']
-        _fdCut = "(VFASPF(VMINVDDV(PRIMARY))>%s)" % config['Lb_FDwrtPV']
+        "(VFASPF(VMINVDDV(PRIMARY))>%s)" % config['Lb_FDwrtPV']
         _fdChi2Cut = "(BPVVDCHI2>%s)" % config['Lb_LD_FDChi2']
 
         _motherCuts = _ptCut
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBnoC/StrippingLb2V0pp.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBnoC/StrippingLb2V0pp.py
index 23c63deba0a566efad08463be4f9e9577abecd08..77385a7d77c2a03b1678f32801ca31cd7356be5c 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBnoC/StrippingLb2V0pp.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBnoC/StrippingLb2V0pp.py
@@ -24,7 +24,6 @@ __date__ = '06/01/2019'
 __version__ = 'Stripping34'
 __all__ = 'Lb2V0ppConf'
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
@@ -210,8 +209,8 @@ class Lb2V0ppConf(LineBuilder):
         _vtxCut = "(VFASPF(VCHI2)<%s)   " % config['Lambda_DD_VtxChi2']
         _fdChi2Cut = "(BPVVDCHI2>%s)" % config['Lambda_DD_FDChi2']
         _momCut = "(P>%s*MeV)" % config['Lambda_DD_Pmin']
-        _trkGhostProbCut1 = "(CHILDCUT((TRGHOSTPROB<%s),1))" % config['Trk_GhostProb']
-        _trkGhostProbCut2 = "(CHILDCUT((TRGHOSTPROB<%s),2))" % config['Trk_GhostProb']
+        "(CHILDCUT((TRGHOSTPROB<%s),1))" % config['Trk_GhostProb']
+        "(CHILDCUT((TRGHOSTPROB<%s),2))" % config['Trk_GhostProb']
 
         _allCuts = _momCut
         _allCuts += '&'+_massCut
@@ -266,8 +265,8 @@ class Lb2V0ppConf(LineBuilder):
         _vtxCut = "(VFASPF(VCHI2)<%s)   " % config['Lambda_DD_VtxChi2']
         _fdChi2Cut = "(BPVVDCHI2>%s)" % config['Lambda_DD_FDChi2']
         _momCut = "(P>%s*MeV)" % config['Lambda_DD_Pmin']
-        _trkGhostProbCut1 = "(CHILDCUT((TRGHOSTPROB<%s),1))" % config['Trk_GhostProb']
-        _trkGhostProbCut2 = "(CHILDCUT((TRGHOSTPROB<%s),2))" % config['Trk_GhostProb']
+        "(CHILDCUT((TRGHOSTPROB<%s),1))" % config['Trk_GhostProb']
+        "(CHILDCUT((TRGHOSTPROB<%s),2))" % config['Trk_GhostProb']
 
         _allCuts = _momCut
         _allCuts += '&'+_massCut
@@ -300,7 +299,7 @@ class Lb2V0ppConf(LineBuilder):
         _massCutHigh = "(AM<(5619+%s)*MeV)" % config['Lb_2bodyMhigh']
         _aptCut = "(APT>%s*MeV)" % config['Lb_APTmin']
         _daugMedPtCut = "(ANUM(PT>%s*MeV)>=2)" % config['LbDaug_MedPT_PT']
-        _daugMaxPtIPCut = "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP']
+        "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP']
         _maxDocaChi2Cut = "(ACUTDOCACHI2(%s,''))" % config['LbDaug_DD_maxDocaChi2']
         _daugPtSumCut = "(APT1>%s*MeV)" % config['Lbh_DD_PTMin']
 
@@ -351,7 +350,7 @@ class Lb2V0ppConf(LineBuilder):
         _massCutHigh = "(AM<(5619+%s)*MeV)" % config['Lb_Mhigh']
         _aptCut = "(APT>%s*MeV)" % config['Lb_APTmin']
         _daugMedPtCut = "(ANUM(PT>%s*MeV)>=2)" % config['LbDaug_MedPT_PT']
-        _daugMaxPtIPCut = "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP']
+        "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP']
         _maxDocaChi2Cut = "(ACUTDOCACHI2(%s,''))" % config['LbDaug_DD_maxDocaChi2']
         _daugPtSumCut = "((APT1+APT2+APT3)>%s*MeV)" % config['LbDaug_DD_PTsum']
 
@@ -540,7 +539,7 @@ class Lb2V0ppConf(LineBuilder):
         _massCutHigh = "(AM<(5619+%s)*MeV)" % config['Lb_2bodyMhigh']
         _aptCut = "(APT>%s*MeV)" % config['Lb_APTmin']
         _daugMedPtCut = "(ANUM(PT>%s*MeV)>=2)" % config['LbDaug_MedPT_PT']
-        _daugMaxPtIPCut = "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP']
+        "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP']
         _maxDocaChi2Cut = "(ACUTDOCACHI2(%s,''))" % config['LbDaug_LD_maxDocaChi2']
         _daugPtSumCut = "(APT1>%s*MeV)" % config['Lbh_LD_PTMin']
 
@@ -591,7 +590,7 @@ class Lb2V0ppConf(LineBuilder):
         _massCutHigh = "(AM<(5619+%s)*MeV)" % config['Lb_Mhigh']
         _aptCut = "(APT>%s*MeV)" % config['Lb_APTmin']
         _daugMedPtCut = "(ANUM(PT>%s*MeV)>=2)" % config['LbDaug_MedPT_PT']
-        _daugMaxPtIPCut = "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP']
+        "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP']
         _maxDocaChi2Cut = "(ACUTDOCACHI2(%s,''))" % config['LbDaug_LD_maxDocaChi2']
         _daugPtSumCut = "((APT1+APT2+APT3)>%s*MeV)" % config['LbDaug_LD_PTsum']
 
@@ -607,7 +606,7 @@ class Lb2V0ppConf(LineBuilder):
         _vtxChi2Cut = "(VFASPF(VCHI2)<%s)" % config['Lb_VtxChi2']
         _diraCut = "(BPVDIRA>%s)" % config['Lb_LD_Dira']
         _ipChi2Cut = "(MIPCHI2DV(PRIMARY)<%s)" % config['Lb_LD_IPCHI2wrtPV']
-        _fdCut = "(VFASPF(VMINVDDV(PRIMARY))>%s)" % config['Lb_FDwrtPV']
+        "(VFASPF(VMINVDDV(PRIMARY))>%s)" % config['Lb_FDwrtPV']
         _fdChi2Cut = "(BPVVDCHI2>%s)" % config['Lb_LD_FDChi2']
 
         _motherCuts = _ptCut
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBnoC/StrippingXb23ph.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBnoC/StrippingXb23ph.py
index 44ba838d436b418c4eaef7372eccd95c28426134..ef24837631cfc50b46aabe0cc7dba0c8cdeb66fd 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBnoC/StrippingXb23ph.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBnoC/StrippingXb23ph.py
@@ -22,7 +22,6 @@ from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, DaVinci__N4Body
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection
-from Gaudi.Configuration import *
 __author__ = ['Jinlin Fu', 'Maurizio Martinelli', 'Andrea Merli']
 __date__ = '12/11/2015'
 __version__ = 'v1r0'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBnoC/StrippingXb2p3h.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBnoC/StrippingXb2p3h.py
index d07d7e52c17b8a01201968b3a1b929751c31bc9d..2c10d1f20bf15892c5e8ef6a5861130250a0a8ae 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBnoC/StrippingXb2p3h.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBnoC/StrippingXb2p3h.py
@@ -22,7 +22,6 @@ from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, DaVinci__N4Body
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection
-from Gaudi.Configuration import *
 __author__ = ['Jan Mickelle V. Maratas', 'Stephane Monteil', 'Andrea Merli']
 __date__ = '01/04/2016'
 __version__ = 'v1r0'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBnoC/StrippingXb2phh.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBnoC/StrippingXb2phh.py
index ae62ac803dcda11696229820fa7bcb3737c75114..35432dcb4a93cdbf47f1ec738735037534d82c07 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBnoC/StrippingXb2phh.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingBnoC/StrippingXb2phh.py
@@ -22,7 +22,6 @@ from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, DaVinci__N3Body
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection
-from Gaudi.Configuration import *
 __author__ = ['Jan Mickelle V. Maratas', 'Stephane Monteil', 'Thomas Latham']
 __date__ = '24/11/2016'
 __version__ = 'v1r0'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCalib/StrippingCharmFromBSemiForHadronAsy.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCalib/StrippingCharmFromBSemiForHadronAsy.py
index 08e7ce501b97c255a5b8e5a3de8395e4cbcf3cb6..6156fdca33abf5ffff5cbf8a3a9368f977dbcd6f 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCalib/StrippingCharmFromBSemiForHadronAsy.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCalib/StrippingCharmFromBSemiForHadronAsy.py
@@ -19,14 +19,12 @@ __author__ = ['Mika Vesterinen']
 __date__ = '10/03/2013'
 __version__ = '$Revision: 0.0 $'
 
-from Gaudi.Configuration import *
 
 from Configurables import FilterDesktop, CombineParticles
 from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from StandardParticles import StdAllLoosePions, StdLoosePions, StdLooseMuons, StdLooseKaons, StdLooseProtons
-from Configurables import TisTosParticleTagger
+from StandardParticles import StdLooseKaons, StdLooseMuons, StdLoosePions
 
 __all__ = ('CharmFromBSemiForHadronAsyAllLinesConf',
            'TOSFilter',
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCalib/StrippingCharmFromBSemiForProtonPID.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCalib/StrippingCharmFromBSemiForProtonPID.py
index 331ebd34b3e7842bbf2e94a73977d8b0cc10b450..a1e805b96edf80f3f08a3ba0f447e47d13b203c2 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCalib/StrippingCharmFromBSemiForProtonPID.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCalib/StrippingCharmFromBSemiForProtonPID.py
@@ -18,12 +18,11 @@ __author__ = ['Mika Vesterinen']
 __date__ = '19/03/2013'
 __version__ = '$Revision: 0.0 $'
 
-from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from StandardParticles import StdLoosePions, StdLooseMuons, StdLooseKaons, StdLooseProtons, StdNoPIDsProtons
+from StandardParticles import StdLooseKaons, StdLooseMuons, StdLoosePions, StdNoPIDsProtons
 
 __all__ = ('CharmFromBSemiForProtonPIDAllLinesConf',
            'default_config')
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCalib/StrippingD02KPiPi0.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCalib/StrippingD02KPiPi0.py
index b0efbccbb69d5ac6209e0a251edf9943a222afe9..a431e7b970041f35d68bc9a765db0757832a6fdd 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCalib/StrippingD02KPiPi0.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCalib/StrippingD02KPiPi0.py
@@ -25,9 +25,8 @@ __all__ = ('StrippingD02KPiPi0Conf',
            'makeD02KPiPi0M',
            'default_config')
 
-from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from PhysSelPython.Wrappers import Selection, DataOnDemand
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
+from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from StandardParticles import StdTightPions, StdTightKaons, StdLooseMergedPi0, StdLooseResolvedPi0
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCalib/StrippingD02KPiPi0DalitzPartReco.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCalib/StrippingD02KPiPi0DalitzPartReco.py
index caaa8b1b857ec7efb302c62895c9b7a334961cbf..7a1c97e88520fb73f140818146de685e254df9f7 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCalib/StrippingD02KPiPi0DalitzPartReco.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCalib/StrippingD02KPiPi0DalitzPartReco.py
@@ -8,9 +8,7 @@
 # granted to it by virtue of its status as an Intergovernmental Organization  #
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
-import logging
 from StrippingUtils.Utils import LineBuilder
-from Gaudi.Configuration import *
 __author__ = ['Greg Ciezarek', 'Liang Sun', 'Adam Davis']
 __date__ = '18/05/2017'
 __version__ = '$Revision: 0.01 $'
@@ -75,7 +73,6 @@ class D2KPiPi0_PartRecoBuilder(LineBuilder):
     def __init__(self, name, config):
         LineBuilder.__init__(self, name, config)
         self._config = config
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
 
         # self.GECs = { "Code":"( recSummaryTrack(LHCb.RecSummary.nLongTracks, TrLONG) < %(GEC_nLongTrk)s )" % config,
         #              "Preambulo": ["from LoKiTracks.decorators import *"]}
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCalib/StrippingD0ForBXX.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCalib/StrippingD0ForBXX.py
index 836cb251bf6bed5dcdba32758964e9950e666b07..d9859abdb5e61ecd488fc22f98c91f6df28e248f 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCalib/StrippingD0ForBXX.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCalib/StrippingD0ForBXX.py
@@ -20,7 +20,7 @@ from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from StandardParticles import StdLoosePions, StdLooseKaons, StdLooseProtons, StdAllLoosePions
+from StandardParticles import StdAllLoosePions, StdLooseKaons, StdLoosePions
 
 
 name = 'confD0forBXX'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCalib/StrippingDstarD02hhPi0PartRecoForPhotonCalib.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCalib/StrippingDstarD02hhPi0PartRecoForPhotonCalib.py
index ee8e553744feb3138a51e275635fb7d6e5f04f18..5e9f1e9a8d8aaff44060d1c66e8f15e033d7db22 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCalib/StrippingDstarD02hhPi0PartRecoForPhotonCalib.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCalib/StrippingDstarD02hhPi0PartRecoForPhotonCalib.py
@@ -31,15 +31,15 @@ from Gaudi.Configuration import *
 
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 from StandardParticles import StdAllNoPIDsPions, StdNoPIDsPions, StdNoPIDsKaons
-from StandardParticles import StdLooseAllPhotons, StdLooseResolvedPi0, StdLooseMergedPi0
+from StandardParticles import StdLooseAllPhotons
 
 from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
-from StrippingUtils.Utils import LineBuilder, checkConfig
+from StrippingUtils.Utils import LineBuilder
 
 from Configurables import FilterDesktop
 
-from GaudiKernel.SystemOfUnits import GeV, MeV, picosecond, mm
+from GaudiKernel.SystemOfUnits import GeV, MeV, picosecond
 
 default_config = {
     'NAME': 'DstarD2hhGammaCalib',
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCalib/StrippingElectronID.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCalib/StrippingElectronID.py
index f8385e403a664f2d870608e8c28ac1032d182cc0..1b5dd98b23444069027c372e85ae7f6f3318a423 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCalib/StrippingElectronID.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCalib/StrippingElectronID.py
@@ -23,9 +23,8 @@ stream.appendLines( [
 
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand
+from PhysSelPython.Wrappers import Selection
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = ['Jibo He']
 __date__ = '03/10/2010'
 __version__ = '$Revision: 1.2 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCalib/StrippingElectronRecoEff.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCalib/StrippingElectronRecoEff.py
index c19ff961c1db5ef3bfbfb03a4d9133a4c8888bdf..bdb2892004f5f8e6c93bb551bb939895eca5eb63 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCalib/StrippingElectronRecoEff.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCalib/StrippingElectronRecoEff.py
@@ -17,17 +17,15 @@ from StandardParticles import StdAllLoosePions as Hlt2Pions
 from StandardParticles import StdAllLooseKaons as Hlt2Kaons
 from StandardParticles import StdNoPIDsElectrons as Hlt2Electrons
 from StandardParticles import StdNoPIDsMuons as Hlt2Muons
-from TrackFitter.ConfiguredFitters import (ConfiguredEventFitter,
-                                           ConfiguredForwardStraightLineEventFitter)
+from TrackFitter.ConfiguredFitters import ConfiguredEventFitter
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import DataOnDemand, MergedSelection
 from PhysConf.Selections import L0TOSSelection
 from PhysConf.Selections import Hlt1TOSSelection
 from PhysConf.Selections import Hlt2TOSSelection
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 from StrippingUtils.Utils import LineBuilder
-from GaudiKernel.SystemOfUnits import GeV, MeV, mm
+from GaudiKernel.SystemOfUnits import MeV, mm
 from Gaudi.Configuration import *
 __author__ = ['Adam Davis', 'Laurent Dufour', 'V. V. Gligorov']
 __date__ = '14/1/2018'
@@ -45,10 +43,9 @@ from PhysSelPython.Wrappers import Selection, Hlt1Selection, Hlt2Selection, L0Se
 from SelPy.utils import (UniquelyNamedObject,
                          ClonableObject,
                          SelectionBase)
-from Configurables import (DecodeVeloRawBuffer, FastVeloTracking, TrackPrepareVelo,
-                           NoPIDsParticleMaker, DataOnDemandSvc, ChargedProtoParticleMaker,
-                           PrTrackAssociator, DelegatingTrackSelector, TrackContainerCopy, TrackAssociator,
-                           TrackStateInitAlg, TrackStateInitTool)
+from Configurables import (FastVeloTracking, NoPIDsParticleMaker, DataOnDemandSvc,
+                           ChargedProtoParticleMaker, DelegatingTrackSelector, TrackContainerCopy,
+                           TrackStateInitAlg)
 
 default_config = {'NAME': 'ElectronRecoEff',
                   'WGs': ['Calib'],
@@ -287,7 +284,6 @@ class StrippingElectronRecoEffLines(LineBuilder):
     def __init__(self, name, config):
         LineBuilder.__init__(self, name, config)
 
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
         self._config = config
         self.name = name
 
@@ -571,7 +567,7 @@ class StrippingElectronRecoEffLines(LineBuilder):
         )
 
     def DetachedEEKPair(self, _name):
-        configuration = self._config["DetachedEEK"]
+        self._config["DetachedEEK"]
 
         _DetachedEEKPair = self.getCPForEEK("DetachedEEK")
         _DetachedEEKPair_Sel = Selection("SelEEK_for_"+_name,
@@ -591,7 +587,7 @@ class StrippingElectronRecoEffLines(LineBuilder):
         return line
 
     def DetachedEEKstarPair(self, _name):
-        configuration = self._config["DetachedEEKstar"]
+        self._config["DetachedEEKstar"]
 
         _DetachedEEKstarPair = self.getCPForEEK("DetachedEEKstar")
         _DetachedEEKstarPair_Sel = Selection("SelEEKstar_for_"+_name,
@@ -611,7 +607,7 @@ class StrippingElectronRecoEffLines(LineBuilder):
         return line
 
     def DetachedEEPhiPair(self, _name):
-        configuration = self._config["DetachedEEPhi"]
+        self._config["DetachedEEPhi"]
 
         _DetachedEEPhiPair = self.getCPForEEK("DetachedEEPhi")
         _DetachedEEPhiPair_Sel = Selection("SelEEPhi_for_"+_name,
@@ -882,7 +878,6 @@ class StrippingElectronRecoEffLines(LineBuilder):
     def MakeVeloTracks(self, prefilter):
         if self._config["DoVeloDecoding"]:
             from DAQSys.Decoders import DecoderDB
-            from DAQSys.DecoderClass import decodersForBank
             decs = []
             vdec = DecoderDB["DecodeVeloRawBuffer/createBothVeloClusters"]
             vdec.Active = True
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCalib/StrippingJPsiForSL.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCalib/StrippingJPsiForSL.py
index 66d3cf569e7e3d642fb1e90689c09009970a9f91..f83a469f0d79f559f3b8f1ce7fa0a29617c07287 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCalib/StrippingJPsiForSL.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCalib/StrippingJPsiForSL.py
@@ -20,11 +20,10 @@ __version__ = '$Revision: 0.1 $'
 
 from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from PhysSelPython.Wrappers import Selection, DataOnDemand
+from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from StandardParticles import StdLoosePions, StdLooseMuons, StdLooseKaons, StdLooseProtons, StdNoPIDsPions, StdNoPIDsMuons, StdLooseMergedPi0, StdLooseResolvedPi0, StdLooseElectrons, StdNoPIDsKaons
-from Configurables import TisTosParticleTagger
+from StandardParticles import StdNoPIDsKaons, StdNoPIDsMuons
 
 __all__ = ('JPsiForSLAllLinesConf',
            'confdict')
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCalib/StrippingK23PiForDownstreamTrackEff.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCalib/StrippingK23PiForDownstreamTrackEff.py
index 5e95ecb40bf4a7b0d570152c6cb5a85c2e157431..9ea071dc760c1a4d2e8adb1bd47ddd464f85a7d1 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCalib/StrippingK23PiForDownstreamTrackEff.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCalib/StrippingK23PiForDownstreamTrackEff.py
@@ -14,10 +14,6 @@ one missing pion, using the corrected mass
 '''
 
 from StrippingUtils.Utils import LineBuilder
-from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = ['Michel De Cian']
 __date__ = '19/12/2018'
 __version__ = '$Revision: 1.0 $'
@@ -269,8 +265,8 @@ class K23PiForDownstreamTrackEffConf(LineBuilder):
         if self._dipionSelSSNarrowDownstream is not None:
             return self._dipionSelSSNarrowDownstream
 
-        from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
+        from GaudiConfUtils.ConfigurableGenerators import CombineParticles
+        from PhysSelPython.Wrappers import Selection
 
         _k2pipi = CombineParticles(
             DecayDescriptors=["[phi(1020) -> pi+ pi+]cc"],
@@ -293,8 +289,8 @@ class K23PiForDownstreamTrackEffConf(LineBuilder):
         if self._dipionSelSSNarrowLong is not None:
             return self._dipionSelSSNarrowLong
 
-        from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
+        from GaudiConfUtils.ConfigurableGenerators import CombineParticles
+        from PhysSelPython.Wrappers import Selection
 
         _k2pipi = CombineParticles(
             DecayDescriptors=["[phi(1020) -> pi+ pi+]cc"],
@@ -317,8 +313,8 @@ class K23PiForDownstreamTrackEffConf(LineBuilder):
         if self._dipionSelSSWide is not None:
             return self._dipionSelSSWide
 
-        from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
+        from GaudiConfUtils.ConfigurableGenerators import CombineParticles
+        from PhysSelPython.Wrappers import Selection
 
         _k2pipi = CombineParticles(
             DecayDescriptors=["[phi(1020) -> pi+ pi+]cc"],
@@ -342,8 +338,8 @@ class K23PiForDownstreamTrackEffConf(LineBuilder):
         if self._dipionSelOSNarrowDownstream is not None:
             return self._dipionSelOSNarrowDownstream
 
-        from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
+        from GaudiConfUtils.ConfigurableGenerators import CombineParticles
+        from PhysSelPython.Wrappers import Selection
 
         # Cut out the Kshort
         mCut = self._dipionSelectionNarrow() + " & (ADMASS('KS0') > 40)"
@@ -370,8 +366,8 @@ class K23PiForDownstreamTrackEffConf(LineBuilder):
         if self._dipionSelOSNarrowLong is not None:
             return self._dipionSelOSNarrowLong
 
-        from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
+        from GaudiConfUtils.ConfigurableGenerators import CombineParticles
+        from PhysSelPython.Wrappers import Selection
 
         # Cut out the Kshort
         mCut = self._dipionSelectionNarrow() + " & (ADMASS('KS0') > 40)"
@@ -398,8 +394,8 @@ class K23PiForDownstreamTrackEffConf(LineBuilder):
         if self._dipionSelOSWide is not None:
             return self._dipionSelOSWide
 
-        from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
+        from GaudiConfUtils.ConfigurableGenerators import CombineParticles
+        from PhysSelPython.Wrappers import Selection
 
         # Cut out the Kshort
         mCut = self._dipionSelectionWide() + " & (ADMASS('KS0') > 40)"
@@ -427,8 +423,8 @@ class K23PiForDownstreamTrackEffConf(LineBuilder):
         # if self._tripionSelDipionSS is not None:
         #   return self._tripionSelDipionSS
 
-        from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
+        from GaudiConfUtils.ConfigurableGenerators import CombineParticles
+        from PhysSelPython.Wrappers import Selection
 
         _k2pipipi = CombineParticles(
             DecayDescriptors=["[K+ -> phi(1020) pi-]cc"],
@@ -449,8 +445,8 @@ class K23PiForDownstreamTrackEffConf(LineBuilder):
         # if self._tripionSelDipionOS is not None:
         #   return self._tripionSelDipionOS
 
-        from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
+        from GaudiConfUtils.ConfigurableGenerators import CombineParticles
+        from PhysSelPython.Wrappers import Selection
 
         _k2pipipi = CombineParticles(
             DecayDescriptors=["[K+ -> phi(1020) pi+]cc"],
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCalib/StrippingLowPtMuID.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCalib/StrippingLowPtMuID.py
index c938bbfa4f325120436121227b8c9ba66d1420d7..96d9c592351659e6d677d1fb083266fb9f80f738 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCalib/StrippingLowPtMuID.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCalib/StrippingLowPtMuID.py
@@ -19,12 +19,9 @@ largely cloned from line written by 'S.Furcas', 'G.Lanfranchi', 'M.Palutan', 'A.
 
 from StandardParticles import StdAllNoPIDsMuons
 from StrippingUtils.Utils import LineBuilder
-from Configurables import LoKi__Hybrid__CoreFactory as CoreFactory
-from Configurables import LoKi__VoidFilter as VoidFilter
-from PhysSelPython.Wrappers import DataOnDemand, Selection, SelectionSequence, MergedSelection
+from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 __author__ = ['G.Ciezarek', ]
 __date__ = '03/12/2015'
 __version__ = '$Revision: 1.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCalib/StrippingMuIDCalib.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCalib/StrippingMuIDCalib.py
index 48473756334933bd76098e1f169f2fcac058f2d2..9647c11e74493f1b68f480afc92080ecc6f1c325 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCalib/StrippingMuIDCalib.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCalib/StrippingMuIDCalib.py
@@ -22,15 +22,12 @@ lb = builder( 'MuIDCalib', config_params )
 
 '''
 
-from StandardParticles import StdAllNoPIDsKaons, StdAllNoPIDsMuons, StdAllNoPIDsPions, StdAllNoPIDsProtons
+from StandardParticles import StdAllNoPIDsMuons
 from StandardParticles import StdNoPIDsKaons, StdNoPIDsMuons, StdNoPIDsPions, StdNoPIDsProtons
 from StrippingUtils.Utils import LineBuilder
-from Configurables import LoKi__Hybrid__CoreFactory as CoreFactory
-from Configurables import LoKi__VoidFilter as VoidFilter
-from PhysSelPython.Wrappers import DataOnDemand, Selection, SelectionSequence, MergedSelection
+from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 __author__ = ['S.Furcas', 'G.Lanfranchi',
               'M.Palutan', 'A.Sarti', 'D.Milanes', 'MuID Team']
 __date__ = '23/08/2011'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCalib/StrippingNoPIDDstarWithD02RSKPi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCalib/StrippingNoPIDDstarWithD02RSKPi.py
index 914c4a47cd048e3cd64e662985a9b4f35d9be508..5969dfaafb882830e2b62086af2a6274bffd846b 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCalib/StrippingNoPIDDstarWithD02RSKPi.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCalib/StrippingNoPIDDstarWithD02RSKPi.py
@@ -13,10 +13,8 @@
 from StandardParticles import StdAllNoPIDsKaons, StdAllNoPIDsPions
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from LHCbKernel.Configuration import *
-from Gaudi.Configuration import *
+from PhysSelPython.Wrappers import Selection
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 __author__ = ['Philip Xing', 'Andrew Powell']
 __date__ = '23rd August 2012'
 __version__ = '$Revision: 7.0 $'
@@ -42,7 +40,7 @@ StrippingReport                                                INFO Event 100000
 __all__ = ('NoPIDDstarWithD02RSKPiConf', 'default_config')
 
 
-from GaudiKernel.SystemOfUnits import mm, cm, MeV, GeV
+from GaudiKernel.SystemOfUnits import GeV, MeV
 # from Configurables import FilterDesktop, CombineParticles
 
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCalib/StrippingPIDCalib.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCalib/StrippingPIDCalib.py
index f3872175c1963791b4ef11e27dece0c57f983c05..65099ba3209f82b019bfdda36cf17bc93d0b54e0 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCalib/StrippingPIDCalib.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCalib/StrippingPIDCalib.py
@@ -35,9 +35,7 @@ from Configurables import DaVinci__N3BodyDecays
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
 from Configurables import CombineParticles
-from Gaudi.Configuration import *
 __author__ = ['Lucio Anderlini']
 __date__ = '25/02/2015'
 __version__ = '$Revision: 1.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCalib/StrippingTrackEffD0ToKPi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCalib/StrippingTrackEffD0ToKPi.py
index b93a420e3f50b2e4f8f1d92b1881f55e362e1bcf..1a0ca1d608bbe19c5586681674ba9a975871571b 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCalib/StrippingTrackEffD0ToKPi.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCalib/StrippingTrackEffD0ToKPi.py
@@ -17,7 +17,7 @@ from Configurables import FilterDesktop, CombineParticles
 from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from StandardParticles import StdLooseKaons, StdLoosePions, StdAllLoosePions, StdAllNoPIDsPions
+from StandardParticles import StdAllLoosePions, StdLooseKaons, StdLoosePions
 from SelPy.utils import (UniquelyNamedObject,
                          ClonableObject,
                          SelectionBase)
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCalib/StrippingTrackEffDownMuon.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCalib/StrippingTrackEffDownMuon.py
old mode 100755
new mode 100644
index 21183c23cb96bfab39ffdcc6bd7c4179aa95fcb1..c1b3a3d27fbe6ff6795e43bbb378b51ecdd2211d
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCalib/StrippingTrackEffDownMuon.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCalib/StrippingTrackEffDownMuon.py
@@ -48,35 +48,27 @@ __all__ = ('StrippingTrackEffDownMuonConf',
 # FIXME Write includes in a cleaner way
 from Gaudi.Configuration import *
 from LHCbKernel.Configuration import *
-from DAQSys.DecoderClass import Decoder
 from Configurables import GaudiSequencer
 from Configurables import UnpackTrack, ChargedProtoParticleMaker, DelegatingTrackSelector, TrackSelector, BestPIDParticleMaker
-from TrackFitter.ConfiguredFitters import ConfiguredFit
 from Configurables import TrackStateInitAlg
 from StrippingConf.StrippingLine import StrippingLine
-from Configurables import ChargedProtoParticleAddMuonInfo, MuonIDAlgLite
+from Configurables import ChargedProtoParticleAddMuonInfo
 from MuonID import ConfiguredMuonIDs
 from Configurables import ChargedProtoCombineDLLsAlg, ProtoParticleMUONFilter
-from PhysSelPython.Wrappers import Selection, DataOnDemand
+from PhysSelPython.Wrappers import Selection
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
 from StandardParticles import StdLooseMuons
 
 from StrippingUtils.Utils import LineBuilder
-from Configurables import LoKi__VoidFilter
-from os import environ
 from Gaudi.Configuration import *
-import GaudiKernel.ProcessJobOptions
-from GaudiKernel.SystemOfUnits import mm
 
 from GaudiConfUtils.ConfigurableGenerators import TisTosParticleTagger
 from StandardParticles import StdAllLooseMuons
 from Configurables import GaudiSequencer
 from Configurables import TrackToDST
-from Configurables import TrackSys
 from Configurables import PatSeeding, PatSeedingTool, PatLongLivedTracking
-from PhysSelPython.Wrappers import AutomaticData
 # Get the fitters
-from TrackFitter.ConfiguredFitters import ConfiguredFit, ConfiguredFitSeed, ConfiguredFitDownstream
+from TrackFitter.ConfiguredFitters import ConfiguredFitDownstream
 from PatAlgorithms import PatAlgConf
 
 from SelPy.utils import (UniquelyNamedObject,
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCalib/StrippingTrackEffMuonTT.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCalib/StrippingTrackEffMuonTT.py
index e4b5dcdd3e9e45e78514419f33215ba0c11c8214..2813f15a2bd11c522ce8fa41d62c8cba8c67b48f 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCalib/StrippingTrackEffMuonTT.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCalib/StrippingTrackEffMuonTT.py
@@ -64,11 +64,10 @@ __all__ = ('StrippingTrackEffMuonTTConf',
            'makeBJpsiKTrackEff',
            'filterHLT2ForBJpsiK')
 
-from Gaudi.Configuration import *
-from PhysSelPython.Wrappers import Selection, DataOnDemand, ChargedProtoParticleSelection
+from PhysSelPython.Wrappers import ChargedProtoParticleSelection, Selection
 from StrippingConf.StrippingLine import StrippingLine
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from StrippingUtils.Utils import LineBuilder, checkConfig
+from StrippingUtils.Utils import LineBuilder
 from StandardParticles import StdLooseKaons, StdLooseMuons, StdAllLooseMuons
 
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCalib/StrippingTrackEffVeloMuon.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCalib/StrippingTrackEffVeloMuon.py
index c7da7abeddda6483ce8d3b57a6b3083ee07bdafe..3f821c02445e084449fcec8a684ab687eb7dca9a 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCalib/StrippingTrackEffVeloMuon.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCalib/StrippingTrackEffVeloMuon.py
@@ -29,25 +29,17 @@
 from SelPy.utils import (UniquelyNamedObject,
                          ClonableObject,
                          SelectionBase)
-from Configurables import TrackEventCloneKiller, VeloMuonBuilder
-from Configurables import TrackStateInitAlg, TrackEventFitter, TrackPrepareVelo, TrackContainerCopy, Tf__PatVeloSpaceTool, StandaloneMuonRec
+from Configurables import VeloMuonBuilder
+from Configurables import StandaloneMuonRec, TrackPrepareVelo
 from Configurables import CombineParticles
-from Configurables import TrackKalmanFilter, TrackMasterExtrapolator
-from Configurables import TrackEventFitter, TrackMasterFitter
-from TrackFitter.ConfiguredFitters import ConfiguredFit
-from PhysSelPython.Wrappers import AutomaticData
-from Configurables import TrackSys
 from Configurables import GaudiSequencer
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, TisTosParticleTagger
 from StandardParticles import StdLooseMuons
 from StrippingUtils.Utils import LineBuilder
-from Configurables import TrackCloneFinder
 from StrippingConf.StrippingLine import StrippingLine
 from Configurables import FastVeloTracking
-from Configurables import ChargedProtoParticleMaker, NoPIDsParticleMaker, DataOnDemandSvc, DelegatingTrackSelector, TrackSelector, CombinedParticleMaker, BestPIDParticleMaker
-from PhysSelPython.Wrappers import Selection, SelectionSequence, DataOnDemand
-from LHCbKernel.Configuration import *
-from Gaudi.Configuration import *
+from Configurables import ChargedProtoParticleMaker, DataOnDemandSvc, DelegatingTrackSelector, NoPIDsParticleMaker, TrackSelector
+from PhysSelPython.Wrappers import Selection
 __author__ = ['Flavio Archilli']
 __date__ = '30/10/2019'
 __version__ = '$Revision: 0.1 $'
@@ -159,8 +151,6 @@ class StrippingTrackEffVeloMuonConf(LineBuilder):
 
         _config = self.config[confLine]
 
-        _pchargeCut = None
-        _tchargeCut = None
         _tagCharge = None
         _probeCharge = None
         _chargename = None
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCharm/StrippingB2ppipiSigmacmm_Lcpi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCharm/StrippingB2ppipiSigmacmm_Lcpi.py
index 1932ea73632bfc335a5d650d07d5b01c5d455fa9..397b76425631bddc729ad4ce8bbb2a99c6f92bf2 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCharm/StrippingB2ppipiSigmacmm_Lcpi.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCharm/StrippingB2ppipiSigmacmm_Lcpi.py
@@ -31,12 +31,11 @@ __all__ = ('StrippingB2ppipiSigmacmm_Lcpi_Conf', 'makeLc2pKpi', 'makepifromSigma
            )
 
 from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, ConjugateNeutralPID, DaVinci__N3BodyDecays
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N3BodyDecays, FilterDesktop
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
-from StrippingUtils.Utils import checkConfig, LineBuilder
+from StrippingUtils.Utils import LineBuilder
 from GaudiKernel.SystemOfUnits import MeV, GeV, mm
-from copy import copy
 
 name = 'StrippingB2ppipiSigmacmm_Lcpi'
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCharm/StrippingChargedHyperons.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCharm/StrippingChargedHyperons.py
index 920c9faefc12697a4686bb708606c7aefce7c812..1e9ecbdf32eac322732659ae13423893f4c17ced 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCharm/StrippingChargedHyperons.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCharm/StrippingChargedHyperons.py
@@ -21,13 +21,9 @@ __version__ = '$Revision: 1.0 $'
 __all__ = ('StrippingChargedHyperonsConf', 'default_config')
 
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from StandardParticles import StdLoosePions, StdNoPIDsDownPions, StdLooseKaons, StdLooseDownKaons
-from StandardParticles import StdAllLoosePions, StdAllLooseKaons
 
 from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
-from PhysSelPython.Wrappers import MultiSelectionSequence
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from GaudiKernel.SystemOfUnits import MeV, mm, picosecond
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCharm/StrippingCharm2PPX.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCharm/StrippingCharm2PPX.py
index 8f420ab23681879eda33d3f11a9c1854083e6f5d..1776621bc50d11dd212c17cc7c967c25e7570f68 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCharm/StrippingCharm2PPX.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCharm/StrippingCharm2PPX.py
@@ -26,7 +26,7 @@ __all__ = (
     'StrippingCharm2PPXConf'  # ???
 )
 
-from GaudiKernel.SystemOfUnits import MeV, GeV, mm, mrad
+from GaudiKernel.SystemOfUnits import GeV, MeV, mm
 from Configurables import CombineParticles, FilterDesktop
 # from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop, DaVinci__N3BodyDecays
 from StandardParticles import (
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCharm/StrippingCharmForVub.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCharm/StrippingCharmForVub.py
index addb5112d833323e807d80a2fcd5d1c6ef104d89..196b7aca8b732e4ce87cfa408c9240c9d4ca9fe8 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCharm/StrippingCharmForVub.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCharm/StrippingCharmForVub.py
@@ -31,9 +31,8 @@ __all__ = ('CharmForVubConf',
            'makeDstarD02HMuNu')
 
 from Gaudi.Configuration import *
-from Configurables import SubstitutePID
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
+from PhysSelPython.Wrappers import MergedSelection, Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from StandardParticles import StdLooseMuons, StdLooseKaons, StdAllLoosePions, StdLoosePions
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCharm/StrippingCharmWeakDecays.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCharm/StrippingCharmWeakDecays.py
index 62cf538da90f04787baab5c812393440f86c3b23..72c36178501074aeada4d5d7f91bd305c974ec78 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCharm/StrippingCharmWeakDecays.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCharm/StrippingCharmWeakDecays.py
@@ -28,7 +28,7 @@ __all__ = ('CharmWeakDecaysConf',
            'default_config')
 
 from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCharm/StrippingD02KSKS.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCharm/StrippingD02KSKS.py
index 048a0f735673d789716920a6b813f3734a817158..2e831b063d5dd66449d672d2c0c14659bb9d9210 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCharm/StrippingD02KSKS.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCharm/StrippingD02KSKS.py
@@ -25,9 +25,8 @@ __date__ = '15/05/2014'
 __version__ = 'Stripping23'
 __all__ = 'D02KSKSConf'
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
+from PhysSelPython.Wrappers import DataOnDemand, Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 
@@ -556,7 +555,7 @@ class D02KSKSConf(LineBuilder):
         _daughterCuts = "(TRGHOSTPROB <=%s )" % config['slowPi_LLL_TRGHOSTPROB']
 
         # 40
-        _vertexChi2_cut = "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_LL']
+        "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_LL']
 
         # 200
         _combCuts = "(ADAMASS('D*(2010)+') < %s*MeV)" % config['Dst_mass_LL']
@@ -593,7 +592,7 @@ class D02KSKSConf(LineBuilder):
         _daughterCuts = "(TRGHOSTPROB <=%s )" % config['slowPi_LLU_TRGHOSTPROB']
 
         # 40
-        _vertexChi2_cut = "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_LL']
+        "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_LL']
 
         # 200
         _combCuts = "(ADAMASS('D*(2010)+') < %s*MeV)" % config['Dst_mass_LL']
@@ -630,7 +629,7 @@ class D02KSKSConf(LineBuilder):
         _daughterCuts = "(TRGHOSTPROB <=%s )" % config['slowPi_LDL_TRGHOSTPROB']
 
         # 40
-        _vertexChi2_cut = "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_LD']
+        "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_LD']
 
         # 200
         _combCuts = "(ADAMASS('D*(2010)+') < %s*MeV)" % config['Dst_mass_LD']
@@ -667,7 +666,7 @@ class D02KSKSConf(LineBuilder):
         _daughterCuts = "(TRGHOSTPROB <=%s )" % config['slowPi_LDU_TRGHOSTPROB']
 
         # 40
-        _vertexChi2_cut = "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_LD']
+        "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_LD']
 
         # 200
         _combCuts = "(ADAMASS('D*(2010)+') < %s*MeV)" % config['Dst_mass_LD']
@@ -704,7 +703,7 @@ class D02KSKSConf(LineBuilder):
         _daughterCuts = "(TRGHOSTPROB <=%s )" % config['slowPi_DDL_TRGHOSTPROB']
 
         # 40
-        _vertexChi2_cut = "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_DD']
+        "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_DD']
 
         # 200
         _combCuts = "(ADAMASS('D*(2010)+') < %s*MeV)" % config['Dst_mass_DD']
@@ -741,7 +740,7 @@ class D02KSKSConf(LineBuilder):
         _daughterCuts = "(TRGHOSTPROB <=%s )" % config['slowPi_DDU_TRGHOSTPROB']
 
         # 40
-        _vertexChi2_cut = "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_DD']
+        "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_DD']
 
         # 200
         _combCuts = "(ADAMASS('D*(2010)+') < %s*MeV)" % config['Dst_mass_DD']
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCharm/StrippingD2HHHGamma.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCharm/StrippingD2HHHGamma.py
index f493f6bd9021f7c482ad4f11110b31209e277d1e..e0da6bf833dec41ba4733267992c2593b1e66642 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCharm/StrippingD2HHHGamma.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCharm/StrippingD2HHHGamma.py
@@ -22,19 +22,18 @@ __version__ = '$Revision: 0.1 $'
 __all__ = ('D2HHHGammaLines',
            'default_config')
 
-from Gaudi.Configuration import *
 
-from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N4BodyDecays
+from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays
 from StandardParticles import StdNoPIDsPions, StdNoPIDsKaons
 from StandardParticles import StdLooseAllPhotons, StdAllLooseGammaLL, StdAllLooseGammaDD
 
 from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
-from StrippingUtils.Utils import LineBuilder, checkConfig
+from StrippingUtils.Utils import LineBuilder
 
 from Configurables import FilterDesktop
 
-from GaudiKernel.SystemOfUnits import GeV, MeV, picosecond, mm
+from GaudiKernel.SystemOfUnits import GeV, MeV, picosecond
 
 
 default_config = {
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCharm/StrippingD2HHHKs.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCharm/StrippingD2HHHKs.py
index e5639b90812290f4e2226c3b0c140285aa788b00..8b56f2ae08f0d364c45bed96aa90657daee77a7d 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCharm/StrippingD2HHHKs.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCharm/StrippingD2HHHKs.py
@@ -22,19 +22,18 @@ __version__ = '$Revision: 0.1 $'
 __all__ = ('D2HHHKsLines',
            'default_config')
 
-from Gaudi.Configuration import *
 
-from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N4BodyDecays
+from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays
 from StandardParticles import StdNoPIDsPions, StdNoPIDsKaons
 from StandardParticles import StdLooseKsDD, StdLooseKsLL
 
 from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
-from StrippingUtils.Utils import LineBuilder, checkConfig
+from StrippingUtils.Utils import LineBuilder
 
 from Configurables import FilterDesktop
 
-from GaudiKernel.SystemOfUnits import GeV, MeV, picosecond, mm
+from GaudiKernel.SystemOfUnits import MeV, mm, picosecond
 
 
 default_config = {
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCharm/StrippingD2HHHPi0.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCharm/StrippingD2HHHPi0.py
index 6083359069ac88d66ad4d2d0c3f6c4a785962da6..8557b0ed7b6ea3312ecd34ede82d7cbd720f6775 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCharm/StrippingD2HHHPi0.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCharm/StrippingD2HHHPi0.py
@@ -22,19 +22,18 @@ __version__ = '$Revision: 0.1 $'
 __all__ = ('D2HHHPi0Lines',
            'default_config')
 
-from Gaudi.Configuration import *
 
-from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N4BodyDecays
+from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays
 from StandardParticles import StdNoPIDsPions, StdNoPIDsKaons
 from StandardParticles import StdLooseResolvedPi0, StdLooseMergedPi0
 
 from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
-from StrippingUtils.Utils import LineBuilder, checkConfig
+from StrippingUtils.Utils import LineBuilder
 
 from Configurables import FilterDesktop
 
-from GaudiKernel.SystemOfUnits import GeV, MeV, picosecond, mm
+from GaudiKernel.SystemOfUnits import GeV, MeV, picosecond
 
 
 default_config = {
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCharm/StrippingD2HMuNu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCharm/StrippingD2HMuNu.py
index 2ceba3956453266f579b29b43ab66b82c4dc906a..0b1aa8422f7bb32ab3d194b98dead0e474772019 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCharm/StrippingD2HMuNu.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCharm/StrippingD2HMuNu.py
@@ -9,9 +9,7 @@
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
 
-import logging
 from StrippingUtils.Utils import LineBuilder
-from Gaudi.Configuration import *
 __author__ = ['Liang Sun', 'Adam Davis']
 __date__ = '09/11/2015'
 __version__ = '$Revision: 0.01 $'
@@ -98,7 +96,6 @@ class D2HLepNuBuilder(LineBuilder):
     def __init__(self, name, config):
         LineBuilder.__init__(self, name, config)
         self._config = config
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
 
         self.GECs = {"Code": "( recSummaryTrack(LHCb.RecSummary.nLongTracks, TrLONG) < %(GEC_nLongTrk)s )" % config,
                      "Preambulo": ["from LoKiTracks.decorators import *"]}
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCharm/StrippingD2KS0H_conf.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCharm/StrippingD2KS0H_conf.py
index d58964475590bc2e6571bcd929685425e3694bc1..e5b9f6c8683eaaab3109aca8686f163c2f08aef0 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCharm/StrippingD2KS0H_conf.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCharm/StrippingD2KS0H_conf.py
@@ -44,9 +44,9 @@ from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticle
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StandardParticles import StdLoosePions, StdLooseKaons
 from StrippingConf.StrippingLine import StrippingLine
-from StrippingUtils.Utils import LineBuilder, checkConfig
+from StrippingUtils.Utils import LineBuilder
 from Configurables import TisTosParticleTagger
-from GaudiKernel.SystemOfUnits import GeV, MeV, picosecond, mm
+from GaudiKernel.SystemOfUnits import MeV, mm, picosecond
 
 default_name = 'D2KS0H'
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCharm/StrippingD2PiPi0.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCharm/StrippingD2PiPi0.py
index 2cf2e1f2dfcc01187fa87b6b497e55c580034ef2..3593748cd50e6ab84496cfb7045a1b29f0016504 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCharm/StrippingD2PiPi0.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCharm/StrippingD2PiPi0.py
@@ -33,7 +33,7 @@ __all__ = (
 
 )
 
-from GaudiKernel.SystemOfUnits import MeV, GeV, mrad, picosecond
+from GaudiKernel.SystemOfUnits import MeV, picosecond
 
 from StandardParticles import (
     StdAllNoPIDsKaons,
@@ -51,7 +51,7 @@ from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 
 # from Configurables import CombineParticles, FilterDesktop
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, ConjugateNeutralPID, DaVinci__N3BodyDecays
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N3BodyDecays
 
 default_config = {
     'D2Pi0H': {
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCharm/StrippingD2XMuMuSS.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCharm/StrippingD2XMuMuSS.py
index 6cb43802872df951b5676b3b0a91f42091655f73..f2ecc06f375c01960838df612bae449a097161ea 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCharm/StrippingD2XMuMuSS.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCharm/StrippingD2XMuMuSS.py
@@ -9,14 +9,13 @@
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
 
-from StandardParticles import StdAllLooseElectrons, StdAllNoPIDsElectrons
+from StandardParticles import StdAllLooseElectrons
 from StandardParticles import StdAllLooseKaons, StdAllLoosePions, StdAllLooseMuons, StdAllNoPIDsPions, StdAllNoPIDsKaons
-from StandardParticles import StdLooseKaons, StdLoosePions, StdLooseMuons, StdNoPIDsPions, StdNoPIDsKaons, StdLooseProtons, StdAllNoPIDsProtons
+from StandardParticles import StdAllNoPIDsProtons, StdLooseKaons, StdLooseMuons, StdLoosePions, StdLooseProtons
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, OfflineVertexFitter
-from Gaudi.Configuration import *
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop
 import copy
 __author__ = ['Malcolm John', 'B. Viaud', 'O. Kochebina']
 __date__ = '25/6/2012'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCharm/StrippingD2hh.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCharm/StrippingD2hh.py
index 51c213ed2d3c259435dcd6aef0631877156b6bb0..a370c49abb16101fe062f7fa9fd7c27efecb37e3 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCharm/StrippingD2hh.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCharm/StrippingD2hh.py
@@ -24,7 +24,6 @@ __all__ = ('D2hhBuilder',
 '''
 This file contains stripping lines for time-dependent two-body charm analyses of mixing, yCP, and A_Gamma
 '''
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
@@ -129,7 +128,7 @@ class D2hhBuilder(LineBuilder):
         stdNoPIDsPions = StdAllNoPIDsPions
 
         d2kpi_name = name+'PromptD2KPi'
-        d0RS_name = name+'PromptD0RS'
+        name+'PromptD0RS'
         d0WS_name = name+'PromptD0WS'
         d2kk_name = name+'PromptD2KK'
         d2pipi_name = name+'PromptD2PiPi'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCharm/StrippingD2hhh_FTcalib.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCharm/StrippingD2hhh_FTcalib.py
index 1ec2a52397a24a0cbc076e1b808944bfc5bf21da..eb622bead0fbe08c7b00587f38e94c60ed0a8ade 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCharm/StrippingD2hhh_FTcalib.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCharm/StrippingD2hhh_FTcalib.py
@@ -29,13 +29,10 @@ __version__ = '$Revision: 0.0 $'
 __all__ = ('D2hhhFTCalibConf',
            'makeStdD2hhhFT')
 
-from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
+from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from StandardParticles import (StdNoPIDsPions,
-                               StdTightKaons)
 
 name = "D2hhhFTCalib"
 # Cuts to be implemented vy the Stripping team in Stripping Settings
@@ -254,7 +251,6 @@ def globalEventCutFilter(name,
     if MaxTrSIZE == None:
         return None
 
-    from Configurables import LoKi__VoidFilter as VoidFilter
     from Configurables import LoKi__Hybrid__CoreFactory as CoreFactory
     modules = CoreFactory('CoreFactory').Modules
     for i in ['LoKiTracks.decorators']:
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCharm/StrippingD2hhh_conf.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCharm/StrippingD2hhh_conf.py
index 436d8a20ebfa69a07273b9fc952667e306a823fd..49374bf7789c8403fcf3e4660b179452634cef16 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCharm/StrippingD2hhh_conf.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCharm/StrippingD2hhh_conf.py
@@ -38,8 +38,7 @@ from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticle
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from StandardParticles import (StdNoPIDsPions,
-                               StdTightKaons)
+from StandardParticles import StdNoPIDsPions
 
 name = "D2hhh"
 # Cuts to be implemented vy the Stripping team in Stripping Settings
@@ -717,7 +716,6 @@ def globalEventCutFilter(name,
     if MaxTrSIZE == None:
         return None
 
-    from Configurables import LoKi__VoidFilter as VoidFilter
     from Configurables import LoKi__Hybrid__CoreFactory as CoreFactory
     modules = CoreFactory('CoreFactory').Modules
     for i in ['LoKiTracks.decorators']:
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCharm/StrippingDstarD02xx.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCharm/StrippingDstarD02xx.py
index ce2ac8d8facde4ad7816e78bcb9fd402160bb81a..e052e20eec4a83a6f489851d64e937c3ee00b05f 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCharm/StrippingDstarD02xx.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCharm/StrippingDstarD02xx.py
@@ -22,8 +22,7 @@ __all__ = ('StrippingDstarD02xxConf', 'combinetwobody', 'combineDstar', 'default
             where xx = {mu mu, pi pi, pi mu, k mu, ... }
             
 '''
-from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCharm/StrippingDstarD0ToHHPi0.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCharm/StrippingDstarD0ToHHPi0.py
index fd5188441bc83f651edf601e0fc081e5761b90a2..9f366f1a65e17dac9704f2cda14ac7c90073bb1d 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCharm/StrippingDstarD0ToHHPi0.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCharm/StrippingDstarD0ToHHPi0.py
@@ -17,13 +17,11 @@ Module for D* tagged D0 -> hhpi0.
 Supersedes StrippingDstarD2hhpi0
 """
 
-from Gaudi.Configuration import *
 from Configurables import FilterDesktop, CombineParticles, OfflineVertexFitter
 from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from StandardParticles import StdAllLoosePions, StdLoosePions, StdLooseKaons, StdLooseResolvedPi0, StdLooseMergedPi0
-from Configurables import TisTosParticleTagger
 
 __all__ = ('DstarD0ToHHPi0AllLinesBuilder',
            'DstarMaker',
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCharm/StrippingDstarD2HHHH.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCharm/StrippingDstarD2HHHH.py
index 79b905d65e08f76846da8aeebd29e1bd52022454..15c8bc47e0445328a0083162a53a4335865cca1b 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCharm/StrippingDstarD2HHHH.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCharm/StrippingDstarD2HHHH.py
@@ -22,16 +22,15 @@ __version__ = '$Revision: 1.0 $'
 __all__ = ('DstarD2HHHHLines',
            'default_config')
 
-from Gaudi.Configuration import *
 
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N4BodyDecays
 from StandardParticles import StdAllNoPIDsPions, StdNoPIDsPions, StdNoPIDsKaons
 
 from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
-from StrippingUtils.Utils import LineBuilder, checkConfig
+from StrippingUtils.Utils import LineBuilder
 
-from GaudiKernel.SystemOfUnits import GeV, MeV, picosecond, mm
+from GaudiKernel.SystemOfUnits import MeV, picosecond
 
 
 default_config = {
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCharm/StrippingDstarD2KSHHPi0.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCharm/StrippingDstarD2KSHHPi0.py
index 1a1c91b788986c0a547216e92ee30ee234979f5e..2cf7967d07c7867df16b8b2cfa45c3c0ddd24ac4 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCharm/StrippingDstarD2KSHHPi0.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCharm/StrippingDstarD2KSHHPi0.py
@@ -22,18 +22,17 @@ __version__ = '$Revision: 1.0 $'
 __all__ = ('DstarD2KSHHPi0Lines',
            'default_config')
 
-from Gaudi.Configuration import *
 
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N4BodyDecays
 from StandardParticles import StdAllNoPIDsPions, StdNoPIDsPions, StdNoPIDsKaons, StdLooseResolvedPi0, StdLooseMergedPi0, StdLooseKsDD, StdLooseKsLL
 
 from PhysSelPython.Wrappers import Selection, MergedSelection
 from StrippingConf.StrippingLine import StrippingLine
-from StrippingUtils.Utils import LineBuilder, checkConfig
+from StrippingUtils.Utils import LineBuilder
 
 from Configurables import FilterDesktop
 
-from GaudiKernel.SystemOfUnits import GeV, MeV, picosecond, mm
+from GaudiKernel.SystemOfUnits import MeV, mm, picosecond
 
 
 default_config = {
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCharm/StrippingDstarD2KShh.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCharm/StrippingDstarD2KShh.py
index 0446a490bf8b78aaa6a090c0170ee5d84241b931..8bb88c690db0782705ee07f1579b03266ff72d96 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCharm/StrippingDstarD2KShh.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCharm/StrippingDstarD2KShh.py
@@ -34,7 +34,6 @@ __all__ = ('DstarD2KShhBuilder',
            'makeD2KShh',
            'makeDstar')
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCharm/StrippingDstarD2XGamma.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCharm/StrippingDstarD2XGamma.py
index 59e1a9cc73eb63cebf8d359be22611bfea10a6f4..4bebda09363078aa7f375ea30e19d74cba44a31c 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCharm/StrippingDstarD2XGamma.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCharm/StrippingDstarD2XGamma.py
@@ -26,7 +26,6 @@ __version__ = '$Revision: 0.2 $'
 __all__ = ('DstarD2XGammaLines',
            'default_config')
 
-from Gaudi.Configuration import *
 
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 from StandardParticles import StdAllNoPIDsPions, StdNoPIDsPions, StdNoPIDsKaons
@@ -34,11 +33,11 @@ from StandardParticles import StdLooseAllPhotons, StdAllLooseGammaLL, StdAllLoos
 
 from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
-from StrippingUtils.Utils import LineBuilder, checkConfig
+from StrippingUtils.Utils import LineBuilder
 
 from Configurables import FilterDesktop
 
-from GaudiKernel.SystemOfUnits import GeV, MeV, picosecond, mm
+from GaudiKernel.SystemOfUnits import GeV, MeV, picosecond
 
 default_config = {
     'NAME': 'DstarD2XGamma',
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCharm/StrippingDstarPromptWithD02HHHH.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCharm/StrippingDstarPromptWithD02HHHH.py
index 13343e4031d3c9fe7ad9b92cfb6f3c3fff754d98..22e9ffd46fd5a0b8ab4623cae0293fe3c10c129d 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCharm/StrippingDstarPromptWithD02HHHH.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCharm/StrippingDstarPromptWithD02HHHH.py
@@ -36,11 +36,10 @@ __version__ = '$Revision: 1.2 $'
 __all__ = ('DstarPromptWithD02HHHHConf', 'makeD02hhhh',
            'makePromptDstar', 'default_config')
 
-from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, ConjugateNeutralPID
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles, ConjugateNeutralPID
 from PhysSelPython.Wrappers import Selection, MergedSelection
 from StrippingConf.StrippingLine import StrippingLine
-from StrippingUtils.Utils import checkConfig, LineBuilder
+from StrippingUtils.Utils import LineBuilder
 from GaudiKernel.SystemOfUnits import MeV, GeV, mm
 from copy import copy
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCharm/StrippingDstarPromptWithD02HHMuMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCharm/StrippingDstarPromptWithD02HHMuMu.py
index e83ad60bb1ff3c30f6cfd21e7ea0e2fb6ead7646..a1c41727aab9df91366ea29963944e783d29f676 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCharm/StrippingDstarPromptWithD02HHMuMu.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCharm/StrippingDstarPromptWithD02HHMuMu.py
@@ -29,11 +29,10 @@ __version__ = '$Revision: 2.0 $'
 __all__ = ('DstarPromptWithD02HHLLConf', 'makeD02hhll',
            'makePromptDstar', 'default_config')
 
-from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, ConjugateNeutralPID
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles, ConjugateNeutralPID
 from PhysSelPython.Wrappers import Selection, MergedSelection
 from StrippingConf.StrippingLine import StrippingLine
-from StrippingUtils.Utils import checkConfig, LineBuilder
+from StrippingUtils.Utils import LineBuilder
 from GaudiKernel.SystemOfUnits import MeV, GeV, mm
 from copy import copy
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCharm/StrippingExcitedDsSpectroscopy.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCharm/StrippingExcitedDsSpectroscopy.py
index 6b08898929e9ee290d51640d43d073b4a548a98b..dadd6c5c25c094fb4e5dfdef695cd98af0384ee1 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCharm/StrippingExcitedDsSpectroscopy.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCharm/StrippingExcitedDsSpectroscopy.py
@@ -321,7 +321,6 @@ def globalEventCutFilter(name,
     if MaxTrSIZE == None:
         return None
 
-    from Configurables import LoKi__VoidFilter as VoidFilter
     from Configurables import LoKi__Hybrid__CoreFactory as CoreFactory
     modules = CoreFactory('CoreFactory').Modules
     for i in ['LoKiTracks.decorators']:
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCharm/StrippingHc2V02H.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCharm/StrippingHc2V02H.py
index 5f63de83baa118d330a0b95e541553d6a8e4581f..ca96215521b00ad6379d0a82538d3ada0714a5a3 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCharm/StrippingHc2V02H.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCharm/StrippingHc2V02H.py
@@ -27,11 +27,9 @@ __all__ = (
 )
 
 from GaudiKernel.SystemOfUnits import MeV, GeV, mm, mrad
-from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop, DaVinci__N3BodyDecays
+from GaudiConfUtils.ConfigurableGenerators import DaVinci__N3BodyDecays, FilterDesktop
 from StandardParticles import StdNoPIDsPions as InputPions
 from StandardParticles import StdNoPIDsKaons as InputKaons
-from StandardParticles import StdLooseLambdaLL as InputLambdasLL
-from StandardParticles import StdLooseLambdaDD as InputLambdasDD
 
 from PhysSelPython.Wrappers import Selection, MergedSelection, DataOnDemand
 from StrippingUtils.Utils import LineBuilder
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCharm/StrippingHc2V03H.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCharm/StrippingHc2V03H.py
index 77f8f1aecfa7a04b18d5642386d1c094392b96cd..84c4dbd802a10fae27a11a4440538bce29b36ffc 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCharm/StrippingHc2V03H.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCharm/StrippingHc2V03H.py
@@ -27,11 +27,9 @@ __all__ = (
 )
 
 from GaudiKernel.SystemOfUnits import MeV, GeV, mm, mrad
-from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop, DaVinci__N4BodyDecays
+from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays, FilterDesktop
 from StandardParticles import StdNoPIDsPions as InputPions
 from StandardParticles import StdNoPIDsKaons as InputKaons
-from StandardParticles import StdLooseLambdaLL as InputLambdasLL
-from StandardParticles import StdLooseLambdaDD as InputLambdasDD
 
 from PhysSelPython.Wrappers import Selection, MergedSelection, DataOnDemand
 from StrippingUtils.Utils import LineBuilder
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCharm/StrippingHc2V2H.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCharm/StrippingHc2V2H.py
index 1cc1e18bb59332589773894f931054575d3bd57d..62f83f01a95c995d84514559ea3eb725d34e7335 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCharm/StrippingHc2V2H.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCharm/StrippingHc2V2H.py
@@ -29,8 +29,6 @@ from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDeskto
 from StandardParticles import StdNoPIDsDownPions as InputDownPions
 from StandardParticles import StdNoPIDsPions as InputPions
 from StandardParticles import StdNoPIDsKaons as InputKaons
-from StandardParticles import StdLooseLambdaLL as InputLambdasLL
-from StandardParticles import StdLooseLambdaDD as InputLambdasDD
 
 from PhysSelPython.Wrappers import Selection, MergedSelection, DataOnDemand
 from StrippingUtils.Utils import LineBuilder
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCharm/StrippingHc2V3H.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCharm/StrippingHc2V3H.py
index 8860909e6ec1c8f2862b43d64f75e5158a1c67e3..05d0ef19028d88f3cf40161b0e7b207226c117e3 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCharm/StrippingHc2V3H.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCharm/StrippingHc2V3H.py
@@ -31,8 +31,6 @@ from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDeskto
 from StandardParticles import StdNoPIDsDownPions as InputDownPions
 from StandardParticles import StdNoPIDsPions as InputPions
 from StandardParticles import StdNoPIDsKaons as InputKaons
-from StandardParticles import StdLooseLambdaLL as InputLambdasLL
-from StandardParticles import StdLooseLambdaDD as InputLambdasDD
 
 from PhysSelPython.Wrappers import Selection, MergedSelection, DataOnDemand
 from StrippingUtils.Utils import LineBuilder
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCharm/StrippingKKPiPi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCharm/StrippingKKPiPi.py
index cedaab2089da1034f1207a1c958ba82c6e694ba7..767a1fdbf50445fb204987a0cc70c2f97dfb5421 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCharm/StrippingKKPiPi.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCharm/StrippingKKPiPi.py
@@ -12,12 +12,11 @@
 Module for selecting [cs][ubar dbar] -> K+ K+ pi- pi-
 '''
 
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
+from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
 from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
-from Gaudi.Configuration import *
 __author__ = ['Mengzhen Wang']
 __date__ = '10/10/2017'
 __version__ = '$Revision: 1.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCharm/StrippingLambdac2V03H.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCharm/StrippingLambdac2V03H.py
index 8c19d9d3aeebd29855bd2d76b366fe9611b08aaf..9689bee39c9e7d84a61e56605ba3bb5f443ec5d1 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCharm/StrippingLambdac2V03H.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCharm/StrippingLambdac2V03H.py
@@ -27,7 +27,7 @@ __all__ = (
 )
 
 from GaudiKernel.SystemOfUnits import MeV, GeV, mm, mrad
-from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop, DaVinci__N4BodyDecays
+from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays, FilterDesktop
 from StandardParticles import StdNoPIDsPions as InputPions
 from StandardParticles import StdNoPIDsKaons as InputKaons
 from StandardParticles import StdLooseLambdaLL as InputLambdasLL
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCharm/StrippingLc2L0LLpi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCharm/StrippingLc2L0LLpi.py
index 0165e116e9da33c044fd297b7fa4c1090c6cbf39..0a027afeb1d2d303ea6a37758bc2b3bf4bb5f79d 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCharm/StrippingLc2L0LLpi.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCharm/StrippingLc2L0LLpi.py
@@ -12,17 +12,10 @@
 Module for selecting Lambda_c+->Lambda pi+
 '''
 
-from StandardParticles import (StdAllLoosePions, StdLooseProtons,
-                               StdLoosePions, StdNoPIDsUpPions)
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from StandardParticles import StdLooseAllPhotons, StdVeryLooseAllPhotons
-from Configurables import LoKi__VoidFilter
-from PhysSelPython.Wrappers import MergedSelection
-from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
-from Gaudi.Configuration import *
 __author__ = ['Guiyun Ding', 'Jiesheng Yu', 'Yuehong Xie']
 __date__ = '28/11/2016'
 __version__ = '$Revision: 2.0$'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCharm/StrippingNeutralCBaryons.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCharm/StrippingNeutralCBaryons.py
index bf6d1603296752d86c0e7c13ec03b037aa4b7dd0..165e0fbf71ca71084e7f0b7ac538d4257975d87f 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCharm/StrippingNeutralCBaryons.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCharm/StrippingNeutralCBaryons.py
@@ -23,13 +23,9 @@ __version__ = '$Revision: 1.0 $'
 __all__ = ('StrippingNeutralCBaryonsConf', 'default_config')
 
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from StandardParticles import StdLoosePions, StdNoPIDsDownPions, StdLooseKaons, StdLooseDownKaons
-from StandardParticles import StdAllLoosePions, StdAllLooseKaons
 
 from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
-from PhysSelPython.Wrappers import MultiSelectionSequence
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from GaudiKernel.SystemOfUnits import MeV, mm, picosecond
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCharm/StrippingXic2HHH.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCharm/StrippingXic2HHH.py
index e34807cd11d54a2a33e0a1189dffe5a4b8d17475..32300611aa84de3bdf0390670c07b3849c390e20 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCharm/StrippingXic2HHH.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCharm/StrippingXic2HHH.py
@@ -8,18 +8,15 @@
 # granted to it by virtue of its status as an Intergovernmental Organization  #
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
-from StandardParticles import StdNoPIDsPions, StdNoPIDsKaons, StdNoPIDsProtons, StdAllNoPIDsProtons
-from Configurables import TisTosParticleTagger
+from StandardParticles import StdNoPIDsKaons, StdNoPIDsPions, StdNoPIDsProtons
 from StrippingUtils.Utils import LineBuilder
-from PhysSelPython.Wrappers import MultiSelectionSequence
-from PhysSelPython.Wrappers import Selection, DataOnDemand, AutomaticData, MergedSelection
+from PhysSelPython.Wrappers import DataOnDemand, MergedSelection, Selection
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
 from Configurables import FilterDesktop, CombineParticles
 from LHCbKernel.Configuration import *
-from GaudiKernel.SystemOfUnits import MeV, mm, ns
+from GaudiKernel.SystemOfUnits import MeV, mm
 from StrippingConf.StrippingLine import StrippingLine
 from Gaudi.Configuration import *
-import re
 all
 ''' Xic+ and Theta+ lines Designed by Yury Shcheglov, Alexey Dzyuba, Nelya Sagidova to study Xic+ and Theta+ particles '''
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCharm/StrippingXicc.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCharm/StrippingXicc.py
index 2468c2d79739511bfdefe170463aa125124d506e..45478d9be226dbd5e3fdd09b0ff769294d99d064 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCharm/StrippingXicc.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingCharm/StrippingXicc.py
@@ -52,9 +52,6 @@ from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticle
 from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from StandardParticles import StdAllLoosePions, StdAllLooseKaons, StdAllLooseProtons
-from StandardParticles import StdLoosePions
-from CommonParticles.StdLooseLambda import StdLooseLambdaLL, StdLooseLambdaDD
 from GaudiKernel.SystemOfUnits import MeV, GeV, mm
 from Configurables import TisTosParticleTagger
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingIFT/StrippingHeavyIonB2DInclusive.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingIFT/StrippingHeavyIonB2DInclusive.py
index 29327d8aa62c735207342925663d33d03f9aaeb4..294c1a30fa24ff829e44ac27d679aa745baf7954 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingIFT/StrippingHeavyIonB2DInclusive.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingIFT/StrippingHeavyIonB2DInclusive.py
@@ -22,10 +22,8 @@ from StandardParticles import StdLooseKaons as kaons
 from StandardParticles import StdLoosePions as pions
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection, AutomaticData
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from GaudiKernel.SystemOfUnits import *
-from Gaudi.Configuration import *
+from PhysSelPython.Wrappers import MergedSelection, Selection
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 __author__ = ['Cameron Dean']
 __date__ = '06/04/2020'
 __version__ = '$Revision: 1.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingIFT/StrippingHeavyIonB2HHBDT.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingIFT/StrippingHeavyIonB2HHBDT.py
index 39e4907aa24d3419a37627bc2d24bf122274128c..ae690bbaa260b540ffe66785100426d71af41f8c 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingIFT/StrippingHeavyIonB2HHBDT.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingIFT/StrippingHeavyIonB2HHBDT.py
@@ -24,16 +24,13 @@ __all__ = ('HeavyIonB2HHBDTLines',
            'applyBDT',
            'default_config')
 
-from Gaudi.Configuration import *
 
-from GaudiKernel.SystemOfUnits import *
-
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 from StandardParticles import StdNoPIDsPions
 
 from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
-from StrippingUtils.Utils import LineBuilder, checkConfig
+from StrippingUtils.Utils import LineBuilder
 
 
 default_config = {
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingIFT/StrippingHeavyIonB2nbody.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingIFT/StrippingHeavyIonB2nbody.py
index 5df90d0f3514da9dad84756a19284e71402c86ad..b288806e8b1b690009b74eb25f55c6a26f1fefe8 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingIFT/StrippingHeavyIonB2nbody.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingIFT/StrippingHeavyIonB2nbody.py
@@ -16,7 +16,6 @@ from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, MergedSelection, DataOnDemand, VoidEventSelection
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = ['Rudolf Oldeman']
 __date__ = '08/02/2011'
 __version__ = '$Revision: 1.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingIFT/StrippingHeavyIonConvertedPhoton.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingIFT/StrippingHeavyIonConvertedPhoton.py
index c011500783a27985e134f081748afc5b4188e044..7d5bc9da797b4fc01853fe797dc8ed3f994238bc 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingIFT/StrippingHeavyIonConvertedPhoton.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingIFT/StrippingHeavyIonConvertedPhoton.py
@@ -23,7 +23,7 @@ __all__ = (
 
 from Gaudi.Configuration import *
 from CommonParticles.Utils import *
-from GaudiKernel.SystemOfUnits import MeV, GeV, mm
+from GaudiKernel.SystemOfUnits import MeV, mm
 from Configurables import (DiElectronMaker,
                            ProtoParticleCALOFilter,
                            ParticleTransporter,
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingIFT/StrippingHeavyIonD02KPiPi0.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingIFT/StrippingHeavyIonD02KPiPi0.py
index 3e380b9342ba9bebae1a3195dcadf08a1b598fc9..8ffdf55b27ce401ff26b2fe355cc99597f755347 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingIFT/StrippingHeavyIonD02KPiPi0.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingIFT/StrippingHeavyIonD02KPiPi0.py
@@ -25,9 +25,8 @@ __all__ = ('StrippingHeavyIonD02KPiPi0Conf',
            'makeD02KPiPi0M',
            'default_config')
 
-from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from PhysSelPython.Wrappers import Selection, DataOnDemand
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
+from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from StandardParticles import StdTightPions, StdTightKaons, StdLooseMergedPi0, StdLooseResolvedPi0
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingIFT/StrippingHeavyIonDiMuon.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingIFT/StrippingHeavyIonDiMuon.py
index 8f416b66bd8dc6307c5dbd3fa9a8fc3c6ec1958d..0d7ba0992a361bd6d1f97bd4cf31f3c18c82c2a6 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingIFT/StrippingHeavyIonDiMuon.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingIFT/StrippingHeavyIonDiMuon.py
@@ -17,8 +17,7 @@ from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 from StandardParticles import StdAllLooseMuons
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand
-from Gaudi.Configuration import *
+from PhysSelPython.Wrappers import Selection
 __author__ = ['Emilie MAURICE']
 __date__ = ''
 __version__ = '$Revision: 2.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingIFT/StrippingHeavyIonDst2D0KPiForPID.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingIFT/StrippingHeavyIonDst2D0KPiForPID.py
index 4282eb3c7b386840ce3bb3a47569a6a981e3194c..c3ba0aa8f46df637625d1f88481903dd9414f15e 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingIFT/StrippingHeavyIonDst2D0KPiForPID.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingIFT/StrippingHeavyIonDst2D0KPiForPID.py
@@ -13,10 +13,8 @@
 from StandardParticles import StdAllNoPIDsKaons, StdAllNoPIDsPions
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from LHCbKernel.Configuration import *
-from Gaudi.Configuration import *
+from PhysSelPython.Wrappers import Selection
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 __author__ = ['Philip Xing', 'Andrew Powell']
 __date__ = '23rd August 2012'
 __version__ = '$Revision: 7.0 $'
@@ -36,7 +34,7 @@ Usage:
 __all__ = ('HeavyIonDst2D0KPiForPIDConf', 'default_config', "D0", "Dstar")
 
 
-from GaudiKernel.SystemOfUnits import mm, cm, MeV, GeV
+from GaudiKernel.SystemOfUnits import GeV, MeV
 # from Configurables import FilterDesktop, CombineParticles
 
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingIFT/StrippingHeavyIonGammaHadron.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingIFT/StrippingHeavyIonGammaHadron.py
index df8ad92d7e7813151437ff0a0a8d2dfe8e9bab68..42c4e64093225339c3ada6e6ee97e25c483ed75e 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingIFT/StrippingHeavyIonGammaHadron.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingIFT/StrippingHeavyIonGammaHadron.py
@@ -13,13 +13,10 @@ Stripping selections or Gamma+Hadron physics.
 Based on those by Patrick K.
 '''
 
-from Configurables import RelInfoConeVariables
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from Configurables import FilterDesktop, CombineParticles
-from StandardParticles import StdLoosePhotons, StdAllLooseGammaLL, StdAllLooseGammaDD, StandardBasic
-from Gaudi.Configuration import *
+from Configurables import FilterDesktop
 __author__ = 'Cesar da Silva'
 __date__ = '30/04/2017'
 __version__ = '$Revision: 0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingIFT/StrippingHeavyIonMiniBias.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingIFT/StrippingHeavyIonMiniBias.py
index 106ff07bd3dd9d047427060881d42717210d2772..3c7b671fce8427b6a2b6d42fee0446cd5decdc2f 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingIFT/StrippingHeavyIonMiniBias.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingIFT/StrippingHeavyIonMiniBias.py
@@ -13,7 +13,6 @@ Stripping selections or Minimum Bias physics.
 Based on those by Patrick K.
 '''
 
-from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 __author__ = 'Yanxi ZHANG, Emilie MAURICE'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingIFT/StrippingHeavyIonOpenCharm.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingIFT/StrippingHeavyIonOpenCharm.py
index f63bb420dcaf59b6bfa48f6043f3ac9725be95f5..79c0a039a36968ea5b8dbe7e043f8eb760aac7b8 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingIFT/StrippingHeavyIonOpenCharm.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingIFT/StrippingHeavyIonOpenCharm.py
@@ -32,7 +32,7 @@ __all__ = (
 
 
 from GaudiKernel.SystemOfUnits import MeV, GeV, mrad, mm
-from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 # from Configurables import CombineParticles, FilterDesktop
 from StandardParticles import (
     StdAllNoPIDsKaons,
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingIFT/StrippingHeavyIonOthercc.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingIFT/StrippingHeavyIonOthercc.py
index adacaca64526f2aeee8ebe6d795f0991ae6b6bb1..b3062d99f4ba4098dfebaeaef033a35b3f4d587e 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingIFT/StrippingHeavyIonOthercc.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingIFT/StrippingHeavyIonOthercc.py
@@ -17,8 +17,7 @@ from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 from StandardParticles import StdNoPIDsElectrons, StdLooseProtons, StdLooseMuons
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand
-from Gaudi.Configuration import *
+from PhysSelPython.Wrappers import Selection
 __author__ = ['Emilie MAURICE']
 __date__ = ''
 __version__ = '$Revision: 1.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingIFT/StrippingHeavyIonPIDCalib.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingIFT/StrippingHeavyIonPIDCalib.py
index 4d96b70412efeeaa567401f7247511c02704fc0f..635480e78d2cba544bf3537d6a6d0e92293ac75f 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingIFT/StrippingHeavyIonPIDCalib.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingIFT/StrippingHeavyIonPIDCalib.py
@@ -37,7 +37,6 @@ from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
 from Gaudi.Configuration import *
 __author__ = ['Yanxi ZHANG']
 __date__ = '25/02/2015'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingIFT/StrippingHeavyIonSingleElectron.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingIFT/StrippingHeavyIonSingleElectron.py
index 4751a2767bc4a63d9d78087de7b67a9493851237..ce4c263cd6870c12d9bbbfccb585bedc00c300f9 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingIFT/StrippingHeavyIonSingleElectron.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingIFT/StrippingHeavyIonSingleElectron.py
@@ -14,7 +14,7 @@ Stripping selections for single scattered electrons
 
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
 from StandardParticles import StdAllNoPIDsElectrons
-from PhysSelPython.Wrappers import Selection, DataOnDemand
+from PhysSelPython.Wrappers import Selection
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 __author__ = 'Giacomo Graziani'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingIFT/StrippingHeavyIonTopology.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingIFT/StrippingHeavyIonTopology.py
index d53f7d8bf9c845db7987b0f30a531d1d2afa6498..0d62cf184e07db219b598aa5daeacb8c8e830a5e 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingIFT/StrippingHeavyIonTopology.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingIFT/StrippingHeavyIonTopology.py
@@ -12,13 +12,9 @@
 Module for selecting specific topology
 '''
 
-from Configurables import FilterDesktop, CombineParticles
-from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-from StandardParticles import StdAllLooseMuons, StdAllLoosePions, StdAllNoPIDsPions, StdLoosePhotons
+from Configurables import FilterDesktop
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand
-from Gaudi.Configuration import *
 __author__ = ['Emilie MAURICE']
 __date__ = ''
 __version__ = '$Revision: 1.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingIFT/StrippingHeavyIonTrackEffDownMuon.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingIFT/StrippingHeavyIonTrackEffDownMuon.py
index 6e7eb7567d6f9a66f2e89cffa4cea4c71115f9cf..0880e97b075e2bc495173b6acf653ff01884be82 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingIFT/StrippingHeavyIonTrackEffDownMuon.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingIFT/StrippingHeavyIonTrackEffDownMuon.py
@@ -43,34 +43,26 @@ __all__ = ('StrippingHeavyIonTrackEffDownMuonConf',
 # FIXME Write includes in a cleaner way
 from Gaudi.Configuration import *
 from LHCbKernel.Configuration import *
-from DAQSys.DecoderClass import Decoder
 from Configurables import GaudiSequencer
 from Configurables import UnpackTrack, ChargedProtoParticleMaker, DelegatingTrackSelector, TrackSelector, BestPIDParticleMaker
-from TrackFitter.ConfiguredFitters import ConfiguredFit
 from Configurables import TrackStateInitAlg
 from StrippingConf.StrippingLine import StrippingLine
-from Configurables import ChargedProtoParticleAddMuonInfo, MuonIDAlgLite
+from Configurables import ChargedProtoParticleAddMuonInfo
 from MuonID import ConfiguredMuonIDs
 from Configurables import ChargedProtoCombineDLLsAlg, ProtoParticleMUONFilter
-from PhysSelPython.Wrappers import Selection, DataOnDemand
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
+from PhysSelPython.Wrappers import Selection
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 
 from StrippingUtils.Utils import LineBuilder
-from Configurables import LoKi__VoidFilter
-from os import environ
 from Gaudi.Configuration import *
-import GaudiKernel.ProcessJobOptions
-from GaudiKernel.SystemOfUnits import mm
 
 from GaudiConfUtils.ConfigurableGenerators import TisTosParticleTagger
 from StandardParticles import StdAllLooseMuons
 from Configurables import GaudiSequencer
 from Configurables import TrackToDST
-from Configurables import TrackSys
 from Configurables import PatSeeding, PatSeedingTool, PatLongLivedTracking
-from PhysSelPython.Wrappers import AutomaticData
 # Get the fitters
-from TrackFitter.ConfiguredFitters import ConfiguredFit, ConfiguredFitSeed, ConfiguredFitDownstream
+from TrackFitter.ConfiguredFitters import ConfiguredFitDownstream
 from PatAlgorithms import PatAlgConf
 
 from SelPy.utils import (UniquelyNamedObject,
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingIFT/StrippingHeavyIonTrackEffMuonTT.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingIFT/StrippingHeavyIonTrackEffMuonTT.py
index 56d4a18efe2b562eed3412a268bb47e35915eb37..3af84c0e2ed472dd795c0b18c8d095381ac3715c 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingIFT/StrippingHeavyIonTrackEffMuonTT.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingIFT/StrippingHeavyIonTrackEffMuonTT.py
@@ -63,10 +63,10 @@ __all__ = ('StrippingHeavyionTrackEffMuonTTConf',
            'filterHLT2ForBJpsiK')
 
 from Gaudi.Configuration import *
-from PhysSelPython.Wrappers import Selection, DataOnDemand, ChargedProtoParticleSelection
+from PhysSelPython.Wrappers import ChargedProtoParticleSelection, Selection
 from StrippingConf.StrippingLine import StrippingLine
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from StrippingUtils.Utils import LineBuilder, checkConfig
+from StrippingUtils.Utils import LineBuilder
 from StandardParticles import StdLooseKaons, StdLooseMuons, StdAllLooseMuons
 
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingIFT/StrippingHeavyIonTrackEffVeloMuon.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingIFT/StrippingHeavyIonTrackEffVeloMuon.py
index 0e07045325c58f87f6345eafe88988d9f7a3f147..7cd8b2c0d6f462f14fd64f8f6c50386fc74e091e 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingIFT/StrippingHeavyIonTrackEffVeloMuon.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingIFT/StrippingHeavyIonTrackEffVeloMuon.py
@@ -40,17 +40,14 @@ __all__ = ('HeavyIonTrackEffVeloMuonConf',
            )
 
 
-from Gaudi.Configuration import *
-from LHCbKernel.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 # from Configurables import CombineParticles
-from PhysSelPython.Wrappers import Selection, SelectionSequence, DataOnDemand
-from Configurables import ChargedProtoParticleMaker, NoPIDsParticleMaker, DataOnDemandSvc, DelegatingTrackSelector, TrackSelector, CombinedParticleMaker, BestPIDParticleMaker
+from PhysSelPython.Wrappers import Selection
+from Configurables import ChargedProtoParticleMaker, DataOnDemandSvc, DelegatingTrackSelector, NoPIDsParticleMaker, TrackSelector
 from Configurables import FastVeloTracking
 
 from StrippingConf.StrippingLine import StrippingLine
-from Configurables import TrackStateInitAlg, TrackEventFitter, TrackPrepareVelo, TrackContainerCopy, Tf__PatVeloSpaceTool, StandaloneMuonRec
-from Configurables import TrackCloneFinder
+from Configurables import StandaloneMuonRec, TrackPrepareVelo
 from StrippingUtils.Utils import LineBuilder
 # changed from StdLooseMuons, yanxi
 from StandardParticles import StdAllLooseMuons
@@ -59,14 +56,9 @@ from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, TisTosParticleT
 # from Configurables import TisTosParticleTagger
 
 from Configurables import GaudiSequencer
-from Configurables import TrackSys
-from PhysSelPython.Wrappers import AutomaticData
 # Get the fitters
-from TrackFitter.ConfiguredFitters import ConfiguredFit
 
-from Configurables import TrackEventCloneKiller, VeloMuonBuilder
-from Configurables import TrackEventFitter, TrackMasterFitter
-from Configurables import TrackKalmanFilter, TrackMasterExtrapolator
+from Configurables import VeloMuonBuilder
 # from TrackFitter.ConfiguredFitters import ConfiguredFastFitter
 # from Configurables import TrackCloneFinder
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingMiniBias/StrippingBadEvents.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingMiniBias/StrippingBadEvents.py
index 4d837a2f722d72d1c7683e8f61d6316db037f332..460036843530f41526b7139b73c204dba3cf9160 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingMiniBias/StrippingBadEvents.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingMiniBias/StrippingBadEvents.py
@@ -8,7 +8,6 @@
 # granted to it by virtue of its status as an Intergovernmental Organization  #
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
-from PhysSelPython.Wrappers import Selection
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 __author__ = 'Andrea Contu'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingMiniBias/StrippingMiniBias.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingMiniBias/StrippingMiniBias.py
index 7ba890fe41b117c0dcaaac7777296c741c397754..f791c6cd1cfac775c9b2357307a4044a5100eb87 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingMiniBias/StrippingMiniBias.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingMiniBias/StrippingMiniBias.py
@@ -8,7 +8,6 @@
 # granted to it by virtue of its status as an Intergovernmental Organization  #
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
-from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 __author__ = 'Patrick Koppenburg'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingQEE/DisplVertices_Utils.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingQEE/DisplVertices_Utils.py
index f9e3c9136e46dcf7697209e381ff7735b840ed2e..bcd9752464adf9657cb3a290918226a7d0f05341 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingQEE/DisplVertices_Utils.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingQEE/DisplVertices_Utils.py
@@ -14,12 +14,11 @@ Utilities for displaced vertex stripping: wrapper class around PatPV3D
 
 __all__ = ("SelectionFromAlgorithmWithTools", "SelectionPatPV3DWrapper")
 
-from GaudiConfUtils import isConfigurable
 
 from SelPy.utils import (UniquelyNamedObject, ClonableObject, SelectionBase, compatibleSequences,
-                         IncompatibleInputLocations, CloneCallable, makeOutputLocation, setOutputLocation)
+                         IncompatibleInputLocations, makeOutputLocation, setOutputLocation)
 
-from PhysSelPython.Wrappers import checkConfigurable, checkName
+from PhysSelPython.Wrappers import checkName
 
 
 def connectToRequiredSelections(selection, inputSetter):
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingQEE/StrippingA1MuMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingQEE/StrippingA1MuMu.py
old mode 100755
new mode 100644
index 91e62b0b649d88ac57d91a3cf24db5351e7b19de..281aebf4be79ceaf5c90e7533eb04d49847e5185
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingQEE/StrippingA1MuMu.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingQEE/StrippingA1MuMu.py
@@ -23,11 +23,9 @@ A_1 -> mu+ mu-, based on functionality from StrippingDiMuonNew by Jibo He.
 
 """
 
-from Gaudi.Configuration import *
-from LHCbKernel.Configuration import *
 
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
-from PhysSelPython.Wrappers import Selection, DataOnDemand, SimpleSelection
+from PhysSelPython.Wrappers import SimpleSelection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from GaudiKernel.SystemOfUnits import MeV
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingQEE/StrippingA2MuMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingQEE/StrippingA2MuMu.py
index 64c106858ef1dd3206b2083b5ea5e630aec55ae8..cd47529d168278a387e79f1f772ca7cf3b1d8040 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingQEE/StrippingA2MuMu.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingQEE/StrippingA2MuMu.py
@@ -22,7 +22,7 @@ from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from StandardParticles import StdAllLooseMuons, StdAllNoPIDsMuons
+from StandardParticles import StdAllLooseMuons
 from GaudiKernel.SystemOfUnits import GeV
 
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingQEE/StrippingA2MuMuSameSign.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingQEE/StrippingA2MuMuSameSign.py
index 5911c40e36b1e66721231826c818abbc79aed758..a89a6a8b5ff2bf6571b4fe0fcaeb93088567f2a5 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingQEE/StrippingA2MuMuSameSign.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingQEE/StrippingA2MuMuSameSign.py
@@ -22,7 +22,7 @@ from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from StandardParticles import StdAllLooseMuons, StdAllNoPIDsMuons
+from StandardParticles import StdAllLooseMuons
 from GaudiKernel.SystemOfUnits import GeV
 
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingQEE/StrippingB2LLP2HH.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingQEE/StrippingB2LLP2HH.py
index 073c098c3a38cbbfb2655b777880011ad219247a..179fe2f52ea095317c5a39508a99a578c806ae3a 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingQEE/StrippingB2LLP2HH.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingQEE/StrippingB2LLP2HH.py
@@ -18,13 +18,11 @@ __date__ = '25/01/2019'
 
 __all__ = ('B2LLPV0_sConf', 'default_config')
 
-from Gaudi.Configuration import *
 from StandardParticles import StdAllNoPIDsPions
 from PhysSelPython.Wrappers import CombineSelection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from GaudiKernel.SystemOfUnits import GeV
-from LoKiPhys.functions import SOURCE, SIZE
 
 default_config = {
     'NAME': 'B2LLPV0',
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingQEE/StrippingConvertedPhoton.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingQEE/StrippingConvertedPhoton.py
index 75d6970b1df2c63c192f20d524128d15f914343b..6a24e6a634b2578b9537332d82053d30b73013fd 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingQEE/StrippingConvertedPhoton.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingQEE/StrippingConvertedPhoton.py
@@ -23,7 +23,7 @@ __all__ = (
 
 from Gaudi.Configuration import *
 from CommonParticles.Utils import *
-from GaudiKernel.SystemOfUnits import MeV, GeV, mm
+from GaudiKernel.SystemOfUnits import MeV, mm
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
 from Configurables import (DiElectronMaker,
                            ProtoParticleCALOFilter,
@@ -31,9 +31,7 @@ from Configurables import (DiElectronMaker,
                            LoKi__VertexFitter,
                            )
 from PhysSelPython.Wrappers import (Selection,
-                                    SimpleSelection,
-                                    MergedSelection,
-                                    AutomaticData)
+                                    MergedSelection)
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingQEE/StrippingDY2MuMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingQEE/StrippingDY2MuMu.py
index 9c7c8a7706d666e3fac7a8f8316de58468cc8b74..6a28183b934ae8110dbdef65c4d96d44dd261b82 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingQEE/StrippingDY2MuMu.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingQEE/StrippingDY2MuMu.py
@@ -26,9 +26,8 @@ __author__ = ['J. Anderson']
 
 __all__ = 'DY2MuMuConf', 'default_config'
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-from PhysSelPython.Wrappers import Selection, SimpleSelection
+from PhysSelPython.Wrappers import SimpleSelection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from StandardParticles import StdAllLooseMuons
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingQEE/StrippingDY2ee.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingQEE/StrippingDY2ee.py
index a80a06710257e4a747b068f38b65eda9b6b0de8c..3a4d7395f7894461a94f0c47d79c1d2bc20d648e 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingQEE/StrippingDY2ee.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingQEE/StrippingDY2ee.py
@@ -20,9 +20,8 @@ __author__ = ['S.Bifani', 'D.Ward']
 
 __all__ = ('DY2eeConf', 'default_config')
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-from PhysSelPython.Wrappers import Selection, DataOnDemand
+from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from StandardParticles import StdAllNoPIDsElectrons
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingQEE/StrippingDisplJets.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingQEE/StrippingDisplJets.py
index 5fef3562a7eba983dc7ba2e37ee9b5a47fc6bebf..28c1bab64dafcce7d73fff3cdfe6a61833456218 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingQEE/StrippingDisplJets.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingQEE/StrippingDisplJets.py
@@ -9,8 +9,6 @@
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
 
-from Gaudi.Configuration import *
-from CommonParticles.Utils import *
 # from Configurables import FilterDesktop
 # from PhysSelPython.Wrappers import Selection, DataOnDemand, FilterSelection
 from StrippingConf.StrippingLine import StrippingLine
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingQEE/StrippingDisplVertices.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingQEE/StrippingDisplVertices.py
index 1ceed257a457950890e0fc33aaf7abc06342b70a..66be8a1f8712b367d96e50ebeb3d82892c0f2c1b 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingQEE/StrippingDisplVertices.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingQEE/StrippingDisplVertices.py
@@ -40,7 +40,6 @@ __all__ = ('DisplVerticesConf', 'default_config')
 
 from Gaudi.Configuration import *
 from GaudiKernel import SystemOfUnits as units
-from LHCbKernel.Configuration import DEBUG, VERBOSE
 
 import logging
 logger = logging.getLogger(__name__)
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingQEE/StrippingDitau.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingQEE/StrippingDitau.py
old mode 100755
new mode 100644
index fa049324f79a44e720a641aa2ed2cdc857f4435e..3e2dd3df509a4ead7bb1a73e4cccd6e5f2e99c0f
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingQEE/StrippingDitau.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingQEE/StrippingDitau.py
@@ -155,8 +155,7 @@ Derived from works of S.Farry & P. Ilten
 
 """
 
-import os
-from GaudiKernel.SystemOfUnits import MeV, GeV, micrometer
+from GaudiKernel.SystemOfUnits import GeV, MeV
 from PhysSelPython.Wrappers import Selection, SimpleSelection, PassThroughSelection, MergedSelection, AutomaticData
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
@@ -894,7 +893,7 @@ def Tuples():
 
     """
     import re
-    from DecayTreeTuple.Configuration import DecayTreeTuple, EventTuple
+    from DecayTreeTuple.Configuration import DecayTreeTuple
 
     seq = GaudiSequencer('TupleSeq')
     seq.ModeOR = True
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingQEE/StrippingExotica.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingQEE/StrippingExotica.py
old mode 100755
new mode 100644
index 6bc342e6673e7b1e6203b8260039fdde1761206c..6bb564d6b7bbd36c36350f55b005a51272e6ab12
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingQEE/StrippingExotica.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingQEE/StrippingExotica.py
@@ -34,7 +34,7 @@ Hlt2ExoticaEtaToDiEGamma
 from GaudiKernel.SystemOfUnits import MeV, GeV, mm, picosecond
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-from PhysSelPython.Wrappers import Selection, SimpleSelection, MergedSelection, AutomaticData
+from PhysSelPython.Wrappers import AutomaticData, SimpleSelection
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingQEE/StrippingFullDiJets.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingQEE/StrippingFullDiJets.py
index 0e20ce2d9fcbfbea2ea7828e4bd1f9db7eed9790..b2931713d0c65ae7ee7dfa387b7b5473c635eba4 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingQEE/StrippingFullDiJets.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingQEE/StrippingFullDiJets.py
@@ -9,14 +9,10 @@
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
 
-from Gaudi.Configuration import *
-from Configurables import FilterDesktop, CombineParticles, LoKi__VertexFitter
+from Configurables import CombineParticles, LoKi__VertexFitter
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from StandardParticles import StdJets
-from CommonParticles.Utils import *
-from Configurables import FilterJet
 from GaudiKernel.SystemOfUnits import GeV
 
 __author__ = "Xabier Cid Vidal", "Cedric Potterat", "William Barter"
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingQEE/StrippingGluinos.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingQEE/StrippingGluinos.py
index 0867cc3c369e7f5b06dfb5d1909d7eeda820e3f0..8070b81f174dd132e7ec9c150bbe87dc5befc9b9 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingQEE/StrippingGluinos.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingQEE/StrippingGluinos.py
@@ -10,11 +10,10 @@
 ###############################################################################
 from Configurables import FilterDesktop, JetVertexAlg
 from CommonParticles.Utils import *
-from LoKiPhys.functions import SOURCE, SIZE
 from GaudiKernel.SystemOfUnits import GeV
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import FilterSelection, PassThroughSelection, DataOnDemand
+from PhysSelPython.Wrappers import FilterSelection, PassThroughSelection
 from StandardParticles import StdJets
 from Gaudi.Configuration import *
 __author__ = ['Xabier Cid Vidal', 'Carlos Vazquez Sierra', 'Igor Kostiuk']
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingQEE/StrippingLFVExotica.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingQEE/StrippingLFVExotica.py
old mode 100755
new mode 100644
index 88da9dcd829a1905c1264408cac8e2e94c89b89f..fef9c145f071f0ab2fe36aeab16fc22bc5d9a283
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingQEE/StrippingLFVExotica.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingQEE/StrippingLFVExotica.py
@@ -174,7 +174,7 @@ def create_stdjets(strob, line_location, stdjets_name_ban):
         strob.StdJetsNoJetIDBan = [myconf1]
 
     # configure Data-On-Demand service
-    locations = updateDoD(myconf1)
+    updateDoD(myconf1)
 
 
 relInfoJetsVars = ["JETNOMU1PX", "JETNOMU1PY", "JETNOMU1PZ", "JETNOMU1PT", "JETNOMU1JETWIDTH", "JETNOMU1NNTAG", "JETNOMU1MNF", "JETNOMU2PX", "JETNOMU2PY", "JETNOMU2PZ", "JETNOMU2PT", "JETNOMU2JETWIDTH", "JETNOMU2NNTAG", "JETNOMU2MNF", "JETNOMU3PX", "JETNOMU3PY",
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingQEE/StrippingLLP2HH.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingQEE/StrippingLLP2HH.py
index a44e21b9d685dfdf71578f4a8c9db734abf73c01..b2b088c7863a076933f8b5770260224a4ca2b483 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingQEE/StrippingLLP2HH.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingQEE/StrippingLLP2HH.py
@@ -18,13 +18,11 @@ __date__ = '24/01/2019'
 
 __all__ = ('LLPV0_sConf', 'default_config')
 
-from Gaudi.Configuration import *
 from StandardParticles import StdAllNoPIDsPions
 from PhysSelPython.Wrappers import CombineSelection, PassThroughSelection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from GaudiKernel.SystemOfUnits import GeV
-from LoKiPhys.functions import SOURCE, SIZE
 
 default_config = {
     'NAME': 'LLPV0',
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingQEE/StrippingLLP2Jets.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingQEE/StrippingLLP2Jets.py
index 8619ba15a78cfb147e8f2c955611f8cdd44bd2ba..9c25c3202184e96ffba87e12971ec43ac9362246 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingQEE/StrippingLLP2Jets.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingQEE/StrippingLLP2Jets.py
@@ -18,7 +18,6 @@ __date__ = '25/01/2019'
 
 __all__ = ('LLP2Jets_sConf', 'default_config')
 
-from Gaudi.Configuration import *
 from Configurables import JetVertexAlg
 from StandardParticles import StdJets
 from CommonParticles.Utils import updateDoD
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingQEE/StrippingLLP2MuX.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingQEE/StrippingLLP2MuX.py
index 16654f3c9d1acc1925968a5d39f0087bea5086a7..f93bc4732424f6eaeb1951cb1a244ef0de7e8b5e 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingQEE/StrippingLLP2MuX.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingQEE/StrippingLLP2MuX.py
@@ -16,7 +16,6 @@ from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import AutomaticData, Selection
 from GaudiKernel import SystemOfUnits as units
-from LHCbKernel.Configuration import *
 __author__ = "Pieter David"
 __date__ = "2014-08-28"
 __all__ = ("LLP2MuXConf", "default_config")
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingQEE/StrippingLb2dp.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingQEE/StrippingLb2dp.py
old mode 100755
new mode 100644
index cf2bf7494c36f78187f495fe46a2fcfe068338e0..cbd7593f597ef30b0f56f7070b78fe66905549e5
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingQEE/StrippingLb2dp.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingQEE/StrippingLb2dp.py
@@ -23,15 +23,11 @@ __all__ = ('Lb2dpConf',
            )
 
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop
-from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays
 
-from StandardParticles import StdAllNoPIDsPions, StdAllNoPIDsProtons,  StdAllNoPIDsKaons
 from PhysSelPython.Wrappers import Selection, DataOnDemand, SimpleSelection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from Configurables import LoKi__VoidFilter as VoidFilter
 
 default_config = {
     'NAME': 'Lb2dp',
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingQEE/StrippingMicroDiJets.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingQEE/StrippingMicroDiJets.py
index 60a35abe10febcab0dcf2d24628e23b510f946b5..db8af2aecfab54badd7fd3305d3d0716cbe4802b 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingQEE/StrippingMicroDiJets.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingQEE/StrippingMicroDiJets.py
@@ -10,13 +10,12 @@
 ###############################################################################
 
 from Gaudi.Configuration import *
-from Configurables import FilterDesktop, CombineParticles, LoKi__VertexFitter
+from Configurables import CombineParticles
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from StandardParticles import StdJets
 from CommonParticles.Utils import *
-from Configurables import FilterJet, ClearDaughters
+from Configurables import ClearDaughters
 from GaudiKernel.SystemOfUnits import GeV
 
 __author__ = "Xabier Cid Vidal", "Cedric Potterat", "William Barter"
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingQEE/StrippingMuMuSS.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingQEE/StrippingMuMuSS.py
index 46e50bf48c5974152d914b654bd5b1fd74bb2b6e..130bda526520d302d34046bd7d905f2bb8920adf 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingQEE/StrippingMuMuSS.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingQEE/StrippingMuMuSS.py
@@ -26,7 +26,7 @@ __author__ = (
 )
 
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-from PhysSelPython.Wrappers import Selection, SimpleSelection
+from PhysSelPython.Wrappers import SimpleSelection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from StandardParticles import StdAllLooseMuons
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingQEE/StrippingSbarSCorrelations.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingQEE/StrippingSbarSCorrelations.py
index 63378eabc81bb7a2995cb94f8b8e7faad734f19d..33589834379b334e6b432982e264803ceb8d8308 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingQEE/StrippingSbarSCorrelations.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingQEE/StrippingSbarSCorrelations.py
@@ -21,10 +21,8 @@ Long tracks only
 from GaudiKernel.SystemOfUnits import MeV, GeV
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
-from StandardParticles import StdAllNoPIDsPions, StdTightKaons, StdAllNoPIDsProtons
+from PhysSelPython.Wrappers import DataOnDemand, Selection
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = ['Florin MACIUC']
 __date__ = '24/08/2013'
 __version__ = '$Revision: 1.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingQEE/StrippingStrangeBaryons.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingQEE/StrippingStrangeBaryons.py
index f3dd8ebdec4e50abd2bed892959740435ac5d9b5..2405f0e9c6f1695dd9f652d6aae992473b3135a2 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingQEE/StrippingStrangeBaryons.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingQEE/StrippingStrangeBaryons.py
@@ -18,14 +18,10 @@ Xi -> Lambda pi,   Omega -> Lambda K
 LLL DDL DDD
 '''
 
-from GaudiKernel.SystemOfUnits import MeV
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
-from CommonParticles import StdLooseLambda
-from StandardParticles import StdLoosePions, StdNoPIDsDownPions, StdLooseKaons, StdLooseDownKaons, StdLooseProtons, StdNoPIDsDownProtons
+from PhysSelPython.Wrappers import DataOnDemand, Selection
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = ['Mihai Straticiuc', 'Florin Maciuc', 'Nguyen Thi Dung']
 __date__ = '26/06/2012'
 __version__ = '$Revision: 0.3 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingQEE/StrippingStrangeBaryonsNoPID.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingQEE/StrippingStrangeBaryonsNoPID.py
index 668986b834d39169c5ae15803bf5d5fb33cff67b..208ab8bad23a5e36e2a0a609a82dd6ca2fc9d012 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingQEE/StrippingStrangeBaryonsNoPID.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingQEE/StrippingStrangeBaryonsNoPID.py
@@ -18,12 +18,10 @@ Xi -> Lambda pi,   Omega -> Lambda K
 LLL
 '''
 
-from GaudiKernel.SystemOfUnits import MeV
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
+from PhysSelPython.Wrappers import DataOnDemand, Selection
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = ['Florin Maciuc']
 __date__ = '13/01/2014'
 __version__ = '$Revision: 0.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingQEE/StrippingTaggedJets.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingQEE/StrippingTaggedJets.py
old mode 100755
new mode 100644
index 2205ce56dd85643e92bc55ab369b85378152951c..4927224c3710ed4cad5cd3baa918ec4b163f34f2
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingQEE/StrippingTaggedJets.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingQEE/StrippingTaggedJets.py
@@ -10,11 +10,10 @@
 ###############################################################################
 
 from Gaudi.Configuration import *
-from Configurables import FilterDesktop, CombineParticles, LoKi__VertexFitter
+from Configurables import CombineParticles, LoKi__VertexFitter
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from StandardParticles import StdJets
 from CommonParticles.Utils import *
 from Configurables import FilterJet
 from GaudiKernel.SystemOfUnits import GeV
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingQEE/StrippingW2nH.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingQEE/StrippingW2nH.py
index cc373f666cb49309b9f3e2efe0dae8e52ac260a4..22eacc1d77ba55838726dc481db0fa8f76e6bf1d 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingQEE/StrippingW2nH.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingQEE/StrippingW2nH.py
@@ -26,7 +26,6 @@ from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from StandardParticles import StdAllNoPIDsPions
 from GaudiKernel.SystemOfUnits import GeV
-from GaudiKernel.SystemOfUnits import MeV
 
 
 default_config = {
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingQEE/StrippingWJets.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingQEE/StrippingWJets.py
old mode 100755
new mode 100644
index 69b6940c49ad110ace21f32d3dbb3e2904580aed..a8dd17366932d60f3bf41f7c5c6503ba39ea6532
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingQEE/StrippingWJets.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingQEE/StrippingWJets.py
@@ -22,14 +22,12 @@ They are then cover a phasespace complementarily on each other.
 
 """
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
 from Configurables import CombineParticles, LoKi__VertexFitter
 from PhysSelPython.Wrappers import Selection, SimpleSelection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from StandardParticles import StdAllLooseMuons, StdAllNoPIDsElectrons, StdJets
-from CommonParticles.Utils import *
 from GaudiKernel.SystemOfUnits import GeV, MeV
 
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingQEE/StrippingWRareDecay.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingQEE/StrippingWRareDecay.py
index de1eaf98e07a599774f9667406768492a892a465..f599f543313af3af803cfd1ae503077a399fbebb 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingQEE/StrippingWRareDecay.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingQEE/StrippingWRareDecay.py
@@ -21,8 +21,7 @@ from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from GaudiKernel.SystemOfUnits import MeV, GeV, mm, picosecond
-from Gaudi.Configuration import *
+from GaudiKernel.SystemOfUnits import MeV, picosecond
 __author__ = ['Hang Yin', 'Qundong Han']
 __date__ = '11/29/2016'
 __version__ = '$Revision: 2.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingQEE/StrippingWe.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingQEE/StrippingWe.py
index 0820e8b431f0bb8891ac3f88f980c3fcbe0a181c..3e509fb26655db393ee396f8d85f74a24b0c62d7 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingQEE/StrippingWe.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingQEE/StrippingWe.py
@@ -21,7 +21,6 @@ We control: StdAllNoPIDsElectrons, PRS>50Mev & E_ECal/P>0.1 & E_HCal/P<0.05 & pT
 __all__ = 'WeConf', 'default_config'
 __author__ = 'S. Bifani', 'D. Ward'
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
 from PhysSelPython.Wrappers import SimpleSelection
 from StrippingConf.StrippingLine import StrippingLine
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingQEE/StrippingZ02ee.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingQEE/StrippingZ02ee.py
index e797011998c7d9201276f70cdabaa1b30ae4d70f..f6977308a75475dc2fd7e695d713190194177820 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingQEE/StrippingZ02ee.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingQEE/StrippingZ02ee.py
@@ -23,7 +23,6 @@ __all__ = (
     'default_config',
 )
 
-from Gaudi.Configuration import *
 from GaudiKernel.SystemOfUnits import GeV, MeV
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 from PhysSelPython.Wrappers import SimpleSelection
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingQEE/StrippingZ02nH.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingQEE/StrippingZ02nH.py
index 2f8d8eb612b1c353cf08c5e72ca77ae205eb7a72..35de5f4d789850497ba9aa5b71430ef065284077 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingQEE/StrippingZ02nH.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingQEE/StrippingZ02nH.py
@@ -26,7 +26,6 @@ from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from StandardParticles import StdAllNoPIDsPions
 from GaudiKernel.SystemOfUnits import GeV
-from GaudiKernel.SystemOfUnits import MeV
 
 
 default_config = {
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingQEE/StrippingZ0RareDecay.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingQEE/StrippingZ0RareDecay.py
index 57c2091f2ac6a4efcb43bd28c4251acba348f513..e181b28533d1769723804e5ccc2d55ce3dfbccea 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingQEE/StrippingZ0RareDecay.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingQEE/StrippingZ0RareDecay.py
@@ -22,8 +22,7 @@ __version__ = '$Revision: 2.0 $'
 
 __all__ = 'default_config', 'Z0RareDecayConf'
 
-from Gaudi.Configuration import *
-from GaudiKernel.SystemOfUnits import MeV, GeV, mm
+from GaudiKernel.SystemOfUnits import MeV
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
 from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
 from StrippingConf.StrippingLine import StrippingLine
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingQEE/depreciated/StrippingDijets.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingQEE/depreciated/StrippingDijets.py
index f0793d3411791797729ad540397e458f4646f78b..975321a6b30b00b6f80aee11878eb20ba9d16b84 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingQEE/depreciated/StrippingDijets.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingQEE/depreciated/StrippingDijets.py
@@ -15,8 +15,7 @@
 __all__ = ('DijetsConf',
            'default_config')
 
-from Gaudi.Configuration import *
-from GaudiKernel.SystemOfUnits import MeV, GeV, mm
+from GaudiKernel.SystemOfUnits import GeV, MeV
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingQEE/depreciated/StrippingHighPtTopoJets.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingQEE/depreciated/StrippingHighPtTopoJets.py
index 73ca61d9e7e0914a21b65e40361131e8f38c026d..6078cdec364615de35d547f813533d0a763afeef 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingQEE/depreciated/StrippingHighPtTopoJets.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingQEE/depreciated/StrippingHighPtTopoJets.py
@@ -21,8 +21,6 @@ __all__ = ('default_config', 'HighPtTopoJetsConf')
 # \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\#
 
 
-from Gaudi.Configuration import *
-from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from PhysSelPython.Wrappers import EventSelection
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingQEE/depreciated/StrippingJets.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingQEE/depreciated/StrippingJets.py
index 02e5fc43080729f2f38d0bc0bde65232a21f0202..55abf24d99577dcb8f10b30fda8803015b0c09f0 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingQEE/depreciated/StrippingJets.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingQEE/depreciated/StrippingJets.py
@@ -15,13 +15,11 @@
 __all__ = ('JetsConf',
            'default_config')
 
-from Gaudi.Configuration import *
-from GaudiKernel.SystemOfUnits import MeV, GeV, mm
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
+from GaudiKernel.SystemOfUnits import GeV, MeV
+from PhysSelPython.Wrappers import MergedSelection, Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
-from JetAccessories.JetMaker_Config import JetMakerConf
 from StandardParticles import StdJets, StdAllNoPIDsPions
 from Configurables import CombineParticles
 from Configurables import TopologicalTagging
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/Beauty2Charm_LoKiCuts.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/Beauty2Charm_LoKiCuts.py
index ce5265655cf518aa12121d3a5728d84c36da26cd..666cef80aacee423a071365fe7281c63e506e27d 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/Beauty2Charm_LoKiCuts.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/Beauty2Charm_LoKiCuts.py
@@ -10,11 +10,6 @@
 ###############################################################################
 # \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\#
 
-from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
-from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-from PhysSelPython.Wrappers import Selection, MergedSelection
-from StandardParticles import StdNoPIDsPions, StdNoPIDsKaons
 
 # \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\#
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingB02Lcmu_pKpi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingB02Lcmu_pKpi.py
index 3d6992fd337683bf5bcf97e994e4fd64705add4f..93bd54fbf8871329e8e7bcb95f7722d9913e1cff 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingB02Lcmu_pKpi.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingB02Lcmu_pKpi.py
@@ -14,7 +14,6 @@ from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = ['Nikita Beliy', 'Jibo He']
 __date__ = '28/11/2016'
 __version__ = '$Revision: 1.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingB23MuLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingB23MuLines.py
index a6e53abda621d1f1b0efe6185553c1b46aae67e6..15ea2076dcaea1a75c4fec8295e895be19887b4a 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingB23MuLines.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingB23MuLines.py
@@ -55,13 +55,11 @@ __all__ = ("B23MuLinesConf",
 
 #############################################################################
 
-from Gaudi.Configuration import *
-from Configurables import FilterDesktop, CombineParticles, DaVinci__N3BodyDecays
+from Configurables import DaVinci__N3BodyDecays
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 # from StrippingSelections.Utils import checkConfig
-from GaudiKernel.PhysicalConstants import c_light
 
 #############################################################################
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingB2EtaMuMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingB2EtaMuMu.py
index 121398b271451a2ef53c96b9cde3d79a68bd4d2e..9c2efbbacf4dc368cb7c6d742a93721b60444611 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingB2EtaMuMu.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingB2EtaMuMu.py
@@ -12,13 +12,12 @@
 B->etamumuselection
 '''
 
-from StandardParticles import StdAllNoPIDsMuons, StdAllLooseMuons
+from StandardParticles import StdAllNoPIDsMuons
 from StandardParticles import StdNoPIDsPions, StdLooseAllPhotons, StdLooseMergedPi0, StdLooseResolvedPi0
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand, SimpleSelection, MergedSelection
+from PhysSelPython.Wrappers import MergedSelection, Selection, SimpleSelection
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = ['Fred Blanc']
 __date__ = '26/01/2019'
 __version__ = '$Revision: 1.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingB2KLLXInclusive.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingB2KLLXInclusive.py
index a9d2ffd4e4d8d6444da6c3df3731248c13fce6e7..61a740d6b5d3d92a7f2015b59a5021738a7a2958 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingB2KLLXInclusive.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingB2KLLXInclusive.py
@@ -19,15 +19,12 @@ __all__ = ('B2KLLXInclusiveConf', 'default_config')
 Stripping selection for inclusively selected B->KmumuX decays.
 """
 
-from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop
+from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
 
 from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from LHCbKernel.Configuration import *  # check if needed
-from Configurables import SubstitutePID
-from Configurables import SubPIDMMFilter
 
 
 #################
@@ -333,7 +330,6 @@ class B2KLLXInclusiveConf(LineBuilder):
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         CombineDiMuon = CombineParticles()
         CombineDiMuon.DecayDescriptors = ["[B+ -> J/psi(1S) K+]cc"]
-        sel_name = "InclKLL"
         CombineDiMuon.MotherCut = self.InclKLLCut
         # choose
         leptons = self.InclLeptons
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingB2KstTauTau.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingB2KstTauTau.py
index 0e62fb1a13ae5f9586b34995cc3f4f00d8de7dee..a236059c8ca69aa4aaf625cf6925165cda17c83a 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingB2KstTauTau.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingB2KstTauTau.py
@@ -15,8 +15,7 @@ from StandardParticles import StdTightMuons
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, OfflineVertexFitter, DaVinci__N3BodyDecays
-from Gaudi.Configuration import *
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N3BodyDecays, FilterDesktop
 __author__ = [' G. Mancinelli, J. Serrano']
 __date__ = '15/08/2014'
 __version__ = '$Revision: 0.1 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingB2LLXBDT.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingB2LLXBDT.py
index 33ad8193f48b0db42c11b2b0fdb770bc37fa1794..b45675d8906a352a37b4bdd5ca92e02e5c6279bf 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingB2LLXBDT.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingB2LLXBDT.py
@@ -20,8 +20,6 @@ from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticle
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, MergedSelection
-from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays
-from Gaudi.Configuration import *
 __author__ = ['Jibo He']
 __date__ = '20/11/2015'
 __version__ = '$Revision: 1.0 $'
@@ -261,7 +259,7 @@ class B2LLXBDTConf(LineBuilder):
         """
         Kshort, both LL and DD
         """
-        from StandardParticles import StdLooseKsDD, StdLooseKsLL
+        from StandardParticles import StdLooseKsDD
 
         self.SelKsDD = self.createSubSel(OutputList=self.name + "SelKsDD",
                                          InputList=StdLooseKsDD,
@@ -297,7 +295,7 @@ class B2LLXBDTConf(LineBuilder):
         """
         Lambda, both LL and DD
         """
-        from StandardParticles import StdLooseLambdaDD, StdLooseLambdaLL
+        from StandardParticles import StdLooseLambdaDD
 
         self.SelLambdaDD = self.createSubSel(OutputList=self.name + "SelLambdaDD",
                                              InputList=StdLooseLambdaDD,
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingB2Lambda0ELines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingB2Lambda0ELines.py
index dcb376b6317e21a82d05511d6642d51a9139b1e0..beaae1e2b2d8fdb3ab6922b0b597f4f3735074b1 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingB2Lambda0ELines.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingB2Lambda0ELines.py
@@ -21,7 +21,6 @@ __all__ = ('B2Lambda0ELines',
            'default_config')
 
 from StandardParticles import StdLoosePions, StdLooseElectrons, StdNoPIDsDownElectrons, StdNoPIDsDownPions
-from Configurables import TisTosParticleTagger
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingB2Lambda0MuLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingB2Lambda0MuLines.py
index e758feafbbaf38bbf2c16b62697aeccc5044b5c0..8c8ebee90e957bb0642c7fb649a57f03d93eef97 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingB2Lambda0MuLines.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingB2Lambda0MuLines.py
@@ -21,7 +21,6 @@ __all__ = ('B2Lambda0MuLines',
            'default_config')
 
 from StandardParticles import StdLoosePions, StdLooseMuons, StdLooseDownMuons, StdNoPIDsDownPions
-from Configurables import TisTosParticleTagger
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingB2Lambda0MuOSLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingB2Lambda0MuOSLines.py
index 389b9bf695c2932c173a4ee768404acc14c2b153..4186a8554984cb039f3d149cda4700f95f9a9753 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingB2Lambda0MuOSLines.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingB2Lambda0MuOSLines.py
@@ -21,7 +21,6 @@ __all__ = ('B2Lambda0MuOSLines',
            'default_config')
 
 from StandardParticles import StdLoosePions, StdLooseMuons, StdLooseDownMuons, StdNoPIDsDownPions
-from Configurables import TisTosParticleTagger
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingB2Lambda0SSMuMu3PiLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingB2Lambda0SSMuMu3PiLines.py
index b829fcd48cd4d244f39b998208c83dfea4c65343..f47c81735abc7cb47558594658aaf83f1ca7bc36 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingB2Lambda0SSMuMu3PiLines.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingB2Lambda0SSMuMu3PiLines.py
@@ -21,7 +21,6 @@ __all__ = ('B2Lambda0SSMuMu3PiLines',
            'default_config')
 
 from StandardParticles import StdLoosePions, StdLooseMuons, StdLooseDownMuons, StdNoPIDsDownPions
-from Configurables import TisTosParticleTagger
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingB2MuMuMuMuLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingB2MuMuMuMuLines.py
index e8be535494b2f042b5e0ac87439ef9f4f7c4bd9d..e6a830521e3233715c6896a50d0ffe4616617755 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingB2MuMuMuMuLines.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingB2MuMuMuMuLines.py
@@ -19,7 +19,7 @@ from Beauty2Charm_LoKiCuts import LoKiCuts
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
-from Configurables import FilterDesktop, CombineParticles
+from Configurables import CombineParticles
 from Gaudi.Configuration import *
 __author__ = ['Diego Martinez Santos', 'Johannes Albrecht',
               'Konstantinos A. Petridis', 'Alexander Baranov']
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingB2XLL.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingB2XLL.py
old mode 100755
new mode 100644
index 893c8f7d24822aaf5128c145a0ea679b0efd25cc..54c9d8dbdf1774215b4f2574855ce20420b67924
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingB2XLL.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingB2XLL.py
@@ -10,9 +10,8 @@
 ###############################################################################
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection, AutomaticData
+from PhysSelPython.Wrappers import MergedSelection, Selection
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = 'Raja Nandakumar, Fergus Wilson, Stefania Ricciardi'
 __date__ = '04/11/2015'
 __version__ = '$Revision: 0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingB2XMuMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingB2XMuMu.py
index 9025207d02fbeeac1ba75e61e29706ad4d96e0d2..b89aef24e7a93c79addc371ccdea665995446fb7 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingB2XMuMu.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingB2XMuMu.py
@@ -19,7 +19,6 @@ __version__ = '$Revision: 1.2 $'
 __all__ = ('B2XMuMuConf', 'default_config')
 
 
-from Gaudi.Configuration import *
 from LHCbKernel.Configuration import *  # check if needed
 
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingB2XTau.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingB2XTau.py
index 89967ffc1bd10cb56544c7233004d1b229731f9c..9050443393da5af1c9abb3eee3ba2e1eda76009d 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingB2XTau.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingB2XTau.py
@@ -8,16 +8,13 @@
 # granted to it by virtue of its status as an Intergovernmental Organization  #
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
-from StandardParticles import StdAllLoosePions, StdAllNoPIDsPions
-from copy import deepcopy
 from StandardParticles import StdLooseKaons
-from StandardParticles import StdLoosePions, StdTightPions
-from StandardParticles import StdNoPIDsKaons, StdNoPIDsPions, StdTightMuons
+from StandardParticles import StdLoosePions
+from StandardParticles import StdNoPIDsPions, StdTightMuons
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, OfflineVertexFitter, DaVinci__N3BodyDecays
-from Gaudi.Configuration import *
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N3BodyDecays, FilterDesktop
 __author__ = ['G. Dujany, G. Mancinelli, J. Serrano']
 __date__ = '24/05/2010,15/01/2014, 19/10/2017'
 __version__ = '$Revision: 1.3 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingB2XTauMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingB2XTauMu.py
index 1539daf38aad3280d179e42101b30c7b9367dc90..3bf392ac2eb839b14fbb1f75d9e94e760e94edd9 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingB2XTauMu.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingB2XTauMu.py
@@ -25,8 +25,6 @@ __all__ = ('B2XTauMuConf',
            'default_config')
 
 
-from Gaudi.Configuration import *
-
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
 from PhysSelPython.Wrappers import Selection, MergedSelection
 from StrippingConf.StrippingLine import StrippingLine
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingB2XTauTau.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingB2XTauTau.py
index 4fcaf356c2071cae8a3b6be504e35eab73cf10ce..d2ac23a901190aa51d99a2548c6383a01f998521 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingB2XTauTau.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingB2XTauTau.py
@@ -14,8 +14,7 @@ from StandardParticles import StdNoPIDsPions, StdLoosePions
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand, SimpleSelection
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, OfflineVertexFitter, DaVinci__N3BodyDecays
-from Gaudi.Configuration import *
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N3BodyDecays, FilterDesktop
 __author__ = [' L. Pescatore', 'F. Blanc']
 __date__ = '28/09/2018'
 __version__ = '$Revision: 0.1$'
@@ -23,7 +22,6 @@ __version__ = '$Revision: 0.1$'
 # Stripping line for B->Htautau
 
 from GaudiKernel.SystemOfUnits import MeV
-from GaudiKernel.SystemOfUnits import mm
 
 """
   B->KstarTauTau, B->KTauTau, B->PhiTauTau, B->Eta'TauTau
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingBLVLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingBLVLines.py
index 8bf68933cf866f19e4931849021862745276afe7..a5196ce34b14f3f32b717e3c7fcb254e2f21f2fa 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingBLVLines.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingBLVLines.py
@@ -95,8 +95,7 @@ __all__ = ("BLVLinesConf",
 
 ###################################################################################################
 
-from Gaudi.Configuration import *
-from Configurables import FilterDesktop, CombineParticles, DaVinci__N3BodyDecays
+from Configurables import CombineParticles, DaVinci__N3BodyDecays
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingBd2KSLLX.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingBd2KSLLX.py
index 419b0f7505b9bb8f7a0008bd6bd040167c12c60a..54c987ef8b72fd7e148a11fb44cebadb12188639 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingBd2KSLLX.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingBd2KSLLX.py
@@ -10,9 +10,8 @@
 ###############################################################################
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection, AutomaticData
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, DaVinci__N3BodyDecays
-from Gaudi.Configuration import *
+from PhysSelPython.Wrappers import MergedSelection, Selection
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop
 __author__ = 'SB'
 __date__ = '08/10/2017'
 __version__ = '$Revision: 1 $'
@@ -47,15 +46,8 @@ class Bd2KSLLXConf(LineBuilder):
         mmXLine_name = name + "_mm"
         eeXLine_name = name + "_ee"
 
-        from StandardParticles import StdLoosePions as Pions
-        from StandardParticles import StdLooseKaons as Kaons
-        from StandardParticles import StdLooseKstar2Kpi as Kstars
-        from StandardParticles import StdLoosePhi2KK as Phis
         from StandardParticles import StdLooseKsLL as KshortsLL
         from StandardParticles import StdLooseKsDD as KshortsDD
-        from StandardParticles import StdLooseLambdaLL as LambdasLL
-        from StandardParticles import StdLooseLambdaDD as LambdasDD
-        from StandardParticles import StdLooseLambdastar2pK as Lambdastars
 
         SelKshortsLL = self._filterHadron(name="KshortsLLFor" + self._name,
                                           sel=KshortsLL,
@@ -64,12 +56,10 @@ class Bd2KSLLXConf(LineBuilder):
                                           sel=KshortsDD,
                                           params=config)
 
-        from StandardParticles import StdDiElectronFromTracks as DiElectronsFromTracks
         from StandardParticles import StdLooseDiElectron as DiElectrons
         from StandardParticles import StdLooseDiMuon as DiMuons
 
-        ElecID = "(PIDe > %(PIDe)s)" % config
-        MuonID = "(HASMUON)&(ISMUON)"
+        "(PIDe > %(PIDe)s)" % config
 
         DiElectronID = "(2 == NINTREE((ABSID==11)&(PIDe > %(PIDe)s)))" % config
         DiMuonID = "(2 == NINTREE((ABSID==13)&(HASMUON)&(ISMUON)))"
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingBd2eeKstarBDT.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingBd2eeKstarBDT.py
index 1a6b3547113e58f48bff1e36952cfc3fb4d30295..6776dcdf27807a56103010584c7a22734b4a8a3f 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingBd2eeKstarBDT.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingBd2eeKstarBDT.py
@@ -18,7 +18,6 @@ from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = ['Marie-Helene Schune', 'Jibo He']
 __date__ = '20/01/2012'
 __version__ = '$Revision: 1.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingBeauty2XGamma.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingBeauty2XGamma.py
index d21b9a25bc2714ed14237d6218c1dad601dc1240..05e9c9cf0af28c167f2cc98f655c56f432f3ea6b 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingBeauty2XGamma.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingBeauty2XGamma.py
@@ -12,7 +12,7 @@
 B-> X Gamma selections
 '''
 
-from StandardParticles import StdAllNoPIDsKaons, StdAllNoPIDsPions, StdLooseAllPhotons, StdLooseMergedPi0, StdLooseResolvedPi0, StdAllLooseGammaDD, StdAllLooseGammaLL, StdAllNoPIDsProtons
+from StandardParticles import StdAllLooseGammaDD, StdAllLooseGammaLL, StdAllNoPIDsPions, StdLooseAllPhotons, StdLooseMergedPi0, StdLooseResolvedPi0
 from Configurables import TisTosParticleTagger
 from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays as Combine4Particles
 from GaudiConfUtils.ConfigurableGenerators import DaVinci__N3BodyDecays as Combine3Particles
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingBs2MuMuGamma.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingBs2MuMuGamma.py
index 0cfb5425d7a51fe618e72a66a2e6e2062510e41d..f1f37c46035071eccb7cf880d283aafb532e0b8f 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingBs2MuMuGamma.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingBs2MuMuGamma.py
@@ -15,7 +15,7 @@ Authors: Meril Reboud, Jean-Francois Marchand
 """
 
 ########################################################################
-from StrippingUtils.Utils import LineBuilder, checkConfig
+from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Combine3BodySelection
 from StandardParticles import StdLooseMuons, StdLooseAllPhotons
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingBs2MuMuLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingBs2MuMuLines.py
index 28fab868cccc6d58e46553f2585cd743326a977c..8bf0a80a0ffc3aa0267bf6dfb6cc948d4a90331a 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingBs2MuMuLines.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingBs2MuMuLines.py
@@ -26,7 +26,7 @@ from Gaudi.Configuration import *
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
-from Configurables import FilterDesktop, CombineParticles
+from Configurables import CombineParticles
 from JetAccessories.JetMaker_Config import JetMakerConf
 from CommonParticles.Utils import *
 from Gaudi.Configuration import *
@@ -159,7 +159,7 @@ def create_stdjets(strob, line_location, stdjets_name_ban, stdjets_name_addb):
         strob.StdJetsNoJetIDBan = [myconf1]
 
     # configure Data-On-Demand service
-    locations = updateDoD(myconf1)
+    updateDoD(myconf1)
 
     myconf2 = JetMakerConf(stdjets_name_addb,
                            Inputs=['Phys/PFParticles/Particles', line_location],
@@ -173,7 +173,7 @@ def create_stdjets(strob, line_location, stdjets_name_ban, stdjets_name_addb):
         strob.StdJetsNoJetIDAddB = [myconf2]
 
     # configure Data-On-Demand service
-    locations = updateDoD(myconf2)
+    updateDoD(myconf2)
 
 ##########################################
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingBs2gammagamma.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingBs2gammagamma.py
index a19590514ce1912b186311ffed8d51783a633f9c..5dd7a2cdce789ca4b9dbc99b6ec9ffef3e98e01e 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingBs2gammagamma.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingBs2gammagamma.py
@@ -21,16 +21,11 @@ Exports the following stripping lines as instance data members:
 - Bs2gammagamma_NoConvWideLine  : wide line with 0 conversions
 '''
 
-from Configurables import (DiElectronMaker, ProtoParticleCALOFilter,
-                           ParticleTransporter, BremAdder)
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop  # , CombineParticles
-from CommonParticles import StdLooseAllPhotons
-from CommonParticles import StdAllLooseGammaConversion
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
 from Configurables import CombineParticles
-from Gaudi.Configuration import *
 __author__ = ['Sean Benson']
 __date__ = '2016/04/08'
 __version__ = '1.2'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingBs2st2KKMuX.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingBs2st2KKMuX.py
index 86d2fbe036d44821a158f2fba4fe7e558c1d3d55..22e9c5c994936c1db65ca0b5c70f9d8f5601bd3b 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingBs2st2KKMuX.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingBs2st2KKMuX.py
@@ -22,9 +22,8 @@ Stripping lines:
 from StandardParticles import StdLooseMuons, StdLooseKaons, StdAllLooseKaons, StdMassConstrainedJpsi2MuMu
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand
+from PhysSelPython.Wrappers import Selection
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = ['Jianchun Wang']
 __date__ = '03/22/2015'
 __version__ = '$Revision: 0.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingBu2LLK.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingBu2LLK.py
index ccdadc65103f0ad7d64540f186d2928a622eb079..c8fca833f5d7ccca659cabf968c9051df1adff6b 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingBu2LLK.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingBu2LLK.py
@@ -10,7 +10,7 @@
 ###############################################################################
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection, AutomaticData
+from PhysSelPython.Wrappers import DataOnDemand, MergedSelection, Selection
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, DaVinci__N3BodyDecays
 from Gaudi.Configuration import *
 __author__ = 'Patrick Koppenburg, Alex Shires, Thomas Blake, Luca Pescatore, Simone Bifani, Yasmine Amhis, Paula Alvarez Cartelle, Harry Cliff, Rafael Silva Coutinho, Guido Andreassi, Mick Mulder, Maarten van Veghel, John Smeaton, Vitalii Lisovskyi'
@@ -297,7 +297,6 @@ class Bu2LLKConf(LineBuilder):
         from StandardParticles import StdLoosePions as Pions
         from StandardParticles import StdLooseKaons as Kaons
         from StandardParticles import StdLooseProtons as Protons
-        from StandardParticles import StdAllLoosePions as AllPions
         from StandardParticles import StdAllLooseKaons as AllKaons
         from StandardParticles import StdAllLooseProtons as AllProtons
         from StandardParticles import StdLooseKstar2Kpi as Kstars
@@ -1520,7 +1519,6 @@ class Bu2LLKConf(LineBuilder):
         from StandardParticles import StdLooseMuons as Muons
         # from CommonParticles import StdLooseDetachedTau
         # Taus = DataOnDemand(Location = "Phys/StdLooseDetachedTau3pi/Particles")
-        from CommonParticles import StdTightDetachedTau
         Taus = DataOnDemand(Location="Phys/StdTightDetachedTau3pi/Particles")
 
         _DecayDescriptor = "[J/psi(1S) -> mu+ tau-]cc"
@@ -1675,7 +1673,6 @@ class Bu2LLKConf(LineBuilder):
 #####################################################
 
     def _storeInputBremPhotons(self, linename, outputlocprefix="Leptonic/Phys/", photonloc="Phys/StdVeryLooseAllPhotons/Particles"):
-        from PhysSelPython.Wrappers import FilterSelection, DataOnDemand, SelectionSequence
         from Configurables import (CopyParticles, ParticleCloner,
                                    ProtoParticleCloner, CaloHypoCloner,
                                    CaloClusterCloner)
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingBu2MajoLep.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingBu2MajoLep.py
index 5a96cdedd562ea723f6b2b20d6b2cf30f98f517f..850c2f87ccfaddc8f68a9b6e087f3f6d41cebbb1 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingBu2MajoLep.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingBu2MajoLep.py
@@ -19,12 +19,10 @@ __version__ = 'V0.9'
 __all__ = ('Bu2MajoLepConf',
            'default_config')
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
+from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from GaudiKernel.SystemOfUnits import *
 
 from StandardParticles import StdLooseMuons as Muons
 from StandardParticles import StdLoosePions as Pions
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingBu2MuNu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingBu2MuNu.py
index 19ce21e90e54ca7bc0f65d55187d37c95520c6d9..4163901dd65f50c70f659de9c335932f2c9649fa 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingBu2MuNu.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingBu2MuNu.py
@@ -25,12 +25,11 @@ __all__ = ('Bu2MuNuConf',
            'default_config')
 
 from Gaudi.Configuration import *
-from PhysSelPython.Wrappers import Selection, DataOnDemand
+from PhysSelPython.Wrappers import DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from StandardParticles import StdTightMuons, StdTightANNMuons
 from CommonParticles.Utils import *
-from Configurables import FilterDesktop, CombineParticles
+from Configurables import FilterDesktop
 from JetAccessories.JetMaker_Config import JetMakerConf
 
 default_name = 'Bu2MuNu'
@@ -72,7 +71,7 @@ def create_stdjets(strobj, line_location, stdjets_name_ban):
         strobj.StdJetsNoJetIDBan = [myconf1]
 
     # configure Data-On-Demand service
-    locations = updateDoD(myconf1)
+    updateDoD(myconf1)
 
 
 relInfoJetsVars = ["JETNOMU1PX", "JETNOMU1PY", "JETNOMU1PZ", "JETNOMU1PT", "JETNOMU1JETWIDTH", "JETNOMU1NNTAG", "JETNOMU1MNF", "JETNOMU2PX", "JETNOMU2PY", "JETNOMU2PZ", "JETNOMU2PT", "JETNOMU2JETWIDTH", "JETNOMU2NNTAG",
@@ -255,7 +254,7 @@ class Bu2MuNuConf(LineBuilder):
                                            JetIDCut=False).algorithms[0]
 
         # configure Data-On-Demand service
-        locations = updateDoD(StdJetsNoJetIDNoBan)
+        updateDoD(StdJetsNoJetIDNoBan)
 
         # add the jets with the specific banning
         create_stdjets(self, self.ControlLine.outputLocation(),
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingD23MuLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingD23MuLines.py
index 9d9153bde02604dd6518511524323b953c58b810..a119c6aadabeb6405ae23f48d28004723f035a3b 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingD23MuLines.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingD23MuLines.py
@@ -51,12 +51,11 @@ __all__ = ("D23MuLinesConf",
 #############################################################################
 
 from Gaudi.Configuration import *
-from Configurables import FilterDesktop, CombineParticles, DaVinci__N3BodyDecays
+from Configurables import DaVinci__N3BodyDecays
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 # from StrippingSelections.Utils import checkConfig
-from GaudiKernel.PhysicalConstants import c_light
 
 #############################################################################
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingDarkBoson.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingDarkBoson.py
index 754d0f38050b7a4694b6c0d51d824b1e808d61c3..e79bed1bf4d9ba4dcb692145cb4e20d25fe0063e 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingDarkBoson.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingDarkBoson.py
@@ -17,23 +17,18 @@ Author: M. Williams, D. Craik
 from Configurables import DiElectronMaker, ProtoParticleCALOFilter
 from GaudiConfUtils.ConfigurableGenerators import DaVinci__N3BodyDecays
 from CommonParticles.Utils import *
-from copy import deepcopy
 from Configurables import SubstitutePID
 from StandardParticles import StdAllLooseGammaLL, StdAllLooseGammaDD, \
     StdAllLooseElectrons, StdLooseAllPhotons  # , StdDiElectronFromTracks
 from Beauty2Charm_LoKiCuts import LoKiCuts
 from StandardParticles import StdAllNoPIDsPions, StdAllNoPIDsKaons, \
-    StdAllNoPIDsProtons, StdNoPIDsUpPions, StdAllLooseMuons, \
-    StdLooseDownMuons
-from Configurables import LoKi__VoidFilter
+    StdAllLooseMuons, StdLooseDownMuons
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import EventSelection
 from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
 from Gaudi.Configuration import *
-import re
 __author__ = ['Mike Williams', 'Dan Craik']
 
 moduleName = 'DarkBoson'
@@ -364,7 +359,7 @@ class DarkBosonConf(LineBuilder):
         mmDDX = makeX(
             'MuMuDD', default_config['XDD'], 'KS0 -> mu+ mu-', [muDX])
         kkX = makeX('KK', default_config['XLL'], 'KS0 -> K+ K-', [kX])
-        kkDDX = makeX('KKDD', default_config['XDD'], 'KS0 -> K+ K-', [kDX])
+        makeX('KKDD', default_config['XDD'], 'KS0 -> K+ K-', [kDX])
         pipiX = makeX(
             'PiPi', default_config['XLLhard'], 'KS0 -> pi+ pi-', [piX])
         pipiDDX = makeX(
@@ -419,7 +414,7 @@ class DarkBosonConf(LineBuilder):
             'PiPiSSDD', default_config['XDD'], '[KS0 -> pi+ pi+]cc', [piDX])
         preSS = default_config['Prescales']['SS']
 
-        preDD = default_config['Prescales']['DD']
+        default_config['Prescales']['DD']
         preKK = default_config['Prescales']['KK']
 
         j = makeJ(default_config['J'], [muJ])
@@ -630,7 +625,7 @@ class DarkBosonConf(LineBuilder):
         kst = filterKst()
         self._makeBLine('B2JKst', ['[B0 -> J/psi(1S) K*(892)0]cc'],
                         [j, kst], default_config['B2KX'])
-        rho = makeRho([piB])
+        makeRho([piB])
         # self._makeBLine('B2RhoX2MuMu',['B0 -> rho(770)0 KS0'],[rho,mmX],
         #                default_config['B2HHX'])
         # self._makeBLine('B2RhoX2MuMuDD',['B0 -> rho(770)0 KS0'],[rho,mmDDX],
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingDoubleSLForRX.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingDoubleSLForRX.py
index f7e5ccc228e7525247584f38f94bf53502f3cdea..3116bd40e9e8d6da906924d79ac8c85fabf37565 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingDoubleSLForRX.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingDoubleSLForRX.py
@@ -19,7 +19,6 @@ from GaudiConfUtils.ConfigurableGenerators import (CombineParticles,
                                                    DaVinci__N3BodyDecays)
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from Gaudi.Configuration import *
 __author__ = 'M. Kreps, T. Blake, D. Loh'
 __date__ = '10/11/2016'
 __version__ = '$Revision: 1.0$'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingHypb2L0HGamma.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingHypb2L0HGamma.py
index 83e2745fd58ace3d154d5c84e17588243850ee63..e33667deb325d3bc47009996d2c37915a3a42fd3 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingHypb2L0HGamma.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingHypb2L0HGamma.py
@@ -16,8 +16,8 @@ __all__ = ('Hypb2L0HGammaConf',
            'default_config', )
 
 from Gaudi.Configuration import *
-from Configurables import FilterDesktop, CombineParticles, TisTosParticleTagger
-from PhysSelPython.Wrappers import Selection, MergedSelection, DataOnDemand
+from Configurables import CombineParticles, FilterDesktop
+from PhysSelPython.Wrappers import DataOnDemand, Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from StandardParticles import StdLooseAllPhotons
@@ -495,7 +495,7 @@ def tisTosSelection(sel, TISTOSdict):
 
 
 def makevelotracks(name):
-    from Configurables import FastVeloTracking, TrackPrepareVelo, DecodeVeloRawBuffer, TrackEventFitter, TrackStateInitAlg,  TrackContainerCopy
+    from Configurables import FastVeloTracking, TrackContainerCopy, TrackStateInitAlg
     from TrackFitter.ConfiguredFitters import ConfiguredEventFitter
 
     MyFastVeloTracking = FastVeloTracking(
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingK0s2XXMuMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingK0s2XXMuMu.py
index 454c44356bf363573cfae8fad85f13e9b83e92ea..dc8a94331712da6fda2d902eeaadf4a4c7f30f0f 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingK0s2XXMuMu.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingK0s2XXMuMu.py
@@ -19,9 +19,7 @@ from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection
 from StandardParticles import StdAllLoosePions, StdAllLooseMuons
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-from GaudiKernel.PhysicalConstants import c_light
-from GaudiKernel.SystemOfUnits import MeV, m, mm, picosecond
-from Gaudi.Configuration import *
+from GaudiKernel.SystemOfUnits import MeV, mm, picosecond
 __author__ = ['Miguel Ramos Pernas']
 __date__ = '10/10/2017'
 __version__ = '$Revision: 0.00 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingKshort2Leptons.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingKshort2Leptons.py
index 67d107ee83706c36aa632cb5fa02a0f94c867573..22bd7388a2a3885597300244554f814dc453b243 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingKshort2Leptons.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingKshort2Leptons.py
@@ -20,7 +20,6 @@ from StandardParticles import StdAllNoPIDsElectrons
 from StandardParticles import StdNoPIDsUpPions
 from StandardParticles import StdAllNoPIDsPions
 from StandardParticles import StdAllLooseMuons
-from StandardParticles import StdAllNoPIDsMuons
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingKshort2MuMuMuMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingKshort2MuMuMuMu.py
index 86a943e5a6fb41852c6a9f29c92389947b9c890f..81ef82f2043ed504638103a44bd0a0e915d41771 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingKshort2MuMuMuMu.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingKshort2MuMuMuMu.py
@@ -15,15 +15,12 @@ derived, in large measure, from StrippingKshort2PiPiMuMu.py
 '''
 
 from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays
-from GaudiKernel.SystemOfUnits import MeV
-from StandardParticles import StdNoPIDsDownPions, StdLooseDownMuons
-from StandardParticles import StdAllLoosePions, StdAllLooseMuons, StdAllNoPIDsPions
-from StandardParticles import StdLoosePions, StdLooseMuons, StdNoPIDsPions
+from StandardParticles import StdLooseDownMuons
+from StandardParticles import StdAllLooseMuons
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
+from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
 __author__ = ['Mike Sokoloff']
 __date__ = '07 January 2014'
 __version__ = '$Revision: 0.1 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingKshort2PiPiMuMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingKshort2PiPiMuMu.py
index 0955f65fa0e2efdcb575b1c11a7ad439f53a1944..07b134c737342e2921702f4d74fa30eda7121cf9 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingKshort2PiPiMuMu.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingKshort2PiPiMuMu.py
@@ -10,15 +10,12 @@
 ###############################################################################
 
 from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays
-from GaudiKernel.SystemOfUnits import MeV
 from StandardParticles import StdNoPIDsDownPions, StdLooseDownMuons
-from StandardParticles import StdAllLoosePions, StdAllLooseMuons, StdAllNoPIDsPions
-from StandardParticles import StdLoosePions, StdLooseMuons, StdNoPIDsPions
+from StandardParticles import StdAllLooseMuons, StdAllLoosePions
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
+from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
 __author__ = ['Mike Sokoloff']
 __date__ = '25/10/2012'
 __version__ = '$Revision: 0.1 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingKshort2eePiPi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingKshort2eePiPi.py
index 5ac8f83630db4b9cf4e5a235dd3ceeb48b0a2a95..d8b95bcb790eaafc5b7c90a8f83fe5663eee0c11 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingKshort2eePiPi.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingKshort2eePiPi.py
@@ -23,7 +23,6 @@ from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection
 from GaudiConfUtils.ConfigurableGenerators import DaVinci__N3BodyDecays as Combine3Particles
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
-from Gaudi.Configuration import *
 __author__ = ['Carla Marin', 'Xabier Cid Vidal',  'Adrian Casais Vidal']
 __date__ = '23/02/2018'
 __version__ = '$2.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingLFVLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingLFVLines.py
index c3458781eb83744dc2820565a0f47b37b5fc2d0a..2e36db58ca9de1003ed6876cdfe53d8f1ccd6f4d 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingLFVLines.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingLFVLines.py
@@ -23,14 +23,12 @@ __all__ = ('LFVLinesConf',
            'default_config',
            )
 
-from Gaudi.Configuration import *
 # from Configurables import FilterDesktop, CombineParticles
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, DaVinci__N3BodyDecays
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N3BodyDecays
 from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from GaudiKernel.PhysicalConstants import c_light
-from GaudiKernel.SystemOfUnits import GeV, MeV, mm
+from GaudiKernel.SystemOfUnits import MeV, mm
 from copy import deepcopy
 #
 # Configure related info tools
@@ -1223,7 +1221,7 @@ class LFVLinesConf(LineBuilder):
         hemu_name = name+'B2heMu'
         pmu_name = name+'B2hMu'
         bu_name = name+'Bu2KJPsiee'
-        taumu_name = name+'B2TauMu'
+        name+'B2TauMu'
         htaumu_name = name+'B2hTauMu'
         muetap_gamma_name = name+'Tau2MuEtaP2pipig'
         muetap_pi_name = name+'Tau2MuEtaP2pipipi'
@@ -1716,7 +1714,6 @@ def makeB2TauMu(name):
         "& (BPVVDCHI2> 225)"\
         "& (BPVIPCHI2()< 25) "
 
-    from CommonParticles import StdLooseDetachedTau, StdLooseDipion
     _stdLooseMuons = DataOnDemand(Location="Phys/StdLooseMuons/Particles")
     _stdLooseDetachedTaus = DataOnDemand(
         Location="Phys/StdLooseDetachedTau3pi/Particles")
@@ -2356,7 +2353,6 @@ def makeB2hTauMu(name):
                           "& (BPVVDCHI2> 225)"\
                           "& (BPVIPCHI2()< 16) "  # maybe 16
 
-    from CommonParticles import StdLooseDetachedTau, StdLooseDipion
     _stdLooseMuons = DataOnDemand(Location="Phys/StdLooseMuons/Particles")
     _stdLooseDetachedTaus = DataOnDemand(
         Location="Phys/StdLooseDetachedTau3pi/Particles")
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingLb2L0Gamma.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingLb2L0Gamma.py
index 802119884510c53e5cf00d3e4788223b09ab5a71..bfcf8336af14cb0e5ff39ae2da6502181e9066d9 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingLb2L0Gamma.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingLb2L0Gamma.py
@@ -25,9 +25,6 @@ __date__ = "14.11.2016"
 __version__ = "2.0"
 __all__ = ("default_config", "StrippingLb2L0GammaConf")
 
-import os
-
-from Gaudi.Configuration import *
 
 from Configurables import CombineParticles
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
@@ -36,9 +33,7 @@ from PhysSelPython.Wrappers import Selection, MergedSelection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 
-from StandardParticles import StdAllNoPIDsPions, StdAllNoPIDsProtons
 from StandardParticles import StdLooseAllPhotons, StdAllLooseGammaDD, StdAllLooseGammaLL
-from StandardParticles import StdVeryLooseDetachedKst2Kpi
 from StandardParticles import StdLooseJpsi2MuMu
 
 default_config = {'NAME': 'Lb2L0Gamma',
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingLc23MuLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingLc23MuLines.py
index b2244bd7aa9f116d9783ce03a8fc1944cde17b39..3d97e939f7633e3e700dd756976cae1b815955f7 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingLc23MuLines.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingLc23MuLines.py
@@ -68,12 +68,11 @@ __all__ = ("Lc23MuLinesConf",
 ###################################################################################################
 
 from Gaudi.Configuration import *
-from Configurables import FilterDesktop, CombineParticles, DaVinci__N3BodyDecays, DaVinci__N4BodyDecays
+from Configurables import CombineParticles, DaVinci__N3BodyDecays, DaVinci__N4BodyDecays
 # from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from GaudiKernel.PhysicalConstants import c_light
 
 ###################################################################################################
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingPhiToKSKS.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingPhiToKSKS.py
index ff157859dd3877ab38f9cad234fb49a80418e50d..1a62ef5db16a204dc0a3d66d1fd1d1f75d4a04d4 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingPhiToKSKS.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingPhiToKSKS.py
@@ -23,8 +23,7 @@ from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from StandardParticles import StdAllLooseKaons, StdAllLooseMuons
-from Configurables import FitDecayTrees
-from PhysSelPython.Wrappers import AutomaticData, MergedSelection
+from PhysSelPython.Wrappers import MergedSelection
 
 __all__ = ('PhiToKSKSAllLinesConf',
            'TOSFilter',
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingRareNStrange.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingRareNStrange.py
index 95f70d0b641829f0a44259b730566f4c68fa1093..98b3814df4bee7388e334a0c9969c741474a9f63 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingRareNStrange.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingRareNStrange.py
@@ -10,9 +10,8 @@
 ###############################################################################
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection, AutomaticData
+from PhysSelPython.Wrappers import Selection
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = 'Diego Martinez Santos, Carlos Vazquez, Xabier Cid, Jessica Prisciandaro, Miguel Ramos Pernas'
 __date__ = '08/05/2015'
 __version__ = '$Revision: Not sure $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingRareStrange.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingRareStrange.py
index 6f7264e1db8f4045b2b139a11daa3e90056e3c44..bba73d994ee42cf94a9237f00597a4d7be7cc54d 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingRareStrange.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingRareStrange.py
@@ -59,15 +59,11 @@ __all__ = ('RareStrangeLinesConf',
 from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 from GaudiConfUtils.ConfigurableGenerators import DaVinci__N3BodyDecays as Combine3Particles
-from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays as Combine4Particles
-from CommonParticles import StdNoPIDsDownElectrons
 from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from GaudiKernel.PhysicalConstants import c_light
-from StandardParticles import (StdAllNoPIDsPions, StdNoPIDsDownPions,
-                               StdLoosePions, StdLooseDownMuons,
-                               StdLooseMergedPi0, StdLooseResolvedPi0, StdLooseDalitzPi0)
+from StandardParticles import (StdLooseMergedPi0, StdLooseResolvedPi0,
+                               StdLooseDalitzPi0)
 
 # from CommonParticles.StdLooseDalitzPi0 import (StdLoosePi02gee, StdLoosePi024e)
 
@@ -2786,7 +2782,7 @@ def makeLambdaPPiEE(name, config, inputs):
 
 
 def makevelotracks(name):
-    from Configurables import FastVeloTracking, TrackPrepareVelo, DecodeVeloRawBuffer, TrackEventFitter, TrackStateInitAlg,  TrackContainerCopy
+    from Configurables import FastVeloTracking, TrackContainerCopy, TrackStateInitAlg
     from TrackFitter.ConfiguredFitters import ConfiguredEventFitter
 
     MyFastVeloTracking = FastVeloTracking(
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingStrangeHadrons.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingStrangeHadrons.py
index 5c16fb7fd63ec1f15df76e17b03a96af7c5a4c61..e2488a937f3c160c5d1dc0bbb81310ee8ff58466 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingStrangeHadrons.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingStrangeHadrons.py
@@ -35,23 +35,12 @@ __all__ = ('default_config',
            'StrangeHadronsConf',
            )
 
-import os
 
-from Gaudi.Configuration import *
-
-from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-
-from GaudiConfUtils.ConfigurableGenerators import DaVinci__N3BodyDecays as Combine3Particles
-from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays as Combine4Particles
-from CommonParticles import StdNoPIDsDownElectrons
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
+from PhysSelPython.Wrappers import DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from GaudiKernel.PhysicalConstants import c_light
 from GaudiKernel.SystemOfUnits import MeV
 
-from StandardParticles import StdAllNoPIDsPions, StdLoosePions, StdLooseProtons, StdAllLoosePions, StdAllLooseMuons
-from StandardParticles import StdLooseAllPhotons
 ##
 from PhysConf.Selections import CombineSelection
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingStrangeSL.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingStrangeSL.py
index 5134ef5434ea3f244733fc6ac26485b868c228fb..26590be4ba73ad6710f007e7e831cea2a4a4b23a 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingStrangeSL.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingStrangeSL.py
@@ -36,23 +36,12 @@ __all__ = ('default_config',
            'StrangeSLConf',
            )
 
-import os
 
-from Gaudi.Configuration import *
-
-from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-
-from GaudiConfUtils.ConfigurableGenerators import DaVinci__N3BodyDecays as Combine3Particles
-from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays as Combine4Particles
-from CommonParticles import StdNoPIDsDownElectrons
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
+from PhysSelPython.Wrappers import DataOnDemand, Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from GaudiKernel.PhysicalConstants import c_light
 from GaudiKernel.SystemOfUnits import MeV
 
-from StandardParticles import StdAllNoPIDsPions, StdLoosePions, StdLooseProtons, StdAllLoosePions, StdAllLooseMuons, StdAllLooseElectrons
-from StandardParticles import StdLooseMergedPi0, StdLooseResolvedPi0, StdLooseDalitzPi0
 from PhysConf.Selections import CombineSelection
 
 default_config = {
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingTau23MuLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingTau23MuLines.py
index 6adb37dd06aeeb58dcd798447fe8b5ee90fa6e99..b2fa9b13c2441549d3939f19589727c3e261e09d 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingTau23MuLines.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingTau23MuLines.py
@@ -35,7 +35,6 @@ from GaudiConfUtils.ConfigurableGenerators import DaVinci__N5BodyDecays as Combi
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from GaudiKernel.PhysicalConstants import c_light
 
 default_config = {
     'NAME': 'Tau23Mu',
@@ -70,7 +69,7 @@ class Tau23MuLinesConf(LineBuilder):
         # checkConfig(Bs2MuMuLinesConf.__configuration_keys__,config)
 
         tau_name = name+'Tau23Mu'
-        ds23PiTIS_name = name+'Ds23PiTIS'
+        name+'Ds23PiTIS'
         ds23Pi_name = name+'Ds23Pi'
         ds2PhiPi_name = name+'Ds2PhiPi'
         tau25_name = name+'Tau25Mu'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingTau2LambdaMuLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingTau2LambdaMuLines.py
index 6f7caa01d008433cca4a3184d6bdfeb2a9bcd909..2e5401740f914b698345c335bfe29788f1e7ed2e 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingTau2LambdaMuLines.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingTau2LambdaMuLines.py
@@ -16,12 +16,10 @@ Exported symbols (use python help!):
    - 
 '''
 
-from GaudiKernel.PhysicalConstants import c_light
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
-from Configurables import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
+from Configurables import CombineParticles
 __author__ = ['Marcin Chrzaszcz']
 __date__ = '14/12/2012'
 __version__ = '$Revision: 1.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingZVTOP.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingZVTOP.py
index f4ee63f69c4320486335e4fa797004ccb36ecca4..6b5cbfa74e249908ea9e854e9c0f238ebdd2d9cf 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingZVTOP.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingRD/StrippingZVTOP.py
@@ -9,14 +9,12 @@
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
 from Configurables import TopoTauAlg, TopoVertexTool
-from StandardParticles import StdLooseKaons
-from StandardParticles import StdLoosePions, StdTightPions
-from StandardParticles import StdNoPIDsKaons, StdNoPIDsPions
+from StandardParticles import StdLoosePions
+from StandardParticles import StdNoPIDsPions
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, OfflineVertexFitter
-from Gaudi.Configuration import *
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop
 __author__ = ['Giampi Mancinelli', 'Julien Cogan', 'Justine Serrano']
 
 __date__ = '14/01/2014'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingSL/StrippingB23MuNu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingSL/StrippingB23MuNu.py
index 11d81c34fb0178677727235bc3bd636b83427207..97c4220c4e62f1a00d3c320d5f76806aba8c4c4a 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingSL/StrippingB23MuNu.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingSL/StrippingB23MuNu.py
@@ -19,15 +19,12 @@ __all__ = ('B23MuNuConf')
 Stripping selection for B to three muons and a neutrino.
 """
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop
 
-from PhysSelPython.Wrappers import Selection, AutomaticData, MergedSelection
+from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from LHCbKernel.Configuration import *  # check if needed
-from Configurables import SubstitutePID
-from Configurables import SubPIDMMFilter
 
 
 #################
@@ -161,15 +158,13 @@ class B23MuNuConf(LineBuilder):
         """
         Creates Jpsi as proxy for dimuon
         """
-        from PhysSelPython.Wrappers import AutomaticData, Selection, SelectionSequence, DataOnDemand, MergedSelection
+        from PhysSelPython.Wrappers import Selection
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         # from Configurables import CombineParticles
 
         CombineJpsi = CombineParticles(DecayDescriptors=["J/psi(1S) -> mu+ mu-", "[J/psi(1S) -> mu+ mu+]cc"],
                                        MotherCut="ALL")
 
-        sel_name = "Jpsi"
-
         from PhysSelPython.Wrappers import Selection
         SelJpsi = Selection("Sel_" + self.name + "_Jpsi", Algorithm=CombineJpsi,
                             RequiredSelections=[self.Muons])
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingSL/StrippingB2DMuForTauMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingSL/StrippingB2DMuForTauMu.py
index bbb6591f636c547192b1c9759ebfeedf27b88e2b..8bd9a436ea3d941e0b4ec5b3610d262206579753 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingSL/StrippingB2DMuForTauMu.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingSL/StrippingB2DMuForTauMu.py
@@ -18,12 +18,10 @@ __version__ = '$Revision: 2.0 $'
 
 from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from PhysSelPython.Wrappers import Selection, DataOnDemand
+from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from StandardParticles import StdLoosePions, StdAllLooseMuons, StdLooseKaons, StdLooseProtons, StdAllLoosePions, StdLooseMergedPi0, StdLooseResolvedPi0, StdAllNoPIDsMuons, StdLooseANNUpPions
-from Configurables import ConjugateNeutralPID
-from PhysSelPython.Wrappers import MergedSelection
+from StandardParticles import StdAllLooseMuons, StdAllNoPIDsMuons, StdLooseKaons, StdLoosePions, StdLooseProtons
 
 __all__ = ('B2DMuForTauMuconf',
            # 'makeb2DMuX',
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingSL/StrippingB2DMuNuX.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingSL/StrippingB2DMuNuX.py
index 5336bea5bd5d1a8013b026a62b999e808bf61eab..3736f86309ec24b62f81a2c483ee5e5d23d7fad9 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingSL/StrippingB2DMuNuX.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingSL/StrippingB2DMuNuX.py
@@ -13,14 +13,13 @@ __date__ = '23/07/2010'
 __version__ = '$Revision: 5.0 $'
 
 from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
+from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
 from PhysSelPython.Wrappers import Selection
-from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from StandardParticles import StdLoosePions, StdLooseMuons, StdLooseKaons, StdLooseProtons, StdLooseElectrons
 from StandardParticles import StdNoPIDsPions, StdNoPIDsKaons, StdNoPIDsProtons, StdNoPIDsMuons
 from StrippingB2DMuNuXUtils import *
-from GaudiKernel.SystemOfUnits import MeV, GeV, cm, mm
+from GaudiKernel.SystemOfUnits import GeV, MeV, mm
 
 __all__ = ('B2DMuNuXAllLinesConf',
            'default_config')
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingSL/StrippingB2DMuNuXUtils.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingSL/StrippingB2DMuNuXUtils.py
index 6130e13de2c5b9fe72cd44d5967aeceaa4452074..e91f29e3fa36cef61e702f06f89eb4418ddf4695 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingSL/StrippingB2DMuNuXUtils.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingSL/StrippingB2DMuNuXUtils.py
@@ -13,11 +13,9 @@ __date__ = '06/03/2015'
 __version__ = '$Revision: 0.0 $'
 
 from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
-from StrippingUtils.Utils import LineBuilder
-from StandardParticles import StdLoosePions, StdLooseMuons, StdLooseKaons, StdLooseProtons, StdNoPIDsPions, StdLooseElectrons, StdNoPIDsMuons
 
 
 def BtoDlnuLine(module_name,
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingSL/StrippingB2Dlnu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingSL/StrippingB2Dlnu.py
index 0c8d00bd94717af821926626f5446a85cb20a902..b05a05c95319c31661cfe61524eca70e234905c3 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingSL/StrippingB2Dlnu.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingSL/StrippingB2Dlnu.py
@@ -17,12 +17,10 @@ __version__ = '$Revision: 1.0 $'
 
 from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from PhysSelPython.Wrappers import Selection, DataOnDemand
+from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from StandardParticles import StdLoosePions, StdLooseMuons, StdLooseKaons, StdLooseProtons, StdAllLoosePions, StdLooseMergedPi0, StdLooseResolvedPi0, StdAllNoPIDsMuons, StdLooseANNUpPions, StdLooseElectrons
-from Configurables import ConjugateNeutralPID
-from PhysSelPython.Wrappers import MergedSelection
+from StandardParticles import StdAllNoPIDsMuons, StdLooseElectrons, StdLooseKaons, StdLooseMuons, StdLoosePions
 
 __all__ = ('B2DMuForLNuconf',
            # 'makeb2DMuX',
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingSL/StrippingB2Dst0MuNu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingSL/StrippingB2Dst0MuNu.py
index 3f6fd96ade4433b51152a37ee46ccbd072892fbe..e98d2b4850975113ec77abeed5a53c59a6ba950c 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingSL/StrippingB2Dst0MuNu.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingSL/StrippingB2Dst0MuNu.py
@@ -12,12 +12,11 @@ __author__ = ['Michel De Cian']
 __date__ = '12/12/2018'
 __version__ = '$Revision: 0.0 $'
 
-from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from PhysSelPython.Wrappers import Selection, DataOnDemand
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
+from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from StandardParticles import StdLoosePions, StdLooseMuons, StdLooseKaons, StdAllLoosePions, StdAllLooseElectrons, StdLooseResolvedPi0, StdLooseMergedPi0, StdLooseDalitzPi0
+from StandardParticles import StdAllLooseElectrons, StdLooseDalitzPi0, StdLooseKaons, StdLooseMergedPi0, StdLooseMuons, StdLoosePions, StdLooseResolvedPi0
 
 __all__ = ('B2Dst0MuNuAllLinesConf',
            'TOSFilter',
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingSL/StrippingB2DstMuNuIncl.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingSL/StrippingB2DstMuNuIncl.py
index 6abd041bf344194b0ad86747d5d5622ae5fdddf9..3a91f70e613b554c2c0d5b7095d89a8eb3c67f3d 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingSL/StrippingB2DstMuNuIncl.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingSL/StrippingB2DstMuNuIncl.py
@@ -12,9 +12,8 @@ __author__ = ['Mika Vesterinen']
 __date__ = '04/04/2015'
 __version__ = '$Revision: 0.0 $'
 
-from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from PhysSelPython.Wrappers import Selection, DataOnDemand
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
+from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from StandardParticles import StdLoosePions, StdLooseMuons, StdLooseKaons, StdAllLoosePions
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingSL/StrippingB2PPbarMuForTauMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingSL/StrippingB2PPbarMuForTauMu.py
index 1d97e42a98b40f8bef4d02281e5fd0b77ab45300..5eaa8cff0ccedf2007a0fc0b82bdb43f18bff30a 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingSL/StrippingB2PPbarMuForTauMu.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingSL/StrippingB2PPbarMuForTauMu.py
@@ -9,9 +9,7 @@
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
 
-import logging
 from StrippingUtils.Utils import LineBuilder
-from Gaudi.Configuration import *
 __author__ = ['Mark Smith']
 __date__ = '17/10/2016'
 __version__ = '$Revision: 1.0 $'
@@ -107,8 +105,6 @@ class B2PPbarMuForTauMuBuilder(LineBuilder):
     def __init__(self, name, config):
         LineBuilder.__init__(self, name, config)
 
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
-
         self.GECs = {"Code": "( recSummary(LHCb.RecSummary.nSPDhits,'Raw/Spd/Digits') < %(GEC_nSPDHits)s )" % config,
                      "Preambulo": ["from LoKiTracks.decorators import *"]}
 
@@ -437,7 +433,7 @@ class B2PPbarMuForTauMuBuilder(LineBuilder):
     ###### B->ppMuNu Signal ######
     def _bhad2PMuX_B(self):
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-        from PhysSelPython.Wrappers import Selection, MergedSelection
+        from PhysSelPython.Wrappers import Selection
 
         _pMu = CombineParticles(
             DecayDescriptors=self._config["DECAYS"], ReFitPVs=True)
@@ -454,7 +450,7 @@ class B2PPbarMuForTauMuBuilder(LineBuilder):
     ###### B->ppMuNu Signal for Topo Line ######
     def _bhad2PMuX_BTopo(self):
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-        from PhysSelPython.Wrappers import Selection, MergedSelection
+        from PhysSelPython.Wrappers import Selection
 
         _pMu = CombineParticles(
             DecayDescriptors=self._config["DECAYS"], ReFitPVs=True)
@@ -471,7 +467,7 @@ class B2PPbarMuForTauMuBuilder(LineBuilder):
     ###### B->ppMuNu Same-Sign protons ######
     def _bhad2PMuX_B_SS(self):
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-        from PhysSelPython.Wrappers import Selection, MergedSelection
+        from PhysSelPython.Wrappers import Selection
 
         _pMu = CombineParticles(
             DecayDescriptors=self._config["DECAYS"], ReFitPVs=True)
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingSL/StrippingB2XTauNu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingSL/StrippingB2XTauNu.py
index 7e086d88664dbe28a77ab80ac882b7a7014366c9..6ace30c6ea487c9ee422ba92f199da4e11ac0085 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingSL/StrippingB2XTauNu.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingSL/StrippingB2XTauNu.py
@@ -610,7 +610,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         self.__MakeB0d2DdoubleStar2PiDstar02GammaD0TauNuNonPhysTau__()
 
         from StrippingConf.StrippingLine import StrippingLine
-        from PhysSelPython.Wrappers import SelectionSequence
 
         # TisTos filter
         def filterTisTos(name, Input, myTisTosSpecs):
@@ -1365,7 +1364,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
 
         from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseJpsi2MuMu
 
         JpsiForBc = FilterDesktop(
             Code=self.totalJpsiCut
@@ -1384,7 +1382,7 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
 
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
+        from PhysSelPython.Wrappers import Selection
         from StandardParticles import StdLoosePions
 
         CombDdoubleStar02DstarPi = CombineParticles(
@@ -1405,7 +1403,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3pi/Particles')
@@ -1428,7 +1425,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3pi/Particles')
@@ -1453,7 +1449,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3pi/Particles')
@@ -1477,7 +1472,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTauNonPhys
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3piNonPhys/Particles')
@@ -1501,7 +1495,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3pi/Particles')
@@ -1526,7 +1519,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3pi/Particles')
@@ -1551,7 +1543,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTauNonPhys
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3piNonPhys/Particles')
@@ -1575,7 +1566,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3pi/Particles')
@@ -1600,7 +1590,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3pi/Particles')
@@ -1625,7 +1614,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTauNonPhys
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3piNonPhys/Particles')
@@ -1650,7 +1638,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3pi/Particles')
@@ -1674,7 +1661,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTauNonPhys
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3piNonPhys/Particles')
@@ -1698,7 +1684,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3pi/Particles')
@@ -1723,7 +1708,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3pi/Particles')
@@ -1748,7 +1732,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTauNonPhys
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3piNonPhys/Particles')
@@ -1773,7 +1756,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3pi/Particles')
@@ -1799,7 +1781,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3pi/Particles')
@@ -1823,7 +1804,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3pi/Particles')
@@ -1849,7 +1829,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3pi/Particles')
@@ -1874,7 +1853,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTauNonPhys
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3piNonPhys/Particles')
@@ -1900,7 +1878,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3pi/Particles')
@@ -1924,7 +1901,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3pi/Particles')
@@ -1947,7 +1923,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3pi/Particles')
@@ -1971,7 +1946,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3pi/Particles')
@@ -1995,7 +1969,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTauNonPhys
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3piNonPhys/Particles')
@@ -2019,7 +1992,7 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
 
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
+        from PhysSelPython.Wrappers import Selection
         from StandardParticles import StdLooseResolvedPi0
 
         CombDStar02Pi0D0 = CombineParticles(
@@ -2039,7 +2012,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3pi/Particles')
@@ -2062,7 +2034,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3pi/Particles')
@@ -2085,7 +2056,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3piNonPhys/Particles')
@@ -2108,7 +2078,7 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
 
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
+        from PhysSelPython.Wrappers import Selection
         from StandardParticles import StdLooseAllPhotons
 
         CombDStar02GammaD0 = CombineParticles(
@@ -2128,7 +2098,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3pi/Particles')
@@ -2151,7 +2120,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3pi/Particles')
@@ -2174,7 +2142,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3piNonPhys/Particles')
@@ -2196,7 +2163,7 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
 
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
+        from PhysSelPython.Wrappers import Selection
         from StandardParticles import StdLoosePions
 
         CombDdoubleStar2PiDstar02Pi0D0 = CombineParticles(
@@ -2216,7 +2183,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3pi/Particles')
@@ -2239,7 +2205,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3pi/Particles')
@@ -2262,7 +2227,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3piNonPhys/Particles')
@@ -2284,7 +2248,7 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
 
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
+        from PhysSelPython.Wrappers import Selection
         from StandardParticles import StdLoosePions
 
         CombDdoubleStar2PiDstar02GammaD0 = CombineParticles(
@@ -2304,7 +2268,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3pi/Particles')
@@ -2327,7 +2290,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3pi/Particles')
@@ -2350,7 +2312,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3piNonPhys/Particles')
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingSL/StrippingB2XuENu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingSL/StrippingB2XuENu.py
index 73ab1a2a4e2c0a0a1016fb4040cc2e6b7b36c884..b59084d7969d22b0c34cc4c7c11b62ae657ce530 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingSL/StrippingB2XuENu.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingSL/StrippingB2XuENu.py
@@ -9,9 +9,7 @@
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
 
-import logging
 from StrippingUtils.Utils import LineBuilder
-from Gaudi.Configuration import *
 __author__ = ['Phillip Urquijo, Alessandra Borgia', 'Michel De Cian']
 __date__ = '11/01/2019'
 __version__ = '$Revision: 1.6 $'
@@ -243,7 +241,7 @@ class B2XuENuBuilder(LineBuilder):
     def __init__(self, name, config):
         LineBuilder.__init__(self, name, config)
         self.config = config
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
+        from PhysSelPython.Wrappers import DataOnDemand
         self._stdVeryLooseKsLL = DataOnDemand(
             "Phys/StdVeryLooseKsLL/Particles")
         self._stdLooseKsLD = DataOnDemand("Phys/StdLooseKsLD/Particles")
@@ -734,7 +732,7 @@ class B2XuENuBuilder(LineBuilder):
 
     # Bs -> K*/Kspi e nu lines
     def _Kstar_line(self):
-        NoPS = self.config['NoPrescales']
+        self.config['NoPrescales']
         from StrippingConf.StrippingLine import StrippingLine
         return StrippingLine(self._name+'Bs2Kstar_Line', prescale=1.0,
                              FILTER=self.GECs,
@@ -1055,8 +1053,8 @@ class B2XuENuBuilder(LineBuilder):
         if self._KSSel is not None:
             return self._KSSel
 
-        from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
+        from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
+        from PhysSelPython.Wrappers import Selection
 
         _code = FilterDesktop(Code=self._NominalKsSelection() % self._config)
 
@@ -1141,7 +1139,6 @@ class B2XuENuBuilder(LineBuilder):
 
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection
-        from StandardParticles import StdLoosePions
 
         _rho770 = CombineParticles(
             DecayDescriptors=["rho(770)0 -> pi- pi+"],
@@ -1171,7 +1168,6 @@ class B2XuENuBuilder(LineBuilder):
 
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection
-        from StandardParticles import StdLoosePions
 
         _rho770NoPID = CombineParticles(
             DecayDescriptors=["rho(770)0 -> pi- pi+"],
@@ -1201,7 +1197,6 @@ class B2XuENuBuilder(LineBuilder):
 
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection
-        from StandardParticles import StdLoosePions
 
         _rho770WS = CombineParticles(
             DecayDescriptors=["[rho(770)0 -> pi+ pi+]cc"],
@@ -1229,7 +1224,6 @@ class B2XuENuBuilder(LineBuilder):
 
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection
-        from StandardParticles import StdLoosePions
 
         _rho770SB = CombineParticles(
             DecayDescriptors=["rho(770)0 -> pi+ pi-"],
@@ -1341,7 +1335,7 @@ class B2XuENuBuilder(LineBuilder):
 
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection
-        from StandardParticles import StdLoosePions, StdLooseElectrons
+        from StandardParticles import StdLoosePions
 
         _Ksh = CombineParticles(
             DecayDescriptor="KS0 -> e- pi+",
@@ -1369,7 +1363,7 @@ class B2XuENuBuilder(LineBuilder):
 
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection
-        from StandardParticles import StdLoosePions, StdLooseElectrons
+        from StandardParticles import StdLoosePions
 
         _Ksh = CombineParticles(
             DecayDescriptor="KS0 -> e+ pi-",
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingSL/StrippingB2XuMuNu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingSL/StrippingB2XuMuNu.py
index e990a0f5fca381288d278a31edfe8c4be451c2d9..7dbf8f670c004436033f2172b635cf83469f0692 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingSL/StrippingB2XuMuNu.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingSL/StrippingB2XuMuNu.py
@@ -9,9 +9,7 @@
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
 
-import logging
 from StrippingUtils.Utils import LineBuilder
-from Gaudi.Configuration import *
 __author__ = ['Phillip Urquijo, Alessandra Borgia', 'Michel De Cian']
 __date__ = '11/01/2019'
 __version__ = '$Revision: 1.6 $'
@@ -238,7 +236,7 @@ class B2XuMuNuBuilder(LineBuilder):
     def __init__(self, name, config):
         LineBuilder.__init__(self, name, config)
         self.config = config
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
+        from PhysSelPython.Wrappers import DataOnDemand
         self._stdVeryLooseKsLL = DataOnDemand(
             "Phys/StdVeryLooseKsLL/Particles")
         self._stdLooseKsLD = DataOnDemand("Phys/StdLooseKsLD/Particles")
@@ -733,7 +731,7 @@ class B2XuMuNuBuilder(LineBuilder):
 
     # Bs -> K*/Kspi mu nu lines
     def _Kstar_line(self):
-        NoPS = self.config['NoPrescales']
+        self.config['NoPrescales']
         from StrippingConf.StrippingLine import StrippingLine
         return StrippingLine(self._name+'Bs2Kstar_Line', prescale=1.0,
                              FILTER=self.GECs,
@@ -1052,8 +1050,8 @@ class B2XuMuNuBuilder(LineBuilder):
         if self._KSSel is not None:
             return self._KSSel
 
-        from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
+        from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
+        from PhysSelPython.Wrappers import Selection
 
         _code = FilterDesktop(Code=self._NominalKsSelection() % self._config)
 
@@ -1138,7 +1136,6 @@ class B2XuMuNuBuilder(LineBuilder):
 
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection
-        from StandardParticles import StdLoosePions
 
         _rho770 = CombineParticles(
             DecayDescriptors=["rho(770)0 -> pi- pi+"],
@@ -1168,7 +1165,6 @@ class B2XuMuNuBuilder(LineBuilder):
 
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection
-        from StandardParticles import StdLoosePions
 
         _rho770NoPID = CombineParticles(
             DecayDescriptors=["rho(770)0 -> pi- pi+"],
@@ -1198,7 +1194,6 @@ class B2XuMuNuBuilder(LineBuilder):
 
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection
-        from StandardParticles import StdLoosePions
 
         _rho770WS = CombineParticles(
             DecayDescriptors=["[rho(770)0 -> pi+ pi+]cc"],
@@ -1226,7 +1221,6 @@ class B2XuMuNuBuilder(LineBuilder):
 
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection
-        from StandardParticles import StdLoosePions
 
         _rho770SB = CombineParticles(
             DecayDescriptors=["rho(770)0 -> pi+ pi-"],
@@ -1338,7 +1332,7 @@ class B2XuMuNuBuilder(LineBuilder):
 
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection
-        from StandardParticles import StdLoosePions, StdLooseMuons
+        from StandardParticles import StdLoosePions
 
         _Ksh = CombineParticles(
             DecayDescriptor="KS0 -> mu- pi+",
@@ -1366,7 +1360,7 @@ class B2XuMuNuBuilder(LineBuilder):
 
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection
-        from StandardParticles import StdLoosePions, StdLooseMuons
+        from StandardParticles import StdLoosePions
 
         _Ksh = CombineParticles(
             DecayDescriptor="KS0 -> mu+ pi-",
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingSL/StrippingCharmFromBSemiForHadronAsy.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingSL/StrippingCharmFromBSemiForHadronAsy.py
index a80fcb301fa6917bd97160506a3b0a679ff40777..ddaec2925512363daba54947938f97bdafffeb41 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingSL/StrippingCharmFromBSemiForHadronAsy.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingSL/StrippingCharmFromBSemiForHadronAsy.py
@@ -25,8 +25,7 @@ from Configurables import FilterDesktop, CombineParticles
 from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from StandardParticles import StdAllLoosePions, StdLoosePions, StdLooseMuons, StdLooseKaons, StdLooseProtons
-from Configurables import TisTosParticleTagger
+from StandardParticles import StdLooseKaons, StdLooseMuons, StdLoosePions
 
 __all__ = ('CharmFromBSemiForHadronAsyAllLinesConf',
            'TOSFilter',
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingSL/StrippingLb2LcMuNuX_Lc2L0Pi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingSL/StrippingLb2LcMuNuX_Lc2L0Pi.py
index 074ba01a451ce4cf74c483e687d7a71c404d4adb..729f75ac3c69725569c584dc08bdd9610f2b693a 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingSL/StrippingLb2LcMuNuX_Lc2L0Pi.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingSL/StrippingLb2LcMuNuX_Lc2L0Pi.py
@@ -16,14 +16,13 @@ __author__ = ['Scott Ely']
 __date__ = '23/01/2019'
 __version__ = '$Revision: 1.0 $'
 
-from Gaudi.Configuration import *
 from Configurables import FilterDesktop, CombineParticles
-from PhysSelPython.Wrappers import Selection, DataOnDemand
+from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from StandardParticles import StdLoosePions, StdLooseMuons, StdLooseKaons, StdLooseProtons, StdLooseElectrons, StdVeryLooseLambdaLL
-from StandardParticles import StdNoPIDsPions, StdNoPIDsKaons, StdNoPIDsProtons, StdNoPIDsMuons
-from GaudiKernel.SystemOfUnits import MeV, GeV, cm, mm
+from StandardParticles import StdLooseMuons, StdLoosePions, StdVeryLooseLambdaLL
+from StandardParticles import StdNoPIDsMuons
+from GaudiKernel.SystemOfUnits import GeV, MeV, mm
 
 __all__ = ('Lb2LcMuNuX_Lc2L0PiConf', 'default_config')
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingSL/StrippingLb2pMuNuVub.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingSL/StrippingLb2pMuNuVub.py
index cd969d689449a9dc069bd745b4acbc62f683dfda..e74c7de20e90982142bcf10f66be4a6cb90689e6 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingSL/StrippingLb2pMuNuVub.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingSL/StrippingLb2pMuNuVub.py
@@ -9,9 +9,7 @@
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
 
-import logging
 from StrippingUtils.Utils import LineBuilder
-from Gaudi.Configuration import *
 __author__ = ['William Sutcliffe']
 __date__ = '19/01/2014'
 __version__ = '$Revision: 1.0 $'
@@ -137,8 +135,6 @@ class Lb2pMuNuVubBuilder(LineBuilder):
     def __init__(self, name, config):
         LineBuilder.__init__(self, name, config)
 
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
-
         self.GECs = {"Code": "( recSummaryTrack(LHCb.RecSummary.nLongTracks, TrLONG) < %(GEC_nLongTrk)s )" % config,
                      "Preambulo": ["from LoKiTracks.decorators import *"]}
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingSL/Strippingbhad2PMuX.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingSL/Strippingbhad2PMuX.py
index e89305332152e8ebc4ee1e72a7f10cd8d9d2dfae..f46738721f8dbfce869e840a1aa8cbb13c6fdd2f 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingSL/Strippingbhad2PMuX.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r2/StrippingSL/Strippingbhad2PMuX.py
@@ -9,9 +9,7 @@
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
 
-import logging
 from StrippingUtils.Utils import LineBuilder
-from Gaudi.Configuration import *
 __author__ = ['William Sutcliffe', 'Patrick Owen']
 __date__ = '02/12/2015'
 __version__ = '$Revision: 2.0 $'
@@ -132,8 +130,6 @@ class bhad2PMuXBuilder(LineBuilder):
     def __init__(self, name, config):
         LineBuilder.__init__(self, name, config)
 
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
-
         self.GECs = {"Code": "( recSummaryTrack(LHCb.RecSummary.nLongTracks, TrLONG) < %(GEC_nLongTrk)s )" % config,
                      "Preambulo": ["from LoKiTracks.decorators import *"]}
 
@@ -455,7 +451,7 @@ class bhad2PMuXBuilder(LineBuilder):
     ###### Lb->pMuNu High M_corr Opposite Sign ######
     def _bhad2PMuX_Lb(self):
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-        from PhysSelPython.Wrappers import Selection, MergedSelection
+        from PhysSelPython.Wrappers import Selection
 
         _pMu = CombineParticles(
             DecayDescriptors=self._config["DECAYS"], ReFitPVs=True)
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingB2CC/StrippingB2JpsiHH.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingB2CC/StrippingB2JpsiHH.py
index 426a15a03fdb410fd33fba1d83ccac165f4c345b..ea80a2693083b0dd305af119c0794a0a03dd0088 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingB2CC/StrippingB2JpsiHH.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingB2CC/StrippingB2JpsiHH.py
@@ -20,18 +20,10 @@ __date__ = '10/11/2016'
 
 __all__ = ('B2JpsiHHConf', 'default_config')
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from CommonParticles.Utils import updateDoD
-from StandardParticles import StdLoosePions
-from StandardParticles import StdLooseKaons
-from StandardParticles import StdLooseProtons
-from StandardParticles import StdAllLooseKaons
-from StandardParticles import StdAllLooseProtons
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
+from PhysSelPython.Wrappers import DataOnDemand, Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from GaudiKernel.SystemOfUnits import MeV
 
 default_config = {
     'NAME': 'B2JpsiHH',
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingB2CC/StrippingB2JpsiPi0.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingB2CC/StrippingB2JpsiPi0.py
index 90740f80b4fbe5d7cdd945fc3fb2a4331ac1e49d..170baf2fb63c5dbaab6735a4dbe697c61ed379a3 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingB2CC/StrippingB2JpsiPi0.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingB2CC/StrippingB2JpsiPi0.py
@@ -14,15 +14,10 @@ __version__ = '$Revision: 1.1$'
 
 __all__ = ('B2JpsiPi0Conf', 'default_config')
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from CommonParticles.Utils import updateDoD
-from StandardParticles import StdLooseResolvedPi0
-from StandardParticles import StdLooseMergedPi0
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
+from PhysSelPython.Wrappers import DataOnDemand, Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from GaudiKernel.SystemOfUnits import MeV
 
 default_config = {
     # The real name of the lines is BetaS, this is a reference this for the Settings.
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingB2CC/StrippingB2JpsiPi0_Run1.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingB2CC/StrippingB2JpsiPi0_Run1.py
index 3f5f0443aa9132ab2494cbb48813c4ad8991fc1b..1bf462e0083a2da3704b1f804d03b10239ecd920 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingB2CC/StrippingB2JpsiPi0_Run1.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingB2CC/StrippingB2JpsiPi0_Run1.py
@@ -14,15 +14,10 @@ __version__ = '$Revision: 1.2$'
 
 __all__ = ('B2JpsiPi0Conf_RI', 'default_config')
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from CommonParticles.Utils import updateDoD
-from StandardParticles import StdLooseResolvedPi0
-from StandardParticles import StdLooseMergedPi0
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
+from PhysSelPython.Wrappers import DataOnDemand, Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from GaudiKernel.SystemOfUnits import MeV
 
 default_config = {
     # The real name of the lines is BetaS, this is a reference this for the Settings.
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingB2CC/StrippingB2JpsiX0.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingB2CC/StrippingB2JpsiX0.py
index d93a42cce82d84a0ed23627a007cbaad6d469573..e15a04497fca1b721a890552c1359e732098a2be 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingB2CC/StrippingB2JpsiX0.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingB2CC/StrippingB2JpsiX0.py
@@ -20,18 +20,10 @@ __date__ = '22/01/2018'
 
 __all__ = ('B2JpsiX0Conf', 'default_config')
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from CommonParticles.Utils import updateDoD
-from StandardParticles import StdLoosePions
-from StandardParticles import StdLooseKaons
-from StandardParticles import StdLooseProtons
-from StandardParticles import StdAllLooseKaons
-from StandardParticles import StdAllLooseProtons
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
+from PhysSelPython.Wrappers import DataOnDemand, Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from GaudiKernel.SystemOfUnits import MeV
 
 default_config = {
     'NAME': 'B2JpsiX0',
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingB2CC/StrippingB2JpsiXforBeta_s.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingB2CC/StrippingB2JpsiXforBeta_s.py
index f249942b6e70534073a342298d7e41c294d2ac84..83cfcf7fbfeca7d7da85f9148f6fff86360c328b 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingB2CC/StrippingB2JpsiXforBeta_s.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingB2CC/StrippingB2JpsiXforBeta_s.py
@@ -26,16 +26,12 @@ __version__ = '$Revision: 4.0$'
 
 __all__ = ('B2JpsiXforBeta_sConf', 'default_config')
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from CommonParticles.Utils import updateDoD
 from StandardParticles import StdLoosePions
 from StandardParticles import StdLooseKaons
-from StandardParticles import StdAllLooseKaons
 from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from GaudiKernel.SystemOfUnits import MeV
 
 default_config = {
     'NAME': 'BetaS',
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingB2CC/StrippingBd2JpsieeKS.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingB2CC/StrippingBd2JpsieeKS.py
index 447acfd66a8a888ea16f056888b1b5a41ccee167..ccac3244d5f71227250f84d9c5d0c485845ab5b3 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingB2CC/StrippingBd2JpsieeKS.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingB2CC/StrippingBd2JpsieeKS.py
@@ -8,16 +8,10 @@
 # granted to it by virtue of its status as an Intergovernmental Organization  #
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
-from GaudiKernel.SystemOfUnits import MeV
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
-from StandardParticles import StdAllLooseKaons
-from StandardParticles import StdLooseKaons
-from StandardParticles import StdLoosePions
-from CommonParticles.Utils import updateDoD
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = 'Ramon Niet'
 __date__ = '2014/10/23'
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingB2CC/StrippingBd2JpsieeKstar.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingB2CC/StrippingBd2JpsieeKstar.py
index 2f212b3648b3a956f93594588b6f5fd1a345b725..8ce24bba33857f9f52e405dfb33b6f4cfbc72be8 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingB2CC/StrippingBd2JpsieeKstar.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingB2CC/StrippingBd2JpsieeKstar.py
@@ -12,7 +12,6 @@ from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from Configurables import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = 'Artur Ukleja, Jibo He, Konrad Klimaszewski, Varvara Batozskaya'
 __date__ = '2019/01/22'
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingB2CC/StrippingBs2EtacPhiBDT.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingB2CC/StrippingBs2EtacPhiBDT.py
index b6e256eaa1235a84cbf3b68362eea9bf7f387897..30d69a2c110a19ab5a45303854da636781997f4f 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingB2CC/StrippingBs2EtacPhiBDT.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingB2CC/StrippingBs2EtacPhiBDT.py
@@ -17,7 +17,6 @@ from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
-from Gaudi.Configuration import *
 __author__ = ['Morgan Martin, Jibo He']
 __date__ = '20/08/2014'
 __version__ = '$Revision: 1.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingB2CC/StrippingBs2JpsieePhi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingB2CC/StrippingBs2JpsieePhi.py
index 933c2f46f93196ffa448a855cea7a82e5fca3652..ee8bf0cf2aad66cd3771f048a336fffb0ed8165d 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingB2CC/StrippingBs2JpsieePhi.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingB2CC/StrippingBs2JpsieePhi.py
@@ -12,7 +12,6 @@ from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from Configurables import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = 'Artur Ukleja, Jibo He, Konrad Klimaszewski'
 __date__ = '2011/03/01'
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingB2OC/Beauty2Charm_B2DXBuilder.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingB2OC/Beauty2Charm_B2DXBuilder.py
index 2d1c9d69a292481caadad4c128dc90547777bf58..d86ed2e85c6a4d8cd4220bde92edd4e1f99e0d84 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingB2OC/Beauty2Charm_B2DXBuilder.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingB2OC/Beauty2Charm_B2DXBuilder.py
@@ -12,11 +12,7 @@
 
 from copy import deepcopy
 from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-from PhysSelPython.Wrappers import Selection
-from Beauty2Charm_LoKiCuts import LoKiCuts
 from Beauty2Charm_Utils import *
-from Configurables import SubstitutePID
 
 # \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\#
 
@@ -1090,7 +1086,7 @@ class B2DXBuilder(object):
                                     "B- -> D*_2(2460)0 D0 K-"],
                   'B2D0st2460D0Pi': ["B+ -> D*_2(2460)0 D0 pi+",
                                      "B- -> D*_2(2460)0 D0 pi-"]}
-        input = self.dst.dpi_2460_pid+self.d.kpi_pid+self.topoKaons_PID
+        self.dst.dpi_2460_pid+self.d.kpi_pid+self.topoKaons_PID
         inputs = {'B2D0st2460D0K': self.dst.dpi_2460_pid+self.d.kpi_pid+self.topoKaons_PID,
                   'B2D0st2460D0Pi': self.dst.dpi_2460_pid+self.d.kpi_pid+self.topoPions_PID}
         rs = makeB2XSels(decays, '', inputs, self.config)
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingB2OC/Beauty2Charm_Bc2BXBuilder.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingB2OC/Beauty2Charm_Bc2BXBuilder.py
index 63ecc854364bae2f29d64ea2b95c3484988c7016..5bb9297a5c69f56bc7b9761489bf517623df7d3c 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingB2OC/Beauty2Charm_Bc2BXBuilder.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingB2OC/Beauty2Charm_Bc2BXBuilder.py
@@ -8,11 +8,9 @@
 # granted to it by virtue of its status as an Intergovernmental Organization  #
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
-from copy import deepcopy
 from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 from PhysSelPython.Wrappers import Selection, MergedSelection
-from Beauty2Charm_LoKiCuts import LoKiCuts
 from Beauty2Charm_Utils import *
 
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingB2OC/Beauty2Charm_Bc2DDBuilder.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingB2OC/Beauty2Charm_Bc2DDBuilder.py
index 17eda4547110606bb00b589ef9a9081a7ab985e7..44526bcd78bbc48eb6f8c6416c9eabdc38313ac4 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingB2OC/Beauty2Charm_Bc2DDBuilder.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingB2OC/Beauty2Charm_Bc2DDBuilder.py
@@ -11,10 +11,8 @@
 
 # \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\#
 
-from copy import deepcopy
 from Gaudi.Configuration import *
-from PhysSelPython.Wrappers import Selection, MergedSelection
-from Beauty2Charm_LoKiCuts import LoKiCuts
+from PhysSelPython.Wrappers import MergedSelection
 from Beauty2Charm_Utils import *
 # from Configurables import SubstitutePID
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingB2OC/Beauty2Charm_Bc2DXBuilder.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingB2OC/Beauty2Charm_Bc2DXBuilder.py
index 6f6b41a5a8d8e6494ece3c8a144bcc57574870b7..4965e7a83f1b9871f219ab719abb3e950ee03bbd 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingB2OC/Beauty2Charm_Bc2DXBuilder.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingB2OC/Beauty2Charm_Bc2DXBuilder.py
@@ -10,9 +10,6 @@
 ###############################################################################
 from copy import deepcopy
 from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-from PhysSelPython.Wrappers import Selection, MergedSelection
-from Beauty2Charm_LoKiCuts import LoKiCuts
 from Beauty2Charm_Utils import *
 
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingB2OC/Beauty2Charm_DBuilder.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingB2OC/Beauty2Charm_DBuilder.py
index d4740efb1cda30fc3ac5cdfb96c40d12fe5606f3..c4e957ea4c19356392178500bc0038fb77f701cb 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingB2OC/Beauty2Charm_DBuilder.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingB2OC/Beauty2Charm_DBuilder.py
@@ -321,7 +321,6 @@ class DBuilder(object):
         # self.k3pi_ddx_pid = [filterSelection('D2k3pi_for_DDX',LoKiCuts(['VCHI2DOF','BPVVDCHI2'],config_for_ddx).code(),self.k3pi_pid)]
 
         # use this below
-        d_cf_noMassWin = d_cf
         d_cf = LoKiCuts.combine([d_cf, "in_range(%s,MM,%s)" % (d_min, d_max)])
         ds_cf = LoKiCuts.combine(
             [ds_cf, "in_range(%s,MM,%s)" % (ds_min, ds_max)])
@@ -1820,9 +1819,6 @@ class DBuilder(object):
 
     def _makeD2PhiMuNu(self, up=False):
         '''makes Ds->phi mu nu'''
-        decays = [['phi(1020)', 'mu+']]
-        min = '1125.13*MeV'
-        max = '2168.49*MeV'
         cpkk = CombineParticles(CombinationCut="ADAMASS('phi(1020)') < 150*MeV",  # ( hasTopoChild() )
                                 MotherCut='(VFASPF(VCHI2/VDOF) < 10)',
                                 DaughtersCuts={'K+': '(PIDK>-10)'},
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingB2OC/Beauty2Charm_HHBuilder.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingB2OC/Beauty2Charm_HHBuilder.py
index ac91c76ab1a16bdd9e6da4a8f26964aba8913d00..2a73dd8afc3d6f2f1e9b68b60ae7b3dd4bb6654c 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingB2OC/Beauty2Charm_HHBuilder.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingB2OC/Beauty2Charm_HHBuilder.py
@@ -10,7 +10,6 @@
 ###############################################################################
 # \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\#
 
-from copy import deepcopy
 from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 from PhysSelPython.Wrappers import Selection
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingB2OC/Beauty2Charm_HHHBuilder.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingB2OC/Beauty2Charm_HHHBuilder.py
index 4ca95e738689e28e73bea3eb642ac88f607712a1..28ca931f76590f11cdabcf62760db4c23769a749 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingB2OC/Beauty2Charm_HHHBuilder.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingB2OC/Beauty2Charm_HHHBuilder.py
@@ -10,9 +10,8 @@
 ###############################################################################
 # \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\#
 
-from copy import deepcopy
 from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N3BodyDecays
+from GaudiConfUtils.ConfigurableGenerators import DaVinci__N3BodyDecays
 from PhysSelPython.Wrappers import Selection
 from Beauty2Charm_LoKiCuts import LoKiCuts
 from Beauty2Charm_Utils import *
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingB2OC/Beauty2Charm_Lb2XBuilder.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingB2OC/Beauty2Charm_Lb2XBuilder.py
index b7be9235f35813eff39c035e1cb6714db9d90ca1..45e5b0dd4789b8e7ff6c046e70b87ec2e5b19c66 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingB2OC/Beauty2Charm_Lb2XBuilder.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingB2OC/Beauty2Charm_Lb2XBuilder.py
@@ -1333,7 +1333,7 @@ class Lb2XBuilder(object):
 
     def _makeX2LcKPiPiPi(self):
         '''Makes RS + WS Xib -> Lc HH + c.c.'''
-        pions = self.pions
+        self.pions
         kaons = self.kaons
         pipipi = self.hhh.pipipi
         config = deepcopy(self.config)
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingB2OC/Beauty2Charm_LoKiCuts.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingB2OC/Beauty2Charm_LoKiCuts.py
index 54540ea2a223d554a751b02cf83000df4f3aa076..0fd327f8d32075591c9ca0e2d4dd434636c0ab35 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingB2OC/Beauty2Charm_LoKiCuts.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingB2OC/Beauty2Charm_LoKiCuts.py
@@ -10,11 +10,6 @@
 ###############################################################################
 # \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\#
 
-from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
-from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-from PhysSelPython.Wrappers import Selection, MergedSelection
-from StandardParticles import StdNoPIDsPions, StdNoPIDsKaons
 
 # \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\#
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingB2OC/Beauty2Charm_Utils.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingB2OC/Beauty2Charm_Utils.py
index 1fe78df7c079a95de0d4ea880934703d735084c0..4a7f7a1c5fd4d4c38087b77dfd87eb04fa363095 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingB2OC/Beauty2Charm_Utils.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingB2OC/Beauty2Charm_Utils.py
@@ -10,13 +10,11 @@
 ###############################################################################
 # \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\#
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-from PhysSelPython.Wrappers import DataOnDemand, Selection, MergedSelection, VoidEventSelection
+from PhysSelPython.Wrappers import DataOnDemand, Selection, VoidEventSelection
 from Beauty2Charm_LoKiCuts import LoKiCuts
 from Configurables import SubstitutePID
-from Configurables import ConeJetProxyFilter
 
 # \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\#
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingB2OC/StrippingB2DDphi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingB2OC/StrippingB2DDphi.py
index b0f8982f1efb389032da5f7becb2881e3c005379..92ca95c2ea3f7c46766aedbc04dbbc34c9c0b8ef 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingB2OC/StrippingB2DDphi.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingB2OC/StrippingB2DDphi.py
@@ -15,8 +15,7 @@ Author: M. Martinelli
 Notes: Excited states are included by placing the line in FULL.DST
 '''
 from PhysSelPython.Wrappers import Selection, DataOnDemand
-from Configurables import FilterDesktop, CombineParticles, DaVinci__N4BodyDecays
-from GaudiConfUtils.ConfigurableGenerators import CombineParticles
+from Configurables import DaVinci__N4BodyDecays, FilterDesktop
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 __author__ = ['Maurizio Martinelli']
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingB2OC/StrippingB2DXD2HMuNu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingB2OC/StrippingB2DXD2HMuNu.py
index 0c33c7610ceda08cc07fbbc35c72e2186d8d5d81..d01564ec9dde10135fe1fc2b84e567d131876e4c 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingB2OC/StrippingB2DXD2HMuNu.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingB2OC/StrippingB2DXD2HMuNu.py
@@ -12,13 +12,11 @@ __author__ = ['Wenbin Qian']
 __date__ = '09/11/2015'
 __version__ = '$Revision: 0.01 $'
 
-from Gaudi.Configuration import *
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, DaVinci__N4BodyDecays, DaVinci__N3BodyDecays
-from PhysSelPython.Wrappers import Selection, DataOnDemand
+from PhysSelPython.Wrappers import Selection
 from StandardParticles import StdLooseMuons, StdLoosePions, StdLooseKaons
-from GaudiKernel.SystemOfUnits import MeV, GeV, cm, mm
 
 __all__ = ('B2DXD2HMuNuBuilder',
            'default_config')
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingB2OC/StrippingB2nbody.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingB2OC/StrippingB2nbody.py
index 663bdbbf855c3d8d19dad3a29b6be667edaeedb9..04c84fc2dc39eb4b3d3d954f3c0083396e0c84fa 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingB2OC/StrippingB2nbody.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingB2OC/StrippingB2nbody.py
@@ -16,7 +16,6 @@ from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, MergedSelection, DataOnDemand, VoidEventSelection
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = ['Rudolf Oldeman']
 __date__ = '08/02/2011'
 __version__ = '$Revision: 1.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingB2OC/StrippingBeauty2Charm.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingB2OC/StrippingBeauty2Charm.py
index 4d5f2c9be463ca2124ea2f2d0afc00614c46a995..3742d441c292d70cce6002696220883629d7fe34 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingB2OC/StrippingBeauty2Charm.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingB2OC/StrippingBeauty2Charm.py
@@ -28,11 +28,9 @@ from Beauty2Charm_HHHBuilder import *
 from Beauty2Charm_HHBuilder import *
 from Beauty2Charm_DBuilder import *
 from StandardParticles import StdLooseAllPhotons, StdVeryLooseAllPhotons
-from Configurables import LoKi__VoidFilter
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import EventSelection
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
+from PhysSelPython.Wrappers import MergedSelection, Selection
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
 from Gaudi.Configuration import *
 import re
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingB2Chic0KPi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingB2Chic0KPi.py
index 69e18721b3c6b45435046eaac0c9a79d5818b6da..030871800dfb7d9f6c18c93c207febaf3fad5cf8 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingB2Chic0KPi.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingB2Chic0KPi.py
@@ -17,7 +17,6 @@ from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
-from Gaudi.Configuration import *
 __author__ = ['Andrii Usachov']
 __date__ = '13/03/2018'
 __version__ = '$Revision: 1.2$'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingB2JpsiXforEM_s.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingB2JpsiXforEM_s.py
index d3aeeef75411f9cecca87053ee0faa991e8c7fd8..394fd7c3171d61beb9b93f762a890a248f2b190f 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingB2JpsiXforEM_s.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingB2JpsiXforEM_s.py
@@ -20,21 +20,11 @@ __version__ = '$Revision: 0.0 $'
 
 __all__ = ('B2JpsiXforEM_sConf', 'default_config')
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
 from Configurables import LoKi__PVReFitter, CombineParticles
-from CommonParticles.Utils import updateDoD
-from StandardParticles import StdLoosePions
-from StandardParticles import StdLooseKaons
-from StandardParticles import StdAllLooseKaons
-from StandardParticles import StdLooseResolvedPi0
-from StandardParticles import StdLooseMergedPi0
-from StandardParticles import StdNoPIDsPions
-from StandardParticles import StdLooseProtons
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
+from PhysSelPython.Wrappers import DataOnDemand, Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from GaudiKernel.SystemOfUnits import MeV
 
 default_config = {
     'NAME': 'B2JpsiXforEM',
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingBbbar2PhiPhi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingBbbar2PhiPhi.py
index 2c308991a8d9592619777fb7aad4c619a4a40437..fd4e526f5796889d5eb13efd1f1fca7adfbf4a97 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingBbbar2PhiPhi.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingBbbar2PhiPhi.py
@@ -21,12 +21,10 @@ confBbbar2PhiPhi = Bbbar2PhiPhiConf( name = 'Bbbar2PhiPhi', config = config_Bbba
 stream.appendLines( confBbbar2PhiPhi.lines() )
 '''
 
-from StandardParticles import StdNoPIDsProtons, StdNoPIDsPions, StdNoPIDsDownPions
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
+from PhysSelPython.Wrappers import DataOnDemand, Selection
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = ['Simone Stracka']
 __date__ = '10/03/2015'
 __all__ = (
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingBc2JpsiHBDT.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingBc2JpsiHBDT.py
index d973f13d2bc8b32c5045776e5b5d3f96bc618e74..7b5a84a9de9b55f09a9ef0da7469b5cc113c4602 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingBc2JpsiHBDT.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingBc2JpsiHBDT.py
@@ -18,7 +18,6 @@ from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = ['Jibo He']
 __date__ = '02/11/2013'
 __version__ = '$Revision: 2.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingBc2JpsiMuXNew.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingBc2JpsiMuXNew.py
index 946bad8366ac6019498b9d14e89f0a8899cf70d4..bd156feb81f0deaaf2a07b14df76bcbbcdd03d5c 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingBc2JpsiMuXNew.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingBc2JpsiMuXNew.py
@@ -18,7 +18,6 @@ from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = ['Jibo He']
 __date__ = '02/09/2010'
 __version__ = '$Revision: 2.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingCC2DD.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingCC2DD.py
index 58f89513ddb6f5ae23ad89c616deb7d8f0c6f719..39a30438368c27a6a42f57688de187a8b1135e72 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingCC2DD.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingCC2DD.py
@@ -22,8 +22,7 @@ Module for construction of CC->D D, where CC is a particle decaying to D D
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 __author__ = ['Lucio Anderlini', 'Andrea Bizzeti']
 __date__ = '2015-12-01'
 __version__ = '$Revision: 0.4 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingCcbar2Baryons.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingCcbar2Baryons.py
index e5a87f652fa30a90026cc6172bb112eb157c1e0f..3e235742a82cc6b6eef181ba5871e7096a9e965d 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingCcbar2Baryons.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingCcbar2Baryons.py
@@ -20,7 +20,6 @@ stream.appendLines( [
 ])
 '''
 
-from StandardParticles import StdNoPIDsProtons, StdNoPIDsPions, StdNoPIDsDownPions
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingCcbar2LambdaLambda.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingCcbar2LambdaLambda.py
index 627203da22f81a94eda9c6247ea6c2a1fb128927..283be918e66c410e5d5d0c9fd13effb397d4b70b 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingCcbar2LambdaLambda.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingCcbar2LambdaLambda.py
@@ -12,14 +12,10 @@
 Module for selecting Ccbar->LambdaLambda detached line, with loose PT, PID cuts. 
 '''
 
-from StandardParticles import StdAllLoosePions
-from StandardParticles import StdLoosePions, StdNoPIDsDownPions
-from StandardParticles import StdNoPIDsProtons
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = ['Andrii Usachov']
 __date__ = '27/01/2019'
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingCcbar2LstLambda.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingCcbar2LstLambda.py
index 0c317712061ae5a153e89bd41b8390a4fc74e187..4937ef3626431e3998bb3086fe7c656fa4ec9e57 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingCcbar2LstLambda.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingCcbar2LstLambda.py
@@ -12,14 +12,10 @@
 Module for selecting Ccbar->LstLambda detached line, with loose PT, PID cuts. 
 '''
 
-from StandardParticles import StdAllLoosePions, StdAllLooseKaons
-from StandardParticles import StdLoosePions, StdNoPIDsDownPions, StdLooseKaons, StdLooseDownKaons
-from StandardParticles import StdNoPIDsProtons, StdNoPIDsKaons
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = ['Andrii Usachov']
 __date__ = '23/11/2017'
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingCcbar2LstLst.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingCcbar2LstLst.py
index cf2d3319f4c8d473c85741f08945e6d15bd1722b..fb7af606490052a513bd2a8433237fcbfca14aa4 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingCcbar2LstLst.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingCcbar2LstLst.py
@@ -12,12 +12,10 @@
 Module for selecting Ccbar->LstLst detached line, with loose PT, PID cuts. 
 '''
 
-from StandardParticles import StdNoPIDsProtons, StdNoPIDsKaons
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
+from PhysSelPython.Wrappers import DataOnDemand, Selection
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = ['Andrii Usachov']
 __date__ = '12/01/2017'
 
@@ -58,19 +56,19 @@ class Ccbar2LstLstConf(LineBuilder):
         self.name = name
         self.config = config
 
-        TRCHI2DOF = config['TRCHI2DOF']
-        KaonProbNNk = config['KaonProbNNk']
-        KaonPTSec = config['KaonPTSec']
-        ProtonProbNNp = config['ProtonProbNNp']
-        ProtonP = config['ProtonP']
-        ProtonPTSec = config['ProtonPTSec']
-        LstVtxChi2 = config['LstVtxChi2']
-        LstMinMass = config['LstMinMass']
-        LstMaxMass = config['LstMaxMass']
-        CombMaxMass = config['CombMaxMass']
-        CombMinMass = config['CombMinMass']
-        MaxMass = config['MaxMass']
-        MinMass = config['MinMass']
+        config['TRCHI2DOF']
+        config['KaonProbNNk']
+        config['KaonPTSec']
+        config['ProtonProbNNp']
+        config['ProtonP']
+        config['ProtonPTSec']
+        config['LstVtxChi2']
+        config['LstMinMass']
+        config['LstMaxMass']
+        config['CombMaxMass']
+        config['CombMinMass']
+        config['MaxMass']
+        config['MinMass']
 
         self.DetachedProtonForLst = self.createSubSel(OutputList="DetachedProtonForLst" + self.name,
                                                       InputList=DataOnDemand(
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingCcbar2PPPiPi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingCcbar2PPPiPi.py
index 28b6a56f5499cd8ecbce8b1d1e366f216f123073..91e5c78c655288eb933c6478d1eafcaee3904f84 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingCcbar2PPPiPi.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingCcbar2PPPiPi.py
@@ -12,12 +12,11 @@
 Module for selecting charmonium -> p pbar pi pi 
 '''
 
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
+from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
 from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
-from Gaudi.Configuration import *
 __author__ = ['Jibo He']
 __date__ = '12/11/2015'
 __version__ = '$Revision: 1.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingCcbar2PhiPhi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingCcbar2PhiPhi.py
index c21b9fa874a5dccb0d9c373c28e255bbe309ea95..101a8e21ba087c6c991fe35e18471728a0abe2e3 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingCcbar2PhiPhi.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingCcbar2PhiPhi.py
@@ -21,12 +21,10 @@ confCcbar2PhiPhi = Ccbar2PhiPhiConf( name = 'Ccbar2PhiPhi', config = config_Ccba
 stream.appendLines( confCcbar2PhiPhi.lines() )
 '''
 
-from StandardParticles import StdNoPIDsProtons, StdNoPIDsPions, StdNoPIDsDownPions
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
+from PhysSelPython.Wrappers import DataOnDemand, Selection
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = ['Jibo He']
 __date__ = '20/01/2012'
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingCcbar2PhiPhiDetached.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingCcbar2PhiPhiDetached.py
index 9cece8aa8a316b6c48d7062407ae3c5e4a4703e3..8d48d19f4b11b35402f710baec49d8b99bec7f11 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingCcbar2PhiPhiDetached.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingCcbar2PhiPhiDetached.py
@@ -15,12 +15,10 @@ Inherited from StrippingCcbar2PhiPhi.py; moved To FullDST
 
 '''
 
-from StandardParticles import StdNoPIDsProtons, StdNoPIDsPions, StdNoPIDsDownPions
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
+from PhysSelPython.Wrappers import DataOnDemand, Selection
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = ['Jibo He, Liupan An']
 __date__ = '11/01/2017'
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingCcbar2PhiPhiPiPi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingCcbar2PhiPhiPiPi.py
index 3255f0fb24ce2bf3d5dedf3d48901b1a3b7fdf4c..8ded03963ceb90126c111e3d53772e2529b17348 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingCcbar2PhiPhiPiPi.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingCcbar2PhiPhiPiPi.py
@@ -12,12 +12,11 @@
 Module for selecting charmonium -> phi phi pi pi 
 '''
 
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
+from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
 from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
-from Gaudi.Configuration import *
 __author__ = ['Andrii Usachov']
 __date__ = '10/04/2017'
 __version__ = '$Revision: 1.1 $'
@@ -60,12 +59,12 @@ class Ccbar2PhiPhiPiPiConf(LineBuilder):
         self.name = name
         self.config = config
 
-        PhiVtxChi2 = config['PhiVtxChi2']
-        PhiMassW = config['PhiMassW']
-        KaonPT = config['KaonPT']
-        TRCHI2DOF = config['TRCHI2DOF']
-        KaonProbNNk = config['KaonProbNNk']
-        KaonIPCHI2 = config['KaonIPCHI2']
+        config['PhiVtxChi2']
+        config['PhiMassW']
+        config['KaonPT']
+        config['TRCHI2DOF']
+        config['KaonProbNNk']
+        config['KaonIPCHI2']
 
         self.SelPions = self.createSubSel(OutputList=self.name + "SelPions",
                                           InputList=DataOnDemand(
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingCcbar2PpbarNew.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingCcbar2PpbarNew.py
index ee8963df34aa184b52ef4e748c679800cc8ef52e..85282982e0396ca96b5935ba315d5b23bee0ba45 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingCcbar2PpbarNew.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingCcbar2PpbarNew.py
@@ -18,9 +18,8 @@ Module for Charmonium->p pbar, including three lines
 
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
+from PhysSelPython.Wrappers import Selection
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 __author__ = ['Jibo He']
 __date__ = '03/10/2010'
 __version__ = '$Revision: 1.2 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingChiCJPsiGammaConv.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingChiCJPsiGammaConv.py
index 0974ad33bc785e6c21ccfbd8abd76c1de3c8330d..13c82277579b4165c559b3e45a8dc8a26f329028 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingChiCJPsiGammaConv.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingChiCJPsiGammaConv.py
@@ -11,8 +11,7 @@
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
-from Configurables import FilterDesktop, CombineParticles, OfflineVertexFitter
-from Gaudi.Configuration import *
+from Configurables import CombineParticles, FilterDesktop
 __author__ = 'Edwige Tournefier'
 __date__ = '08/06/2012'
 __version__ = '$ 1.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingDiMuonForXsection.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingDiMuonForXsection.py
index 99d45c194f644de10f8a90371ed1079dcd2e147e..7ceb214bd70cc59ffa52391a7a3321cce9dba642 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingDiMuonForXsection.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingDiMuonForXsection.py
@@ -16,7 +16,6 @@ from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
-from Gaudi.Configuration import *
 __author__ = ['Jibo He']
 __date__ = '28/03/2012'
 __version__ = '$Revision: 1.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingDiMuonNew.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingDiMuonNew.py
index 7c60c2e0a15b0e700724dae73d54a428fd669c7a..dd539e9d69fb0fa229c32fd245d281db456c4fed 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingDiMuonNew.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingDiMuonNew.py
@@ -60,7 +60,6 @@ from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand, EventSelection
 from Configurables import LoKi__VoidFilter
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
-from Gaudi.Configuration import *
 __author__ = ['Jibo He']
 __date__ = '30/09/2010'
 __version__ = '$Revision: 1.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingEtap2pipimumu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingEtap2pipimumu.py
index d3d1d1ace791be2cf505fc6059dff04cd92af55b..af48f7c83025956348c7d9b1611c8e902321aa5f 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingEtap2pipimumu.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingEtap2pipimumu.py
@@ -13,9 +13,7 @@ from StandardParticles import StdAllLooseMuons, StdAllLoosePions, StdAllLooseKao
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, OfflineVertexFitter
-from Gaudi.Configuration import *
-from copy import copy
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop
 __author__ = ['Xabier Cid Vidal']
 # inspired by StrippingD2XMuMuSSConf, from Malcolm John, B. Viaud and O. Kochebina
 __date__ = '25/1/2019'
@@ -149,10 +147,10 @@ class StrippingEtap2pipimumuConf(LineBuilder):
 
         LineBuilder.__init__(self, name, config)
 
-        Ds2EtapLine_name = name+"_Ds2Etap"
-        Bu2EtapLine_name = name+"_Bu2Etap"
-        Ds2Phi3PiLine_name = name+"_Ds2Phi3Pi"
-        Bu2JPsiKLine_name = name+"_Bu2JPsiK"
+        name+"_Ds2Etap"
+        name+"_Bu2Etap"
+        name+"_Ds2Phi3Pi"
+        name+"_Bu2JPsiK"
 
         # 1 : Make pions and kaons
         selPionsEta = makeDaughters(
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingHeavyBaryons.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingHeavyBaryons.py
index fdc48e45e9d8cddbdbd0c89c4f67663a329603f3..500f8829198f1352b6129c8bf22fff77d3f04e68 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingHeavyBaryons.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingHeavyBaryons.py
@@ -12,14 +12,10 @@
 Stripping line for HeavyBaryons studies : Xi_b-, Xi_b0 and Omega_b-
 Author: Yasmine Amhis
 '''
-from GaudiKernel.SystemOfUnits import MeV
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
-from StandardParticles import StdAllLoosePions, StdAllLooseKaons
-from StandardParticles import StdLoosePions, StdNoPIDsDownPions, StdLooseKaons, StdLooseDownKaons
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = ['Yasmine Amhis']
 __date__ = '19/05/2011'
 __version__ = '$Revision: 1.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingInclusiveCharmBaryons.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingInclusiveCharmBaryons.py
index 201c096247b241236a2ac4156fecd55babf00dd3..5b13bff30a6f8279c85e884ed961904aa89e38d3 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingInclusiveCharmBaryons.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingInclusiveCharmBaryons.py
@@ -17,13 +17,10 @@ Author: M. Stahl
 Notes: Be creative!
 '''
 from PhysSelPython.Wrappers import Selection, AutomaticData
-import math
 from LoKiProtoParticles.decorators import *
 from LoKiArrayFunctors.decorators import *
 from LoKiPhys.decorators import *
-from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-from Configurables import FilterDesktop
-from PhysConf.Selections import FilterSelection, CombineSelection, Combine4BodySelection, Combine3BodySelection, LimitSelection, MergedSelection
+from PhysConf.Selections import Combine3BodySelection, Combine4BodySelection, FilterSelection, MergedSelection
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 __author__ = ['Marian Stahl']
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingInclusiveDoubleD.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingInclusiveDoubleD.py
index a06a38a50584fac39714125ffd40ab9e15ade044..6feefa7e6c9dc9308b80bba2c991944f64e4fafb 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingInclusiveDoubleD.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingInclusiveDoubleD.py
@@ -18,13 +18,10 @@ Author: M. Stahl
 Notes: Be creative!
 '''
 from PhysSelPython.Wrappers import Selection, AutomaticData
-import math
 from LoKiProtoParticles.decorators import *
 from LoKiArrayFunctors.decorators import *
 from LoKiPhys.decorators import *
-from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-from Configurables import FilterDesktop
-from PhysConf.Selections import FilterSelection, CombineSelection, Combine4BodySelection, Combine3BodySelection, LimitSelection, MergedSelection
+from PhysConf.Selections import Combine3BodySelection, Combine4BodySelection, CombineSelection, FilterSelection, MergedSelection
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 __author__ = ['Marian Stahl']
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingLb2EtacKp.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingLb2EtacKp.py
index 55d3c83ddc36e31f40d92545ba06d3c99b11dcce..860ca3a5a0957521bcd7a48d6e0a5073d1e24017 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingLb2EtacKp.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingLb2EtacKp.py
@@ -17,7 +17,6 @@ from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
-from Gaudi.Configuration import *
 __author__ = ['Liming Zhang', 'Xuesong Liu']
 __date__ = '23/11/2016'
 __version__ = '$Revision: 2.0$'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingOmegabDecays.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingOmegabDecays.py
index 10321ae5335297f63b4b8b2f71c70f7293172c1a..4002bd8ca389c38c15dddd1c90f1046ac80538f9 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingOmegabDecays.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingOmegabDecays.py
@@ -32,8 +32,7 @@ __all__ = ('OmegabDecaysConf',
            'makeOmegab2Omegacgammapi',
            'default_config')
 
-from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingPPMuMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingPPMuMu.py
index cfa93241546b8cb1958f0c080bce3ed3974eb196..1e28adc9f8419151808afa067316d7a0f98387fb 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingPPMuMu.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingPPMuMu.py
@@ -12,12 +12,11 @@
 Module for selecting Hc -> p pbar mu mu
 '''
 
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
+from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
 from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
-from Gaudi.Configuration import *
 __author__ = ['Liupan An']
 __date__ = '18/05/2017'
 __version__ = '$Revision: 1.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingXibc.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingXibc.py
index ed73d91a4d03fe2ff6427b7cd54ccc7ed18aeaa7..d0446cddfd42feba526eaf11c9d8cf13a4160779 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingXibc.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingXibc.py
@@ -47,17 +47,11 @@ __all__ = ('XibcBuilder'  # LineBuilder class specialization
            )
 
 
-from Gaudi.Configuration import *
-
 from Configurables import FilterDesktop, CombineParticles
 from PhysSelPython.Wrappers import Selection, AutomaticData, MergedSelection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 
-from CommonParticles.StdLooseLambda import StdLooseLambdaLL, StdLooseLambdaDD
-from GaudiKernel.SystemOfUnits import MeV, GeV, mm
-from Configurables import TisTosParticleTagger
-
 
 default_name = "Xibc"
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingXibcBDT.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingXibcBDT.py
index 5520ac91aac71eded5064eb9daf551c6b35891fe..28b1ca4c2d5b6567ed207d4b3cd2e8dcd52a9324 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingXibcBDT.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingXibcBDT.py
@@ -33,8 +33,6 @@ from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticle
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, MergedSelection, DataOnDemand
-from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays
-from Gaudi.Configuration import *
 __author__ = ['Jibo He']
 __date__ = '20/11/2016'
 __version__ = '$Revision: 1.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingXiccBDT.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingXiccBDT.py
index 0fda677dfb8d63acd803c2278c95da8b32d22700..7dde23cf7ee6e3329158f6ed2ef36ed1b1c5655c 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingXiccBDT.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBandQ/StrippingXiccBDT.py
@@ -30,9 +30,7 @@ Xicc+  -> D+ p+ K-
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, MergedSelection, DataOnDemand
-from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays
-from Gaudi.Configuration import *
+from PhysSelPython.Wrappers import DataOnDemand, Selection
 __author__ = ['Jibo He']
 __date__ = '20/11/2016'
 __version__ = '$Revision: 1.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingB24pLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingB24pLines.py
index fed91323554dd309e9a4137174eba46ba8676d87..2c744f40e0299eacf7acf157af33557db0eec23d 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingB24pLines.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingB24pLines.py
@@ -54,12 +54,10 @@ Exported symbols (use python help!):
    - 
 """
 
-from GaudiKernel.PhysicalConstants import c_light
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
-from Configurables import FilterDesktop, CombineParticles, DaVinci__N4BodyDecays
-from Gaudi.Configuration import *
+from Configurables import DaVinci__N4BodyDecays
 __author__ = ["Pietro Marino", "Oliver Gruenberg"]
 __date__ = "13.10.2017"
 __version__ = "$Revision: 3.0 $"
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingB2CharmlessInclusive.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingB2CharmlessInclusive.py
index 056df1189d8c6e124a4dcb4201ec68d8ac1fc40d..8ae9f04166a6ba66089d684f07c4dfc79cbbc333 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingB2CharmlessInclusive.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingB2CharmlessInclusive.py
@@ -16,9 +16,8 @@ from StandardParticles import StdLooseKsDD, StdLooseKsLL
 from StandardParticles import StdNoPIDsPions, StdLooseAllPhotons, StdLooseMergedPi0, StdLooseResolvedPi0
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand, SimpleSelection, MergedSelection
+from PhysSelPython.Wrappers import MergedSelection, Selection, SimpleSelection
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = ['Fred Blanc', 'Luca Pescatore']
 __date__ = '23/01/2019'
 __version__ = '$Revision: 3.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingB2HHBDT.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingB2HHBDT.py
index 58ec12b040a0d920e656286d4bfc1dda9cf9a73f..e6d9ba6ae39bf426ebdfb99b036c32ac4554915e 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingB2HHBDT.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingB2HHBDT.py
@@ -24,16 +24,13 @@ __all__ = ('B2HHBDTLines',
            'applyBDT',
            'default_config')
 
-from Gaudi.Configuration import *
 
-from GaudiKernel.SystemOfUnits import *
-
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 from StandardParticles import StdNoPIDsPions
 
 from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
-from StrippingUtils.Utils import LineBuilder, checkConfig
+from StrippingUtils.Utils import LineBuilder
 
 
 default_config = {
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingB2HHPi0.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingB2HHPi0.py
index bb255a96ff5e37e3059e4fd6df5cfadc8cfb0b7a..f8813f46fcbbc60b4f1ff068547e0ee3c7d07454 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingB2HHPi0.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingB2HHPi0.py
@@ -27,9 +27,8 @@ __all__ = ('StrippingB2HHPi0Conf',
            'makeB2HHPi0M',
            'default_config')
 
-from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from PhysSelPython.Wrappers import Selection, DataOnDemand
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
+from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from StandardParticles import StdNoPIDsPions, StdLooseMergedPi0, StdLooseResolvedPi0
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingB2KShh.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingB2KShh.py
index f404e2a87328dc23eb64929a9a9f3cd002ddadcf..2dcd40aee03deb0e241de124f68de39f1abe783b 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingB2KShh.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingB2KShh.py
@@ -25,7 +25,6 @@ __version__ = 'Stripping24r1/Stripping26r1'
 __all__ = {'B2KShhConf',
            'default_config'}
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, DaVinci__N3BodyDecays
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingB2KShhh.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingB2KShhh.py
index f95cf109667b3401f5eb904c78285279c34d00b5..07d236ac77af02d637424d32f3f4e637192ba3e1 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingB2KShhh.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingB2KShhh.py
@@ -27,13 +27,13 @@ __all__ = ('B2KShhhConf',
 
 from Gaudi.Configuration import *
 
-from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N4BodyDecays
+from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays
 from StandardParticles import StdNoPIDsPions, StdNoPIDsKaons  # ipchi2 cut
 from StandardParticles import StdLooseKsDD, StdLooseKsLL
 
-from PhysSelPython.Wrappers import Selection, MergedSelection
+from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
-from StrippingUtils.Utils import LineBuilder, checkConfig
+from StrippingUtils.Utils import LineBuilder
 
 from Configurables import FilterDesktop
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingB2Ksthh.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingB2Ksthh.py
index 94a25a2714e9626cb22e6966b9ad7a1955d78eb9..a39998cb04eef71b62a1bf9337b6fb914d58a917 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingB2Ksthh.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingB2Ksthh.py
@@ -22,7 +22,6 @@ __version__ = 'Stripping26'
 __all__ = {'B2KsthhConf',
            'default_config'}
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
@@ -176,7 +175,7 @@ class B2KsthhConf(LineBuilder):
         _massCutHigh = "(AM<(5279+%s)*MeV)" % config['B_Mhigh']
         _aptCut = "(APT>%s*MeV)" % config['B_APTmin']
         _daugMedPtCut = "(ANUM(PT>%s*MeV)>=2)" % config['BDaug_MedPT_PT']
-        _daugMaxPtIPCut = "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['BDaug_MaxPT_IP']
+        "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['BDaug_MaxPT_IP']
         _daugPtSumCut = "((APT1+APT2+APT3)>%s*MeV)" % config['BDaug_PTsum']
 
         _combCuts = _aptCut
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingB2TwoBaryons.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingB2TwoBaryons.py
index 8911a3d3bdc4a0add9f550c63095470ab59d4fef..93fef262a5bd7d8cd0abd1063e287bef85404e66 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingB2TwoBaryons.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingB2TwoBaryons.py
@@ -31,11 +31,10 @@ from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
 from StandardParticles import StdLooseProtons
 from StandardParticles import StdNoPIDsPions as Pions
-from CommonParticles.StdLooseLambda import StdLooseLambdaLL, StdLooseLambdaDD
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
-from StrippingUtils.Utils import LineBuilder, checkConfig
-from GaudiKernel.SystemOfUnits import MeV, GeV, mm, ns
+from StrippingUtils.Utils import LineBuilder
+from GaudiKernel.SystemOfUnits import GeV, MeV, mm
 
 default_config = {'NAME': 'B2TwoBaryons',
                   'WGs': ['BnoC'],
@@ -157,7 +156,7 @@ class B2TwoBaryonLines(LineBuilder):
 
         B2PPbarName = name + "B2PPbar"
 
-        B2PPSameSignName = name + "B2PPSameSign"
+        name + "B2PPSameSign"
 
         B2Lp_dd_name = name+'B2PLambdabarDD'
         B2Lp_ll_name = name+'B2PLambdabarLL'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingB2XEta.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingB2XEta.py
index e1adec50004bf9392e263cc5cb3ba465d4e08bf7..95fbd42162ff7cf67819bcb2ccbe2b4f88c30155 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingB2XEta.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingB2XEta.py
@@ -25,9 +25,7 @@ from StandardParticles import StdLoosePions as Pions
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, DaVinci__N3BodyDecays
-from PhysSelPython.Wrappers import DataOnDemand, Selection, SelectionSequence, MergedSelection
-from GaudiKernel import SystemOfUnits as Units
-from Gaudi.Configuration import *
+from PhysSelPython.Wrappers import DataOnDemand, MergedSelection, Selection
 __author__ = ['Timothy Williams']
 __date__ = '1/12/2016'
 __version__ = 'Stripping26r1'
@@ -564,7 +562,7 @@ class B2XEtaConf(LineBuilder):
         _trackCuts = _track_PT+'&'+_track_Chi2+'&'+_track_GPCut+'&'+_track_PIDCut
         _combCuts = _massCut+'&'+_docaCut
         _combCut12Doca = "ACHI2DOCA(1,2)<%s" % config['eta_DOCA']
-        _combCut12Vtx = "(VFASPF(VCHI2/VDOF)<%s)" % config['eta_vtxChi2']
+        "(VFASPF(VCHI2/VDOF)<%s)" % config['eta_vtxChi2']
         _combCut12 = _combCut12Doca
 
         # _eta3Pi=CombineParticles("eta3Pi",
@@ -592,7 +590,7 @@ class B2XEtaConf(LineBuilder):
         _trackCuts = _track_PT+'&'+_track_Chi2+'&'+_track_GPCut+'&'+_track_PIDCut
         _combCuts = _massCut+'&'+_docaCut
         _combCut12Doca = "ACHI2DOCA(1,2)<%s" % config['eta_prime_DOCA']
-        _combCut12Vtx = "(VFASPF(VCHI2/VDOF)<%s)" % config['eta_prime_vtxChi2']
+        "(VFASPF(VCHI2/VDOF)<%s)" % config['eta_prime_vtxChi2']
         _combCut12 = _combCut12Doca
 
         # _etap=CombineParticles("etap",
@@ -883,7 +881,7 @@ class B2XEtaConf(LineBuilder):
         _combCuts = _massCut+'&'+_docaCut
         _allCuts = _PTCut+'&'+_vtxCut+'&'+_diraCut+'&'+_IPChi2Cut
         _combCut12Doca = "ACHI2DOCA(1,2)<%s" % config['LbDaug_LL_maxDocaChi2']
-        _combCut12Vtx = "(VFASPF(VCHI2/VDOF)<%s)" % config['Lb_VtxChi2']
+        "(VFASPF(VCHI2/VDOF)<%s)" % config['Lb_VtxChi2']
         _combCut12 = _combCut12Doca
 
         _Lb2pKetap = DaVinci__N3BodyDecays(DecayDescriptor="[Lambda_b0 -> p+ K- eta_prime]cc",
@@ -921,7 +919,7 @@ class B2XEtaConf(LineBuilder):
         _combCuts = _massCut
         _allCuts = _PTCut+'&'+_IPChi2Cut+'&'+_vtxCut+'&'+_diraCut
         _combCut12Doca = "ACHI2DOCA(1,2)<%s" % config['LbDaug_LL_maxDocaChi2']
-        _combCut12Vtx = "(VFASPF(VCHI2/VDOF)<%s)" % config['Lb_VtxChi2']
+        "(VFASPF(VCHI2/VDOF)<%s)" % config['Lb_VtxChi2']
         _combCut12 = _combCut12Doca
 
         _Lb2pKeta3Pi = DaVinci__N3BodyDecays(DecayDescriptor="[Lambda_b0 -> p+ K- eta]cc",
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingB2a1Pi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingB2a1Pi.py
index 29c0766744b242c4ed1be4817cca727495bcb265..9f701cc986294843a275fb204128fb9f3c88fb1d 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingB2a1Pi.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingB2a1Pi.py
@@ -17,7 +17,6 @@ from Configurables import DaVinci__N4BodyDecays
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
-from Gaudi.Configuration import *
 __author__ = ['Daniel Vieira, Jibo He']
 __date__ = '01/12/2016'
 __version__ = '$Revision: 1.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingB2hhpipiPhsSpcCut.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingB2hhpipiPhsSpcCut.py
index 08e1d2943eafcfa9ad7d1764a6d5aab6ce3c9526..9fe5c82af0b14937c33c30fd9627961fa0731c0a 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingB2hhpipiPhsSpcCut.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingB2hhpipiPhsSpcCut.py
@@ -17,7 +17,6 @@ from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = ['Daniel Vieira']
 __date__ = '29/11/2018'
 __version__ = '$Revision: 1.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingB2pphh.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingB2pphh.py
old mode 100755
new mode 100644
index 782d89e7466f93f490e15dd1095ac153359b502b..99d5b7265b684f2c69cc962f37bc4fe0b20ac220
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingB2pphh.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingB2pphh.py
@@ -25,16 +25,13 @@ __all__ = ('B2pphhConf',
            )
 
 
-from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop
+from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
 # from Configurables import DaVinci__N4BodyDecays
 from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays
 
-from StandardParticles import StdAllNoPIDsKaons, StdAllNoPIDsPions, StdAllNoPIDsProtons
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from Configurables import LoKi__VoidFilter as VoidFilter
 
 default_config = {
     'NAME': 'B2pphh',
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingBc2hhh_BnoC.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingBc2hhh_BnoC.py
index cc0952e7ed4c72dc5b618028ac8bc563928c126d..21b92fa5aab68df4d68f10c50e59c126b546bd31 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingBc2hhh_BnoC.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingBc2hhh_BnoC.py
@@ -23,13 +23,11 @@ Exported symbols (use python help!):
    - makeppK_excl  
 '''
 
-from Configurables import LoKi__VoidFilter as VoidFilter
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection
 import StandardParticles
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 __author__ = ['Alvaro Gomes', 'Adlene Hicheur']
 __date__ = '31/08/2014'
 __version__ = '$Revision: 1.5 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingBs2KKhh.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingBs2KKhh.py
index c9b61ca022f83746560bd95dce95d56ab056c7d1..03011c3e32fb079bbbaa6b9d424d8c8b718c76bb 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingBs2KKhh.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingBs2KKhh.py
@@ -30,7 +30,6 @@ from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop
-from Gaudi.Configuration import *
 __author__ = ['Sean Benson', 'Adam Morris', 'Laurence Carson',
               'Emmy Pauline Maria Gabriel' 'Markus Roehrken']
 __date__ = '22/11/2016'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingBs2KSKS_Run2.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingBs2KSKS_Run2.py
index 629ca8140bd72d6380100393e840bf791f2f2cd9..6afaa37fab4f411e76010a848c09d7d72e5a05d9 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingBs2KSKS_Run2.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingBs2KSKS_Run2.py
@@ -22,15 +22,11 @@ __date__ = '13/09/2016'
 __version__ = 'Run2'
 __all__ = {'Bs2KSKSConf', 'default_config'}
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
+from PhysSelPython.Wrappers import DataOnDemand, Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 
-from StandardParticles import StdNoPIDsPions as Pions
-from StandardParticles import StdNoPIDsDownPions as DownPions
-
 
 default_config = {
     'NAME': 'Bs2KSKS',
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingBs2Kst_0Kst_0.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingBs2Kst_0Kst_0.py
index 6179c70e7f0f16586cd5a958eb2131e9f13bf1ad..7345868ade6e0cebd873ec58d7ea07808efe59f9 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingBs2Kst_0Kst_0.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingBs2Kst_0Kst_0.py
@@ -22,11 +22,8 @@ Rate estimated on 100K events using a 2017 data sample is: 0.027%
 
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, SelectionSequence, DataOnDemand
+from PhysSelPython.Wrappers import DataOnDemand, Selection
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-from CommonParticles.Utils import *
-from LHCbKernel.Configuration import *
-from Gaudi.Configuration import *
 __author__ = ['Brais Sanmartin Sedes']
 __date__ = '12/11/2015'
 __version__ = '5.1'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingBs2PhiKst0.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingBs2PhiKst0.py
index ceb8daa24373fc0cd210ec42fdbc56fd456f51e4..0c1ff7d620f2ef3058536bb8bbba7bedc35b168a 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingBs2PhiKst0.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingBs2PhiKst0.py
@@ -20,11 +20,8 @@ Exported symbols (use python help!):
 
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, SelectionSequence, DataOnDemand
+from PhysSelPython.Wrappers import DataOnDemand, Selection
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-from CommonParticles.Utils import *
-from LHCbKernel.Configuration import *
-from Gaudi.Configuration import *
 __author__ = ['Brais Sanmartin Sedes']
 __date__ = '01/12/2015'
 __version__ = '5.0'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingBs2PhiPhi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingBs2PhiPhi.py
index 0f280a3a06ba478759dc6e19bf80e278c15e5d40..1124dcdfd432c594fe79f1bc1e0b70fc24f9d21f 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingBs2PhiPhi.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingBs2PhiPhi.py
@@ -23,13 +23,10 @@ Exports the following stripping lines as instance data members:
 '''
 
 from StandardParticles import StdAllLooseANNKaons as MyLooseKaons
-from StandardParticles import StdLooseANNUpKaons as MyLooseUpKaons
-import StandardParticles
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
+from PhysSelPython.Wrappers import Selection
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 __author__ = ['Sean Benson']
 __date__ = '2013/08/15'
 __version__ = '3.0'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingBu2Ksthh.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingBu2Ksthh.py
index 5a06d1502605fd2037a6b16043d5efb150ce86d5..032717bced65040c1e6edaf12520110a1398cd1d 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingBu2Ksthh.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingBu2Ksthh.py
@@ -23,7 +23,6 @@ __version__ = 'Stripping26'
 __all__ = {'Bu2KsthhConf',
            'default_config'}
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
@@ -302,7 +301,7 @@ class Bu2KsthhConf(LineBuilder):
         _massCutHigh = "(AM<(5279+%s)*MeV)" % config['B_Mhigh']
         _aptCut = "(APT>%s*MeV)" % config['B_APTmin']
         _daugMedPtCut = "(ANUM(PT>%s*MeV)>=2)" % config['BDaug_MedPT_PT']
-        _daugMaxPtIPCut = "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['BDaug_MaxPT_IP']
+        "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['BDaug_MaxPT_IP']
         _maxDocaChi2Cut = "(ACUTDOCACHI2(%s,''))" % config['BDaug_DD_maxDocaChi2']
         _daugPtSumCut = "((APT1+APT2+APT3)>%s*MeV)" % config['BDaug_DD_PTsum']
 
@@ -359,7 +358,7 @@ class Bu2KsthhConf(LineBuilder):
         _massCutHigh = "(AM<(5279+%s)*MeV)" % config['B_Mhigh']
         _aptCut = "(APT>%s*MeV)" % config['B_APTmin']
         _daugMedPtCut = "(ANUM(PT>%s*MeV)>=2)" % config['BDaug_MedPT_PT']
-        _daugMaxPtIPCut = "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['BDaug_MaxPT_IP']
+        "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['BDaug_MaxPT_IP']
         _maxDocaChi2Cut = "(ACUTDOCACHI2(%s,''))" % config['BDaug_LL_maxDocaChi2']
         _daugPtSumCut = "((APT1+APT2+APT3)>%s*MeV)" % config['BDaug_LL_PTsum']
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingBu2hhh.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingBu2hhh.py
index 890eba4692dbe06517c0d7aee8f51d320cca8a64..62ede4129b7f2bd6ff173b27d26ebf7e47e4e6ea 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingBu2hhh.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingBu2hhh.py
@@ -22,13 +22,11 @@ Exported symbols (use python help!):
    - makepph_incl
 '''
 
-from Configurables import LoKi__VoidFilter as VoidFilter
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection
 import StandardParticles
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 __author__ = ['Irina Nasteva', 'Jussara Miranda', 'Alvaro Gomes']
 __date__ = '19/05/2017'
 __version__ = 'Stripping29'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingBu2rho0rhoPlus.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingBu2rho0rhoPlus.py
index 6ff36ce6304e5d819eb96fe6ca06587bb1baa6cc..51df1d5067b9100ee67537610b0005b048a5d51f 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingBu2rho0rhoPlus.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingBu2rho0rhoPlus.py
@@ -21,7 +21,6 @@ from StrippingUtils.Utils import LineBuilder, checkConfig
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = "Jason E Andrews"
 __date__ = "26/11/2016"
 __version__ = "4.0"
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingButo5h.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingButo5h.py
index be4eeb8a2dc0617afde7aab5929540d3bc8d05c7..65e1b29f0dde00492a6a5432e53292b9bc4c81a7 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingButo5h.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingButo5h.py
@@ -23,13 +23,11 @@ Exported symbols (use python help!):
    - makeppKpipi_excl
 '''
 
-from Configurables import LoKi__VoidFilter as VoidFilter
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection
 import StandardParticles
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 __author__ = ['Luiz Gustavo de Oliveira',
               'Alvaro Gomes', 'Bruno Souza de Paula']
 __date__ = '22/Aug/2014'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingD2HHBDT.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingD2HHBDT.py
index 6bee345112d54e258044f31f0e7d809849b112f7..98ef43000bc5732a81fe2e10bace645263334787 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingD2HHBDT.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingD2HHBDT.py
@@ -23,14 +23,13 @@ __all__ = ('D2HHBDTLines',
            'makeD2HHBDT',
            'default_config')
 
-from Gaudi.Configuration import *
 
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
 from StandardParticles import StdNoPIDsKaons, StdAllNoPIDsPions
 
 from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
-from StrippingUtils.Utils import LineBuilder, checkConfig
+from StrippingUtils.Utils import LineBuilder
 
 
 default_config = {
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingHb2Charged2Body.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingHb2Charged2Body.py
index 11da99218434ae71c894fa73b708dca4ee60de5d..3b3424d2fb6688333e151f52793701a7a2c00dbe 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingHb2Charged2Body.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingHb2Charged2Body.py
@@ -23,14 +23,13 @@ __all__ = ('Hb2Charged2BodyLines',
            'makeB2Charged2Body',
            'default_config')
 
-from Gaudi.Configuration import *
 
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-from StandardParticles import StdNoPIDsPions, StdLooseProtons, StdLooseKaons
+from StandardParticles import StdNoPIDsPions
 
 from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
-from StrippingUtils.Utils import LineBuilder, checkConfig
+from StrippingUtils.Utils import LineBuilder
 
 
 default_config = {
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingHb2V0V0h.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingHb2V0V0h.py
index 6b1c9eb94b261dbc185e979f0314ffe2bd69f930..f3104c9b58e73817c70f7fa7e3d68a0b9ecf0860 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingHb2V0V0h.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingHb2V0V0h.py
@@ -22,7 +22,6 @@ __date__ = '10/02/2017'
 __version__ = 'Stripping28'
 __all__ = 'Hb2V0V0hConf'
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingLb2V0hh.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingLb2V0hh.py
index f63034e02f45426009146384bed4036d16056a26..e896944db6cf521ad12d86186f9bda930b5bfd87 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingLb2V0hh.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingLb2V0hh.py
@@ -25,7 +25,6 @@ __date__ = '11/01/2017'
 __version__ = 'Stripping28'
 __all__ = 'Lb2V0hhConf'
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
@@ -211,8 +210,8 @@ class Lb2V0hhConf(LineBuilder):
         _vtxCut = "(VFASPF(VCHI2)<%s)   " % config['Lambda_DD_VtxChi2']
         _fdChi2Cut = "(BPVVDCHI2>%s)" % config['Lambda_DD_FDChi2']
         _momCut = "(P>%s*MeV)" % config['Lambda_DD_Pmin']
-        _trkGhostProbCut1 = "(CHILDCUT((TRGHOSTPROB<%s),1))" % config['Trk_GhostProb']
-        _trkGhostProbCut2 = "(CHILDCUT((TRGHOSTPROB<%s),2))" % config['Trk_GhostProb']
+        "(CHILDCUT((TRGHOSTPROB<%s),1))" % config['Trk_GhostProb']
+        "(CHILDCUT((TRGHOSTPROB<%s),2))" % config['Trk_GhostProb']
 
         _allCuts = _momCut
         _allCuts += '&'+_massCut
@@ -268,8 +267,8 @@ class Lb2V0hhConf(LineBuilder):
         _vtxCut = "(VFASPF(VCHI2)<%s)   " % config['Lambda_DD_VtxChi2']
         _fdChi2Cut = "(BPVVDCHI2>%s)" % config['Lambda_DD_FDChi2']
         _momCut = "(P>%s*MeV)" % config['Lambda_DD_Pmin']
-        _trkGhostProbCut1 = "(CHILDCUT((TRGHOSTPROB<%s),1))" % config['Trk_GhostProb']
-        _trkGhostProbCut2 = "(CHILDCUT((TRGHOSTPROB<%s),2))" % config['Trk_GhostProb']
+        "(CHILDCUT((TRGHOSTPROB<%s),1))" % config['Trk_GhostProb']
+        "(CHILDCUT((TRGHOSTPROB<%s),2))" % config['Trk_GhostProb']
 
         _allCuts = _momCut
         _allCuts += '&'+_massCut
@@ -302,7 +301,7 @@ class Lb2V0hhConf(LineBuilder):
         _massCutHigh = "(AM<(5619+%s)*MeV)" % config['Lb_2bodyMhigh']
         _aptCut = "(APT>%s*MeV)" % config['Lb_APTmin']
         _daugMedPtCut = "(ANUM(PT>%s*MeV)>=2)" % config['LbDaug_MedPT_PT']
-        _daugMaxPtIPCut = "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP']
+        "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP']
         _maxDocaChi2Cut = "(ACUTDOCACHI2(%s,''))" % config['LbDaug_DD_maxDocaChi2']
         _daugPtSumCut = "(APT1>%s*MeV)" % config['Lbh_DD_PTMin']
 
@@ -353,7 +352,7 @@ class Lb2V0hhConf(LineBuilder):
         _massCutHigh = "(AM<(5619+%s)*MeV)" % config['Lb_Mhigh']
         _aptCut = "(APT>%s*MeV)" % config['Lb_APTmin']
         _daugMedPtCut = "(ANUM(PT>%s*MeV)>=2)" % config['LbDaug_MedPT_PT']
-        _daugMaxPtIPCut = "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP']
+        "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP']
         _maxDocaChi2Cut = "(ACUTDOCACHI2(%s,''))" % config['LbDaug_DD_maxDocaChi2']
         _daugPtSumCut = "((APT1+APT2+APT3)>%s*MeV)" % config['LbDaug_DD_PTsum']
 
@@ -369,7 +368,7 @@ class Lb2V0hhConf(LineBuilder):
         _vtxChi2Cut = "(VFASPF(VCHI2)<%s)" % config['Lb_VtxChi2']
         _diraCut = "(BPVDIRA>%s)" % config['Lb_DD_Dira']
         _ipChi2Cut = "(MIPCHI2DV(PRIMARY)<%s)" % config['Lb_DD_IPCHI2wrtPV']
-        _fdCut = "(VFASPF(VMINVDDV(PRIMARY))>%s)" % config['Lb_FDwrtPV']
+        "(VFASPF(VMINVDDV(PRIMARY))>%s)" % config['Lb_FDwrtPV']
         _fdChi2Cut = "(BPVVDCHI2>%s)" % config['Lb_DD_FDChi2']
 
         _motherCuts = _ptCut
@@ -541,7 +540,7 @@ class Lb2V0hhConf(LineBuilder):
         _massCutHigh = "(AM<(5619+%s)*MeV)" % config['Lb_2bodyMhigh']
         _aptCut = "(APT>%s*MeV)" % config['Lb_APTmin']
         _daugMedPtCut = "(ANUM(PT>%s*MeV)>=2)" % config['LbDaug_MedPT_PT']
-        _daugMaxPtIPCut = "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP']
+        "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP']
         _maxDocaChi2Cut = "(ACUTDOCACHI2(%s,''))" % config['LbDaug_LD_maxDocaChi2']
         _daugPtSumCut = "(APT1>%s*MeV)" % config['Lbh_LD_PTMin']
 
@@ -592,7 +591,7 @@ class Lb2V0hhConf(LineBuilder):
         _massCutHigh = "(AM<(5619+%s)*MeV)" % config['Lb_Mhigh']
         _aptCut = "(APT>%s*MeV)" % config['Lb_APTmin']
         _daugMedPtCut = "(ANUM(PT>%s*MeV)>=2)" % config['LbDaug_MedPT_PT']
-        _daugMaxPtIPCut = "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP']
+        "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP']
         _maxDocaChi2Cut = "(ACUTDOCACHI2(%s,''))" % config['LbDaug_LD_maxDocaChi2']
         _daugPtSumCut = "((APT1+APT2+APT3)>%s*MeV)" % config['LbDaug_LD_PTsum']
 
@@ -608,7 +607,7 @@ class Lb2V0hhConf(LineBuilder):
         _vtxChi2Cut = "(VFASPF(VCHI2)<%s)" % config['Lb_VtxChi2']
         _diraCut = "(BPVDIRA>%s)" % config['Lb_LD_Dira']
         _ipChi2Cut = "(MIPCHI2DV(PRIMARY)<%s)" % config['Lb_LD_IPCHI2wrtPV']
-        _fdCut = "(VFASPF(VMINVDDV(PRIMARY))>%s)" % config['Lb_FDwrtPV']
+        "(VFASPF(VMINVDDV(PRIMARY))>%s)" % config['Lb_FDwrtPV']
         _fdChi2Cut = "(BPVVDCHI2>%s)" % config['Lb_LD_FDChi2']
 
         _motherCuts = _ptCut
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingLb2V0pp.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingLb2V0pp.py
index 23c63deba0a566efad08463be4f9e9577abecd08..77385a7d77c2a03b1678f32801ca31cd7356be5c 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingLb2V0pp.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingLb2V0pp.py
@@ -24,7 +24,6 @@ __date__ = '06/01/2019'
 __version__ = 'Stripping34'
 __all__ = 'Lb2V0ppConf'
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
@@ -210,8 +209,8 @@ class Lb2V0ppConf(LineBuilder):
         _vtxCut = "(VFASPF(VCHI2)<%s)   " % config['Lambda_DD_VtxChi2']
         _fdChi2Cut = "(BPVVDCHI2>%s)" % config['Lambda_DD_FDChi2']
         _momCut = "(P>%s*MeV)" % config['Lambda_DD_Pmin']
-        _trkGhostProbCut1 = "(CHILDCUT((TRGHOSTPROB<%s),1))" % config['Trk_GhostProb']
-        _trkGhostProbCut2 = "(CHILDCUT((TRGHOSTPROB<%s),2))" % config['Trk_GhostProb']
+        "(CHILDCUT((TRGHOSTPROB<%s),1))" % config['Trk_GhostProb']
+        "(CHILDCUT((TRGHOSTPROB<%s),2))" % config['Trk_GhostProb']
 
         _allCuts = _momCut
         _allCuts += '&'+_massCut
@@ -266,8 +265,8 @@ class Lb2V0ppConf(LineBuilder):
         _vtxCut = "(VFASPF(VCHI2)<%s)   " % config['Lambda_DD_VtxChi2']
         _fdChi2Cut = "(BPVVDCHI2>%s)" % config['Lambda_DD_FDChi2']
         _momCut = "(P>%s*MeV)" % config['Lambda_DD_Pmin']
-        _trkGhostProbCut1 = "(CHILDCUT((TRGHOSTPROB<%s),1))" % config['Trk_GhostProb']
-        _trkGhostProbCut2 = "(CHILDCUT((TRGHOSTPROB<%s),2))" % config['Trk_GhostProb']
+        "(CHILDCUT((TRGHOSTPROB<%s),1))" % config['Trk_GhostProb']
+        "(CHILDCUT((TRGHOSTPROB<%s),2))" % config['Trk_GhostProb']
 
         _allCuts = _momCut
         _allCuts += '&'+_massCut
@@ -300,7 +299,7 @@ class Lb2V0ppConf(LineBuilder):
         _massCutHigh = "(AM<(5619+%s)*MeV)" % config['Lb_2bodyMhigh']
         _aptCut = "(APT>%s*MeV)" % config['Lb_APTmin']
         _daugMedPtCut = "(ANUM(PT>%s*MeV)>=2)" % config['LbDaug_MedPT_PT']
-        _daugMaxPtIPCut = "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP']
+        "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP']
         _maxDocaChi2Cut = "(ACUTDOCACHI2(%s,''))" % config['LbDaug_DD_maxDocaChi2']
         _daugPtSumCut = "(APT1>%s*MeV)" % config['Lbh_DD_PTMin']
 
@@ -351,7 +350,7 @@ class Lb2V0ppConf(LineBuilder):
         _massCutHigh = "(AM<(5619+%s)*MeV)" % config['Lb_Mhigh']
         _aptCut = "(APT>%s*MeV)" % config['Lb_APTmin']
         _daugMedPtCut = "(ANUM(PT>%s*MeV)>=2)" % config['LbDaug_MedPT_PT']
-        _daugMaxPtIPCut = "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP']
+        "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP']
         _maxDocaChi2Cut = "(ACUTDOCACHI2(%s,''))" % config['LbDaug_DD_maxDocaChi2']
         _daugPtSumCut = "((APT1+APT2+APT3)>%s*MeV)" % config['LbDaug_DD_PTsum']
 
@@ -540,7 +539,7 @@ class Lb2V0ppConf(LineBuilder):
         _massCutHigh = "(AM<(5619+%s)*MeV)" % config['Lb_2bodyMhigh']
         _aptCut = "(APT>%s*MeV)" % config['Lb_APTmin']
         _daugMedPtCut = "(ANUM(PT>%s*MeV)>=2)" % config['LbDaug_MedPT_PT']
-        _daugMaxPtIPCut = "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP']
+        "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP']
         _maxDocaChi2Cut = "(ACUTDOCACHI2(%s,''))" % config['LbDaug_LD_maxDocaChi2']
         _daugPtSumCut = "(APT1>%s*MeV)" % config['Lbh_LD_PTMin']
 
@@ -591,7 +590,7 @@ class Lb2V0ppConf(LineBuilder):
         _massCutHigh = "(AM<(5619+%s)*MeV)" % config['Lb_Mhigh']
         _aptCut = "(APT>%s*MeV)" % config['Lb_APTmin']
         _daugMedPtCut = "(ANUM(PT>%s*MeV)>=2)" % config['LbDaug_MedPT_PT']
-        _daugMaxPtIPCut = "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP']
+        "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP']
         _maxDocaChi2Cut = "(ACUTDOCACHI2(%s,''))" % config['LbDaug_LD_maxDocaChi2']
         _daugPtSumCut = "((APT1+APT2+APT3)>%s*MeV)" % config['LbDaug_LD_PTsum']
 
@@ -607,7 +606,7 @@ class Lb2V0ppConf(LineBuilder):
         _vtxChi2Cut = "(VFASPF(VCHI2)<%s)" % config['Lb_VtxChi2']
         _diraCut = "(BPVDIRA>%s)" % config['Lb_LD_Dira']
         _ipChi2Cut = "(MIPCHI2DV(PRIMARY)<%s)" % config['Lb_LD_IPCHI2wrtPV']
-        _fdCut = "(VFASPF(VMINVDDV(PRIMARY))>%s)" % config['Lb_FDwrtPV']
+        "(VFASPF(VMINVDDV(PRIMARY))>%s)" % config['Lb_FDwrtPV']
         _fdChi2Cut = "(BPVVDCHI2>%s)" % config['Lb_LD_FDChi2']
 
         _motherCuts = _ptCut
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingXb23ph.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingXb23ph.py
index 44ba838d436b418c4eaef7372eccd95c28426134..ef24837631cfc50b46aabe0cc7dba0c8cdeb66fd 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingXb23ph.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingXb23ph.py
@@ -22,7 +22,6 @@ from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, DaVinci__N4Body
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection
-from Gaudi.Configuration import *
 __author__ = ['Jinlin Fu', 'Maurizio Martinelli', 'Andrea Merli']
 __date__ = '12/11/2015'
 __version__ = 'v1r0'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingXb2p3h.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingXb2p3h.py
index d07d7e52c17b8a01201968b3a1b929751c31bc9d..2c10d1f20bf15892c5e8ef6a5861130250a0a8ae 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingXb2p3h.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingXb2p3h.py
@@ -22,7 +22,6 @@ from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, DaVinci__N4Body
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection
-from Gaudi.Configuration import *
 __author__ = ['Jan Mickelle V. Maratas', 'Stephane Monteil', 'Andrea Merli']
 __date__ = '01/04/2016'
 __version__ = 'v1r0'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingXb2phh.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingXb2phh.py
index ae62ac803dcda11696229820fa7bcb3737c75114..35432dcb4a93cdbf47f1ec738735037534d82c07 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingXb2phh.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingBnoC/StrippingXb2phh.py
@@ -22,7 +22,6 @@ from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, DaVinci__N3Body
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection
-from Gaudi.Configuration import *
 __author__ = ['Jan Mickelle V. Maratas', 'Stephane Monteil', 'Thomas Latham']
 __date__ = '24/11/2016'
 __version__ = 'v1r0'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCalib/StrippingCharmFromBSemiForHadronAsy.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCalib/StrippingCharmFromBSemiForHadronAsy.py
index 08e7ce501b97c255a5b8e5a3de8395e4cbcf3cb6..6156fdca33abf5ffff5cbf8a3a9368f977dbcd6f 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCalib/StrippingCharmFromBSemiForHadronAsy.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCalib/StrippingCharmFromBSemiForHadronAsy.py
@@ -19,14 +19,12 @@ __author__ = ['Mika Vesterinen']
 __date__ = '10/03/2013'
 __version__ = '$Revision: 0.0 $'
 
-from Gaudi.Configuration import *
 
 from Configurables import FilterDesktop, CombineParticles
 from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from StandardParticles import StdAllLoosePions, StdLoosePions, StdLooseMuons, StdLooseKaons, StdLooseProtons
-from Configurables import TisTosParticleTagger
+from StandardParticles import StdLooseKaons, StdLooseMuons, StdLoosePions
 
 __all__ = ('CharmFromBSemiForHadronAsyAllLinesConf',
            'TOSFilter',
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCalib/StrippingCharmFromBSemiForProtonPID.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCalib/StrippingCharmFromBSemiForProtonPID.py
index 331ebd34b3e7842bbf2e94a73977d8b0cc10b450..a1e805b96edf80f3f08a3ba0f447e47d13b203c2 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCalib/StrippingCharmFromBSemiForProtonPID.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCalib/StrippingCharmFromBSemiForProtonPID.py
@@ -18,12 +18,11 @@ __author__ = ['Mika Vesterinen']
 __date__ = '19/03/2013'
 __version__ = '$Revision: 0.0 $'
 
-from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from StandardParticles import StdLoosePions, StdLooseMuons, StdLooseKaons, StdLooseProtons, StdNoPIDsProtons
+from StandardParticles import StdLooseKaons, StdLooseMuons, StdLoosePions, StdNoPIDsProtons
 
 __all__ = ('CharmFromBSemiForProtonPIDAllLinesConf',
            'default_config')
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCalib/StrippingD02KPiPi0.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCalib/StrippingD02KPiPi0.py
index b0efbccbb69d5ac6209e0a251edf9943a222afe9..a431e7b970041f35d68bc9a765db0757832a6fdd 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCalib/StrippingD02KPiPi0.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCalib/StrippingD02KPiPi0.py
@@ -25,9 +25,8 @@ __all__ = ('StrippingD02KPiPi0Conf',
            'makeD02KPiPi0M',
            'default_config')
 
-from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from PhysSelPython.Wrappers import Selection, DataOnDemand
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
+from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from StandardParticles import StdTightPions, StdTightKaons, StdLooseMergedPi0, StdLooseResolvedPi0
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCalib/StrippingD02KPiPi0DalitzPartReco.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCalib/StrippingD02KPiPi0DalitzPartReco.py
index caaa8b1b857ec7efb302c62895c9b7a334961cbf..7a1c97e88520fb73f140818146de685e254df9f7 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCalib/StrippingD02KPiPi0DalitzPartReco.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCalib/StrippingD02KPiPi0DalitzPartReco.py
@@ -8,9 +8,7 @@
 # granted to it by virtue of its status as an Intergovernmental Organization  #
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
-import logging
 from StrippingUtils.Utils import LineBuilder
-from Gaudi.Configuration import *
 __author__ = ['Greg Ciezarek', 'Liang Sun', 'Adam Davis']
 __date__ = '18/05/2017'
 __version__ = '$Revision: 0.01 $'
@@ -75,7 +73,6 @@ class D2KPiPi0_PartRecoBuilder(LineBuilder):
     def __init__(self, name, config):
         LineBuilder.__init__(self, name, config)
         self._config = config
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
 
         # self.GECs = { "Code":"( recSummaryTrack(LHCb.RecSummary.nLongTracks, TrLONG) < %(GEC_nLongTrk)s )" % config,
         #              "Preambulo": ["from LoKiTracks.decorators import *"]}
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCalib/StrippingD0ForBXX.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCalib/StrippingD0ForBXX.py
index 836cb251bf6bed5dcdba32758964e9950e666b07..d9859abdb5e61ecd488fc22f98c91f6df28e248f 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCalib/StrippingD0ForBXX.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCalib/StrippingD0ForBXX.py
@@ -20,7 +20,7 @@ from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from StandardParticles import StdLoosePions, StdLooseKaons, StdLooseProtons, StdAllLoosePions
+from StandardParticles import StdAllLoosePions, StdLooseKaons, StdLoosePions
 
 
 name = 'confD0forBXX'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCalib/StrippingDstarD02hhPi0PartRecoForPhotonCalib.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCalib/StrippingDstarD02hhPi0PartRecoForPhotonCalib.py
index ee8e553744feb3138a51e275635fb7d6e5f04f18..5e9f1e9a8d8aaff44060d1c66e8f15e033d7db22 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCalib/StrippingDstarD02hhPi0PartRecoForPhotonCalib.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCalib/StrippingDstarD02hhPi0PartRecoForPhotonCalib.py
@@ -31,15 +31,15 @@ from Gaudi.Configuration import *
 
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 from StandardParticles import StdAllNoPIDsPions, StdNoPIDsPions, StdNoPIDsKaons
-from StandardParticles import StdLooseAllPhotons, StdLooseResolvedPi0, StdLooseMergedPi0
+from StandardParticles import StdLooseAllPhotons
 
 from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
-from StrippingUtils.Utils import LineBuilder, checkConfig
+from StrippingUtils.Utils import LineBuilder
 
 from Configurables import FilterDesktop
 
-from GaudiKernel.SystemOfUnits import GeV, MeV, picosecond, mm
+from GaudiKernel.SystemOfUnits import GeV, MeV, picosecond
 
 default_config = {
     'NAME': 'DstarD2hhGammaCalib',
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCalib/StrippingElectronID.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCalib/StrippingElectronID.py
index f8385e403a664f2d870608e8c28ac1032d182cc0..1b5dd98b23444069027c372e85ae7f6f3318a423 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCalib/StrippingElectronID.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCalib/StrippingElectronID.py
@@ -23,9 +23,8 @@ stream.appendLines( [
 
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand
+from PhysSelPython.Wrappers import Selection
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = ['Jibo He']
 __date__ = '03/10/2010'
 __version__ = '$Revision: 1.2 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCalib/StrippingElectronRecoEff.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCalib/StrippingElectronRecoEff.py
index c19ff961c1db5ef3bfbfb03a4d9133a4c8888bdf..bdb2892004f5f8e6c93bb551bb939895eca5eb63 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCalib/StrippingElectronRecoEff.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCalib/StrippingElectronRecoEff.py
@@ -17,17 +17,15 @@ from StandardParticles import StdAllLoosePions as Hlt2Pions
 from StandardParticles import StdAllLooseKaons as Hlt2Kaons
 from StandardParticles import StdNoPIDsElectrons as Hlt2Electrons
 from StandardParticles import StdNoPIDsMuons as Hlt2Muons
-from TrackFitter.ConfiguredFitters import (ConfiguredEventFitter,
-                                           ConfiguredForwardStraightLineEventFitter)
+from TrackFitter.ConfiguredFitters import ConfiguredEventFitter
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import DataOnDemand, MergedSelection
 from PhysConf.Selections import L0TOSSelection
 from PhysConf.Selections import Hlt1TOSSelection
 from PhysConf.Selections import Hlt2TOSSelection
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 from StrippingUtils.Utils import LineBuilder
-from GaudiKernel.SystemOfUnits import GeV, MeV, mm
+from GaudiKernel.SystemOfUnits import MeV, mm
 from Gaudi.Configuration import *
 __author__ = ['Adam Davis', 'Laurent Dufour', 'V. V. Gligorov']
 __date__ = '14/1/2018'
@@ -45,10 +43,9 @@ from PhysSelPython.Wrappers import Selection, Hlt1Selection, Hlt2Selection, L0Se
 from SelPy.utils import (UniquelyNamedObject,
                          ClonableObject,
                          SelectionBase)
-from Configurables import (DecodeVeloRawBuffer, FastVeloTracking, TrackPrepareVelo,
-                           NoPIDsParticleMaker, DataOnDemandSvc, ChargedProtoParticleMaker,
-                           PrTrackAssociator, DelegatingTrackSelector, TrackContainerCopy, TrackAssociator,
-                           TrackStateInitAlg, TrackStateInitTool)
+from Configurables import (FastVeloTracking, NoPIDsParticleMaker, DataOnDemandSvc,
+                           ChargedProtoParticleMaker, DelegatingTrackSelector, TrackContainerCopy,
+                           TrackStateInitAlg)
 
 default_config = {'NAME': 'ElectronRecoEff',
                   'WGs': ['Calib'],
@@ -287,7 +284,6 @@ class StrippingElectronRecoEffLines(LineBuilder):
     def __init__(self, name, config):
         LineBuilder.__init__(self, name, config)
 
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
         self._config = config
         self.name = name
 
@@ -571,7 +567,7 @@ class StrippingElectronRecoEffLines(LineBuilder):
         )
 
     def DetachedEEKPair(self, _name):
-        configuration = self._config["DetachedEEK"]
+        self._config["DetachedEEK"]
 
         _DetachedEEKPair = self.getCPForEEK("DetachedEEK")
         _DetachedEEKPair_Sel = Selection("SelEEK_for_"+_name,
@@ -591,7 +587,7 @@ class StrippingElectronRecoEffLines(LineBuilder):
         return line
 
     def DetachedEEKstarPair(self, _name):
-        configuration = self._config["DetachedEEKstar"]
+        self._config["DetachedEEKstar"]
 
         _DetachedEEKstarPair = self.getCPForEEK("DetachedEEKstar")
         _DetachedEEKstarPair_Sel = Selection("SelEEKstar_for_"+_name,
@@ -611,7 +607,7 @@ class StrippingElectronRecoEffLines(LineBuilder):
         return line
 
     def DetachedEEPhiPair(self, _name):
-        configuration = self._config["DetachedEEPhi"]
+        self._config["DetachedEEPhi"]
 
         _DetachedEEPhiPair = self.getCPForEEK("DetachedEEPhi")
         _DetachedEEPhiPair_Sel = Selection("SelEEPhi_for_"+_name,
@@ -882,7 +878,6 @@ class StrippingElectronRecoEffLines(LineBuilder):
     def MakeVeloTracks(self, prefilter):
         if self._config["DoVeloDecoding"]:
             from DAQSys.Decoders import DecoderDB
-            from DAQSys.DecoderClass import decodersForBank
             decs = []
             vdec = DecoderDB["DecodeVeloRawBuffer/createBothVeloClusters"]
             vdec.Active = True
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCalib/StrippingJPsiForSL.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCalib/StrippingJPsiForSL.py
index 66d3cf569e7e3d642fb1e90689c09009970a9f91..f83a469f0d79f559f3b8f1ce7fa0a29617c07287 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCalib/StrippingJPsiForSL.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCalib/StrippingJPsiForSL.py
@@ -20,11 +20,10 @@ __version__ = '$Revision: 0.1 $'
 
 from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from PhysSelPython.Wrappers import Selection, DataOnDemand
+from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from StandardParticles import StdLoosePions, StdLooseMuons, StdLooseKaons, StdLooseProtons, StdNoPIDsPions, StdNoPIDsMuons, StdLooseMergedPi0, StdLooseResolvedPi0, StdLooseElectrons, StdNoPIDsKaons
-from Configurables import TisTosParticleTagger
+from StandardParticles import StdNoPIDsKaons, StdNoPIDsMuons
 
 __all__ = ('JPsiForSLAllLinesConf',
            'confdict')
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCalib/StrippingK23PiForDownstreamTrackEff.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCalib/StrippingK23PiForDownstreamTrackEff.py
index 5e95ecb40bf4a7b0d570152c6cb5a85c2e157431..9ea071dc760c1a4d2e8adb1bd47ddd464f85a7d1 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCalib/StrippingK23PiForDownstreamTrackEff.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCalib/StrippingK23PiForDownstreamTrackEff.py
@@ -14,10 +14,6 @@ one missing pion, using the corrected mass
 '''
 
 from StrippingUtils.Utils import LineBuilder
-from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = ['Michel De Cian']
 __date__ = '19/12/2018'
 __version__ = '$Revision: 1.0 $'
@@ -269,8 +265,8 @@ class K23PiForDownstreamTrackEffConf(LineBuilder):
         if self._dipionSelSSNarrowDownstream is not None:
             return self._dipionSelSSNarrowDownstream
 
-        from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
+        from GaudiConfUtils.ConfigurableGenerators import CombineParticles
+        from PhysSelPython.Wrappers import Selection
 
         _k2pipi = CombineParticles(
             DecayDescriptors=["[phi(1020) -> pi+ pi+]cc"],
@@ -293,8 +289,8 @@ class K23PiForDownstreamTrackEffConf(LineBuilder):
         if self._dipionSelSSNarrowLong is not None:
             return self._dipionSelSSNarrowLong
 
-        from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
+        from GaudiConfUtils.ConfigurableGenerators import CombineParticles
+        from PhysSelPython.Wrappers import Selection
 
         _k2pipi = CombineParticles(
             DecayDescriptors=["[phi(1020) -> pi+ pi+]cc"],
@@ -317,8 +313,8 @@ class K23PiForDownstreamTrackEffConf(LineBuilder):
         if self._dipionSelSSWide is not None:
             return self._dipionSelSSWide
 
-        from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
+        from GaudiConfUtils.ConfigurableGenerators import CombineParticles
+        from PhysSelPython.Wrappers import Selection
 
         _k2pipi = CombineParticles(
             DecayDescriptors=["[phi(1020) -> pi+ pi+]cc"],
@@ -342,8 +338,8 @@ class K23PiForDownstreamTrackEffConf(LineBuilder):
         if self._dipionSelOSNarrowDownstream is not None:
             return self._dipionSelOSNarrowDownstream
 
-        from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
+        from GaudiConfUtils.ConfigurableGenerators import CombineParticles
+        from PhysSelPython.Wrappers import Selection
 
         # Cut out the Kshort
         mCut = self._dipionSelectionNarrow() + " & (ADMASS('KS0') > 40)"
@@ -370,8 +366,8 @@ class K23PiForDownstreamTrackEffConf(LineBuilder):
         if self._dipionSelOSNarrowLong is not None:
             return self._dipionSelOSNarrowLong
 
-        from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
+        from GaudiConfUtils.ConfigurableGenerators import CombineParticles
+        from PhysSelPython.Wrappers import Selection
 
         # Cut out the Kshort
         mCut = self._dipionSelectionNarrow() + " & (ADMASS('KS0') > 40)"
@@ -398,8 +394,8 @@ class K23PiForDownstreamTrackEffConf(LineBuilder):
         if self._dipionSelOSWide is not None:
             return self._dipionSelOSWide
 
-        from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
+        from GaudiConfUtils.ConfigurableGenerators import CombineParticles
+        from PhysSelPython.Wrappers import Selection
 
         # Cut out the Kshort
         mCut = self._dipionSelectionWide() + " & (ADMASS('KS0') > 40)"
@@ -427,8 +423,8 @@ class K23PiForDownstreamTrackEffConf(LineBuilder):
         # if self._tripionSelDipionSS is not None:
         #   return self._tripionSelDipionSS
 
-        from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
+        from GaudiConfUtils.ConfigurableGenerators import CombineParticles
+        from PhysSelPython.Wrappers import Selection
 
         _k2pipipi = CombineParticles(
             DecayDescriptors=["[K+ -> phi(1020) pi-]cc"],
@@ -449,8 +445,8 @@ class K23PiForDownstreamTrackEffConf(LineBuilder):
         # if self._tripionSelDipionOS is not None:
         #   return self._tripionSelDipionOS
 
-        from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
+        from GaudiConfUtils.ConfigurableGenerators import CombineParticles
+        from PhysSelPython.Wrappers import Selection
 
         _k2pipipi = CombineParticles(
             DecayDescriptors=["[K+ -> phi(1020) pi+]cc"],
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCalib/StrippingLowPtMuID.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCalib/StrippingLowPtMuID.py
index c938bbfa4f325120436121227b8c9ba66d1420d7..96d9c592351659e6d677d1fb083266fb9f80f738 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCalib/StrippingLowPtMuID.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCalib/StrippingLowPtMuID.py
@@ -19,12 +19,9 @@ largely cloned from line written by 'S.Furcas', 'G.Lanfranchi', 'M.Palutan', 'A.
 
 from StandardParticles import StdAllNoPIDsMuons
 from StrippingUtils.Utils import LineBuilder
-from Configurables import LoKi__Hybrid__CoreFactory as CoreFactory
-from Configurables import LoKi__VoidFilter as VoidFilter
-from PhysSelPython.Wrappers import DataOnDemand, Selection, SelectionSequence, MergedSelection
+from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 __author__ = ['G.Ciezarek', ]
 __date__ = '03/12/2015'
 __version__ = '$Revision: 1.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCalib/StrippingMuIDCalib.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCalib/StrippingMuIDCalib.py
index 48473756334933bd76098e1f169f2fcac058f2d2..9647c11e74493f1b68f480afc92080ecc6f1c325 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCalib/StrippingMuIDCalib.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCalib/StrippingMuIDCalib.py
@@ -22,15 +22,12 @@ lb = builder( 'MuIDCalib', config_params )
 
 '''
 
-from StandardParticles import StdAllNoPIDsKaons, StdAllNoPIDsMuons, StdAllNoPIDsPions, StdAllNoPIDsProtons
+from StandardParticles import StdAllNoPIDsMuons
 from StandardParticles import StdNoPIDsKaons, StdNoPIDsMuons, StdNoPIDsPions, StdNoPIDsProtons
 from StrippingUtils.Utils import LineBuilder
-from Configurables import LoKi__Hybrid__CoreFactory as CoreFactory
-from Configurables import LoKi__VoidFilter as VoidFilter
-from PhysSelPython.Wrappers import DataOnDemand, Selection, SelectionSequence, MergedSelection
+from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 __author__ = ['S.Furcas', 'G.Lanfranchi',
               'M.Palutan', 'A.Sarti', 'D.Milanes', 'MuID Team']
 __date__ = '23/08/2011'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCalib/StrippingNoPIDDstarWithD02RSKPi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCalib/StrippingNoPIDDstarWithD02RSKPi.py
index 914c4a47cd048e3cd64e662985a9b4f35d9be508..5969dfaafb882830e2b62086af2a6274bffd846b 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCalib/StrippingNoPIDDstarWithD02RSKPi.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCalib/StrippingNoPIDDstarWithD02RSKPi.py
@@ -13,10 +13,8 @@
 from StandardParticles import StdAllNoPIDsKaons, StdAllNoPIDsPions
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from LHCbKernel.Configuration import *
-from Gaudi.Configuration import *
+from PhysSelPython.Wrappers import Selection
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 __author__ = ['Philip Xing', 'Andrew Powell']
 __date__ = '23rd August 2012'
 __version__ = '$Revision: 7.0 $'
@@ -42,7 +40,7 @@ StrippingReport                                                INFO Event 100000
 __all__ = ('NoPIDDstarWithD02RSKPiConf', 'default_config')
 
 
-from GaudiKernel.SystemOfUnits import mm, cm, MeV, GeV
+from GaudiKernel.SystemOfUnits import GeV, MeV
 # from Configurables import FilterDesktop, CombineParticles
 
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCalib/StrippingPIDCalib.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCalib/StrippingPIDCalib.py
index f3872175c1963791b4ef11e27dece0c57f983c05..65099ba3209f82b019bfdda36cf17bc93d0b54e0 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCalib/StrippingPIDCalib.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCalib/StrippingPIDCalib.py
@@ -35,9 +35,7 @@ from Configurables import DaVinci__N3BodyDecays
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
 from Configurables import CombineParticles
-from Gaudi.Configuration import *
 __author__ = ['Lucio Anderlini']
 __date__ = '25/02/2015'
 __version__ = '$Revision: 1.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCalib/StrippingTrackEffD0ToKPi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCalib/StrippingTrackEffD0ToKPi.py
index b93a420e3f50b2e4f8f1d92b1881f55e362e1bcf..1a0ca1d608bbe19c5586681674ba9a975871571b 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCalib/StrippingTrackEffD0ToKPi.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCalib/StrippingTrackEffD0ToKPi.py
@@ -17,7 +17,7 @@ from Configurables import FilterDesktop, CombineParticles
 from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from StandardParticles import StdLooseKaons, StdLoosePions, StdAllLoosePions, StdAllNoPIDsPions
+from StandardParticles import StdAllLoosePions, StdLooseKaons, StdLoosePions
 from SelPy.utils import (UniquelyNamedObject,
                          ClonableObject,
                          SelectionBase)
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCalib/StrippingTrackEffDownMuon.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCalib/StrippingTrackEffDownMuon.py
old mode 100755
new mode 100644
index 21183c23cb96bfab39ffdcc6bd7c4179aa95fcb1..c1b3a3d27fbe6ff6795e43bbb378b51ecdd2211d
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCalib/StrippingTrackEffDownMuon.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCalib/StrippingTrackEffDownMuon.py
@@ -48,35 +48,27 @@ __all__ = ('StrippingTrackEffDownMuonConf',
 # FIXME Write includes in a cleaner way
 from Gaudi.Configuration import *
 from LHCbKernel.Configuration import *
-from DAQSys.DecoderClass import Decoder
 from Configurables import GaudiSequencer
 from Configurables import UnpackTrack, ChargedProtoParticleMaker, DelegatingTrackSelector, TrackSelector, BestPIDParticleMaker
-from TrackFitter.ConfiguredFitters import ConfiguredFit
 from Configurables import TrackStateInitAlg
 from StrippingConf.StrippingLine import StrippingLine
-from Configurables import ChargedProtoParticleAddMuonInfo, MuonIDAlgLite
+from Configurables import ChargedProtoParticleAddMuonInfo
 from MuonID import ConfiguredMuonIDs
 from Configurables import ChargedProtoCombineDLLsAlg, ProtoParticleMUONFilter
-from PhysSelPython.Wrappers import Selection, DataOnDemand
+from PhysSelPython.Wrappers import Selection
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
 from StandardParticles import StdLooseMuons
 
 from StrippingUtils.Utils import LineBuilder
-from Configurables import LoKi__VoidFilter
-from os import environ
 from Gaudi.Configuration import *
-import GaudiKernel.ProcessJobOptions
-from GaudiKernel.SystemOfUnits import mm
 
 from GaudiConfUtils.ConfigurableGenerators import TisTosParticleTagger
 from StandardParticles import StdAllLooseMuons
 from Configurables import GaudiSequencer
 from Configurables import TrackToDST
-from Configurables import TrackSys
 from Configurables import PatSeeding, PatSeedingTool, PatLongLivedTracking
-from PhysSelPython.Wrappers import AutomaticData
 # Get the fitters
-from TrackFitter.ConfiguredFitters import ConfiguredFit, ConfiguredFitSeed, ConfiguredFitDownstream
+from TrackFitter.ConfiguredFitters import ConfiguredFitDownstream
 from PatAlgorithms import PatAlgConf
 
 from SelPy.utils import (UniquelyNamedObject,
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCalib/StrippingTrackEffMuonTT.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCalib/StrippingTrackEffMuonTT.py
index e4b5dcdd3e9e45e78514419f33215ba0c11c8214..2813f15a2bd11c522ce8fa41d62c8cba8c67b48f 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCalib/StrippingTrackEffMuonTT.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCalib/StrippingTrackEffMuonTT.py
@@ -64,11 +64,10 @@ __all__ = ('StrippingTrackEffMuonTTConf',
            'makeBJpsiKTrackEff',
            'filterHLT2ForBJpsiK')
 
-from Gaudi.Configuration import *
-from PhysSelPython.Wrappers import Selection, DataOnDemand, ChargedProtoParticleSelection
+from PhysSelPython.Wrappers import ChargedProtoParticleSelection, Selection
 from StrippingConf.StrippingLine import StrippingLine
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from StrippingUtils.Utils import LineBuilder, checkConfig
+from StrippingUtils.Utils import LineBuilder
 from StandardParticles import StdLooseKaons, StdLooseMuons, StdAllLooseMuons
 
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCalib/StrippingTrackEffVeloMuon.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCalib/StrippingTrackEffVeloMuon.py
index c7da7abeddda6483ce8d3b57a6b3083ee07bdafe..3f821c02445e084449fcec8a684ab687eb7dca9a 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCalib/StrippingTrackEffVeloMuon.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCalib/StrippingTrackEffVeloMuon.py
@@ -29,25 +29,17 @@
 from SelPy.utils import (UniquelyNamedObject,
                          ClonableObject,
                          SelectionBase)
-from Configurables import TrackEventCloneKiller, VeloMuonBuilder
-from Configurables import TrackStateInitAlg, TrackEventFitter, TrackPrepareVelo, TrackContainerCopy, Tf__PatVeloSpaceTool, StandaloneMuonRec
+from Configurables import VeloMuonBuilder
+from Configurables import StandaloneMuonRec, TrackPrepareVelo
 from Configurables import CombineParticles
-from Configurables import TrackKalmanFilter, TrackMasterExtrapolator
-from Configurables import TrackEventFitter, TrackMasterFitter
-from TrackFitter.ConfiguredFitters import ConfiguredFit
-from PhysSelPython.Wrappers import AutomaticData
-from Configurables import TrackSys
 from Configurables import GaudiSequencer
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, TisTosParticleTagger
 from StandardParticles import StdLooseMuons
 from StrippingUtils.Utils import LineBuilder
-from Configurables import TrackCloneFinder
 from StrippingConf.StrippingLine import StrippingLine
 from Configurables import FastVeloTracking
-from Configurables import ChargedProtoParticleMaker, NoPIDsParticleMaker, DataOnDemandSvc, DelegatingTrackSelector, TrackSelector, CombinedParticleMaker, BestPIDParticleMaker
-from PhysSelPython.Wrappers import Selection, SelectionSequence, DataOnDemand
-from LHCbKernel.Configuration import *
-from Gaudi.Configuration import *
+from Configurables import ChargedProtoParticleMaker, DataOnDemandSvc, DelegatingTrackSelector, NoPIDsParticleMaker, TrackSelector
+from PhysSelPython.Wrappers import Selection
 __author__ = ['Flavio Archilli']
 __date__ = '30/10/2019'
 __version__ = '$Revision: 0.1 $'
@@ -159,8 +151,6 @@ class StrippingTrackEffVeloMuonConf(LineBuilder):
 
         _config = self.config[confLine]
 
-        _pchargeCut = None
-        _tchargeCut = None
         _tagCharge = None
         _probeCharge = None
         _chargename = None
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingB2ppipiSigmacmm_Lcpi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingB2ppipiSigmacmm_Lcpi.py
index 1932ea73632bfc335a5d650d07d5b01c5d455fa9..397b76425631bddc729ad4ce8bbb2a99c6f92bf2 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingB2ppipiSigmacmm_Lcpi.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingB2ppipiSigmacmm_Lcpi.py
@@ -31,12 +31,11 @@ __all__ = ('StrippingB2ppipiSigmacmm_Lcpi_Conf', 'makeLc2pKpi', 'makepifromSigma
            )
 
 from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, ConjugateNeutralPID, DaVinci__N3BodyDecays
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N3BodyDecays, FilterDesktop
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
-from StrippingUtils.Utils import checkConfig, LineBuilder
+from StrippingUtils.Utils import LineBuilder
 from GaudiKernel.SystemOfUnits import MeV, GeV, mm
-from copy import copy
 
 name = 'StrippingB2ppipiSigmacmm_Lcpi'
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingChargedHyperons.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingChargedHyperons.py
index 920c9faefc12697a4686bb708606c7aefce7c812..1e9ecbdf32eac322732659ae13423893f4c17ced 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingChargedHyperons.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingChargedHyperons.py
@@ -21,13 +21,9 @@ __version__ = '$Revision: 1.0 $'
 __all__ = ('StrippingChargedHyperonsConf', 'default_config')
 
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from StandardParticles import StdLoosePions, StdNoPIDsDownPions, StdLooseKaons, StdLooseDownKaons
-from StandardParticles import StdAllLoosePions, StdAllLooseKaons
 
 from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
-from PhysSelPython.Wrappers import MultiSelectionSequence
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from GaudiKernel.SystemOfUnits import MeV, mm, picosecond
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingCharm2PPX.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingCharm2PPX.py
index 8f420ab23681879eda33d3f11a9c1854083e6f5d..1776621bc50d11dd212c17cc7c967c25e7570f68 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingCharm2PPX.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingCharm2PPX.py
@@ -26,7 +26,7 @@ __all__ = (
     'StrippingCharm2PPXConf'  # ???
 )
 
-from GaudiKernel.SystemOfUnits import MeV, GeV, mm, mrad
+from GaudiKernel.SystemOfUnits import GeV, MeV, mm
 from Configurables import CombineParticles, FilterDesktop
 # from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop, DaVinci__N3BodyDecays
 from StandardParticles import (
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingCharmForVub.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingCharmForVub.py
index addb5112d833323e807d80a2fcd5d1c6ef104d89..196b7aca8b732e4ce87cfa408c9240c9d4ca9fe8 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingCharmForVub.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingCharmForVub.py
@@ -31,9 +31,8 @@ __all__ = ('CharmForVubConf',
            'makeDstarD02HMuNu')
 
 from Gaudi.Configuration import *
-from Configurables import SubstitutePID
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
+from PhysSelPython.Wrappers import MergedSelection, Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from StandardParticles import StdLooseMuons, StdLooseKaons, StdAllLoosePions, StdLoosePions
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingCharmWeakDecays.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingCharmWeakDecays.py
index 62cf538da90f04787baab5c812393440f86c3b23..72c36178501074aeada4d5d7f91bd305c974ec78 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingCharmWeakDecays.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingCharmWeakDecays.py
@@ -28,7 +28,7 @@ __all__ = ('CharmWeakDecaysConf',
            'default_config')
 
 from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingD02KSKS.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingD02KSKS.py
index 048a0f735673d789716920a6b813f3734a817158..2e831b063d5dd66449d672d2c0c14659bb9d9210 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingD02KSKS.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingD02KSKS.py
@@ -25,9 +25,8 @@ __date__ = '15/05/2014'
 __version__ = 'Stripping23'
 __all__ = 'D02KSKSConf'
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
+from PhysSelPython.Wrappers import DataOnDemand, Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 
@@ -556,7 +555,7 @@ class D02KSKSConf(LineBuilder):
         _daughterCuts = "(TRGHOSTPROB <=%s )" % config['slowPi_LLL_TRGHOSTPROB']
 
         # 40
-        _vertexChi2_cut = "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_LL']
+        "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_LL']
 
         # 200
         _combCuts = "(ADAMASS('D*(2010)+') < %s*MeV)" % config['Dst_mass_LL']
@@ -593,7 +592,7 @@ class D02KSKSConf(LineBuilder):
         _daughterCuts = "(TRGHOSTPROB <=%s )" % config['slowPi_LLU_TRGHOSTPROB']
 
         # 40
-        _vertexChi2_cut = "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_LL']
+        "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_LL']
 
         # 200
         _combCuts = "(ADAMASS('D*(2010)+') < %s*MeV)" % config['Dst_mass_LL']
@@ -630,7 +629,7 @@ class D02KSKSConf(LineBuilder):
         _daughterCuts = "(TRGHOSTPROB <=%s )" % config['slowPi_LDL_TRGHOSTPROB']
 
         # 40
-        _vertexChi2_cut = "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_LD']
+        "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_LD']
 
         # 200
         _combCuts = "(ADAMASS('D*(2010)+') < %s*MeV)" % config['Dst_mass_LD']
@@ -667,7 +666,7 @@ class D02KSKSConf(LineBuilder):
         _daughterCuts = "(TRGHOSTPROB <=%s )" % config['slowPi_LDU_TRGHOSTPROB']
 
         # 40
-        _vertexChi2_cut = "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_LD']
+        "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_LD']
 
         # 200
         _combCuts = "(ADAMASS('D*(2010)+') < %s*MeV)" % config['Dst_mass_LD']
@@ -704,7 +703,7 @@ class D02KSKSConf(LineBuilder):
         _daughterCuts = "(TRGHOSTPROB <=%s )" % config['slowPi_DDL_TRGHOSTPROB']
 
         # 40
-        _vertexChi2_cut = "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_DD']
+        "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_DD']
 
         # 200
         _combCuts = "(ADAMASS('D*(2010)+') < %s*MeV)" % config['Dst_mass_DD']
@@ -741,7 +740,7 @@ class D02KSKSConf(LineBuilder):
         _daughterCuts = "(TRGHOSTPROB <=%s )" % config['slowPi_DDU_TRGHOSTPROB']
 
         # 40
-        _vertexChi2_cut = "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_DD']
+        "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_DD']
 
         # 200
         _combCuts = "(ADAMASS('D*(2010)+') < %s*MeV)" % config['Dst_mass_DD']
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingD2HHHGamma.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingD2HHHGamma.py
index f493f6bd9021f7c482ad4f11110b31209e277d1e..e0da6bf833dec41ba4733267992c2593b1e66642 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingD2HHHGamma.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingD2HHHGamma.py
@@ -22,19 +22,18 @@ __version__ = '$Revision: 0.1 $'
 __all__ = ('D2HHHGammaLines',
            'default_config')
 
-from Gaudi.Configuration import *
 
-from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N4BodyDecays
+from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays
 from StandardParticles import StdNoPIDsPions, StdNoPIDsKaons
 from StandardParticles import StdLooseAllPhotons, StdAllLooseGammaLL, StdAllLooseGammaDD
 
 from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
-from StrippingUtils.Utils import LineBuilder, checkConfig
+from StrippingUtils.Utils import LineBuilder
 
 from Configurables import FilterDesktop
 
-from GaudiKernel.SystemOfUnits import GeV, MeV, picosecond, mm
+from GaudiKernel.SystemOfUnits import GeV, MeV, picosecond
 
 
 default_config = {
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingD2HHHKs.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingD2HHHKs.py
index e5639b90812290f4e2226c3b0c140285aa788b00..8b56f2ae08f0d364c45bed96aa90657daee77a7d 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingD2HHHKs.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingD2HHHKs.py
@@ -22,19 +22,18 @@ __version__ = '$Revision: 0.1 $'
 __all__ = ('D2HHHKsLines',
            'default_config')
 
-from Gaudi.Configuration import *
 
-from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N4BodyDecays
+from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays
 from StandardParticles import StdNoPIDsPions, StdNoPIDsKaons
 from StandardParticles import StdLooseKsDD, StdLooseKsLL
 
 from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
-from StrippingUtils.Utils import LineBuilder, checkConfig
+from StrippingUtils.Utils import LineBuilder
 
 from Configurables import FilterDesktop
 
-from GaudiKernel.SystemOfUnits import GeV, MeV, picosecond, mm
+from GaudiKernel.SystemOfUnits import MeV, mm, picosecond
 
 
 default_config = {
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingD2HHHPi0.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingD2HHHPi0.py
index 6083359069ac88d66ad4d2d0c3f6c4a785962da6..8557b0ed7b6ea3312ecd34ede82d7cbd720f6775 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingD2HHHPi0.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingD2HHHPi0.py
@@ -22,19 +22,18 @@ __version__ = '$Revision: 0.1 $'
 __all__ = ('D2HHHPi0Lines',
            'default_config')
 
-from Gaudi.Configuration import *
 
-from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N4BodyDecays
+from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays
 from StandardParticles import StdNoPIDsPions, StdNoPIDsKaons
 from StandardParticles import StdLooseResolvedPi0, StdLooseMergedPi0
 
 from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
-from StrippingUtils.Utils import LineBuilder, checkConfig
+from StrippingUtils.Utils import LineBuilder
 
 from Configurables import FilterDesktop
 
-from GaudiKernel.SystemOfUnits import GeV, MeV, picosecond, mm
+from GaudiKernel.SystemOfUnits import GeV, MeV, picosecond
 
 
 default_config = {
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingD2HMuNu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingD2HMuNu.py
index 2ceba3956453266f579b29b43ab66b82c4dc906a..0b1aa8422f7bb32ab3d194b98dead0e474772019 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingD2HMuNu.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingD2HMuNu.py
@@ -9,9 +9,7 @@
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
 
-import logging
 from StrippingUtils.Utils import LineBuilder
-from Gaudi.Configuration import *
 __author__ = ['Liang Sun', 'Adam Davis']
 __date__ = '09/11/2015'
 __version__ = '$Revision: 0.01 $'
@@ -98,7 +96,6 @@ class D2HLepNuBuilder(LineBuilder):
     def __init__(self, name, config):
         LineBuilder.__init__(self, name, config)
         self._config = config
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
 
         self.GECs = {"Code": "( recSummaryTrack(LHCb.RecSummary.nLongTracks, TrLONG) < %(GEC_nLongTrk)s )" % config,
                      "Preambulo": ["from LoKiTracks.decorators import *"]}
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingD2KS0H_conf.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingD2KS0H_conf.py
index d58964475590bc2e6571bcd929685425e3694bc1..e5b9f6c8683eaaab3109aca8686f163c2f08aef0 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingD2KS0H_conf.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingD2KS0H_conf.py
@@ -44,9 +44,9 @@ from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticle
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StandardParticles import StdLoosePions, StdLooseKaons
 from StrippingConf.StrippingLine import StrippingLine
-from StrippingUtils.Utils import LineBuilder, checkConfig
+from StrippingUtils.Utils import LineBuilder
 from Configurables import TisTosParticleTagger
-from GaudiKernel.SystemOfUnits import GeV, MeV, picosecond, mm
+from GaudiKernel.SystemOfUnits import MeV, mm, picosecond
 
 default_name = 'D2KS0H'
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingD2PiPi0.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingD2PiPi0.py
index 2cf2e1f2dfcc01187fa87b6b497e55c580034ef2..3593748cd50e6ab84496cfb7045a1b29f0016504 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingD2PiPi0.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingD2PiPi0.py
@@ -33,7 +33,7 @@ __all__ = (
 
 )
 
-from GaudiKernel.SystemOfUnits import MeV, GeV, mrad, picosecond
+from GaudiKernel.SystemOfUnits import MeV, picosecond
 
 from StandardParticles import (
     StdAllNoPIDsKaons,
@@ -51,7 +51,7 @@ from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 
 # from Configurables import CombineParticles, FilterDesktop
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, ConjugateNeutralPID, DaVinci__N3BodyDecays
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N3BodyDecays
 
 default_config = {
     'D2Pi0H': {
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingD2XMuMuSS.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingD2XMuMuSS.py
index 6cb43802872df951b5676b3b0a91f42091655f73..f2ecc06f375c01960838df612bae449a097161ea 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingD2XMuMuSS.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingD2XMuMuSS.py
@@ -9,14 +9,13 @@
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
 
-from StandardParticles import StdAllLooseElectrons, StdAllNoPIDsElectrons
+from StandardParticles import StdAllLooseElectrons
 from StandardParticles import StdAllLooseKaons, StdAllLoosePions, StdAllLooseMuons, StdAllNoPIDsPions, StdAllNoPIDsKaons
-from StandardParticles import StdLooseKaons, StdLoosePions, StdLooseMuons, StdNoPIDsPions, StdNoPIDsKaons, StdLooseProtons, StdAllNoPIDsProtons
+from StandardParticles import StdAllNoPIDsProtons, StdLooseKaons, StdLooseMuons, StdLoosePions, StdLooseProtons
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, OfflineVertexFitter
-from Gaudi.Configuration import *
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop
 import copy
 __author__ = ['Malcolm John', 'B. Viaud', 'O. Kochebina']
 __date__ = '25/6/2012'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingD2hh.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingD2hh.py
index 51c213ed2d3c259435dcd6aef0631877156b6bb0..a370c49abb16101fe062f7fa9fd7c27efecb37e3 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingD2hh.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingD2hh.py
@@ -24,7 +24,6 @@ __all__ = ('D2hhBuilder',
 '''
 This file contains stripping lines for time-dependent two-body charm analyses of mixing, yCP, and A_Gamma
 '''
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
@@ -129,7 +128,7 @@ class D2hhBuilder(LineBuilder):
         stdNoPIDsPions = StdAllNoPIDsPions
 
         d2kpi_name = name+'PromptD2KPi'
-        d0RS_name = name+'PromptD0RS'
+        name+'PromptD0RS'
         d0WS_name = name+'PromptD0WS'
         d2kk_name = name+'PromptD2KK'
         d2pipi_name = name+'PromptD2PiPi'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingD2hhh_FTcalib.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingD2hhh_FTcalib.py
index 1ec2a52397a24a0cbc076e1b808944bfc5bf21da..eb622bead0fbe08c7b00587f38e94c60ed0a8ade 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingD2hhh_FTcalib.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingD2hhh_FTcalib.py
@@ -29,13 +29,10 @@ __version__ = '$Revision: 0.0 $'
 __all__ = ('D2hhhFTCalibConf',
            'makeStdD2hhhFT')
 
-from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
+from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from StandardParticles import (StdNoPIDsPions,
-                               StdTightKaons)
 
 name = "D2hhhFTCalib"
 # Cuts to be implemented vy the Stripping team in Stripping Settings
@@ -254,7 +251,6 @@ def globalEventCutFilter(name,
     if MaxTrSIZE == None:
         return None
 
-    from Configurables import LoKi__VoidFilter as VoidFilter
     from Configurables import LoKi__Hybrid__CoreFactory as CoreFactory
     modules = CoreFactory('CoreFactory').Modules
     for i in ['LoKiTracks.decorators']:
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingD2hhh_conf.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingD2hhh_conf.py
index 436d8a20ebfa69a07273b9fc952667e306a823fd..49374bf7789c8403fcf3e4660b179452634cef16 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingD2hhh_conf.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingD2hhh_conf.py
@@ -38,8 +38,7 @@ from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticle
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from StandardParticles import (StdNoPIDsPions,
-                               StdTightKaons)
+from StandardParticles import StdNoPIDsPions
 
 name = "D2hhh"
 # Cuts to be implemented vy the Stripping team in Stripping Settings
@@ -717,7 +716,6 @@ def globalEventCutFilter(name,
     if MaxTrSIZE == None:
         return None
 
-    from Configurables import LoKi__VoidFilter as VoidFilter
     from Configurables import LoKi__Hybrid__CoreFactory as CoreFactory
     modules = CoreFactory('CoreFactory').Modules
     for i in ['LoKiTracks.decorators']:
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingDstarD02xx.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingDstarD02xx.py
index ce2ac8d8facde4ad7816e78bcb9fd402160bb81a..e052e20eec4a83a6f489851d64e937c3ee00b05f 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingDstarD02xx.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingDstarD02xx.py
@@ -22,8 +22,7 @@ __all__ = ('StrippingDstarD02xxConf', 'combinetwobody', 'combineDstar', 'default
             where xx = {mu mu, pi pi, pi mu, k mu, ... }
             
 '''
-from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingDstarD0ToHHPi0.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingDstarD0ToHHPi0.py
index fd5188441bc83f651edf601e0fc081e5761b90a2..9f366f1a65e17dac9704f2cda14ac7c90073bb1d 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingDstarD0ToHHPi0.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingDstarD0ToHHPi0.py
@@ -17,13 +17,11 @@ Module for D* tagged D0 -> hhpi0.
 Supersedes StrippingDstarD2hhpi0
 """
 
-from Gaudi.Configuration import *
 from Configurables import FilterDesktop, CombineParticles, OfflineVertexFitter
 from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from StandardParticles import StdAllLoosePions, StdLoosePions, StdLooseKaons, StdLooseResolvedPi0, StdLooseMergedPi0
-from Configurables import TisTosParticleTagger
 
 __all__ = ('DstarD0ToHHPi0AllLinesBuilder',
            'DstarMaker',
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingDstarD2HHHH.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingDstarD2HHHH.py
index 79b905d65e08f76846da8aeebd29e1bd52022454..15c8bc47e0445328a0083162a53a4335865cca1b 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingDstarD2HHHH.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingDstarD2HHHH.py
@@ -22,16 +22,15 @@ __version__ = '$Revision: 1.0 $'
 __all__ = ('DstarD2HHHHLines',
            'default_config')
 
-from Gaudi.Configuration import *
 
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N4BodyDecays
 from StandardParticles import StdAllNoPIDsPions, StdNoPIDsPions, StdNoPIDsKaons
 
 from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
-from StrippingUtils.Utils import LineBuilder, checkConfig
+from StrippingUtils.Utils import LineBuilder
 
-from GaudiKernel.SystemOfUnits import GeV, MeV, picosecond, mm
+from GaudiKernel.SystemOfUnits import MeV, picosecond
 
 
 default_config = {
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingDstarD2KSHHPi0.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingDstarD2KSHHPi0.py
index 1a1c91b788986c0a547216e92ee30ee234979f5e..2cf7967d07c7867df16b8b2cfa45c3c0ddd24ac4 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingDstarD2KSHHPi0.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingDstarD2KSHHPi0.py
@@ -22,18 +22,17 @@ __version__ = '$Revision: 1.0 $'
 __all__ = ('DstarD2KSHHPi0Lines',
            'default_config')
 
-from Gaudi.Configuration import *
 
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N4BodyDecays
 from StandardParticles import StdAllNoPIDsPions, StdNoPIDsPions, StdNoPIDsKaons, StdLooseResolvedPi0, StdLooseMergedPi0, StdLooseKsDD, StdLooseKsLL
 
 from PhysSelPython.Wrappers import Selection, MergedSelection
 from StrippingConf.StrippingLine import StrippingLine
-from StrippingUtils.Utils import LineBuilder, checkConfig
+from StrippingUtils.Utils import LineBuilder
 
 from Configurables import FilterDesktop
 
-from GaudiKernel.SystemOfUnits import GeV, MeV, picosecond, mm
+from GaudiKernel.SystemOfUnits import MeV, mm, picosecond
 
 
 default_config = {
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingDstarD2KShh.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingDstarD2KShh.py
index 0446a490bf8b78aaa6a090c0170ee5d84241b931..8bb88c690db0782705ee07f1579b03266ff72d96 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingDstarD2KShh.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingDstarD2KShh.py
@@ -34,7 +34,6 @@ __all__ = ('DstarD2KShhBuilder',
            'makeD2KShh',
            'makeDstar')
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingDstarD2XGamma.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingDstarD2XGamma.py
index 59e1a9cc73eb63cebf8d359be22611bfea10a6f4..4bebda09363078aa7f375ea30e19d74cba44a31c 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingDstarD2XGamma.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingDstarD2XGamma.py
@@ -26,7 +26,6 @@ __version__ = '$Revision: 0.2 $'
 __all__ = ('DstarD2XGammaLines',
            'default_config')
 
-from Gaudi.Configuration import *
 
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 from StandardParticles import StdAllNoPIDsPions, StdNoPIDsPions, StdNoPIDsKaons
@@ -34,11 +33,11 @@ from StandardParticles import StdLooseAllPhotons, StdAllLooseGammaLL, StdAllLoos
 
 from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
-from StrippingUtils.Utils import LineBuilder, checkConfig
+from StrippingUtils.Utils import LineBuilder
 
 from Configurables import FilterDesktop
 
-from GaudiKernel.SystemOfUnits import GeV, MeV, picosecond, mm
+from GaudiKernel.SystemOfUnits import GeV, MeV, picosecond
 
 default_config = {
     'NAME': 'DstarD2XGamma',
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingDstarPromptWithD02HHHH.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingDstarPromptWithD02HHHH.py
index 13343e4031d3c9fe7ad9b92cfb6f3c3fff754d98..22e9ffd46fd5a0b8ab4623cae0293fe3c10c129d 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingDstarPromptWithD02HHHH.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingDstarPromptWithD02HHHH.py
@@ -36,11 +36,10 @@ __version__ = '$Revision: 1.2 $'
 __all__ = ('DstarPromptWithD02HHHHConf', 'makeD02hhhh',
            'makePromptDstar', 'default_config')
 
-from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, ConjugateNeutralPID
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles, ConjugateNeutralPID
 from PhysSelPython.Wrappers import Selection, MergedSelection
 from StrippingConf.StrippingLine import StrippingLine
-from StrippingUtils.Utils import checkConfig, LineBuilder
+from StrippingUtils.Utils import LineBuilder
 from GaudiKernel.SystemOfUnits import MeV, GeV, mm
 from copy import copy
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingDstarPromptWithD02HHMuMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingDstarPromptWithD02HHMuMu.py
index e83ad60bb1ff3c30f6cfd21e7ea0e2fb6ead7646..a1c41727aab9df91366ea29963944e783d29f676 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingDstarPromptWithD02HHMuMu.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingDstarPromptWithD02HHMuMu.py
@@ -29,11 +29,10 @@ __version__ = '$Revision: 2.0 $'
 __all__ = ('DstarPromptWithD02HHLLConf', 'makeD02hhll',
            'makePromptDstar', 'default_config')
 
-from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, ConjugateNeutralPID
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles, ConjugateNeutralPID
 from PhysSelPython.Wrappers import Selection, MergedSelection
 from StrippingConf.StrippingLine import StrippingLine
-from StrippingUtils.Utils import checkConfig, LineBuilder
+from StrippingUtils.Utils import LineBuilder
 from GaudiKernel.SystemOfUnits import MeV, GeV, mm
 from copy import copy
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingExcitedDsSpectroscopy.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingExcitedDsSpectroscopy.py
index 6b08898929e9ee290d51640d43d073b4a548a98b..dadd6c5c25c094fb4e5dfdef695cd98af0384ee1 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingExcitedDsSpectroscopy.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingExcitedDsSpectroscopy.py
@@ -321,7 +321,6 @@ def globalEventCutFilter(name,
     if MaxTrSIZE == None:
         return None
 
-    from Configurables import LoKi__VoidFilter as VoidFilter
     from Configurables import LoKi__Hybrid__CoreFactory as CoreFactory
     modules = CoreFactory('CoreFactory').Modules
     for i in ['LoKiTracks.decorators']:
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingHc2V02H.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingHc2V02H.py
index 5f63de83baa118d330a0b95e541553d6a8e4581f..ca96215521b00ad6379d0a82538d3ada0714a5a3 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingHc2V02H.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingHc2V02H.py
@@ -27,11 +27,9 @@ __all__ = (
 )
 
 from GaudiKernel.SystemOfUnits import MeV, GeV, mm, mrad
-from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop, DaVinci__N3BodyDecays
+from GaudiConfUtils.ConfigurableGenerators import DaVinci__N3BodyDecays, FilterDesktop
 from StandardParticles import StdNoPIDsPions as InputPions
 from StandardParticles import StdNoPIDsKaons as InputKaons
-from StandardParticles import StdLooseLambdaLL as InputLambdasLL
-from StandardParticles import StdLooseLambdaDD as InputLambdasDD
 
 from PhysSelPython.Wrappers import Selection, MergedSelection, DataOnDemand
 from StrippingUtils.Utils import LineBuilder
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingHc2V03H.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingHc2V03H.py
index 77f8f1aecfa7a04b18d5642386d1c094392b96cd..84c4dbd802a10fae27a11a4440538bce29b36ffc 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingHc2V03H.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingHc2V03H.py
@@ -27,11 +27,9 @@ __all__ = (
 )
 
 from GaudiKernel.SystemOfUnits import MeV, GeV, mm, mrad
-from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop, DaVinci__N4BodyDecays
+from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays, FilterDesktop
 from StandardParticles import StdNoPIDsPions as InputPions
 from StandardParticles import StdNoPIDsKaons as InputKaons
-from StandardParticles import StdLooseLambdaLL as InputLambdasLL
-from StandardParticles import StdLooseLambdaDD as InputLambdasDD
 
 from PhysSelPython.Wrappers import Selection, MergedSelection, DataOnDemand
 from StrippingUtils.Utils import LineBuilder
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingHc2V2H.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingHc2V2H.py
index 1cc1e18bb59332589773894f931054575d3bd57d..62f83f01a95c995d84514559ea3eb725d34e7335 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingHc2V2H.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingHc2V2H.py
@@ -29,8 +29,6 @@ from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDeskto
 from StandardParticles import StdNoPIDsDownPions as InputDownPions
 from StandardParticles import StdNoPIDsPions as InputPions
 from StandardParticles import StdNoPIDsKaons as InputKaons
-from StandardParticles import StdLooseLambdaLL as InputLambdasLL
-from StandardParticles import StdLooseLambdaDD as InputLambdasDD
 
 from PhysSelPython.Wrappers import Selection, MergedSelection, DataOnDemand
 from StrippingUtils.Utils import LineBuilder
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingHc2V3H.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingHc2V3H.py
index 8860909e6ec1c8f2862b43d64f75e5158a1c67e3..05d0ef19028d88f3cf40161b0e7b207226c117e3 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingHc2V3H.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingHc2V3H.py
@@ -31,8 +31,6 @@ from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDeskto
 from StandardParticles import StdNoPIDsDownPions as InputDownPions
 from StandardParticles import StdNoPIDsPions as InputPions
 from StandardParticles import StdNoPIDsKaons as InputKaons
-from StandardParticles import StdLooseLambdaLL as InputLambdasLL
-from StandardParticles import StdLooseLambdaDD as InputLambdasDD
 
 from PhysSelPython.Wrappers import Selection, MergedSelection, DataOnDemand
 from StrippingUtils.Utils import LineBuilder
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingKKPiPi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingKKPiPi.py
index cedaab2089da1034f1207a1c958ba82c6e694ba7..767a1fdbf50445fb204987a0cc70c2f97dfb5421 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingKKPiPi.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingKKPiPi.py
@@ -12,12 +12,11 @@
 Module for selecting [cs][ubar dbar] -> K+ K+ pi- pi-
 '''
 
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
+from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
 from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
-from Gaudi.Configuration import *
 __author__ = ['Mengzhen Wang']
 __date__ = '10/10/2017'
 __version__ = '$Revision: 1.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingLambdac2V03H.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingLambdac2V03H.py
index 8c19d9d3aeebd29855bd2d76b366fe9611b08aaf..9689bee39c9e7d84a61e56605ba3bb5f443ec5d1 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingLambdac2V03H.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingLambdac2V03H.py
@@ -27,7 +27,7 @@ __all__ = (
 )
 
 from GaudiKernel.SystemOfUnits import MeV, GeV, mm, mrad
-from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop, DaVinci__N4BodyDecays
+from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays, FilterDesktop
 from StandardParticles import StdNoPIDsPions as InputPions
 from StandardParticles import StdNoPIDsKaons as InputKaons
 from StandardParticles import StdLooseLambdaLL as InputLambdasLL
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingLc2L0LLpi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingLc2L0LLpi.py
index 0165e116e9da33c044fd297b7fa4c1090c6cbf39..0a027afeb1d2d303ea6a37758bc2b3bf4bb5f79d 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingLc2L0LLpi.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingLc2L0LLpi.py
@@ -12,17 +12,10 @@
 Module for selecting Lambda_c+->Lambda pi+
 '''
 
-from StandardParticles import (StdAllLoosePions, StdLooseProtons,
-                               StdLoosePions, StdNoPIDsUpPions)
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from StandardParticles import StdLooseAllPhotons, StdVeryLooseAllPhotons
-from Configurables import LoKi__VoidFilter
-from PhysSelPython.Wrappers import MergedSelection
-from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
-from Gaudi.Configuration import *
 __author__ = ['Guiyun Ding', 'Jiesheng Yu', 'Yuehong Xie']
 __date__ = '28/11/2016'
 __version__ = '$Revision: 2.0$'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingNeutralCBaryons.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingNeutralCBaryons.py
index bf6d1603296752d86c0e7c13ec03b037aa4b7dd0..165e0fbf71ca71084e7f0b7ac538d4257975d87f 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingNeutralCBaryons.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingNeutralCBaryons.py
@@ -23,13 +23,9 @@ __version__ = '$Revision: 1.0 $'
 __all__ = ('StrippingNeutralCBaryonsConf', 'default_config')
 
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from StandardParticles import StdLoosePions, StdNoPIDsDownPions, StdLooseKaons, StdLooseDownKaons
-from StandardParticles import StdAllLoosePions, StdAllLooseKaons
 
 from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
-from PhysSelPython.Wrappers import MultiSelectionSequence
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from GaudiKernel.SystemOfUnits import MeV, mm, picosecond
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingXic2HHH.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingXic2HHH.py
index e34807cd11d54a2a33e0a1189dffe5a4b8d17475..32300611aa84de3bdf0390670c07b3849c390e20 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingXic2HHH.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingXic2HHH.py
@@ -8,18 +8,15 @@
 # granted to it by virtue of its status as an Intergovernmental Organization  #
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
-from StandardParticles import StdNoPIDsPions, StdNoPIDsKaons, StdNoPIDsProtons, StdAllNoPIDsProtons
-from Configurables import TisTosParticleTagger
+from StandardParticles import StdNoPIDsKaons, StdNoPIDsPions, StdNoPIDsProtons
 from StrippingUtils.Utils import LineBuilder
-from PhysSelPython.Wrappers import MultiSelectionSequence
-from PhysSelPython.Wrappers import Selection, DataOnDemand, AutomaticData, MergedSelection
+from PhysSelPython.Wrappers import DataOnDemand, MergedSelection, Selection
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
 from Configurables import FilterDesktop, CombineParticles
 from LHCbKernel.Configuration import *
-from GaudiKernel.SystemOfUnits import MeV, mm, ns
+from GaudiKernel.SystemOfUnits import MeV, mm
 from StrippingConf.StrippingLine import StrippingLine
 from Gaudi.Configuration import *
-import re
 all
 ''' Xic+ and Theta+ lines Designed by Yury Shcheglov, Alexey Dzyuba, Nelya Sagidova to study Xic+ and Theta+ particles '''
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingXicc.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingXicc.py
index 2468c2d79739511bfdefe170463aa125124d506e..45478d9be226dbd5e3fdd09b0ff769294d99d064 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingXicc.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingCharm/StrippingXicc.py
@@ -52,9 +52,6 @@ from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticle
 from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from StandardParticles import StdAllLoosePions, StdAllLooseKaons, StdAllLooseProtons
-from StandardParticles import StdLoosePions
-from CommonParticles.StdLooseLambda import StdLooseLambdaLL, StdLooseLambdaDD
 from GaudiKernel.SystemOfUnits import MeV, GeV, mm
 from Configurables import TisTosParticleTagger
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingIFT/StrippingHeavyIonD02KPiPi0.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingIFT/StrippingHeavyIonD02KPiPi0.py
index 3e380b9342ba9bebae1a3195dcadf08a1b598fc9..8ffdf55b27ce401ff26b2fe355cc99597f755347 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingIFT/StrippingHeavyIonD02KPiPi0.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingIFT/StrippingHeavyIonD02KPiPi0.py
@@ -25,9 +25,8 @@ __all__ = ('StrippingHeavyIonD02KPiPi0Conf',
            'makeD02KPiPi0M',
            'default_config')
 
-from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from PhysSelPython.Wrappers import Selection, DataOnDemand
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
+from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from StandardParticles import StdTightPions, StdTightKaons, StdLooseMergedPi0, StdLooseResolvedPi0
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingIFT/StrippingHeavyIonDiMuon.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingIFT/StrippingHeavyIonDiMuon.py
index 96980e2e7db9ef8c73badc579e9e6b19d6e2f41d..1bcf15d1caaddbfabf9ca08a8f6a2ea841bb6d72 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingIFT/StrippingHeavyIonDiMuon.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingIFT/StrippingHeavyIonDiMuon.py
@@ -17,8 +17,7 @@ from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 from StandardParticles import StdAllLooseMuons
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand
-from Gaudi.Configuration import *
+from PhysSelPython.Wrappers import Selection
 __author__ = ['Emilie MAURICE']
 __date__ = ''
 __version__ = '$Revision: 2.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingIFT/StrippingHeavyIonDst2D0KPiForPID.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingIFT/StrippingHeavyIonDst2D0KPiForPID.py
index 4282eb3c7b386840ce3bb3a47569a6a981e3194c..c3ba0aa8f46df637625d1f88481903dd9414f15e 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingIFT/StrippingHeavyIonDst2D0KPiForPID.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingIFT/StrippingHeavyIonDst2D0KPiForPID.py
@@ -13,10 +13,8 @@
 from StandardParticles import StdAllNoPIDsKaons, StdAllNoPIDsPions
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from LHCbKernel.Configuration import *
-from Gaudi.Configuration import *
+from PhysSelPython.Wrappers import Selection
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 __author__ = ['Philip Xing', 'Andrew Powell']
 __date__ = '23rd August 2012'
 __version__ = '$Revision: 7.0 $'
@@ -36,7 +34,7 @@ Usage:
 __all__ = ('HeavyIonDst2D0KPiForPIDConf', 'default_config', "D0", "Dstar")
 
 
-from GaudiKernel.SystemOfUnits import mm, cm, MeV, GeV
+from GaudiKernel.SystemOfUnits import GeV, MeV
 # from Configurables import FilterDesktop, CombineParticles
 
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingIFT/StrippingHeavyIonMiniBias.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingIFT/StrippingHeavyIonMiniBias.py
index fbf1fe772ffbce0fcb3f49ac41e96c6d7340deec..ae9ee61c935d081d5ef94f7b701b9ade2c3300dc 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingIFT/StrippingHeavyIonMiniBias.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingIFT/StrippingHeavyIonMiniBias.py
@@ -13,7 +13,6 @@ Stripping selections or Minimum Bias physics.
 Based on those by Patrick K.
 '''
 
-from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 __author__ = 'Yanxi ZHANG, Emilie MAURICE'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingIFT/StrippingHeavyIonOpenCharm.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingIFT/StrippingHeavyIonOpenCharm.py
index 30f90cfcfbd85538f18e4cc692ce59a9cf42b1f3..2c107372da72a124d15d3c4f3bceb9781d7fc0dc 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingIFT/StrippingHeavyIonOpenCharm.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingIFT/StrippingHeavyIonOpenCharm.py
@@ -31,8 +31,8 @@ __all__ = (
 )
 
 
-from GaudiKernel.SystemOfUnits import MeV, GeV, mrad, mm
-from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop
+from GaudiKernel.SystemOfUnits import GeV, MeV, mrad
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 # from Configurables import CombineParticles, FilterDesktop
 from StandardParticles import (
     StdAllNoPIDsKaons,
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingIFT/StrippingHeavyIonOthercc.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingIFT/StrippingHeavyIonOthercc.py
index 46dcb8736bc51128176a89c36d6270f6badbe8f1..8a83859960e8e433fd353be8f0b9da760ac02a79 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingIFT/StrippingHeavyIonOthercc.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingIFT/StrippingHeavyIonOthercc.py
@@ -17,8 +17,7 @@ from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 from StandardParticles import StdAllNoPIDsElectrons, StdAllLooseProtons, StdAllLooseMuons
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand
-from Gaudi.Configuration import *
+from PhysSelPython.Wrappers import Selection
 __author__ = ['Emilie MAURICE']
 __date__ = ''
 __version__ = '$Revision: 1.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingIFT/StrippingHeavyIonPIDCalib.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingIFT/StrippingHeavyIonPIDCalib.py
index 4d96b70412efeeaa567401f7247511c02704fc0f..635480e78d2cba544bf3537d6a6d0e92293ac75f 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingIFT/StrippingHeavyIonPIDCalib.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingIFT/StrippingHeavyIonPIDCalib.py
@@ -37,7 +37,6 @@ from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
 from Gaudi.Configuration import *
 __author__ = ['Yanxi ZHANG']
 __date__ = '25/02/2015'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingIFT/StrippingHeavyIonTopology.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingIFT/StrippingHeavyIonTopology.py
index 9e96e4e01e3c8dee0e26a254dbb38b56ff1b8a39..8ee4ce0bff9e418242f9c9f8c12add43fc236773 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingIFT/StrippingHeavyIonTopology.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingIFT/StrippingHeavyIonTopology.py
@@ -12,13 +12,9 @@
 Module for selecting specific topology
 '''
 
-from Configurables import FilterDesktop, CombineParticles
-from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-from StandardParticles import StdAllLooseMuons, StdAllLoosePions, StdAllNoPIDsPions, StdLoosePhotons
+from Configurables import FilterDesktop
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand
-from Gaudi.Configuration import *
 __author__ = ['Emilie MAURICE']
 __date__ = ''
 __version__ = '$Revision: 1.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingIFT/StrippingHeavyIonTrackEffDownMuon.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingIFT/StrippingHeavyIonTrackEffDownMuon.py
index c4696149c72873e44836c58246efd8fb19626f85..f382715984805054a4ae9bf98d28a41f621e3459 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingIFT/StrippingHeavyIonTrackEffDownMuon.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingIFT/StrippingHeavyIonTrackEffDownMuon.py
@@ -43,34 +43,26 @@ __all__ = ('StrippingHeavyIonTrackEffDownMuonConf',
 # FIXME Write includes in a cleaner way
 from Gaudi.Configuration import *
 from LHCbKernel.Configuration import *
-from DAQSys.DecoderClass import Decoder
 from Configurables import GaudiSequencer
 from Configurables import UnpackTrack, ChargedProtoParticleMaker, DelegatingTrackSelector, TrackSelector, BestPIDParticleMaker
-from TrackFitter.ConfiguredFitters import ConfiguredFit
 from Configurables import TrackStateInitAlg
 from StrippingConf.StrippingLine import StrippingLine
-from Configurables import ChargedProtoParticleAddMuonInfo, MuonIDAlgLite
+from Configurables import ChargedProtoParticleAddMuonInfo
 from MuonID import ConfiguredMuonIDs
 from Configurables import ChargedProtoCombineDLLsAlg, ProtoParticleMUONFilter
-from PhysSelPython.Wrappers import Selection, DataOnDemand
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
+from PhysSelPython.Wrappers import Selection
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 
 from StrippingUtils.Utils import LineBuilder
-from Configurables import LoKi__VoidFilter
-from os import environ
 from Gaudi.Configuration import *
-import GaudiKernel.ProcessJobOptions
-from GaudiKernel.SystemOfUnits import mm
 
 from GaudiConfUtils.ConfigurableGenerators import TisTosParticleTagger
 from StandardParticles import StdAllLooseMuons
 from Configurables import GaudiSequencer
 from Configurables import TrackToDST
-from Configurables import TrackSys
 from Configurables import PatSeeding, PatSeedingTool, PatLongLivedTracking
-from PhysSelPython.Wrappers import AutomaticData
 # Get the fitters
-from TrackFitter.ConfiguredFitters import ConfiguredFit, ConfiguredFitSeed, ConfiguredFitDownstream
+from TrackFitter.ConfiguredFitters import ConfiguredFitDownstream
 from PatAlgorithms import PatAlgConf
 
 from SelPy.utils import (UniquelyNamedObject,
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingIFT/StrippingHeavyIonTrackEffMuonTT.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingIFT/StrippingHeavyIonTrackEffMuonTT.py
index 56d4a18efe2b562eed3412a268bb47e35915eb37..3af84c0e2ed472dd795c0b18c8d095381ac3715c 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingIFT/StrippingHeavyIonTrackEffMuonTT.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingIFT/StrippingHeavyIonTrackEffMuonTT.py
@@ -63,10 +63,10 @@ __all__ = ('StrippingHeavyionTrackEffMuonTTConf',
            'filterHLT2ForBJpsiK')
 
 from Gaudi.Configuration import *
-from PhysSelPython.Wrappers import Selection, DataOnDemand, ChargedProtoParticleSelection
+from PhysSelPython.Wrappers import ChargedProtoParticleSelection, Selection
 from StrippingConf.StrippingLine import StrippingLine
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from StrippingUtils.Utils import LineBuilder, checkConfig
+from StrippingUtils.Utils import LineBuilder
 from StandardParticles import StdLooseKaons, StdLooseMuons, StdAllLooseMuons
 
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingIFT/StrippingHeavyIonTrackEffVeloMuon.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingIFT/StrippingHeavyIonTrackEffVeloMuon.py
index 0e07045325c58f87f6345eafe88988d9f7a3f147..7cd8b2c0d6f462f14fd64f8f6c50386fc74e091e 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingIFT/StrippingHeavyIonTrackEffVeloMuon.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingIFT/StrippingHeavyIonTrackEffVeloMuon.py
@@ -40,17 +40,14 @@ __all__ = ('HeavyIonTrackEffVeloMuonConf',
            )
 
 
-from Gaudi.Configuration import *
-from LHCbKernel.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 # from Configurables import CombineParticles
-from PhysSelPython.Wrappers import Selection, SelectionSequence, DataOnDemand
-from Configurables import ChargedProtoParticleMaker, NoPIDsParticleMaker, DataOnDemandSvc, DelegatingTrackSelector, TrackSelector, CombinedParticleMaker, BestPIDParticleMaker
+from PhysSelPython.Wrappers import Selection
+from Configurables import ChargedProtoParticleMaker, DataOnDemandSvc, DelegatingTrackSelector, NoPIDsParticleMaker, TrackSelector
 from Configurables import FastVeloTracking
 
 from StrippingConf.StrippingLine import StrippingLine
-from Configurables import TrackStateInitAlg, TrackEventFitter, TrackPrepareVelo, TrackContainerCopy, Tf__PatVeloSpaceTool, StandaloneMuonRec
-from Configurables import TrackCloneFinder
+from Configurables import StandaloneMuonRec, TrackPrepareVelo
 from StrippingUtils.Utils import LineBuilder
 # changed from StdLooseMuons, yanxi
 from StandardParticles import StdAllLooseMuons
@@ -59,14 +56,9 @@ from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, TisTosParticleT
 # from Configurables import TisTosParticleTagger
 
 from Configurables import GaudiSequencer
-from Configurables import TrackSys
-from PhysSelPython.Wrappers import AutomaticData
 # Get the fitters
-from TrackFitter.ConfiguredFitters import ConfiguredFit
 
-from Configurables import TrackEventCloneKiller, VeloMuonBuilder
-from Configurables import TrackEventFitter, TrackMasterFitter
-from Configurables import TrackKalmanFilter, TrackMasterExtrapolator
+from Configurables import VeloMuonBuilder
 # from TrackFitter.ConfiguredFitters import ConfiguredFastFitter
 # from Configurables import TrackCloneFinder
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingMiniBias/StrippingBadEvents.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingMiniBias/StrippingBadEvents.py
index 4d837a2f722d72d1c7683e8f61d6316db037f332..460036843530f41526b7139b73c204dba3cf9160 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingMiniBias/StrippingBadEvents.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingMiniBias/StrippingBadEvents.py
@@ -8,7 +8,6 @@
 # granted to it by virtue of its status as an Intergovernmental Organization  #
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
-from PhysSelPython.Wrappers import Selection
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 __author__ = 'Andrea Contu'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingMiniBias/StrippingMiniBias.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingMiniBias/StrippingMiniBias.py
index 7ba890fe41b117c0dcaaac7777296c741c397754..f791c6cd1cfac775c9b2357307a4044a5100eb87 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingMiniBias/StrippingMiniBias.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingMiniBias/StrippingMiniBias.py
@@ -8,7 +8,6 @@
 # granted to it by virtue of its status as an Intergovernmental Organization  #
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
-from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 __author__ = 'Patrick Koppenburg'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/DisplVertices_Utils.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/DisplVertices_Utils.py
index f9e3c9136e46dcf7697209e381ff7735b840ed2e..bcd9752464adf9657cb3a290918226a7d0f05341 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/DisplVertices_Utils.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/DisplVertices_Utils.py
@@ -14,12 +14,11 @@ Utilities for displaced vertex stripping: wrapper class around PatPV3D
 
 __all__ = ("SelectionFromAlgorithmWithTools", "SelectionPatPV3DWrapper")
 
-from GaudiConfUtils import isConfigurable
 
 from SelPy.utils import (UniquelyNamedObject, ClonableObject, SelectionBase, compatibleSequences,
-                         IncompatibleInputLocations, CloneCallable, makeOutputLocation, setOutputLocation)
+                         IncompatibleInputLocations, makeOutputLocation, setOutputLocation)
 
-from PhysSelPython.Wrappers import checkConfigurable, checkName
+from PhysSelPython.Wrappers import checkName
 
 
 def connectToRequiredSelections(selection, inputSetter):
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingA1MuMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingA1MuMu.py
old mode 100755
new mode 100644
index 91e62b0b649d88ac57d91a3cf24db5351e7b19de..281aebf4be79ceaf5c90e7533eb04d49847e5185
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingA1MuMu.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingA1MuMu.py
@@ -23,11 +23,9 @@ A_1 -> mu+ mu-, based on functionality from StrippingDiMuonNew by Jibo He.
 
 """
 
-from Gaudi.Configuration import *
-from LHCbKernel.Configuration import *
 
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
-from PhysSelPython.Wrappers import Selection, DataOnDemand, SimpleSelection
+from PhysSelPython.Wrappers import SimpleSelection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from GaudiKernel.SystemOfUnits import MeV
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingA2MuMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingA2MuMu.py
index 64c106858ef1dd3206b2083b5ea5e630aec55ae8..cd47529d168278a387e79f1f772ca7cf3b1d8040 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingA2MuMu.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingA2MuMu.py
@@ -22,7 +22,7 @@ from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from StandardParticles import StdAllLooseMuons, StdAllNoPIDsMuons
+from StandardParticles import StdAllLooseMuons
 from GaudiKernel.SystemOfUnits import GeV
 
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingA2MuMuSameSign.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingA2MuMuSameSign.py
index 5911c40e36b1e66721231826c818abbc79aed758..a89a6a8b5ff2bf6571b4fe0fcaeb93088567f2a5 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingA2MuMuSameSign.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingA2MuMuSameSign.py
@@ -22,7 +22,7 @@ from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from StandardParticles import StdAllLooseMuons, StdAllNoPIDsMuons
+from StandardParticles import StdAllLooseMuons
 from GaudiKernel.SystemOfUnits import GeV
 
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingB2LLP2HH.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingB2LLP2HH.py
index 073c098c3a38cbbfb2655b777880011ad219247a..179fe2f52ea095317c5a39508a99a578c806ae3a 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingB2LLP2HH.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingB2LLP2HH.py
@@ -18,13 +18,11 @@ __date__ = '25/01/2019'
 
 __all__ = ('B2LLPV0_sConf', 'default_config')
 
-from Gaudi.Configuration import *
 from StandardParticles import StdAllNoPIDsPions
 from PhysSelPython.Wrappers import CombineSelection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from GaudiKernel.SystemOfUnits import GeV
-from LoKiPhys.functions import SOURCE, SIZE
 
 default_config = {
     'NAME': 'B2LLPV0',
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingConvertedPhoton.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingConvertedPhoton.py
index 75d6970b1df2c63c192f20d524128d15f914343b..6a24e6a634b2578b9537332d82053d30b73013fd 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingConvertedPhoton.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingConvertedPhoton.py
@@ -23,7 +23,7 @@ __all__ = (
 
 from Gaudi.Configuration import *
 from CommonParticles.Utils import *
-from GaudiKernel.SystemOfUnits import MeV, GeV, mm
+from GaudiKernel.SystemOfUnits import MeV, mm
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
 from Configurables import (DiElectronMaker,
                            ProtoParticleCALOFilter,
@@ -31,9 +31,7 @@ from Configurables import (DiElectronMaker,
                            LoKi__VertexFitter,
                            )
 from PhysSelPython.Wrappers import (Selection,
-                                    SimpleSelection,
-                                    MergedSelection,
-                                    AutomaticData)
+                                    MergedSelection)
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingDY2MuMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingDY2MuMu.py
index 9c7c8a7706d666e3fac7a8f8316de58468cc8b74..6a28183b934ae8110dbdef65c4d96d44dd261b82 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingDY2MuMu.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingDY2MuMu.py
@@ -26,9 +26,8 @@ __author__ = ['J. Anderson']
 
 __all__ = 'DY2MuMuConf', 'default_config'
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-from PhysSelPython.Wrappers import Selection, SimpleSelection
+from PhysSelPython.Wrappers import SimpleSelection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from StandardParticles import StdAllLooseMuons
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingDY2ee.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingDY2ee.py
index a80a06710257e4a747b068f38b65eda9b6b0de8c..3a4d7395f7894461a94f0c47d79c1d2bc20d648e 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingDY2ee.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingDY2ee.py
@@ -20,9 +20,8 @@ __author__ = ['S.Bifani', 'D.Ward']
 
 __all__ = ('DY2eeConf', 'default_config')
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-from PhysSelPython.Wrappers import Selection, DataOnDemand
+from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from StandardParticles import StdAllNoPIDsElectrons
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingDisplJets.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingDisplJets.py
index 5fef3562a7eba983dc7ba2e37ee9b5a47fc6bebf..28c1bab64dafcce7d73fff3cdfe6a61833456218 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingDisplJets.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingDisplJets.py
@@ -9,8 +9,6 @@
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
 
-from Gaudi.Configuration import *
-from CommonParticles.Utils import *
 # from Configurables import FilterDesktop
 # from PhysSelPython.Wrappers import Selection, DataOnDemand, FilterSelection
 from StrippingConf.StrippingLine import StrippingLine
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingDisplVertices.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingDisplVertices.py
index 1ceed257a457950890e0fc33aaf7abc06342b70a..66be8a1f8712b367d96e50ebeb3d82892c0f2c1b 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingDisplVertices.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingDisplVertices.py
@@ -40,7 +40,6 @@ __all__ = ('DisplVerticesConf', 'default_config')
 
 from Gaudi.Configuration import *
 from GaudiKernel import SystemOfUnits as units
-from LHCbKernel.Configuration import DEBUG, VERBOSE
 
 import logging
 logger = logging.getLogger(__name__)
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingDitau.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingDitau.py
old mode 100755
new mode 100644
index fa049324f79a44e720a641aa2ed2cdc857f4435e..3e2dd3df509a4ead7bb1a73e4cccd6e5f2e99c0f
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingDitau.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingDitau.py
@@ -155,8 +155,7 @@ Derived from works of S.Farry & P. Ilten
 
 """
 
-import os
-from GaudiKernel.SystemOfUnits import MeV, GeV, micrometer
+from GaudiKernel.SystemOfUnits import GeV, MeV
 from PhysSelPython.Wrappers import Selection, SimpleSelection, PassThroughSelection, MergedSelection, AutomaticData
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
@@ -894,7 +893,7 @@ def Tuples():
 
     """
     import re
-    from DecayTreeTuple.Configuration import DecayTreeTuple, EventTuple
+    from DecayTreeTuple.Configuration import DecayTreeTuple
 
     seq = GaudiSequencer('TupleSeq')
     seq.ModeOR = True
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingExotica.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingExotica.py
old mode 100755
new mode 100644
index 6bc342e6673e7b1e6203b8260039fdde1761206c..6bb564d6b7bbd36c36350f55b005a51272e6ab12
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingExotica.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingExotica.py
@@ -34,7 +34,7 @@ Hlt2ExoticaEtaToDiEGamma
 from GaudiKernel.SystemOfUnits import MeV, GeV, mm, picosecond
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-from PhysSelPython.Wrappers import Selection, SimpleSelection, MergedSelection, AutomaticData
+from PhysSelPython.Wrappers import AutomaticData, SimpleSelection
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingFullDiJets.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingFullDiJets.py
index 0e20ce2d9fcbfbea2ea7828e4bd1f9db7eed9790..b2931713d0c65ae7ee7dfa387b7b5473c635eba4 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingFullDiJets.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingFullDiJets.py
@@ -9,14 +9,10 @@
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
 
-from Gaudi.Configuration import *
-from Configurables import FilterDesktop, CombineParticles, LoKi__VertexFitter
+from Configurables import CombineParticles, LoKi__VertexFitter
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from StandardParticles import StdJets
-from CommonParticles.Utils import *
-from Configurables import FilterJet
 from GaudiKernel.SystemOfUnits import GeV
 
 __author__ = "Xabier Cid Vidal", "Cedric Potterat", "William Barter"
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingGluinos.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingGluinos.py
index 0867cc3c369e7f5b06dfb5d1909d7eeda820e3f0..8070b81f174dd132e7ec9c150bbe87dc5befc9b9 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingGluinos.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingGluinos.py
@@ -10,11 +10,10 @@
 ###############################################################################
 from Configurables import FilterDesktop, JetVertexAlg
 from CommonParticles.Utils import *
-from LoKiPhys.functions import SOURCE, SIZE
 from GaudiKernel.SystemOfUnits import GeV
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import FilterSelection, PassThroughSelection, DataOnDemand
+from PhysSelPython.Wrappers import FilterSelection, PassThroughSelection
 from StandardParticles import StdJets
 from Gaudi.Configuration import *
 __author__ = ['Xabier Cid Vidal', 'Carlos Vazquez Sierra', 'Igor Kostiuk']
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingLFVExotica.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingLFVExotica.py
old mode 100755
new mode 100644
index 88da9dcd829a1905c1264408cac8e2e94c89b89f..fef9c145f071f0ab2fe36aeab16fc22bc5d9a283
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingLFVExotica.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingLFVExotica.py
@@ -174,7 +174,7 @@ def create_stdjets(strob, line_location, stdjets_name_ban):
         strob.StdJetsNoJetIDBan = [myconf1]
 
     # configure Data-On-Demand service
-    locations = updateDoD(myconf1)
+    updateDoD(myconf1)
 
 
 relInfoJetsVars = ["JETNOMU1PX", "JETNOMU1PY", "JETNOMU1PZ", "JETNOMU1PT", "JETNOMU1JETWIDTH", "JETNOMU1NNTAG", "JETNOMU1MNF", "JETNOMU2PX", "JETNOMU2PY", "JETNOMU2PZ", "JETNOMU2PT", "JETNOMU2JETWIDTH", "JETNOMU2NNTAG", "JETNOMU2MNF", "JETNOMU3PX", "JETNOMU3PY",
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingLLP2HH.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingLLP2HH.py
index a44e21b9d685dfdf71578f4a8c9db734abf73c01..b2b088c7863a076933f8b5770260224a4ca2b483 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingLLP2HH.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingLLP2HH.py
@@ -18,13 +18,11 @@ __date__ = '24/01/2019'
 
 __all__ = ('LLPV0_sConf', 'default_config')
 
-from Gaudi.Configuration import *
 from StandardParticles import StdAllNoPIDsPions
 from PhysSelPython.Wrappers import CombineSelection, PassThroughSelection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from GaudiKernel.SystemOfUnits import GeV
-from LoKiPhys.functions import SOURCE, SIZE
 
 default_config = {
     'NAME': 'LLPV0',
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingLLP2Jets.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingLLP2Jets.py
index 8619ba15a78cfb147e8f2c955611f8cdd44bd2ba..9c25c3202184e96ffba87e12971ec43ac9362246 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingLLP2Jets.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingLLP2Jets.py
@@ -18,7 +18,6 @@ __date__ = '25/01/2019'
 
 __all__ = ('LLP2Jets_sConf', 'default_config')
 
-from Gaudi.Configuration import *
 from Configurables import JetVertexAlg
 from StandardParticles import StdJets
 from CommonParticles.Utils import updateDoD
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingLLP2MuX.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingLLP2MuX.py
index 16654f3c9d1acc1925968a5d39f0087bea5086a7..f93bc4732424f6eaeb1951cb1a244ef0de7e8b5e 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingLLP2MuX.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingLLP2MuX.py
@@ -16,7 +16,6 @@ from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import AutomaticData, Selection
 from GaudiKernel import SystemOfUnits as units
-from LHCbKernel.Configuration import *
 __author__ = "Pieter David"
 __date__ = "2014-08-28"
 __all__ = ("LLP2MuXConf", "default_config")
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingLb2dp.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingLb2dp.py
old mode 100755
new mode 100644
index cf2bf7494c36f78187f495fe46a2fcfe068338e0..cbd7593f597ef30b0f56f7070b78fe66905549e5
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingLb2dp.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingLb2dp.py
@@ -23,15 +23,11 @@ __all__ = ('Lb2dpConf',
            )
 
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop
-from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays
 
-from StandardParticles import StdAllNoPIDsPions, StdAllNoPIDsProtons,  StdAllNoPIDsKaons
 from PhysSelPython.Wrappers import Selection, DataOnDemand, SimpleSelection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from Configurables import LoKi__VoidFilter as VoidFilter
 
 default_config = {
     'NAME': 'Lb2dp',
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingMicroDiJets.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingMicroDiJets.py
index 60a35abe10febcab0dcf2d24628e23b510f946b5..db8af2aecfab54badd7fd3305d3d0716cbe4802b 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingMicroDiJets.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingMicroDiJets.py
@@ -10,13 +10,12 @@
 ###############################################################################
 
 from Gaudi.Configuration import *
-from Configurables import FilterDesktop, CombineParticles, LoKi__VertexFitter
+from Configurables import CombineParticles
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from StandardParticles import StdJets
 from CommonParticles.Utils import *
-from Configurables import FilterJet, ClearDaughters
+from Configurables import ClearDaughters
 from GaudiKernel.SystemOfUnits import GeV
 
 __author__ = "Xabier Cid Vidal", "Cedric Potterat", "William Barter"
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingMuMuSS.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingMuMuSS.py
index 46e50bf48c5974152d914b654bd5b1fd74bb2b6e..130bda526520d302d34046bd7d905f2bb8920adf 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingMuMuSS.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingMuMuSS.py
@@ -26,7 +26,7 @@ __author__ = (
 )
 
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-from PhysSelPython.Wrappers import Selection, SimpleSelection
+from PhysSelPython.Wrappers import SimpleSelection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from StandardParticles import StdAllLooseMuons
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingSbarSCorrelations.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingSbarSCorrelations.py
index 63378eabc81bb7a2995cb94f8b8e7faad734f19d..33589834379b334e6b432982e264803ceb8d8308 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingSbarSCorrelations.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingSbarSCorrelations.py
@@ -21,10 +21,8 @@ Long tracks only
 from GaudiKernel.SystemOfUnits import MeV, GeV
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
-from StandardParticles import StdAllNoPIDsPions, StdTightKaons, StdAllNoPIDsProtons
+from PhysSelPython.Wrappers import DataOnDemand, Selection
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = ['Florin MACIUC']
 __date__ = '24/08/2013'
 __version__ = '$Revision: 1.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingStrangeBaryons.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingStrangeBaryons.py
index f3dd8ebdec4e50abd2bed892959740435ac5d9b5..2405f0e9c6f1695dd9f652d6aae992473b3135a2 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingStrangeBaryons.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingStrangeBaryons.py
@@ -18,14 +18,10 @@ Xi -> Lambda pi,   Omega -> Lambda K
 LLL DDL DDD
 '''
 
-from GaudiKernel.SystemOfUnits import MeV
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
-from CommonParticles import StdLooseLambda
-from StandardParticles import StdLoosePions, StdNoPIDsDownPions, StdLooseKaons, StdLooseDownKaons, StdLooseProtons, StdNoPIDsDownProtons
+from PhysSelPython.Wrappers import DataOnDemand, Selection
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = ['Mihai Straticiuc', 'Florin Maciuc', 'Nguyen Thi Dung']
 __date__ = '26/06/2012'
 __version__ = '$Revision: 0.3 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingStrangeBaryonsNoPID.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingStrangeBaryonsNoPID.py
index 668986b834d39169c5ae15803bf5d5fb33cff67b..208ab8bad23a5e36e2a0a609a82dd6ca2fc9d012 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingStrangeBaryonsNoPID.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingStrangeBaryonsNoPID.py
@@ -18,12 +18,10 @@ Xi -> Lambda pi,   Omega -> Lambda K
 LLL
 '''
 
-from GaudiKernel.SystemOfUnits import MeV
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
+from PhysSelPython.Wrappers import DataOnDemand, Selection
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = ['Florin Maciuc']
 __date__ = '13/01/2014'
 __version__ = '$Revision: 0.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingTaggedJets.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingTaggedJets.py
old mode 100755
new mode 100644
index 2205ce56dd85643e92bc55ab369b85378152951c..4927224c3710ed4cad5cd3baa918ec4b163f34f2
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingTaggedJets.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingTaggedJets.py
@@ -10,11 +10,10 @@
 ###############################################################################
 
 from Gaudi.Configuration import *
-from Configurables import FilterDesktop, CombineParticles, LoKi__VertexFitter
+from Configurables import CombineParticles, LoKi__VertexFitter
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from StandardParticles import StdJets
 from CommonParticles.Utils import *
 from Configurables import FilterJet
 from GaudiKernel.SystemOfUnits import GeV
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingW2nH.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingW2nH.py
index cc373f666cb49309b9f3e2efe0dae8e52ac260a4..22eacc1d77ba55838726dc481db0fa8f76e6bf1d 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingW2nH.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingW2nH.py
@@ -26,7 +26,6 @@ from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from StandardParticles import StdAllNoPIDsPions
 from GaudiKernel.SystemOfUnits import GeV
-from GaudiKernel.SystemOfUnits import MeV
 
 
 default_config = {
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingWJets.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingWJets.py
old mode 100755
new mode 100644
index 69b6940c49ad110ace21f32d3dbb3e2904580aed..a8dd17366932d60f3bf41f7c5c6503ba39ea6532
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingWJets.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingWJets.py
@@ -22,14 +22,12 @@ They are then cover a phasespace complementarily on each other.
 
 """
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
 from Configurables import CombineParticles, LoKi__VertexFitter
 from PhysSelPython.Wrappers import Selection, SimpleSelection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from StandardParticles import StdAllLooseMuons, StdAllNoPIDsElectrons, StdJets
-from CommonParticles.Utils import *
 from GaudiKernel.SystemOfUnits import GeV, MeV
 
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingWRareDecay.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingWRareDecay.py
index de1eaf98e07a599774f9667406768492a892a465..f599f543313af3af803cfd1ae503077a399fbebb 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingWRareDecay.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingWRareDecay.py
@@ -21,8 +21,7 @@ from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from GaudiKernel.SystemOfUnits import MeV, GeV, mm, picosecond
-from Gaudi.Configuration import *
+from GaudiKernel.SystemOfUnits import MeV, picosecond
 __author__ = ['Hang Yin', 'Qundong Han']
 __date__ = '11/29/2016'
 __version__ = '$Revision: 2.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingWe.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingWe.py
index 0820e8b431f0bb8891ac3f88f980c3fcbe0a181c..3e509fb26655db393ee396f8d85f74a24b0c62d7 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingWe.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingWe.py
@@ -21,7 +21,6 @@ We control: StdAllNoPIDsElectrons, PRS>50Mev & E_ECal/P>0.1 & E_HCal/P<0.05 & pT
 __all__ = 'WeConf', 'default_config'
 __author__ = 'S. Bifani', 'D. Ward'
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
 from PhysSelPython.Wrappers import SimpleSelection
 from StrippingConf.StrippingLine import StrippingLine
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingZ02ee.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingZ02ee.py
index e797011998c7d9201276f70cdabaa1b30ae4d70f..f6977308a75475dc2fd7e695d713190194177820 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingZ02ee.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingZ02ee.py
@@ -23,7 +23,6 @@ __all__ = (
     'default_config',
 )
 
-from Gaudi.Configuration import *
 from GaudiKernel.SystemOfUnits import GeV, MeV
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 from PhysSelPython.Wrappers import SimpleSelection
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingZ02nH.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingZ02nH.py
index 2f8d8eb612b1c353cf08c5e72ca77ae205eb7a72..35de5f4d789850497ba9aa5b71430ef065284077 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingZ02nH.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingZ02nH.py
@@ -26,7 +26,6 @@ from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from StandardParticles import StdAllNoPIDsPions
 from GaudiKernel.SystemOfUnits import GeV
-from GaudiKernel.SystemOfUnits import MeV
 
 
 default_config = {
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingZ0RareDecay.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingZ0RareDecay.py
index 57c2091f2ac6a4efcb43bd28c4251acba348f513..e181b28533d1769723804e5ccc2d55ce3dfbccea 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingZ0RareDecay.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/StrippingZ0RareDecay.py
@@ -22,8 +22,7 @@ __version__ = '$Revision: 2.0 $'
 
 __all__ = 'default_config', 'Z0RareDecayConf'
 
-from Gaudi.Configuration import *
-from GaudiKernel.SystemOfUnits import MeV, GeV, mm
+from GaudiKernel.SystemOfUnits import MeV
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
 from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
 from StrippingConf.StrippingLine import StrippingLine
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/depreciated/StrippingDijets.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/depreciated/StrippingDijets.py
index f0793d3411791797729ad540397e458f4646f78b..975321a6b30b00b6f80aee11878eb20ba9d16b84 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/depreciated/StrippingDijets.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/depreciated/StrippingDijets.py
@@ -15,8 +15,7 @@
 __all__ = ('DijetsConf',
            'default_config')
 
-from Gaudi.Configuration import *
-from GaudiKernel.SystemOfUnits import MeV, GeV, mm
+from GaudiKernel.SystemOfUnits import GeV, MeV
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/depreciated/StrippingHighPtTopoJets.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/depreciated/StrippingHighPtTopoJets.py
index 73ca61d9e7e0914a21b65e40361131e8f38c026d..6078cdec364615de35d547f813533d0a763afeef 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/depreciated/StrippingHighPtTopoJets.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/depreciated/StrippingHighPtTopoJets.py
@@ -21,8 +21,6 @@ __all__ = ('default_config', 'HighPtTopoJetsConf')
 # \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\#
 
 
-from Gaudi.Configuration import *
-from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from PhysSelPython.Wrappers import EventSelection
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/depreciated/StrippingJets.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/depreciated/StrippingJets.py
index 02e5fc43080729f2f38d0bc0bde65232a21f0202..55abf24d99577dcb8f10b30fda8803015b0c09f0 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/depreciated/StrippingJets.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingQEE/depreciated/StrippingJets.py
@@ -15,13 +15,11 @@
 __all__ = ('JetsConf',
            'default_config')
 
-from Gaudi.Configuration import *
-from GaudiKernel.SystemOfUnits import MeV, GeV, mm
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
+from GaudiKernel.SystemOfUnits import GeV, MeV
+from PhysSelPython.Wrappers import MergedSelection, Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
-from JetAccessories.JetMaker_Config import JetMakerConf
 from StandardParticles import StdJets, StdAllNoPIDsPions
 from Configurables import CombineParticles
 from Configurables import TopologicalTagging
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/Beauty2Charm_LoKiCuts.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/Beauty2Charm_LoKiCuts.py
index ce5265655cf518aa12121d3a5728d84c36da26cd..666cef80aacee423a071365fe7281c63e506e27d 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/Beauty2Charm_LoKiCuts.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/Beauty2Charm_LoKiCuts.py
@@ -10,11 +10,6 @@
 ###############################################################################
 # \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\#
 
-from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
-from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-from PhysSelPython.Wrappers import Selection, MergedSelection
-from StandardParticles import StdNoPIDsPions, StdNoPIDsKaons
 
 # \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\#
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingB02Lcmu_pKpi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingB02Lcmu_pKpi.py
index 3d6992fd337683bf5bcf97e994e4fd64705add4f..93bd54fbf8871329e8e7bcb95f7722d9913e1cff 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingB02Lcmu_pKpi.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingB02Lcmu_pKpi.py
@@ -14,7 +14,6 @@ from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = ['Nikita Beliy', 'Jibo He']
 __date__ = '28/11/2016'
 __version__ = '$Revision: 1.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingB23MuLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingB23MuLines.py
index a6e53abda621d1f1b0efe6185553c1b46aae67e6..15ea2076dcaea1a75c4fec8295e895be19887b4a 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingB23MuLines.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingB23MuLines.py
@@ -55,13 +55,11 @@ __all__ = ("B23MuLinesConf",
 
 #############################################################################
 
-from Gaudi.Configuration import *
-from Configurables import FilterDesktop, CombineParticles, DaVinci__N3BodyDecays
+from Configurables import DaVinci__N3BodyDecays
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 # from StrippingSelections.Utils import checkConfig
-from GaudiKernel.PhysicalConstants import c_light
 
 #############################################################################
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingB2EtaMuMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingB2EtaMuMu.py
index 121398b271451a2ef53c96b9cde3d79a68bd4d2e..9c2efbbacf4dc368cb7c6d742a93721b60444611 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingB2EtaMuMu.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingB2EtaMuMu.py
@@ -12,13 +12,12 @@
 B->etamumuselection
 '''
 
-from StandardParticles import StdAllNoPIDsMuons, StdAllLooseMuons
+from StandardParticles import StdAllNoPIDsMuons
 from StandardParticles import StdNoPIDsPions, StdLooseAllPhotons, StdLooseMergedPi0, StdLooseResolvedPi0
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand, SimpleSelection, MergedSelection
+from PhysSelPython.Wrappers import MergedSelection, Selection, SimpleSelection
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = ['Fred Blanc']
 __date__ = '26/01/2019'
 __version__ = '$Revision: 1.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingB2KLLXInclusive.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingB2KLLXInclusive.py
index a9d2ffd4e4d8d6444da6c3df3731248c13fce6e7..61a740d6b5d3d92a7f2015b59a5021738a7a2958 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingB2KLLXInclusive.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingB2KLLXInclusive.py
@@ -19,15 +19,12 @@ __all__ = ('B2KLLXInclusiveConf', 'default_config')
 Stripping selection for inclusively selected B->KmumuX decays.
 """
 
-from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop
+from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
 
 from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from LHCbKernel.Configuration import *  # check if needed
-from Configurables import SubstitutePID
-from Configurables import SubPIDMMFilter
 
 
 #################
@@ -333,7 +330,6 @@ class B2KLLXInclusiveConf(LineBuilder):
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         CombineDiMuon = CombineParticles()
         CombineDiMuon.DecayDescriptors = ["[B+ -> J/psi(1S) K+]cc"]
-        sel_name = "InclKLL"
         CombineDiMuon.MotherCut = self.InclKLLCut
         # choose
         leptons = self.InclLeptons
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingB2KstTauTau.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingB2KstTauTau.py
index 0e62fb1a13ae5f9586b34995cc3f4f00d8de7dee..a236059c8ca69aa4aaf625cf6925165cda17c83a 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingB2KstTauTau.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingB2KstTauTau.py
@@ -15,8 +15,7 @@ from StandardParticles import StdTightMuons
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, OfflineVertexFitter, DaVinci__N3BodyDecays
-from Gaudi.Configuration import *
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N3BodyDecays, FilterDesktop
 __author__ = [' G. Mancinelli, J. Serrano']
 __date__ = '15/08/2014'
 __version__ = '$Revision: 0.1 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingB2LLXBDT.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingB2LLXBDT.py
index 33ad8193f48b0db42c11b2b0fdb770bc37fa1794..b45675d8906a352a37b4bdd5ca92e02e5c6279bf 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingB2LLXBDT.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingB2LLXBDT.py
@@ -20,8 +20,6 @@ from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticle
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, MergedSelection
-from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays
-from Gaudi.Configuration import *
 __author__ = ['Jibo He']
 __date__ = '20/11/2015'
 __version__ = '$Revision: 1.0 $'
@@ -261,7 +259,7 @@ class B2LLXBDTConf(LineBuilder):
         """
         Kshort, both LL and DD
         """
-        from StandardParticles import StdLooseKsDD, StdLooseKsLL
+        from StandardParticles import StdLooseKsDD
 
         self.SelKsDD = self.createSubSel(OutputList=self.name + "SelKsDD",
                                          InputList=StdLooseKsDD,
@@ -297,7 +295,7 @@ class B2LLXBDTConf(LineBuilder):
         """
         Lambda, both LL and DD
         """
-        from StandardParticles import StdLooseLambdaDD, StdLooseLambdaLL
+        from StandardParticles import StdLooseLambdaDD
 
         self.SelLambdaDD = self.createSubSel(OutputList=self.name + "SelLambdaDD",
                                              InputList=StdLooseLambdaDD,
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingB2Lambda0ELines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingB2Lambda0ELines.py
index dcb376b6317e21a82d05511d6642d51a9139b1e0..beaae1e2b2d8fdb3ab6922b0b597f4f3735074b1 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingB2Lambda0ELines.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingB2Lambda0ELines.py
@@ -21,7 +21,6 @@ __all__ = ('B2Lambda0ELines',
            'default_config')
 
 from StandardParticles import StdLoosePions, StdLooseElectrons, StdNoPIDsDownElectrons, StdNoPIDsDownPions
-from Configurables import TisTosParticleTagger
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingB2Lambda0MuLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingB2Lambda0MuLines.py
index e758feafbbaf38bbf2c16b62697aeccc5044b5c0..8c8ebee90e957bb0642c7fb649a57f03d93eef97 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingB2Lambda0MuLines.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingB2Lambda0MuLines.py
@@ -21,7 +21,6 @@ __all__ = ('B2Lambda0MuLines',
            'default_config')
 
 from StandardParticles import StdLoosePions, StdLooseMuons, StdLooseDownMuons, StdNoPIDsDownPions
-from Configurables import TisTosParticleTagger
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingB2Lambda0MuOSLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingB2Lambda0MuOSLines.py
index 389b9bf695c2932c173a4ee768404acc14c2b153..4186a8554984cb039f3d149cda4700f95f9a9753 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingB2Lambda0MuOSLines.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingB2Lambda0MuOSLines.py
@@ -21,7 +21,6 @@ __all__ = ('B2Lambda0MuOSLines',
            'default_config')
 
 from StandardParticles import StdLoosePions, StdLooseMuons, StdLooseDownMuons, StdNoPIDsDownPions
-from Configurables import TisTosParticleTagger
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingB2Lambda0SSMuMu3PiLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingB2Lambda0SSMuMu3PiLines.py
index b829fcd48cd4d244f39b998208c83dfea4c65343..f47c81735abc7cb47558594658aaf83f1ca7bc36 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingB2Lambda0SSMuMu3PiLines.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingB2Lambda0SSMuMu3PiLines.py
@@ -21,7 +21,6 @@ __all__ = ('B2Lambda0SSMuMu3PiLines',
            'default_config')
 
 from StandardParticles import StdLoosePions, StdLooseMuons, StdLooseDownMuons, StdNoPIDsDownPions
-from Configurables import TisTosParticleTagger
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingB2MuMuMuMuLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingB2MuMuMuMuLines.py
index e8be535494b2f042b5e0ac87439ef9f4f7c4bd9d..e6a830521e3233715c6896a50d0ffe4616617755 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingB2MuMuMuMuLines.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingB2MuMuMuMuLines.py
@@ -19,7 +19,7 @@ from Beauty2Charm_LoKiCuts import LoKiCuts
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
-from Configurables import FilterDesktop, CombineParticles
+from Configurables import CombineParticles
 from Gaudi.Configuration import *
 __author__ = ['Diego Martinez Santos', 'Johannes Albrecht',
               'Konstantinos A. Petridis', 'Alexander Baranov']
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingB2XLL.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingB2XLL.py
old mode 100755
new mode 100644
index 893c8f7d24822aaf5128c145a0ea679b0efd25cc..54c9d8dbdf1774215b4f2574855ce20420b67924
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingB2XLL.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingB2XLL.py
@@ -10,9 +10,8 @@
 ###############################################################################
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection, AutomaticData
+from PhysSelPython.Wrappers import MergedSelection, Selection
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = 'Raja Nandakumar, Fergus Wilson, Stefania Ricciardi'
 __date__ = '04/11/2015'
 __version__ = '$Revision: 0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingB2XMuMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingB2XMuMu.py
index 9025207d02fbeeac1ba75e61e29706ad4d96e0d2..b89aef24e7a93c79addc371ccdea665995446fb7 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingB2XMuMu.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingB2XMuMu.py
@@ -19,7 +19,6 @@ __version__ = '$Revision: 1.2 $'
 __all__ = ('B2XMuMuConf', 'default_config')
 
 
-from Gaudi.Configuration import *
 from LHCbKernel.Configuration import *  # check if needed
 
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingB2XTau.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingB2XTau.py
index 89967ffc1bd10cb56544c7233004d1b229731f9c..9050443393da5af1c9abb3eee3ba2e1eda76009d 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingB2XTau.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingB2XTau.py
@@ -8,16 +8,13 @@
 # granted to it by virtue of its status as an Intergovernmental Organization  #
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
-from StandardParticles import StdAllLoosePions, StdAllNoPIDsPions
-from copy import deepcopy
 from StandardParticles import StdLooseKaons
-from StandardParticles import StdLoosePions, StdTightPions
-from StandardParticles import StdNoPIDsKaons, StdNoPIDsPions, StdTightMuons
+from StandardParticles import StdLoosePions
+from StandardParticles import StdNoPIDsPions, StdTightMuons
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, OfflineVertexFitter, DaVinci__N3BodyDecays
-from Gaudi.Configuration import *
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N3BodyDecays, FilterDesktop
 __author__ = ['G. Dujany, G. Mancinelli, J. Serrano']
 __date__ = '24/05/2010,15/01/2014, 19/10/2017'
 __version__ = '$Revision: 1.3 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingB2XTauMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingB2XTauMu.py
index 1539daf38aad3280d179e42101b30c7b9367dc90..3bf392ac2eb839b14fbb1f75d9e94e760e94edd9 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingB2XTauMu.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingB2XTauMu.py
@@ -25,8 +25,6 @@ __all__ = ('B2XTauMuConf',
            'default_config')
 
 
-from Gaudi.Configuration import *
-
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
 from PhysSelPython.Wrappers import Selection, MergedSelection
 from StrippingConf.StrippingLine import StrippingLine
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingB2XTauTau.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingB2XTauTau.py
index 4fcaf356c2071cae8a3b6be504e35eab73cf10ce..d2ac23a901190aa51d99a2548c6383a01f998521 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingB2XTauTau.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingB2XTauTau.py
@@ -14,8 +14,7 @@ from StandardParticles import StdNoPIDsPions, StdLoosePions
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand, SimpleSelection
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, OfflineVertexFitter, DaVinci__N3BodyDecays
-from Gaudi.Configuration import *
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N3BodyDecays, FilterDesktop
 __author__ = [' L. Pescatore', 'F. Blanc']
 __date__ = '28/09/2018'
 __version__ = '$Revision: 0.1$'
@@ -23,7 +22,6 @@ __version__ = '$Revision: 0.1$'
 # Stripping line for B->Htautau
 
 from GaudiKernel.SystemOfUnits import MeV
-from GaudiKernel.SystemOfUnits import mm
 
 """
   B->KstarTauTau, B->KTauTau, B->PhiTauTau, B->Eta'TauTau
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingBLVLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingBLVLines.py
index 8bf68933cf866f19e4931849021862745276afe7..a5196ce34b14f3f32b717e3c7fcb254e2f21f2fa 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingBLVLines.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingBLVLines.py
@@ -95,8 +95,7 @@ __all__ = ("BLVLinesConf",
 
 ###################################################################################################
 
-from Gaudi.Configuration import *
-from Configurables import FilterDesktop, CombineParticles, DaVinci__N3BodyDecays
+from Configurables import CombineParticles, DaVinci__N3BodyDecays
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingBd2KSLLX.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingBd2KSLLX.py
index 419b0f7505b9bb8f7a0008bd6bd040167c12c60a..54c987ef8b72fd7e148a11fb44cebadb12188639 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingBd2KSLLX.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingBd2KSLLX.py
@@ -10,9 +10,8 @@
 ###############################################################################
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection, AutomaticData
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, DaVinci__N3BodyDecays
-from Gaudi.Configuration import *
+from PhysSelPython.Wrappers import MergedSelection, Selection
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop
 __author__ = 'SB'
 __date__ = '08/10/2017'
 __version__ = '$Revision: 1 $'
@@ -47,15 +46,8 @@ class Bd2KSLLXConf(LineBuilder):
         mmXLine_name = name + "_mm"
         eeXLine_name = name + "_ee"
 
-        from StandardParticles import StdLoosePions as Pions
-        from StandardParticles import StdLooseKaons as Kaons
-        from StandardParticles import StdLooseKstar2Kpi as Kstars
-        from StandardParticles import StdLoosePhi2KK as Phis
         from StandardParticles import StdLooseKsLL as KshortsLL
         from StandardParticles import StdLooseKsDD as KshortsDD
-        from StandardParticles import StdLooseLambdaLL as LambdasLL
-        from StandardParticles import StdLooseLambdaDD as LambdasDD
-        from StandardParticles import StdLooseLambdastar2pK as Lambdastars
 
         SelKshortsLL = self._filterHadron(name="KshortsLLFor" + self._name,
                                           sel=KshortsLL,
@@ -64,12 +56,10 @@ class Bd2KSLLXConf(LineBuilder):
                                           sel=KshortsDD,
                                           params=config)
 
-        from StandardParticles import StdDiElectronFromTracks as DiElectronsFromTracks
         from StandardParticles import StdLooseDiElectron as DiElectrons
         from StandardParticles import StdLooseDiMuon as DiMuons
 
-        ElecID = "(PIDe > %(PIDe)s)" % config
-        MuonID = "(HASMUON)&(ISMUON)"
+        "(PIDe > %(PIDe)s)" % config
 
         DiElectronID = "(2 == NINTREE((ABSID==11)&(PIDe > %(PIDe)s)))" % config
         DiMuonID = "(2 == NINTREE((ABSID==13)&(HASMUON)&(ISMUON)))"
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingBd2eeKstarBDT.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingBd2eeKstarBDT.py
index 1a6b3547113e58f48bff1e36952cfc3fb4d30295..6776dcdf27807a56103010584c7a22734b4a8a3f 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingBd2eeKstarBDT.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingBd2eeKstarBDT.py
@@ -18,7 +18,6 @@ from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = ['Marie-Helene Schune', 'Jibo He']
 __date__ = '20/01/2012'
 __version__ = '$Revision: 1.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingBeauty2XGamma.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingBeauty2XGamma.py
index d21b9a25bc2714ed14237d6218c1dad601dc1240..05e9c9cf0af28c167f2cc98f655c56f432f3ea6b 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingBeauty2XGamma.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingBeauty2XGamma.py
@@ -12,7 +12,7 @@
 B-> X Gamma selections
 '''
 
-from StandardParticles import StdAllNoPIDsKaons, StdAllNoPIDsPions, StdLooseAllPhotons, StdLooseMergedPi0, StdLooseResolvedPi0, StdAllLooseGammaDD, StdAllLooseGammaLL, StdAllNoPIDsProtons
+from StandardParticles import StdAllLooseGammaDD, StdAllLooseGammaLL, StdAllNoPIDsPions, StdLooseAllPhotons, StdLooseMergedPi0, StdLooseResolvedPi0
 from Configurables import TisTosParticleTagger
 from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays as Combine4Particles
 from GaudiConfUtils.ConfigurableGenerators import DaVinci__N3BodyDecays as Combine3Particles
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingBs2MuMuGamma.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingBs2MuMuGamma.py
index 0cfb5425d7a51fe618e72a66a2e6e2062510e41d..f1f37c46035071eccb7cf880d283aafb532e0b8f 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingBs2MuMuGamma.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingBs2MuMuGamma.py
@@ -15,7 +15,7 @@ Authors: Meril Reboud, Jean-Francois Marchand
 """
 
 ########################################################################
-from StrippingUtils.Utils import LineBuilder, checkConfig
+from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Combine3BodySelection
 from StandardParticles import StdLooseMuons, StdLooseAllPhotons
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingBs2MuMuLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingBs2MuMuLines.py
index 28fab868cccc6d58e46553f2585cd743326a977c..8bf0a80a0ffc3aa0267bf6dfb6cc948d4a90331a 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingBs2MuMuLines.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingBs2MuMuLines.py
@@ -26,7 +26,7 @@ from Gaudi.Configuration import *
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
-from Configurables import FilterDesktop, CombineParticles
+from Configurables import CombineParticles
 from JetAccessories.JetMaker_Config import JetMakerConf
 from CommonParticles.Utils import *
 from Gaudi.Configuration import *
@@ -159,7 +159,7 @@ def create_stdjets(strob, line_location, stdjets_name_ban, stdjets_name_addb):
         strob.StdJetsNoJetIDBan = [myconf1]
 
     # configure Data-On-Demand service
-    locations = updateDoD(myconf1)
+    updateDoD(myconf1)
 
     myconf2 = JetMakerConf(stdjets_name_addb,
                            Inputs=['Phys/PFParticles/Particles', line_location],
@@ -173,7 +173,7 @@ def create_stdjets(strob, line_location, stdjets_name_ban, stdjets_name_addb):
         strob.StdJetsNoJetIDAddB = [myconf2]
 
     # configure Data-On-Demand service
-    locations = updateDoD(myconf2)
+    updateDoD(myconf2)
 
 ##########################################
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingBs2gammagamma.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingBs2gammagamma.py
index a19590514ce1912b186311ffed8d51783a633f9c..5dd7a2cdce789ca4b9dbc99b6ec9ffef3e98e01e 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingBs2gammagamma.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingBs2gammagamma.py
@@ -21,16 +21,11 @@ Exports the following stripping lines as instance data members:
 - Bs2gammagamma_NoConvWideLine  : wide line with 0 conversions
 '''
 
-from Configurables import (DiElectronMaker, ProtoParticleCALOFilter,
-                           ParticleTransporter, BremAdder)
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop  # , CombineParticles
-from CommonParticles import StdLooseAllPhotons
-from CommonParticles import StdAllLooseGammaConversion
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
 from Configurables import CombineParticles
-from Gaudi.Configuration import *
 __author__ = ['Sean Benson']
 __date__ = '2016/04/08'
 __version__ = '1.2'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingBs2st2KKMuX.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingBs2st2KKMuX.py
index 86d2fbe036d44821a158f2fba4fe7e558c1d3d55..22e9c5c994936c1db65ca0b5c70f9d8f5601bd3b 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingBs2st2KKMuX.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingBs2st2KKMuX.py
@@ -22,9 +22,8 @@ Stripping lines:
 from StandardParticles import StdLooseMuons, StdLooseKaons, StdAllLooseKaons, StdMassConstrainedJpsi2MuMu
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand
+from PhysSelPython.Wrappers import Selection
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = ['Jianchun Wang']
 __date__ = '03/22/2015'
 __version__ = '$Revision: 0.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingBu2LLK.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingBu2LLK.py
index ccdadc65103f0ad7d64540f186d2928a622eb079..c8fca833f5d7ccca659cabf968c9051df1adff6b 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingBu2LLK.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingBu2LLK.py
@@ -10,7 +10,7 @@
 ###############################################################################
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection, AutomaticData
+from PhysSelPython.Wrappers import DataOnDemand, MergedSelection, Selection
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, DaVinci__N3BodyDecays
 from Gaudi.Configuration import *
 __author__ = 'Patrick Koppenburg, Alex Shires, Thomas Blake, Luca Pescatore, Simone Bifani, Yasmine Amhis, Paula Alvarez Cartelle, Harry Cliff, Rafael Silva Coutinho, Guido Andreassi, Mick Mulder, Maarten van Veghel, John Smeaton, Vitalii Lisovskyi'
@@ -297,7 +297,6 @@ class Bu2LLKConf(LineBuilder):
         from StandardParticles import StdLoosePions as Pions
         from StandardParticles import StdLooseKaons as Kaons
         from StandardParticles import StdLooseProtons as Protons
-        from StandardParticles import StdAllLoosePions as AllPions
         from StandardParticles import StdAllLooseKaons as AllKaons
         from StandardParticles import StdAllLooseProtons as AllProtons
         from StandardParticles import StdLooseKstar2Kpi as Kstars
@@ -1520,7 +1519,6 @@ class Bu2LLKConf(LineBuilder):
         from StandardParticles import StdLooseMuons as Muons
         # from CommonParticles import StdLooseDetachedTau
         # Taus = DataOnDemand(Location = "Phys/StdLooseDetachedTau3pi/Particles")
-        from CommonParticles import StdTightDetachedTau
         Taus = DataOnDemand(Location="Phys/StdTightDetachedTau3pi/Particles")
 
         _DecayDescriptor = "[J/psi(1S) -> mu+ tau-]cc"
@@ -1675,7 +1673,6 @@ class Bu2LLKConf(LineBuilder):
 #####################################################
 
     def _storeInputBremPhotons(self, linename, outputlocprefix="Leptonic/Phys/", photonloc="Phys/StdVeryLooseAllPhotons/Particles"):
-        from PhysSelPython.Wrappers import FilterSelection, DataOnDemand, SelectionSequence
         from Configurables import (CopyParticles, ParticleCloner,
                                    ProtoParticleCloner, CaloHypoCloner,
                                    CaloClusterCloner)
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingBu2MajoLep.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingBu2MajoLep.py
index 5a96cdedd562ea723f6b2b20d6b2cf30f98f517f..850c2f87ccfaddc8f68a9b6e087f3f6d41cebbb1 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingBu2MajoLep.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingBu2MajoLep.py
@@ -19,12 +19,10 @@ __version__ = 'V0.9'
 __all__ = ('Bu2MajoLepConf',
            'default_config')
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
+from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from GaudiKernel.SystemOfUnits import *
 
 from StandardParticles import StdLooseMuons as Muons
 from StandardParticles import StdLoosePions as Pions
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingBu2MuNu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingBu2MuNu.py
index 19ce21e90e54ca7bc0f65d55187d37c95520c6d9..4163901dd65f50c70f659de9c335932f2c9649fa 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingBu2MuNu.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingBu2MuNu.py
@@ -25,12 +25,11 @@ __all__ = ('Bu2MuNuConf',
            'default_config')
 
 from Gaudi.Configuration import *
-from PhysSelPython.Wrappers import Selection, DataOnDemand
+from PhysSelPython.Wrappers import DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from StandardParticles import StdTightMuons, StdTightANNMuons
 from CommonParticles.Utils import *
-from Configurables import FilterDesktop, CombineParticles
+from Configurables import FilterDesktop
 from JetAccessories.JetMaker_Config import JetMakerConf
 
 default_name = 'Bu2MuNu'
@@ -72,7 +71,7 @@ def create_stdjets(strobj, line_location, stdjets_name_ban):
         strobj.StdJetsNoJetIDBan = [myconf1]
 
     # configure Data-On-Demand service
-    locations = updateDoD(myconf1)
+    updateDoD(myconf1)
 
 
 relInfoJetsVars = ["JETNOMU1PX", "JETNOMU1PY", "JETNOMU1PZ", "JETNOMU1PT", "JETNOMU1JETWIDTH", "JETNOMU1NNTAG", "JETNOMU1MNF", "JETNOMU2PX", "JETNOMU2PY", "JETNOMU2PZ", "JETNOMU2PT", "JETNOMU2JETWIDTH", "JETNOMU2NNTAG",
@@ -255,7 +254,7 @@ class Bu2MuNuConf(LineBuilder):
                                            JetIDCut=False).algorithms[0]
 
         # configure Data-On-Demand service
-        locations = updateDoD(StdJetsNoJetIDNoBan)
+        updateDoD(StdJetsNoJetIDNoBan)
 
         # add the jets with the specific banning
         create_stdjets(self, self.ControlLine.outputLocation(),
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingD23MuLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingD23MuLines.py
index 9d9153bde02604dd6518511524323b953c58b810..a119c6aadabeb6405ae23f48d28004723f035a3b 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingD23MuLines.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingD23MuLines.py
@@ -51,12 +51,11 @@ __all__ = ("D23MuLinesConf",
 #############################################################################
 
 from Gaudi.Configuration import *
-from Configurables import FilterDesktop, CombineParticles, DaVinci__N3BodyDecays
+from Configurables import DaVinci__N3BodyDecays
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 # from StrippingSelections.Utils import checkConfig
-from GaudiKernel.PhysicalConstants import c_light
 
 #############################################################################
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingDarkBoson.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingDarkBoson.py
index 754d0f38050b7a4694b6c0d51d824b1e808d61c3..e79bed1bf4d9ba4dcb692145cb4e20d25fe0063e 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingDarkBoson.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingDarkBoson.py
@@ -17,23 +17,18 @@ Author: M. Williams, D. Craik
 from Configurables import DiElectronMaker, ProtoParticleCALOFilter
 from GaudiConfUtils.ConfigurableGenerators import DaVinci__N3BodyDecays
 from CommonParticles.Utils import *
-from copy import deepcopy
 from Configurables import SubstitutePID
 from StandardParticles import StdAllLooseGammaLL, StdAllLooseGammaDD, \
     StdAllLooseElectrons, StdLooseAllPhotons  # , StdDiElectronFromTracks
 from Beauty2Charm_LoKiCuts import LoKiCuts
 from StandardParticles import StdAllNoPIDsPions, StdAllNoPIDsKaons, \
-    StdAllNoPIDsProtons, StdNoPIDsUpPions, StdAllLooseMuons, \
-    StdLooseDownMuons
-from Configurables import LoKi__VoidFilter
+    StdAllLooseMuons, StdLooseDownMuons
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import EventSelection
 from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
 from Gaudi.Configuration import *
-import re
 __author__ = ['Mike Williams', 'Dan Craik']
 
 moduleName = 'DarkBoson'
@@ -364,7 +359,7 @@ class DarkBosonConf(LineBuilder):
         mmDDX = makeX(
             'MuMuDD', default_config['XDD'], 'KS0 -> mu+ mu-', [muDX])
         kkX = makeX('KK', default_config['XLL'], 'KS0 -> K+ K-', [kX])
-        kkDDX = makeX('KKDD', default_config['XDD'], 'KS0 -> K+ K-', [kDX])
+        makeX('KKDD', default_config['XDD'], 'KS0 -> K+ K-', [kDX])
         pipiX = makeX(
             'PiPi', default_config['XLLhard'], 'KS0 -> pi+ pi-', [piX])
         pipiDDX = makeX(
@@ -419,7 +414,7 @@ class DarkBosonConf(LineBuilder):
             'PiPiSSDD', default_config['XDD'], '[KS0 -> pi+ pi+]cc', [piDX])
         preSS = default_config['Prescales']['SS']
 
-        preDD = default_config['Prescales']['DD']
+        default_config['Prescales']['DD']
         preKK = default_config['Prescales']['KK']
 
         j = makeJ(default_config['J'], [muJ])
@@ -630,7 +625,7 @@ class DarkBosonConf(LineBuilder):
         kst = filterKst()
         self._makeBLine('B2JKst', ['[B0 -> J/psi(1S) K*(892)0]cc'],
                         [j, kst], default_config['B2KX'])
-        rho = makeRho([piB])
+        makeRho([piB])
         # self._makeBLine('B2RhoX2MuMu',['B0 -> rho(770)0 KS0'],[rho,mmX],
         #                default_config['B2HHX'])
         # self._makeBLine('B2RhoX2MuMuDD',['B0 -> rho(770)0 KS0'],[rho,mmDDX],
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingDoubleSLForRX.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingDoubleSLForRX.py
index f7e5ccc228e7525247584f38f94bf53502f3cdea..3116bd40e9e8d6da906924d79ac8c85fabf37565 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingDoubleSLForRX.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingDoubleSLForRX.py
@@ -19,7 +19,6 @@ from GaudiConfUtils.ConfigurableGenerators import (CombineParticles,
                                                    DaVinci__N3BodyDecays)
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from Gaudi.Configuration import *
 __author__ = 'M. Kreps, T. Blake, D. Loh'
 __date__ = '10/11/2016'
 __version__ = '$Revision: 1.0$'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingHypb2L0HGamma.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingHypb2L0HGamma.py
index 83e2745fd58ace3d154d5c84e17588243850ee63..e33667deb325d3bc47009996d2c37915a3a42fd3 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingHypb2L0HGamma.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingHypb2L0HGamma.py
@@ -16,8 +16,8 @@ __all__ = ('Hypb2L0HGammaConf',
            'default_config', )
 
 from Gaudi.Configuration import *
-from Configurables import FilterDesktop, CombineParticles, TisTosParticleTagger
-from PhysSelPython.Wrappers import Selection, MergedSelection, DataOnDemand
+from Configurables import CombineParticles, FilterDesktop
+from PhysSelPython.Wrappers import DataOnDemand, Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from StandardParticles import StdLooseAllPhotons
@@ -495,7 +495,7 @@ def tisTosSelection(sel, TISTOSdict):
 
 
 def makevelotracks(name):
-    from Configurables import FastVeloTracking, TrackPrepareVelo, DecodeVeloRawBuffer, TrackEventFitter, TrackStateInitAlg,  TrackContainerCopy
+    from Configurables import FastVeloTracking, TrackContainerCopy, TrackStateInitAlg
     from TrackFitter.ConfiguredFitters import ConfiguredEventFitter
 
     MyFastVeloTracking = FastVeloTracking(
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingK0s2XXMuMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingK0s2XXMuMu.py
index 454c44356bf363573cfae8fad85f13e9b83e92ea..dc8a94331712da6fda2d902eeaadf4a4c7f30f0f 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingK0s2XXMuMu.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingK0s2XXMuMu.py
@@ -19,9 +19,7 @@ from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection
 from StandardParticles import StdAllLoosePions, StdAllLooseMuons
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-from GaudiKernel.PhysicalConstants import c_light
-from GaudiKernel.SystemOfUnits import MeV, m, mm, picosecond
-from Gaudi.Configuration import *
+from GaudiKernel.SystemOfUnits import MeV, mm, picosecond
 __author__ = ['Miguel Ramos Pernas']
 __date__ = '10/10/2017'
 __version__ = '$Revision: 0.00 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingKshort2Leptons.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingKshort2Leptons.py
index 67d107ee83706c36aa632cb5fa02a0f94c867573..22bd7388a2a3885597300244554f814dc453b243 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingKshort2Leptons.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingKshort2Leptons.py
@@ -20,7 +20,6 @@ from StandardParticles import StdAllNoPIDsElectrons
 from StandardParticles import StdNoPIDsUpPions
 from StandardParticles import StdAllNoPIDsPions
 from StandardParticles import StdAllLooseMuons
-from StandardParticles import StdAllNoPIDsMuons
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingKshort2MuMuMuMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingKshort2MuMuMuMu.py
index 86a943e5a6fb41852c6a9f29c92389947b9c890f..81ef82f2043ed504638103a44bd0a0e915d41771 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingKshort2MuMuMuMu.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingKshort2MuMuMuMu.py
@@ -15,15 +15,12 @@ derived, in large measure, from StrippingKshort2PiPiMuMu.py
 '''
 
 from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays
-from GaudiKernel.SystemOfUnits import MeV
-from StandardParticles import StdNoPIDsDownPions, StdLooseDownMuons
-from StandardParticles import StdAllLoosePions, StdAllLooseMuons, StdAllNoPIDsPions
-from StandardParticles import StdLoosePions, StdLooseMuons, StdNoPIDsPions
+from StandardParticles import StdLooseDownMuons
+from StandardParticles import StdAllLooseMuons
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
+from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
 __author__ = ['Mike Sokoloff']
 __date__ = '07 January 2014'
 __version__ = '$Revision: 0.1 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingKshort2PiPiMuMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingKshort2PiPiMuMu.py
index 0955f65fa0e2efdcb575b1c11a7ad439f53a1944..07b134c737342e2921702f4d74fa30eda7121cf9 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingKshort2PiPiMuMu.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingKshort2PiPiMuMu.py
@@ -10,15 +10,12 @@
 ###############################################################################
 
 from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays
-from GaudiKernel.SystemOfUnits import MeV
 from StandardParticles import StdNoPIDsDownPions, StdLooseDownMuons
-from StandardParticles import StdAllLoosePions, StdAllLooseMuons, StdAllNoPIDsPions
-from StandardParticles import StdLoosePions, StdLooseMuons, StdNoPIDsPions
+from StandardParticles import StdAllLooseMuons, StdAllLoosePions
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
+from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
 __author__ = ['Mike Sokoloff']
 __date__ = '25/10/2012'
 __version__ = '$Revision: 0.1 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingKshort2eePiPi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingKshort2eePiPi.py
index 5ac8f83630db4b9cf4e5a235dd3ceeb48b0a2a95..d8b95bcb790eaafc5b7c90a8f83fe5663eee0c11 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingKshort2eePiPi.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingKshort2eePiPi.py
@@ -23,7 +23,6 @@ from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection
 from GaudiConfUtils.ConfigurableGenerators import DaVinci__N3BodyDecays as Combine3Particles
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
-from Gaudi.Configuration import *
 __author__ = ['Carla Marin', 'Xabier Cid Vidal',  'Adrian Casais Vidal']
 __date__ = '23/02/2018'
 __version__ = '$2.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingLFVLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingLFVLines.py
index c3458781eb83744dc2820565a0f47b37b5fc2d0a..2e36db58ca9de1003ed6876cdfe53d8f1ccd6f4d 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingLFVLines.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingLFVLines.py
@@ -23,14 +23,12 @@ __all__ = ('LFVLinesConf',
            'default_config',
            )
 
-from Gaudi.Configuration import *
 # from Configurables import FilterDesktop, CombineParticles
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, DaVinci__N3BodyDecays
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N3BodyDecays
 from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from GaudiKernel.PhysicalConstants import c_light
-from GaudiKernel.SystemOfUnits import GeV, MeV, mm
+from GaudiKernel.SystemOfUnits import MeV, mm
 from copy import deepcopy
 #
 # Configure related info tools
@@ -1223,7 +1221,7 @@ class LFVLinesConf(LineBuilder):
         hemu_name = name+'B2heMu'
         pmu_name = name+'B2hMu'
         bu_name = name+'Bu2KJPsiee'
-        taumu_name = name+'B2TauMu'
+        name+'B2TauMu'
         htaumu_name = name+'B2hTauMu'
         muetap_gamma_name = name+'Tau2MuEtaP2pipig'
         muetap_pi_name = name+'Tau2MuEtaP2pipipi'
@@ -1716,7 +1714,6 @@ def makeB2TauMu(name):
         "& (BPVVDCHI2> 225)"\
         "& (BPVIPCHI2()< 25) "
 
-    from CommonParticles import StdLooseDetachedTau, StdLooseDipion
     _stdLooseMuons = DataOnDemand(Location="Phys/StdLooseMuons/Particles")
     _stdLooseDetachedTaus = DataOnDemand(
         Location="Phys/StdLooseDetachedTau3pi/Particles")
@@ -2356,7 +2353,6 @@ def makeB2hTauMu(name):
                           "& (BPVVDCHI2> 225)"\
                           "& (BPVIPCHI2()< 16) "  # maybe 16
 
-    from CommonParticles import StdLooseDetachedTau, StdLooseDipion
     _stdLooseMuons = DataOnDemand(Location="Phys/StdLooseMuons/Particles")
     _stdLooseDetachedTaus = DataOnDemand(
         Location="Phys/StdLooseDetachedTau3pi/Particles")
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingLb2L0Gamma.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingLb2L0Gamma.py
index 802119884510c53e5cf00d3e4788223b09ab5a71..bfcf8336af14cb0e5ff39ae2da6502181e9066d9 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingLb2L0Gamma.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingLb2L0Gamma.py
@@ -25,9 +25,6 @@ __date__ = "14.11.2016"
 __version__ = "2.0"
 __all__ = ("default_config", "StrippingLb2L0GammaConf")
 
-import os
-
-from Gaudi.Configuration import *
 
 from Configurables import CombineParticles
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
@@ -36,9 +33,7 @@ from PhysSelPython.Wrappers import Selection, MergedSelection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 
-from StandardParticles import StdAllNoPIDsPions, StdAllNoPIDsProtons
 from StandardParticles import StdLooseAllPhotons, StdAllLooseGammaDD, StdAllLooseGammaLL
-from StandardParticles import StdVeryLooseDetachedKst2Kpi
 from StandardParticles import StdLooseJpsi2MuMu
 
 default_config = {'NAME': 'Lb2L0Gamma',
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingLc23MuLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingLc23MuLines.py
index b2244bd7aa9f116d9783ce03a8fc1944cde17b39..3d97e939f7633e3e700dd756976cae1b815955f7 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingLc23MuLines.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingLc23MuLines.py
@@ -68,12 +68,11 @@ __all__ = ("Lc23MuLinesConf",
 ###################################################################################################
 
 from Gaudi.Configuration import *
-from Configurables import FilterDesktop, CombineParticles, DaVinci__N3BodyDecays, DaVinci__N4BodyDecays
+from Configurables import CombineParticles, DaVinci__N3BodyDecays, DaVinci__N4BodyDecays
 # from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from GaudiKernel.PhysicalConstants import c_light
 
 ###################################################################################################
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingPhiToKSKS.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingPhiToKSKS.py
index ff157859dd3877ab38f9cad234fb49a80418e50d..1a62ef5db16a204dc0a3d66d1fd1d1f75d4a04d4 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingPhiToKSKS.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingPhiToKSKS.py
@@ -23,8 +23,7 @@ from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from StandardParticles import StdAllLooseKaons, StdAllLooseMuons
-from Configurables import FitDecayTrees
-from PhysSelPython.Wrappers import AutomaticData, MergedSelection
+from PhysSelPython.Wrappers import MergedSelection
 
 __all__ = ('PhiToKSKSAllLinesConf',
            'TOSFilter',
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingRareNStrange.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingRareNStrange.py
index 95f70d0b641829f0a44259b730566f4c68fa1093..98b3814df4bee7388e334a0c9969c741474a9f63 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingRareNStrange.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingRareNStrange.py
@@ -10,9 +10,8 @@
 ###############################################################################
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection, AutomaticData
+from PhysSelPython.Wrappers import Selection
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = 'Diego Martinez Santos, Carlos Vazquez, Xabier Cid, Jessica Prisciandaro, Miguel Ramos Pernas'
 __date__ = '08/05/2015'
 __version__ = '$Revision: Not sure $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingRareStrange.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingRareStrange.py
index 6f7264e1db8f4045b2b139a11daa3e90056e3c44..bba73d994ee42cf94a9237f00597a4d7be7cc54d 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingRareStrange.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingRareStrange.py
@@ -59,15 +59,11 @@ __all__ = ('RareStrangeLinesConf',
 from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 from GaudiConfUtils.ConfigurableGenerators import DaVinci__N3BodyDecays as Combine3Particles
-from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays as Combine4Particles
-from CommonParticles import StdNoPIDsDownElectrons
 from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from GaudiKernel.PhysicalConstants import c_light
-from StandardParticles import (StdAllNoPIDsPions, StdNoPIDsDownPions,
-                               StdLoosePions, StdLooseDownMuons,
-                               StdLooseMergedPi0, StdLooseResolvedPi0, StdLooseDalitzPi0)
+from StandardParticles import (StdLooseMergedPi0, StdLooseResolvedPi0,
+                               StdLooseDalitzPi0)
 
 # from CommonParticles.StdLooseDalitzPi0 import (StdLoosePi02gee, StdLoosePi024e)
 
@@ -2786,7 +2782,7 @@ def makeLambdaPPiEE(name, config, inputs):
 
 
 def makevelotracks(name):
-    from Configurables import FastVeloTracking, TrackPrepareVelo, DecodeVeloRawBuffer, TrackEventFitter, TrackStateInitAlg,  TrackContainerCopy
+    from Configurables import FastVeloTracking, TrackContainerCopy, TrackStateInitAlg
     from TrackFitter.ConfiguredFitters import ConfiguredEventFitter
 
     MyFastVeloTracking = FastVeloTracking(
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingStrangeHadrons.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingStrangeHadrons.py
index 5c16fb7fd63ec1f15df76e17b03a96af7c5a4c61..e2488a937f3c160c5d1dc0bbb81310ee8ff58466 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingStrangeHadrons.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingStrangeHadrons.py
@@ -35,23 +35,12 @@ __all__ = ('default_config',
            'StrangeHadronsConf',
            )
 
-import os
 
-from Gaudi.Configuration import *
-
-from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-
-from GaudiConfUtils.ConfigurableGenerators import DaVinci__N3BodyDecays as Combine3Particles
-from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays as Combine4Particles
-from CommonParticles import StdNoPIDsDownElectrons
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
+from PhysSelPython.Wrappers import DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from GaudiKernel.PhysicalConstants import c_light
 from GaudiKernel.SystemOfUnits import MeV
 
-from StandardParticles import StdAllNoPIDsPions, StdLoosePions, StdLooseProtons, StdAllLoosePions, StdAllLooseMuons
-from StandardParticles import StdLooseAllPhotons
 ##
 from PhysConf.Selections import CombineSelection
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingStrangeSL.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingStrangeSL.py
index 5134ef5434ea3f244733fc6ac26485b868c228fb..26590be4ba73ad6710f007e7e831cea2a4a4b23a 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingStrangeSL.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingStrangeSL.py
@@ -36,23 +36,12 @@ __all__ = ('default_config',
            'StrangeSLConf',
            )
 
-import os
 
-from Gaudi.Configuration import *
-
-from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-
-from GaudiConfUtils.ConfigurableGenerators import DaVinci__N3BodyDecays as Combine3Particles
-from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays as Combine4Particles
-from CommonParticles import StdNoPIDsDownElectrons
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
+from PhysSelPython.Wrappers import DataOnDemand, Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from GaudiKernel.PhysicalConstants import c_light
 from GaudiKernel.SystemOfUnits import MeV
 
-from StandardParticles import StdAllNoPIDsPions, StdLoosePions, StdLooseProtons, StdAllLoosePions, StdAllLooseMuons, StdAllLooseElectrons
-from StandardParticles import StdLooseMergedPi0, StdLooseResolvedPi0, StdLooseDalitzPi0
 from PhysConf.Selections import CombineSelection
 
 default_config = {
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingTau23MuLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingTau23MuLines.py
index 6adb37dd06aeeb58dcd798447fe8b5ee90fa6e99..b2fa9b13c2441549d3939f19589727c3e261e09d 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingTau23MuLines.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingTau23MuLines.py
@@ -35,7 +35,6 @@ from GaudiConfUtils.ConfigurableGenerators import DaVinci__N5BodyDecays as Combi
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from GaudiKernel.PhysicalConstants import c_light
 
 default_config = {
     'NAME': 'Tau23Mu',
@@ -70,7 +69,7 @@ class Tau23MuLinesConf(LineBuilder):
         # checkConfig(Bs2MuMuLinesConf.__configuration_keys__,config)
 
         tau_name = name+'Tau23Mu'
-        ds23PiTIS_name = name+'Ds23PiTIS'
+        name+'Ds23PiTIS'
         ds23Pi_name = name+'Ds23Pi'
         ds2PhiPi_name = name+'Ds2PhiPi'
         tau25_name = name+'Tau25Mu'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingTau2LambdaMuLines.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingTau2LambdaMuLines.py
index 6f7caa01d008433cca4a3184d6bdfeb2a9bcd909..2e5401740f914b698345c335bfe29788f1e7ed2e 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingTau2LambdaMuLines.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingTau2LambdaMuLines.py
@@ -16,12 +16,10 @@ Exported symbols (use python help!):
    - 
 '''
 
-from GaudiKernel.PhysicalConstants import c_light
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
-from Configurables import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
+from Configurables import CombineParticles
 __author__ = ['Marcin Chrzaszcz']
 __date__ = '14/12/2012'
 __version__ = '$Revision: 1.0 $'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingZVTOP.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingZVTOP.py
index f4ee63f69c4320486335e4fa797004ccb36ecca4..6b5cbfa74e249908ea9e854e9c0f238ebdd2d9cf 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingZVTOP.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingRD/StrippingZVTOP.py
@@ -9,14 +9,12 @@
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
 from Configurables import TopoTauAlg, TopoVertexTool
-from StandardParticles import StdLooseKaons
-from StandardParticles import StdLoosePions, StdTightPions
-from StandardParticles import StdNoPIDsKaons, StdNoPIDsPions
+from StandardParticles import StdLoosePions
+from StandardParticles import StdNoPIDsPions
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, OfflineVertexFitter
-from Gaudi.Configuration import *
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop
 __author__ = ['Giampi Mancinelli', 'Julien Cogan', 'Justine Serrano']
 
 __date__ = '14/01/2014'
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingSL/StrippingB23MuNu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingSL/StrippingB23MuNu.py
index 11d81c34fb0178677727235bc3bd636b83427207..97c4220c4e62f1a00d3c320d5f76806aba8c4c4a 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingSL/StrippingB23MuNu.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingSL/StrippingB23MuNu.py
@@ -19,15 +19,12 @@ __all__ = ('B23MuNuConf')
 Stripping selection for B to three muons and a neutrino.
 """
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop
 
-from PhysSelPython.Wrappers import Selection, AutomaticData, MergedSelection
+from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from LHCbKernel.Configuration import *  # check if needed
-from Configurables import SubstitutePID
-from Configurables import SubPIDMMFilter
 
 
 #################
@@ -161,15 +158,13 @@ class B23MuNuConf(LineBuilder):
         """
         Creates Jpsi as proxy for dimuon
         """
-        from PhysSelPython.Wrappers import AutomaticData, Selection, SelectionSequence, DataOnDemand, MergedSelection
+        from PhysSelPython.Wrappers import Selection
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         # from Configurables import CombineParticles
 
         CombineJpsi = CombineParticles(DecayDescriptors=["J/psi(1S) -> mu+ mu-", "[J/psi(1S) -> mu+ mu+]cc"],
                                        MotherCut="ALL")
 
-        sel_name = "Jpsi"
-
         from PhysSelPython.Wrappers import Selection
         SelJpsi = Selection("Sel_" + self.name + "_Jpsi", Algorithm=CombineJpsi,
                             RequiredSelections=[self.Muons])
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingSL/StrippingB2DMuForTauMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingSL/StrippingB2DMuForTauMu.py
index bbb6591f636c547192b1c9759ebfeedf27b88e2b..8bd9a436ea3d941e0b4ec5b3610d262206579753 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingSL/StrippingB2DMuForTauMu.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingSL/StrippingB2DMuForTauMu.py
@@ -18,12 +18,10 @@ __version__ = '$Revision: 2.0 $'
 
 from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from PhysSelPython.Wrappers import Selection, DataOnDemand
+from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from StandardParticles import StdLoosePions, StdAllLooseMuons, StdLooseKaons, StdLooseProtons, StdAllLoosePions, StdLooseMergedPi0, StdLooseResolvedPi0, StdAllNoPIDsMuons, StdLooseANNUpPions
-from Configurables import ConjugateNeutralPID
-from PhysSelPython.Wrappers import MergedSelection
+from StandardParticles import StdAllLooseMuons, StdAllNoPIDsMuons, StdLooseKaons, StdLoosePions, StdLooseProtons
 
 __all__ = ('B2DMuForTauMuconf',
            # 'makeb2DMuX',
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingSL/StrippingB2DMuNuX.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingSL/StrippingB2DMuNuX.py
index 5336bea5bd5d1a8013b026a62b999e808bf61eab..3736f86309ec24b62f81a2c483ee5e5d23d7fad9 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingSL/StrippingB2DMuNuX.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingSL/StrippingB2DMuNuX.py
@@ -13,14 +13,13 @@ __date__ = '23/07/2010'
 __version__ = '$Revision: 5.0 $'
 
 from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
+from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
 from PhysSelPython.Wrappers import Selection
-from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from StandardParticles import StdLoosePions, StdLooseMuons, StdLooseKaons, StdLooseProtons, StdLooseElectrons
 from StandardParticles import StdNoPIDsPions, StdNoPIDsKaons, StdNoPIDsProtons, StdNoPIDsMuons
 from StrippingB2DMuNuXUtils import *
-from GaudiKernel.SystemOfUnits import MeV, GeV, cm, mm
+from GaudiKernel.SystemOfUnits import GeV, MeV, mm
 
 __all__ = ('B2DMuNuXAllLinesConf',
            'default_config')
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingSL/StrippingB2DMuNuXUtils.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingSL/StrippingB2DMuNuXUtils.py
index 6130e13de2c5b9fe72cd44d5967aeceaa4452074..e91f29e3fa36cef61e702f06f89eb4418ddf4695 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingSL/StrippingB2DMuNuXUtils.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingSL/StrippingB2DMuNuXUtils.py
@@ -13,11 +13,9 @@ __date__ = '06/03/2015'
 __version__ = '$Revision: 0.0 $'
 
 from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
-from StrippingUtils.Utils import LineBuilder
-from StandardParticles import StdLoosePions, StdLooseMuons, StdLooseKaons, StdLooseProtons, StdNoPIDsPions, StdLooseElectrons, StdNoPIDsMuons
 
 
 def BtoDlnuLine(module_name,
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingSL/StrippingB2Dlnu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingSL/StrippingB2Dlnu.py
index 0c8d00bd94717af821926626f5446a85cb20a902..b05a05c95319c31661cfe61524eca70e234905c3 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingSL/StrippingB2Dlnu.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingSL/StrippingB2Dlnu.py
@@ -17,12 +17,10 @@ __version__ = '$Revision: 1.0 $'
 
 from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from PhysSelPython.Wrappers import Selection, DataOnDemand
+from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from StandardParticles import StdLoosePions, StdLooseMuons, StdLooseKaons, StdLooseProtons, StdAllLoosePions, StdLooseMergedPi0, StdLooseResolvedPi0, StdAllNoPIDsMuons, StdLooseANNUpPions, StdLooseElectrons
-from Configurables import ConjugateNeutralPID
-from PhysSelPython.Wrappers import MergedSelection
+from StandardParticles import StdAllNoPIDsMuons, StdLooseElectrons, StdLooseKaons, StdLooseMuons, StdLoosePions
 
 __all__ = ('B2DMuForLNuconf',
            # 'makeb2DMuX',
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingSL/StrippingB2Dst0MuNu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingSL/StrippingB2Dst0MuNu.py
index 3f6fd96ade4433b51152a37ee46ccbd072892fbe..e98d2b4850975113ec77abeed5a53c59a6ba950c 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingSL/StrippingB2Dst0MuNu.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingSL/StrippingB2Dst0MuNu.py
@@ -12,12 +12,11 @@ __author__ = ['Michel De Cian']
 __date__ = '12/12/2018'
 __version__ = '$Revision: 0.0 $'
 
-from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from PhysSelPython.Wrappers import Selection, DataOnDemand
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
+from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from StandardParticles import StdLoosePions, StdLooseMuons, StdLooseKaons, StdAllLoosePions, StdAllLooseElectrons, StdLooseResolvedPi0, StdLooseMergedPi0, StdLooseDalitzPi0
+from StandardParticles import StdAllLooseElectrons, StdLooseDalitzPi0, StdLooseKaons, StdLooseMergedPi0, StdLooseMuons, StdLoosePions, StdLooseResolvedPi0
 
 __all__ = ('B2Dst0MuNuAllLinesConf',
            'TOSFilter',
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingSL/StrippingB2DstMuNuIncl.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingSL/StrippingB2DstMuNuIncl.py
index 6abd041bf344194b0ad86747d5d5622ae5fdddf9..3a91f70e613b554c2c0d5b7095d89a8eb3c67f3d 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingSL/StrippingB2DstMuNuIncl.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingSL/StrippingB2DstMuNuIncl.py
@@ -12,9 +12,8 @@ __author__ = ['Mika Vesterinen']
 __date__ = '04/04/2015'
 __version__ = '$Revision: 0.0 $'
 
-from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from PhysSelPython.Wrappers import Selection, DataOnDemand
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
+from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from StandardParticles import StdLoosePions, StdLooseMuons, StdLooseKaons, StdAllLoosePions
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingSL/StrippingB2PPbarMuForTauMu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingSL/StrippingB2PPbarMuForTauMu.py
index 1d97e42a98b40f8bef4d02281e5fd0b77ab45300..5eaa8cff0ccedf2007a0fc0b82bdb43f18bff30a 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingSL/StrippingB2PPbarMuForTauMu.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingSL/StrippingB2PPbarMuForTauMu.py
@@ -9,9 +9,7 @@
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
 
-import logging
 from StrippingUtils.Utils import LineBuilder
-from Gaudi.Configuration import *
 __author__ = ['Mark Smith']
 __date__ = '17/10/2016'
 __version__ = '$Revision: 1.0 $'
@@ -107,8 +105,6 @@ class B2PPbarMuForTauMuBuilder(LineBuilder):
     def __init__(self, name, config):
         LineBuilder.__init__(self, name, config)
 
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
-
         self.GECs = {"Code": "( recSummary(LHCb.RecSummary.nSPDhits,'Raw/Spd/Digits') < %(GEC_nSPDHits)s )" % config,
                      "Preambulo": ["from LoKiTracks.decorators import *"]}
 
@@ -437,7 +433,7 @@ class B2PPbarMuForTauMuBuilder(LineBuilder):
     ###### B->ppMuNu Signal ######
     def _bhad2PMuX_B(self):
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-        from PhysSelPython.Wrappers import Selection, MergedSelection
+        from PhysSelPython.Wrappers import Selection
 
         _pMu = CombineParticles(
             DecayDescriptors=self._config["DECAYS"], ReFitPVs=True)
@@ -454,7 +450,7 @@ class B2PPbarMuForTauMuBuilder(LineBuilder):
     ###### B->ppMuNu Signal for Topo Line ######
     def _bhad2PMuX_BTopo(self):
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-        from PhysSelPython.Wrappers import Selection, MergedSelection
+        from PhysSelPython.Wrappers import Selection
 
         _pMu = CombineParticles(
             DecayDescriptors=self._config["DECAYS"], ReFitPVs=True)
@@ -471,7 +467,7 @@ class B2PPbarMuForTauMuBuilder(LineBuilder):
     ###### B->ppMuNu Same-Sign protons ######
     def _bhad2PMuX_B_SS(self):
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-        from PhysSelPython.Wrappers import Selection, MergedSelection
+        from PhysSelPython.Wrappers import Selection
 
         _pMu = CombineParticles(
             DecayDescriptors=self._config["DECAYS"], ReFitPVs=True)
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingSL/StrippingB2XTauNu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingSL/StrippingB2XTauNu.py
index 7e086d88664dbe28a77ab80ac882b7a7014366c9..6ace30c6ea487c9ee422ba92f199da4e11ac0085 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingSL/StrippingB2XTauNu.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingSL/StrippingB2XTauNu.py
@@ -610,7 +610,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         self.__MakeB0d2DdoubleStar2PiDstar02GammaD0TauNuNonPhysTau__()
 
         from StrippingConf.StrippingLine import StrippingLine
-        from PhysSelPython.Wrappers import SelectionSequence
 
         # TisTos filter
         def filterTisTos(name, Input, myTisTosSpecs):
@@ -1365,7 +1364,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
 
         from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseJpsi2MuMu
 
         JpsiForBc = FilterDesktop(
             Code=self.totalJpsiCut
@@ -1384,7 +1382,7 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
 
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
+        from PhysSelPython.Wrappers import Selection
         from StandardParticles import StdLoosePions
 
         CombDdoubleStar02DstarPi = CombineParticles(
@@ -1405,7 +1403,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3pi/Particles')
@@ -1428,7 +1425,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3pi/Particles')
@@ -1453,7 +1449,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3pi/Particles')
@@ -1477,7 +1472,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTauNonPhys
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3piNonPhys/Particles')
@@ -1501,7 +1495,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3pi/Particles')
@@ -1526,7 +1519,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3pi/Particles')
@@ -1551,7 +1543,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTauNonPhys
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3piNonPhys/Particles')
@@ -1575,7 +1566,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3pi/Particles')
@@ -1600,7 +1590,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3pi/Particles')
@@ -1625,7 +1614,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTauNonPhys
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3piNonPhys/Particles')
@@ -1650,7 +1638,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3pi/Particles')
@@ -1674,7 +1661,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTauNonPhys
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3piNonPhys/Particles')
@@ -1698,7 +1684,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3pi/Particles')
@@ -1723,7 +1708,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3pi/Particles')
@@ -1748,7 +1732,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTauNonPhys
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3piNonPhys/Particles')
@@ -1773,7 +1756,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3pi/Particles')
@@ -1799,7 +1781,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3pi/Particles')
@@ -1823,7 +1804,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3pi/Particles')
@@ -1849,7 +1829,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3pi/Particles')
@@ -1874,7 +1853,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTauNonPhys
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3piNonPhys/Particles')
@@ -1900,7 +1878,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3pi/Particles')
@@ -1924,7 +1901,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3pi/Particles')
@@ -1947,7 +1923,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3pi/Particles')
@@ -1971,7 +1946,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3pi/Particles')
@@ -1995,7 +1969,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTauNonPhys
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3piNonPhys/Particles')
@@ -2019,7 +1992,7 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
 
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
+        from PhysSelPython.Wrappers import Selection
         from StandardParticles import StdLooseResolvedPi0
 
         CombDStar02Pi0D0 = CombineParticles(
@@ -2039,7 +2012,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3pi/Particles')
@@ -2062,7 +2034,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3pi/Particles')
@@ -2085,7 +2056,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3piNonPhys/Particles')
@@ -2108,7 +2078,7 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
 
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
+        from PhysSelPython.Wrappers import Selection
         from StandardParticles import StdLooseAllPhotons
 
         CombDStar02GammaD0 = CombineParticles(
@@ -2128,7 +2098,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3pi/Particles')
@@ -2151,7 +2120,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3pi/Particles')
@@ -2174,7 +2142,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3piNonPhys/Particles')
@@ -2196,7 +2163,7 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
 
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
+        from PhysSelPython.Wrappers import Selection
         from StandardParticles import StdLoosePions
 
         CombDdoubleStar2PiDstar02Pi0D0 = CombineParticles(
@@ -2216,7 +2183,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3pi/Particles')
@@ -2239,7 +2205,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3pi/Particles')
@@ -2262,7 +2227,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3piNonPhys/Particles')
@@ -2284,7 +2248,7 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
 
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
+        from PhysSelPython.Wrappers import Selection
         from StandardParticles import StdLoosePions
 
         CombDdoubleStar2PiDstar02GammaD0 = CombineParticles(
@@ -2304,7 +2268,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3pi/Particles')
@@ -2327,7 +2290,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3pi/Particles')
@@ -2350,7 +2312,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3piNonPhys/Particles')
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingSL/StrippingB2XuENu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingSL/StrippingB2XuENu.py
index 73ab1a2a4e2c0a0a1016fb4040cc2e6b7b36c884..b59084d7969d22b0c34cc4c7c11b62ae657ce530 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingSL/StrippingB2XuENu.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingSL/StrippingB2XuENu.py
@@ -9,9 +9,7 @@
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
 
-import logging
 from StrippingUtils.Utils import LineBuilder
-from Gaudi.Configuration import *
 __author__ = ['Phillip Urquijo, Alessandra Borgia', 'Michel De Cian']
 __date__ = '11/01/2019'
 __version__ = '$Revision: 1.6 $'
@@ -243,7 +241,7 @@ class B2XuENuBuilder(LineBuilder):
     def __init__(self, name, config):
         LineBuilder.__init__(self, name, config)
         self.config = config
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
+        from PhysSelPython.Wrappers import DataOnDemand
         self._stdVeryLooseKsLL = DataOnDemand(
             "Phys/StdVeryLooseKsLL/Particles")
         self._stdLooseKsLD = DataOnDemand("Phys/StdLooseKsLD/Particles")
@@ -734,7 +732,7 @@ class B2XuENuBuilder(LineBuilder):
 
     # Bs -> K*/Kspi e nu lines
     def _Kstar_line(self):
-        NoPS = self.config['NoPrescales']
+        self.config['NoPrescales']
         from StrippingConf.StrippingLine import StrippingLine
         return StrippingLine(self._name+'Bs2Kstar_Line', prescale=1.0,
                              FILTER=self.GECs,
@@ -1055,8 +1053,8 @@ class B2XuENuBuilder(LineBuilder):
         if self._KSSel is not None:
             return self._KSSel
 
-        from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
+        from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
+        from PhysSelPython.Wrappers import Selection
 
         _code = FilterDesktop(Code=self._NominalKsSelection() % self._config)
 
@@ -1141,7 +1139,6 @@ class B2XuENuBuilder(LineBuilder):
 
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection
-        from StandardParticles import StdLoosePions
 
         _rho770 = CombineParticles(
             DecayDescriptors=["rho(770)0 -> pi- pi+"],
@@ -1171,7 +1168,6 @@ class B2XuENuBuilder(LineBuilder):
 
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection
-        from StandardParticles import StdLoosePions
 
         _rho770NoPID = CombineParticles(
             DecayDescriptors=["rho(770)0 -> pi- pi+"],
@@ -1201,7 +1197,6 @@ class B2XuENuBuilder(LineBuilder):
 
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection
-        from StandardParticles import StdLoosePions
 
         _rho770WS = CombineParticles(
             DecayDescriptors=["[rho(770)0 -> pi+ pi+]cc"],
@@ -1229,7 +1224,6 @@ class B2XuENuBuilder(LineBuilder):
 
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection
-        from StandardParticles import StdLoosePions
 
         _rho770SB = CombineParticles(
             DecayDescriptors=["rho(770)0 -> pi+ pi-"],
@@ -1341,7 +1335,7 @@ class B2XuENuBuilder(LineBuilder):
 
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection
-        from StandardParticles import StdLoosePions, StdLooseElectrons
+        from StandardParticles import StdLoosePions
 
         _Ksh = CombineParticles(
             DecayDescriptor="KS0 -> e- pi+",
@@ -1369,7 +1363,7 @@ class B2XuENuBuilder(LineBuilder):
 
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection
-        from StandardParticles import StdLoosePions, StdLooseElectrons
+        from StandardParticles import StdLoosePions
 
         _Ksh = CombineParticles(
             DecayDescriptor="KS0 -> e+ pi-",
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingSL/StrippingB2XuMuNu.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingSL/StrippingB2XuMuNu.py
index e990a0f5fca381288d278a31edfe8c4be451c2d9..7dbf8f670c004436033f2172b635cf83469f0692 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingSL/StrippingB2XuMuNu.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingSL/StrippingB2XuMuNu.py
@@ -9,9 +9,7 @@
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
 
-import logging
 from StrippingUtils.Utils import LineBuilder
-from Gaudi.Configuration import *
 __author__ = ['Phillip Urquijo, Alessandra Borgia', 'Michel De Cian']
 __date__ = '11/01/2019'
 __version__ = '$Revision: 1.6 $'
@@ -238,7 +236,7 @@ class B2XuMuNuBuilder(LineBuilder):
     def __init__(self, name, config):
         LineBuilder.__init__(self, name, config)
         self.config = config
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
+        from PhysSelPython.Wrappers import DataOnDemand
         self._stdVeryLooseKsLL = DataOnDemand(
             "Phys/StdVeryLooseKsLL/Particles")
         self._stdLooseKsLD = DataOnDemand("Phys/StdLooseKsLD/Particles")
@@ -733,7 +731,7 @@ class B2XuMuNuBuilder(LineBuilder):
 
     # Bs -> K*/Kspi mu nu lines
     def _Kstar_line(self):
-        NoPS = self.config['NoPrescales']
+        self.config['NoPrescales']
         from StrippingConf.StrippingLine import StrippingLine
         return StrippingLine(self._name+'Bs2Kstar_Line', prescale=1.0,
                              FILTER=self.GECs,
@@ -1052,8 +1050,8 @@ class B2XuMuNuBuilder(LineBuilder):
         if self._KSSel is not None:
             return self._KSSel
 
-        from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
+        from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
+        from PhysSelPython.Wrappers import Selection
 
         _code = FilterDesktop(Code=self._NominalKsSelection() % self._config)
 
@@ -1138,7 +1136,6 @@ class B2XuMuNuBuilder(LineBuilder):
 
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection
-        from StandardParticles import StdLoosePions
 
         _rho770 = CombineParticles(
             DecayDescriptors=["rho(770)0 -> pi- pi+"],
@@ -1168,7 +1165,6 @@ class B2XuMuNuBuilder(LineBuilder):
 
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection
-        from StandardParticles import StdLoosePions
 
         _rho770NoPID = CombineParticles(
             DecayDescriptors=["rho(770)0 -> pi- pi+"],
@@ -1198,7 +1194,6 @@ class B2XuMuNuBuilder(LineBuilder):
 
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection
-        from StandardParticles import StdLoosePions
 
         _rho770WS = CombineParticles(
             DecayDescriptors=["[rho(770)0 -> pi+ pi+]cc"],
@@ -1226,7 +1221,6 @@ class B2XuMuNuBuilder(LineBuilder):
 
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection
-        from StandardParticles import StdLoosePions
 
         _rho770SB = CombineParticles(
             DecayDescriptors=["rho(770)0 -> pi+ pi-"],
@@ -1338,7 +1332,7 @@ class B2XuMuNuBuilder(LineBuilder):
 
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection
-        from StandardParticles import StdLoosePions, StdLooseMuons
+        from StandardParticles import StdLoosePions
 
         _Ksh = CombineParticles(
             DecayDescriptor="KS0 -> mu- pi+",
@@ -1366,7 +1360,7 @@ class B2XuMuNuBuilder(LineBuilder):
 
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection
-        from StandardParticles import StdLoosePions, StdLooseMuons
+        from StandardParticles import StdLoosePions
 
         _Ksh = CombineParticles(
             DecayDescriptor="KS0 -> mu+ pi-",
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingSL/StrippingCharmFromBSemiForHadronAsy.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingSL/StrippingCharmFromBSemiForHadronAsy.py
index a80fcb301fa6917bd97160506a3b0a679ff40777..ddaec2925512363daba54947938f97bdafffeb41 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingSL/StrippingCharmFromBSemiForHadronAsy.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingSL/StrippingCharmFromBSemiForHadronAsy.py
@@ -25,8 +25,7 @@ from Configurables import FilterDesktop, CombineParticles
 from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from StandardParticles import StdAllLoosePions, StdLoosePions, StdLooseMuons, StdLooseKaons, StdLooseProtons
-from Configurables import TisTosParticleTagger
+from StandardParticles import StdLooseKaons, StdLooseMuons, StdLoosePions
 
 __all__ = ('CharmFromBSemiForHadronAsyAllLinesConf',
            'TOSFilter',
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingSL/StrippingLb2LcMuNuX_Lc2L0Pi.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingSL/StrippingLb2LcMuNuX_Lc2L0Pi.py
index 074ba01a451ce4cf74c483e687d7a71c404d4adb..729f75ac3c69725569c584dc08bdd9610f2b693a 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingSL/StrippingLb2LcMuNuX_Lc2L0Pi.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingSL/StrippingLb2LcMuNuX_Lc2L0Pi.py
@@ -16,14 +16,13 @@ __author__ = ['Scott Ely']
 __date__ = '23/01/2019'
 __version__ = '$Revision: 1.0 $'
 
-from Gaudi.Configuration import *
 from Configurables import FilterDesktop, CombineParticles
-from PhysSelPython.Wrappers import Selection, DataOnDemand
+from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from StandardParticles import StdLoosePions, StdLooseMuons, StdLooseKaons, StdLooseProtons, StdLooseElectrons, StdVeryLooseLambdaLL
-from StandardParticles import StdNoPIDsPions, StdNoPIDsKaons, StdNoPIDsProtons, StdNoPIDsMuons
-from GaudiKernel.SystemOfUnits import MeV, GeV, cm, mm
+from StandardParticles import StdLooseMuons, StdLoosePions, StdVeryLooseLambdaLL
+from StandardParticles import StdNoPIDsMuons
+from GaudiKernel.SystemOfUnits import GeV, MeV, mm
 
 __all__ = ('Lb2LcMuNuX_Lc2L0PiConf', 'default_config')
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingSL/StrippingLb2pMuNuVub.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingSL/StrippingLb2pMuNuVub.py
index cd969d689449a9dc069bd745b4acbc62f683dfda..e74c7de20e90982142bcf10f66be4a6cb90689e6 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingSL/StrippingLb2pMuNuVub.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingSL/StrippingLb2pMuNuVub.py
@@ -9,9 +9,7 @@
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
 
-import logging
 from StrippingUtils.Utils import LineBuilder
-from Gaudi.Configuration import *
 __author__ = ['William Sutcliffe']
 __date__ = '19/01/2014'
 __version__ = '$Revision: 1.0 $'
@@ -137,8 +135,6 @@ class Lb2pMuNuVubBuilder(LineBuilder):
     def __init__(self, name, config):
         LineBuilder.__init__(self, name, config)
 
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
-
         self.GECs = {"Code": "( recSummaryTrack(LHCb.RecSummary.nLongTracks, TrLONG) < %(GEC_nLongTrk)s )" % config,
                      "Preambulo": ["from LoKiTracks.decorators import *"]}
 
diff --git a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingSL/Strippingbhad2PMuX.py b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingSL/Strippingbhad2PMuX.py
index e89305332152e8ebc4ee1e72a7f10cd8d9d2dfae..f46738721f8dbfce869e840a1aa8cbb13c6fdd2f 100644
--- a/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingSL/Strippingbhad2PMuX.py
+++ b/Phys/StrippingArchive/python/StrippingArchive/Stripping35r3/StrippingSL/Strippingbhad2PMuX.py
@@ -9,9 +9,7 @@
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
 
-import logging
 from StrippingUtils.Utils import LineBuilder
-from Gaudi.Configuration import *
 __author__ = ['William Sutcliffe', 'Patrick Owen']
 __date__ = '02/12/2015'
 __version__ = '$Revision: 2.0 $'
@@ -132,8 +130,6 @@ class bhad2PMuXBuilder(LineBuilder):
     def __init__(self, name, config):
         LineBuilder.__init__(self, name, config)
 
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
-
         self.GECs = {"Code": "( recSummaryTrack(LHCb.RecSummary.nLongTracks, TrLONG) < %(GEC_nLongTrk)s )" % config,
                      "Preambulo": ["from LoKiTracks.decorators import *"]}
 
@@ -455,7 +451,7 @@ class bhad2PMuXBuilder(LineBuilder):
     ###### Lb->pMuNu High M_corr Opposite Sign ######
     def _bhad2PMuX_Lb(self):
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-        from PhysSelPython.Wrappers import Selection, MergedSelection
+        from PhysSelPython.Wrappers import Selection
 
         _pMu = CombineParticles(
             DecayDescriptors=self._config["DECAYS"], ReFitPVs=True)
diff --git a/Phys/StrippingConf/python/StrippingConf/StrippingConfigurableUser.py b/Phys/StrippingConf/python/StrippingConf/StrippingConfigurableUser.py
old mode 100755
new mode 100644
index f10e7d7a07d680a1c76026e09c3aaa1f16700714..6200459c70eb02aa7d79115fa3aa9533ae7579e1
--- a/Phys/StrippingConf/python/StrippingConf/StrippingConfigurableUser.py
+++ b/Phys/StrippingConf/python/StrippingConf/StrippingConfigurableUser.py
@@ -18,7 +18,6 @@ __all__ = (
     'StrippingConfigurableUser'
 )
 
-from GaudiConf.Configuration import *
 from Configurables import LHCbConfigurableUser
 
 
diff --git a/Phys/StrippingConf/python/StrippingConf/StrippingStream.py b/Phys/StrippingConf/python/StrippingConf/StrippingStream.py
old mode 100755
new mode 100644
index 938f48cb5ca04cc159880ca3ca8712c9633b8868..541504a0436b6f3afc63deb216aec3f328a407ff
--- a/Phys/StrippingConf/python/StrippingConf/StrippingStream.py
+++ b/Phys/StrippingConf/python/StrippingConf/StrippingStream.py
@@ -19,8 +19,7 @@ __all__ = (
 )
 
 from Gaudi.Configuration import *
-from Gaudi.Configuration import GaudiSequencer, Sequencer, Configurable
-from Configurables import LHCbConfigurableUser
+from Gaudi.Configuration import GaudiSequencer
 from copy import copy
 
 
@@ -87,7 +86,7 @@ class StrippingStream (object):
             line.declareAppended()
 
     def createConfigurables(self):
-        from Configurables import StrippingCheck
+        pass
 
         # Create configurables
 
diff --git a/Phys/StrippingConf/tests/test_strippingline.py b/Phys/StrippingConf/tests/test_strippingline.py
old mode 100755
new mode 100644
index 0023123a43cd4fe4e9cb6e9e7c5feef2e3b17200..8ba8f07062affbdfd51038e266d02976d152ccb0
--- a/Phys/StrippingConf/tests/test_strippingline.py
+++ b/Phys/StrippingConf/tests/test_strippingline.py
@@ -42,7 +42,7 @@ def test_instantiate_from_Selection_object():
 
 
 def test_duplicate_name_raises_ValueError():
-    line0 = StrippingLine('DuplicateLine')
+    StrippingLine('DuplicateLine')
     raises(ValueError, StrippingLine, 'DuplicateLine')
 
 
diff --git a/Phys/StrippingNeuroBayes/options/TestBhh.py b/Phys/StrippingNeuroBayes/options/TestBhh.py
index 6b51868db4f12781c67bc9c0c37143b786a353eb..cd438756510c3abe6018fe2fc3ce060ec390dcea 100644
--- a/Phys/StrippingNeuroBayes/options/TestBhh.py
+++ b/Phys/StrippingNeuroBayes/options/TestBhh.py
@@ -14,16 +14,12 @@ from Configurables import CondDB
 from Configurables import LoKi__Hybrid__TupleTool
 from Configurables import DecayTreeTuple
 from PhysSelPython.Wrappers import SelectionSequence
-from PhysSelPython.Wrappers import MergedSelection
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from Configurables import StrippingNBBhh
-from os import environ
 from Gaudi.Configuration import *
 from Configurables import CombineParticles
 from Configurables import DaVinci
 
-from GaudiKernel.SystemOfUnits import MeV, GeV
-
 
 ########################################################################
 #
diff --git a/Phys/StrippingNeuroBayes/options/TestNeuroBayes.py b/Phys/StrippingNeuroBayes/options/TestNeuroBayes.py
index dbaebe9963fde3a936f7c2404432c43437945671..885fd003d136608d79d68c0edd1df801ea64b02c 100644
--- a/Phys/StrippingNeuroBayes/options/TestNeuroBayes.py
+++ b/Phys/StrippingNeuroBayes/options/TestNeuroBayes.py
@@ -14,16 +14,12 @@ from Configurables import CondDB
 from Configurables import LoKi__Hybrid__TupleTool
 from Configurables import DecayTreeTuple
 from PhysSelPython.Wrappers import SelectionSequence
-from PhysSelPython.Wrappers import MergedSelection
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from Configurables import StrippingNBMuMu
-from os import environ
 from Gaudi.Configuration import *
 from Configurables import CombineParticles
 from Configurables import DaVinci
 
-from GaudiKernel.SystemOfUnits import MeV, GeV
-
 
 ########################################################################
 #
diff --git a/Phys/StrippingSelections/options/STEP09/StrippingB2Charged2Body.py b/Phys/StrippingSelections/options/STEP09/StrippingB2Charged2Body.py
index f267e150ca704cc11d2f8b06ec563e726e85294b..24d98a384c3095c491a2d1aeebcbf18935135738 100644
--- a/Phys/StrippingSelections/options/STEP09/StrippingB2Charged2Body.py
+++ b/Phys/StrippingSelections/options/STEP09/StrippingB2Charged2Body.py
@@ -17,7 +17,7 @@
 #
 ########################################################################
 
-from Configurables import GaudiSequencer, CombineParticles
+from Configurables import CombineParticles
 from StrippingConf.StrippingLine import StrippingLine
 
 PreselB2Charged2Body = CombineParticles("PreselB2Charged2Body")
diff --git a/Phys/StrippingSelections/options/STEP09/StrippingB2DPi.py b/Phys/StrippingSelections/options/STEP09/StrippingB2DPi.py
index a8fec07ca9b6c0cf5040d7455af2299f3afe85f9..0e5138047e20447f5c43eec370daaff157f4f415 100644
--- a/Phys/StrippingSelections/options/STEP09/StrippingB2DPi.py
+++ b/Phys/StrippingSelections/options/STEP09/StrippingB2DPi.py
@@ -14,11 +14,8 @@
 # No StrippingMember functionality is used here.
 #
 
-from os import environ
 from Gaudi.Configuration import *
-from Configurables import DecayTreeTuple
 from Configurables import CombineParticles, FilterDesktop
-from Configurables import TupleToolMCBackgroundInfo, TupleToolMCTruth, BackgroundCategory
 from StrippingConf.StrippingLine import StrippingLine
 
 ########################################################################
diff --git a/Phys/StrippingSelections/options/STEP09/StrippingBd2JpsiKS.py b/Phys/StrippingSelections/options/STEP09/StrippingBd2JpsiKS.py
index 1cc2e87e8954c64a031960ef6cca75360bc52dbd..9ea7dc0034447ab4e833c7f4d3d21b290b322aca 100644
--- a/Phys/StrippingSelections/options/STEP09/StrippingBd2JpsiKS.py
+++ b/Phys/StrippingSelections/options/STEP09/StrippingBd2JpsiKS.py
@@ -20,10 +20,8 @@ configurables. PV refitting is done. Based on roadmap selection
 with loose PID cuts.
 '''
 
-from Gaudi.Configuration import *
-from StrippingConf.StrippingLine import StrippingLine, StrippingMember
+from StrippingConf.StrippingLine import StrippingLine
 from Configurables import FilterDesktop, CombineParticles, OfflineVertexFitter
-import GaudiKernel.SystemOfUnits as Units
 
 ################
 # KS long long #
diff --git a/Phys/StrippingSelections/options/STEP09/StrippingBd2JpsiKstar.py b/Phys/StrippingSelections/options/STEP09/StrippingBd2JpsiKstar.py
index f21298c8eae462caba9130071cd3cd8b4af52567..96d1a3f442adc54249371e10d737a1dbac437cf4 100644
--- a/Phys/StrippingSelections/options/STEP09/StrippingBd2JpsiKstar.py
+++ b/Phys/StrippingSelections/options/STEP09/StrippingBd2JpsiKstar.py
@@ -20,10 +20,8 @@ configurables. PV refitting is done. Based on roadmap selection
 with loose PID cuts.
 '''
 
-from Gaudi.Configuration import *
-from StrippingConf.StrippingLine import StrippingLine, StrippingMember
-from Configurables import FilterDesktop, CombineParticles, OfflineVertexFitter
-import GaudiKernel.SystemOfUnits as Units
+from StrippingConf.StrippingLine import StrippingLine
+from Configurables import CombineParticles, OfflineVertexFitter
 
 #######
 # Kst #
diff --git a/Phys/StrippingSelections/options/STEP09/StrippingBd2KstarMuMu.py b/Phys/StrippingSelections/options/STEP09/StrippingBd2KstarMuMu.py
index 60d4f66c36de7dee55b36dc2aee7982146ec8f89..496b88e821063043335c17ee80c7a403afa395cf 100644
--- a/Phys/StrippingSelections/options/STEP09/StrippingBd2KstarMuMu.py
+++ b/Phys/StrippingSelections/options/STEP09/StrippingBd2KstarMuMu.py
@@ -11,9 +11,8 @@
 # B->JpsiKstar selection
 #
 
-from Gaudi.Configuration import *
-from StrippingConf.StrippingLine import StrippingLine, StrippingMember
-from Configurables import CombineParticles, FilterDesktop
+from StrippingConf.StrippingLine import StrippingLine
+from Configurables import CombineParticles
 
 Strip_Penguin_Jpsi2MuMu = CombineParticles('Strip_Penguin_Jpsi2MuMu')
 Strip_Penguin_Jpsi2MuMu.InputLocations = ["StdLooseMuons"]
diff --git a/Phys/StrippingSelections/options/STEP09/StrippingBs2JpsiPhi.py b/Phys/StrippingSelections/options/STEP09/StrippingBs2JpsiPhi.py
index 4a0dad50e34779f870bf81732f3dce27130143c5..4ae812a0c5b66c6e470cd5d0e137face658a5565 100644
--- a/Phys/StrippingSelections/options/STEP09/StrippingBs2JpsiPhi.py
+++ b/Phys/StrippingSelections/options/STEP09/StrippingBs2JpsiPhi.py
@@ -20,10 +20,8 @@ configurables. PV refitting is done. Based on roadmap selection
 with loose PID cuts.
 '''
 
-from Gaudi.Configuration import *
-from StrippingConf.StrippingLine import StrippingLine, StrippingMember
+from StrippingConf.StrippingLine import StrippingLine
 from Configurables import FilterDesktop, CombineParticles, OfflineVertexFitter
-import GaudiKernel.SystemOfUnits as Units
 
 #############################
 # Standard Unbiased Phi->KK #
diff --git a/Phys/StrippingSelections/options/STEP09/StrippingBu2JpsiK.py b/Phys/StrippingSelections/options/STEP09/StrippingBu2JpsiK.py
index f444d689cf43069eaa6bc52f05dfc49cf9c6c5de..9f186aecd67e13afaea24f495fcc9461cec5cc9f 100644
--- a/Phys/StrippingSelections/options/STEP09/StrippingBu2JpsiK.py
+++ b/Phys/StrippingSelections/options/STEP09/StrippingBu2JpsiK.py
@@ -20,10 +20,8 @@ configurables. PV refitting is done. Based on roadmap selection
 with loose PID cuts.
 '''
 
-from Gaudi.Configuration import *
-from StrippingConf.StrippingLine import StrippingLine, StrippingMember
-from Configurables import FilterDesktop, CombineParticles, OfflineVertexFitter
-import GaudiKernel.SystemOfUnits as Units
+from StrippingConf.StrippingLine import StrippingLine
+from Configurables import CombineParticles, OfflineVertexFitter
 
 ######
 # Bu #
diff --git a/Phys/StrippingSelections/options/STEP09/StrippingTopo.py b/Phys/StrippingSelections/options/STEP09/StrippingTopo.py
index ab0a849ca7fc112410114822c189f16227294a73..d8f5035171665134de5e4ef1422aff7c4a0c2c92 100644
--- a/Phys/StrippingSelections/options/STEP09/StrippingTopo.py
+++ b/Phys/StrippingSelections/options/STEP09/StrippingTopo.py
@@ -13,7 +13,6 @@
 #
 # Author: V. Gligorov
 
-from os import environ
 from Gaudi.Configuration import *
 from Configurables import CombineParticles, FilterDesktop
 from StrippingConf.StrippingLine import StrippingLine
diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingB2CC/StrippingB2JpsiHH.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingB2CC/StrippingB2JpsiHH.py
index 8fdba29f0a96c73f62e3bac58ab9c2e15b2e5db7..e3ae4544669056ef7f03c5709d60510f6eef9f32 100644
--- a/Phys/StrippingSelections/python/StrippingSelections/StrippingB2CC/StrippingB2JpsiHH.py
+++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingB2CC/StrippingB2JpsiHH.py
@@ -20,18 +20,10 @@ __date__ = '10/11/2016'
 
 __all__ = ('B2JpsiHHConf', 'default_config')
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from CommonParticles.Utils import updateDoD
-from StandardParticles import StdLoosePions
-from StandardParticles import StdLooseKaons
-from StandardParticles import StdLooseProtons
-from StandardParticles import StdAllLooseKaons
-from StandardParticles import StdAllLooseProtons
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
+from PhysSelPython.Wrappers import DataOnDemand, Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from GaudiKernel.SystemOfUnits import MeV
 
 default_config = {
     'NAME': 'B2JpsiHH',
diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingB2CC/StrippingB2JpsiPi0.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingB2CC/StrippingB2JpsiPi0.py
index 90740f80b4fbe5d7cdd945fc3fb2a4331ac1e49d..170baf2fb63c5dbaab6735a4dbe697c61ed379a3 100644
--- a/Phys/StrippingSelections/python/StrippingSelections/StrippingB2CC/StrippingB2JpsiPi0.py
+++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingB2CC/StrippingB2JpsiPi0.py
@@ -14,15 +14,10 @@ __version__ = '$Revision: 1.1$'
 
 __all__ = ('B2JpsiPi0Conf', 'default_config')
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from CommonParticles.Utils import updateDoD
-from StandardParticles import StdLooseResolvedPi0
-from StandardParticles import StdLooseMergedPi0
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
+from PhysSelPython.Wrappers import DataOnDemand, Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from GaudiKernel.SystemOfUnits import MeV
 
 default_config = {
     # The real name of the lines is BetaS, this is a reference this for the Settings.
diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingB2CC/StrippingB2JpsiPi0_Run1.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingB2CC/StrippingB2JpsiPi0_Run1.py
index 3f5f0443aa9132ab2494cbb48813c4ad8991fc1b..1bf462e0083a2da3704b1f804d03b10239ecd920 100644
--- a/Phys/StrippingSelections/python/StrippingSelections/StrippingB2CC/StrippingB2JpsiPi0_Run1.py
+++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingB2CC/StrippingB2JpsiPi0_Run1.py
@@ -14,15 +14,10 @@ __version__ = '$Revision: 1.2$'
 
 __all__ = ('B2JpsiPi0Conf_RI', 'default_config')
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from CommonParticles.Utils import updateDoD
-from StandardParticles import StdLooseResolvedPi0
-from StandardParticles import StdLooseMergedPi0
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
+from PhysSelPython.Wrappers import DataOnDemand, Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from GaudiKernel.SystemOfUnits import MeV
 
 default_config = {
     # The real name of the lines is BetaS, this is a reference this for the Settings.
diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingB2CC/StrippingB2JpsiX0.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingB2CC/StrippingB2JpsiX0.py
index d93a42cce82d84a0ed23627a007cbaad6d469573..e15a04497fca1b721a890552c1359e732098a2be 100644
--- a/Phys/StrippingSelections/python/StrippingSelections/StrippingB2CC/StrippingB2JpsiX0.py
+++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingB2CC/StrippingB2JpsiX0.py
@@ -20,18 +20,10 @@ __date__ = '22/01/2018'
 
 __all__ = ('B2JpsiX0Conf', 'default_config')
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from CommonParticles.Utils import updateDoD
-from StandardParticles import StdLoosePions
-from StandardParticles import StdLooseKaons
-from StandardParticles import StdLooseProtons
-from StandardParticles import StdAllLooseKaons
-from StandardParticles import StdAllLooseProtons
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
+from PhysSelPython.Wrappers import DataOnDemand, Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from GaudiKernel.SystemOfUnits import MeV
 
 default_config = {
     'NAME': 'B2JpsiX0',
diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingB2CC/StrippingB2JpsiXforBeta_s.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingB2CC/StrippingB2JpsiXforBeta_s.py
index 523cdae393a5eaafcb013c51488bd213e0b0867a..e1c610266077a45330df6ee5d2d179deab4bdda5 100644
--- a/Phys/StrippingSelections/python/StrippingSelections/StrippingB2CC/StrippingB2JpsiXforBeta_s.py
+++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingB2CC/StrippingB2JpsiXforBeta_s.py
@@ -26,16 +26,12 @@ __version__ = '$Revision: 4.0$'
 
 __all__ = ('B2JpsiXforBeta_sConf', 'default_config')
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from CommonParticles.Utils import updateDoD
 from StandardParticles import StdLoosePions
 from StandardParticles import StdLooseKaons
-from StandardParticles import StdAllLooseKaons
 from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from GaudiKernel.SystemOfUnits import MeV
 
 default_config = {
     'NAME': 'BetaS',
diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingB2CC/StrippingBd2JpsieeKS.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingB2CC/StrippingBd2JpsieeKS.py
index b553711d64d89bc11f40ac43383517f536779ce6..2ca00a91b4fd73eb8d5af28f7937fd9a9c0e7ec0 100644
--- a/Phys/StrippingSelections/python/StrippingSelections/StrippingB2CC/StrippingBd2JpsieeKS.py
+++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingB2CC/StrippingBd2JpsieeKS.py
@@ -8,16 +8,10 @@
 # granted to it by virtue of its status as an Intergovernmental Organization  #
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
-from GaudiKernel.SystemOfUnits import MeV
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
-from StandardParticles import StdAllLooseKaons
-from StandardParticles import StdLooseKaons
-from StandardParticles import StdLoosePions
-from CommonParticles.Utils import updateDoD
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = 'Ramon Niet'
 __date__ = '2014/10/23'
 
diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingB2CC/StrippingBd2JpsieeKSFullDST.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingB2CC/StrippingBd2JpsieeKSFullDST.py
index 4c73451a58cef8538903ce8da801486bb748eb8b..0f5de6e613aed7291f6b1bb6805977096a4220ca 100644
--- a/Phys/StrippingSelections/python/StrippingSelections/StrippingB2CC/StrippingBd2JpsieeKSFullDST.py
+++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingB2CC/StrippingBd2JpsieeKSFullDST.py
@@ -8,16 +8,10 @@
 # granted to it by virtue of its status as an Intergovernmental Organization  #
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
-from GaudiKernel.SystemOfUnits import MeV
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
-from StandardParticles import StdAllLooseKaons
-from StandardParticles import StdLooseKaons
-from StandardParticles import StdLoosePions
-from CommonParticles.Utils import updateDoD
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = 'Gerwin Meier'
 __date__ = '2019/08/12'
 
diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingB2CC/StrippingBd2JpsieeKstar.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingB2CC/StrippingBd2JpsieeKstar.py
index 326fc7c342b5e8e69030f9e3aea12bdf3a65e950..b6ae6bfc4e2e904ff10e3e3ad1a791ff16f615cd 100644
--- a/Phys/StrippingSelections/python/StrippingSelections/StrippingB2CC/StrippingBd2JpsieeKstar.py
+++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingB2CC/StrippingBd2JpsieeKstar.py
@@ -12,7 +12,6 @@ from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from Configurables import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = 'Artur Ukleja, Jibo He, Konrad Klimaszewski, Varvara Batozskaya'
 __date__ = '2019/01/22'
 
diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingB2CC/StrippingBs2EtacPhiBDT.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingB2CC/StrippingBs2EtacPhiBDT.py
index b6e256eaa1235a84cbf3b68362eea9bf7f387897..30d69a2c110a19ab5a45303854da636781997f4f 100644
--- a/Phys/StrippingSelections/python/StrippingSelections/StrippingB2CC/StrippingBs2EtacPhiBDT.py
+++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingB2CC/StrippingBs2EtacPhiBDT.py
@@ -17,7 +17,6 @@ from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
-from Gaudi.Configuration import *
 __author__ = ['Morgan Martin, Jibo He']
 __date__ = '20/08/2014'
 __version__ = '$Revision: 1.0 $'
diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingB2CC/StrippingBs2JpsieePhi.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingB2CC/StrippingBs2JpsieePhi.py
index 933c2f46f93196ffa448a855cea7a82e5fca3652..ee8bf0cf2aad66cd3771f048a336fffb0ed8165d 100644
--- a/Phys/StrippingSelections/python/StrippingSelections/StrippingB2CC/StrippingBs2JpsieePhi.py
+++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingB2CC/StrippingBs2JpsieePhi.py
@@ -12,7 +12,6 @@ from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from Configurables import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = 'Artur Ukleja, Jibo He, Konrad Klimaszewski'
 __date__ = '2011/03/01'
 
diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingB2OC/Beauty2Charm_B2DXBuilder.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingB2OC/Beauty2Charm_B2DXBuilder.py
index 4837b0a432c56ee77aea8155db25430718414ee9..04c8a298f12306e527d3d76a0293573a09d67d96 100644
--- a/Phys/StrippingSelections/python/StrippingSelections/StrippingB2OC/Beauty2Charm_B2DXBuilder.py
+++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingB2OC/Beauty2Charm_B2DXBuilder.py
@@ -12,11 +12,7 @@
 
 from copy import deepcopy
 from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-from PhysSelPython.Wrappers import Selection
-from Beauty2Charm_LoKiCuts import LoKiCuts
 from Beauty2Charm_Utils import *
-from Configurables import SubstitutePID
 
 # \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\#
 
@@ -1399,7 +1395,7 @@ class B2DXBuilder(object):
             'B2D0st2460D0Pi':
             ["B+ -> D*_2(2460)0 D0 pi+", "B- -> D*_2(2460)0 D0 pi-"]
         }
-        input = self.dst.dpi_2460_pid + self.d.kpi_pid + self.topoKaons_PID
+        self.dst.dpi_2460_pid + self.d.kpi_pid + self.topoKaons_PID
         inputs = {
             'B2D0st2460D0K':
             self.dst.dpi_2460_pid + self.d.kpi_pid + self.topoKaons_PID,
diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingB2OC/Beauty2Charm_Bc2BXBuilder.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingB2OC/Beauty2Charm_Bc2BXBuilder.py
index 63ecc854364bae2f29d64ea2b95c3484988c7016..5bb9297a5c69f56bc7b9761489bf517623df7d3c 100644
--- a/Phys/StrippingSelections/python/StrippingSelections/StrippingB2OC/Beauty2Charm_Bc2BXBuilder.py
+++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingB2OC/Beauty2Charm_Bc2BXBuilder.py
@@ -8,11 +8,9 @@
 # granted to it by virtue of its status as an Intergovernmental Organization  #
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
-from copy import deepcopy
 from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 from PhysSelPython.Wrappers import Selection, MergedSelection
-from Beauty2Charm_LoKiCuts import LoKiCuts
 from Beauty2Charm_Utils import *
 
 
diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingB2OC/Beauty2Charm_Bc2DDBuilder.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingB2OC/Beauty2Charm_Bc2DDBuilder.py
index 17eda4547110606bb00b589ef9a9081a7ab985e7..44526bcd78bbc48eb6f8c6416c9eabdc38313ac4 100644
--- a/Phys/StrippingSelections/python/StrippingSelections/StrippingB2OC/Beauty2Charm_Bc2DDBuilder.py
+++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingB2OC/Beauty2Charm_Bc2DDBuilder.py
@@ -11,10 +11,8 @@
 
 # \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\#
 
-from copy import deepcopy
 from Gaudi.Configuration import *
-from PhysSelPython.Wrappers import Selection, MergedSelection
-from Beauty2Charm_LoKiCuts import LoKiCuts
+from PhysSelPython.Wrappers import MergedSelection
 from Beauty2Charm_Utils import *
 # from Configurables import SubstitutePID
 
diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingB2OC/Beauty2Charm_Bc2DXBuilder.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingB2OC/Beauty2Charm_Bc2DXBuilder.py
index af663b7592071fc14302f44aa5c2a5b5eb5608d2..7449f0734a1fbe2c6eafc03f67ed71d3bfd70c18 100644
--- a/Phys/StrippingSelections/python/StrippingSelections/StrippingB2OC/Beauty2Charm_Bc2DXBuilder.py
+++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingB2OC/Beauty2Charm_Bc2DXBuilder.py
@@ -10,9 +10,6 @@
 ###############################################################################
 from copy import deepcopy
 from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-from PhysSelPython.Wrappers import Selection, MergedSelection
-from Beauty2Charm_LoKiCuts import LoKiCuts
 from Beauty2Charm_Utils import *
 
 
diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingB2OC/Beauty2Charm_DBuilder.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingB2OC/Beauty2Charm_DBuilder.py
index b68548ee7cbf1a65c38743cd287babf14333673d..5b18c6b24da520630e58f2f2f1f209024f8f0c86 100644
--- a/Phys/StrippingSelections/python/StrippingSelections/StrippingB2OC/Beauty2Charm_DBuilder.py
+++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingB2OC/Beauty2Charm_DBuilder.py
@@ -385,7 +385,6 @@ class DBuilder(object):
         # self.k3pi_ddx_pid = [filterSelection('D2k3pi_for_DDX',LoKiCuts(['VCHI2DOF','BPVVDCHI2'],config_for_ddx).code(),self.k3pi_pid)]
 
         # use this below
-        d_cf_noMassWin = d_cf
         d_cf = LoKiCuts.combine([d_cf, "in_range(%s,MM,%s)" % (d_min, d_max)])
         ds_cf = LoKiCuts.combine(
             [ds_cf, "in_range(%s,MM,%s)" % (ds_min, ds_max)])
@@ -2058,9 +2057,6 @@ class DBuilder(object):
 
     def _makeD2PhiMuNu(self, up=False):
         '''makes Ds->phi mu nu'''
-        decays = [['phi(1020)', 'mu+']]
-        min = '1125.13*MeV'
-        max = '2168.49*MeV'
         cpkk = CombineParticles(
             # ( hasTopoChild() )
             CombinationCut="ADAMASS('phi(1020)') < 150*MeV",
diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingB2OC/Beauty2Charm_HHBuilder.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingB2OC/Beauty2Charm_HHBuilder.py
index 08f113046063b0225620e80b961f1c934caada99..83e86c72dbafe11cee4a83ba99c7328e94737144 100644
--- a/Phys/StrippingSelections/python/StrippingSelections/StrippingB2OC/Beauty2Charm_HHBuilder.py
+++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingB2OC/Beauty2Charm_HHBuilder.py
@@ -10,7 +10,6 @@
 ###############################################################################
 # \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\#
 
-from copy import deepcopy
 from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 from PhysSelPython.Wrappers import Selection
diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingB2OC/Beauty2Charm_HHHBuilder.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingB2OC/Beauty2Charm_HHHBuilder.py
index 7673d8fcabbf719d31d711cd2cf93068d1cc4a66..3e955dda832402d17b78c3aa269d144532889161 100644
--- a/Phys/StrippingSelections/python/StrippingSelections/StrippingB2OC/Beauty2Charm_HHHBuilder.py
+++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingB2OC/Beauty2Charm_HHHBuilder.py
@@ -10,9 +10,8 @@
 ###############################################################################
 # \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\#
 
-from copy import deepcopy
 from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N3BodyDecays, DaVinci__N4BodyDecays
+from GaudiConfUtils.ConfigurableGenerators import DaVinci__N3BodyDecays, DaVinci__N4BodyDecays
 from PhysSelPython.Wrappers import Selection
 from Beauty2Charm_LoKiCuts import LoKiCuts
 from Beauty2Charm_Utils import *
diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingB2OC/Beauty2Charm_Lb2XBuilder.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingB2OC/Beauty2Charm_Lb2XBuilder.py
index 6f58dbe55c235749264f965d9b872eccc05d4456..049552af8ac3b3b8985213d74d2faa71f8efc288 100644
--- a/Phys/StrippingSelections/python/StrippingSelections/StrippingB2OC/Beauty2Charm_Lb2XBuilder.py
+++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingB2OC/Beauty2Charm_Lb2XBuilder.py
@@ -1704,7 +1704,7 @@ class Lb2XBuilder(object):
 
     def _makeX2LcKPiPiPi(self):
         '''Makes RS + WS Xib -> Lc HH + c.c.'''
-        pions = self.pions
+        self.pions
         kaons = self.kaons
         pipipi = self.hhh.pipipi
         config = deepcopy(self.config)
diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingB2OC/Beauty2Charm_LoKiCuts.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingB2OC/Beauty2Charm_LoKiCuts.py
index 54540ea2a223d554a751b02cf83000df4f3aa076..0fd327f8d32075591c9ca0e2d4dd434636c0ab35 100644
--- a/Phys/StrippingSelections/python/StrippingSelections/StrippingB2OC/Beauty2Charm_LoKiCuts.py
+++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingB2OC/Beauty2Charm_LoKiCuts.py
@@ -10,11 +10,6 @@
 ###############################################################################
 # \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\#
 
-from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
-from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-from PhysSelPython.Wrappers import Selection, MergedSelection
-from StandardParticles import StdNoPIDsPions, StdNoPIDsKaons
 
 # \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\#
 
diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingB2OC/Beauty2Charm_Utils.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingB2OC/Beauty2Charm_Utils.py
index 7949e5482cf0df4296d969b96966d2057310c75b..84d6df19648bdd16451bbfa4a21be153c20799e4 100644
--- a/Phys/StrippingSelections/python/StrippingSelections/StrippingB2OC/Beauty2Charm_Utils.py
+++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingB2OC/Beauty2Charm_Utils.py
@@ -10,13 +10,11 @@
 ###############################################################################
 # \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\#
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-from PhysSelPython.Wrappers import DataOnDemand, Selection, MergedSelection, VoidEventSelection
+from PhysSelPython.Wrappers import DataOnDemand, Selection, VoidEventSelection
 from Beauty2Charm_LoKiCuts import LoKiCuts
 from Configurables import SubstitutePID
-from Configurables import ConeJetProxyFilter
 
 # \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\#
 
diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingB2OC/StrippingB2D0X0.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingB2OC/StrippingB2D0X0.py
index 830d1c34311f28a50fdd4feaa15d97116c87c823..ed453e6e991cc3147b6fb47390782f035edccf73 100644
--- a/Phys/StrippingSelections/python/StrippingSelections/StrippingB2OC/StrippingB2D0X0.py
+++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingB2OC/StrippingB2D0X0.py
@@ -19,18 +19,10 @@ __date__ = '29/11/2021'
 
 __all__ = ('B2D0X0Conf', 'default_config')
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from CommonParticles.Utils import updateDoD
-from StandardParticles import StdLoosePions
-from StandardParticles import StdLooseKaons
-from StandardParticles import StdLooseProtons
-from StandardParticles import StdAllLooseKaons
-from StandardParticles import StdAllLooseProtons
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
+from PhysSelPython.Wrappers import DataOnDemand, Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from GaudiKernel.SystemOfUnits import MeV
 
 default_config = {
     'NAME': 'B2D0X0',
diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingB2OC/StrippingB2DDphi.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingB2OC/StrippingB2DDphi.py
index b0f8982f1efb389032da5f7becb2881e3c005379..92ca95c2ea3f7c46766aedbc04dbbc34c9c0b8ef 100644
--- a/Phys/StrippingSelections/python/StrippingSelections/StrippingB2OC/StrippingB2DDphi.py
+++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingB2OC/StrippingB2DDphi.py
@@ -15,8 +15,7 @@ Author: M. Martinelli
 Notes: Excited states are included by placing the line in FULL.DST
 '''
 from PhysSelPython.Wrappers import Selection, DataOnDemand
-from Configurables import FilterDesktop, CombineParticles, DaVinci__N4BodyDecays
-from GaudiConfUtils.ConfigurableGenerators import CombineParticles
+from Configurables import DaVinci__N4BodyDecays, FilterDesktop
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 __author__ = ['Maurizio Martinelli']
diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingB2OC/StrippingB2DXD2HMuNu.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingB2OC/StrippingB2DXD2HMuNu.py
index 1ec2da4c2510e23471f7b6705c96553b8a859931..0711ca38847920ce87122f8d2d18c51c0f73cfc2 100644
--- a/Phys/StrippingSelections/python/StrippingSelections/StrippingB2OC/StrippingB2DXD2HMuNu.py
+++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingB2OC/StrippingB2DXD2HMuNu.py
@@ -12,13 +12,11 @@ __author__ = ['Wenbin Qian']
 __date__ = '09/11/2015'
 __version__ = '$Revision: 0.01 $'
 
-from Gaudi.Configuration import *
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, DaVinci__N4BodyDecays, DaVinci__N3BodyDecays
-from PhysSelPython.Wrappers import Selection, DataOnDemand
+from PhysSelPython.Wrappers import Selection
 from StandardParticles import StdLooseMuons, StdLoosePions, StdLooseKaons
-from GaudiKernel.SystemOfUnits import MeV, GeV, cm, mm
 
 __all__ = ('B2DXD2HMuNuBuilder',
            'default_config')
diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingB2OC/StrippingB2nbody.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingB2OC/StrippingB2nbody.py
index 663bdbbf855c3d8d19dad3a29b6be667edaeedb9..04c84fc2dc39eb4b3d3d954f3c0083396e0c84fa 100644
--- a/Phys/StrippingSelections/python/StrippingSelections/StrippingB2OC/StrippingB2nbody.py
+++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingB2OC/StrippingB2nbody.py
@@ -16,7 +16,6 @@ from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, MergedSelection, DataOnDemand, VoidEventSelection
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = ['Rudolf Oldeman']
 __date__ = '08/02/2011'
 __version__ = '$Revision: 1.0 $'
diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingB2OC/StrippingBeauty2Charm.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingB2OC/StrippingBeauty2Charm.py
index 884208b81e1d3417e71df6bd6878c89f3ca70a86..fb3342063164f5f018bfbe1e76cf16aa528feae3 100644
--- a/Phys/StrippingSelections/python/StrippingSelections/StrippingB2OC/StrippingBeauty2Charm.py
+++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingB2OC/StrippingBeauty2Charm.py
@@ -28,11 +28,9 @@ from StandardParticles import (StdAllNoPIDsPions, StdAllNoPIDsKaons,
                                StdAllNoPIDsProtons, StdNoPIDsUpPions,
                                StdLooseMuons, StdNoPIDsUpKaons,
                                StdLooseResolvedPi0, StdLooseMergedPi0)
-from Configurables import LoKi__VoidFilter
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import EventSelection
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
+from PhysSelPython.Wrappers import MergedSelection, Selection
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
 from Gaudi.Configuration import *
 import re
diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingBandQ/StrippingB2Chic0KPi.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingBandQ/StrippingB2Chic0KPi.py
index 69e18721b3c6b45435046eaac0c9a79d5818b6da..030871800dfb7d9f6c18c93c207febaf3fad5cf8 100644
--- a/Phys/StrippingSelections/python/StrippingSelections/StrippingBandQ/StrippingB2Chic0KPi.py
+++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingBandQ/StrippingB2Chic0KPi.py
@@ -17,7 +17,6 @@ from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
-from Gaudi.Configuration import *
 __author__ = ['Andrii Usachov']
 __date__ = '13/03/2018'
 __version__ = '$Revision: 1.2$'
diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingBandQ/StrippingB2JpsiXforEM_s.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingBandQ/StrippingB2JpsiXforEM_s.py
index d3aeeef75411f9cecca87053ee0faa991e8c7fd8..394fd7c3171d61beb9b93f762a890a248f2b190f 100644
--- a/Phys/StrippingSelections/python/StrippingSelections/StrippingBandQ/StrippingB2JpsiXforEM_s.py
+++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingBandQ/StrippingB2JpsiXforEM_s.py
@@ -20,21 +20,11 @@ __version__ = '$Revision: 0.0 $'
 
 __all__ = ('B2JpsiXforEM_sConf', 'default_config')
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
 from Configurables import LoKi__PVReFitter, CombineParticles
-from CommonParticles.Utils import updateDoD
-from StandardParticles import StdLoosePions
-from StandardParticles import StdLooseKaons
-from StandardParticles import StdAllLooseKaons
-from StandardParticles import StdLooseResolvedPi0
-from StandardParticles import StdLooseMergedPi0
-from StandardParticles import StdNoPIDsPions
-from StandardParticles import StdLooseProtons
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
+from PhysSelPython.Wrappers import DataOnDemand, Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from GaudiKernel.SystemOfUnits import MeV
 
 default_config = {
     'NAME': 'B2JpsiXforEM',
diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingBandQ/StrippingBbbar2PhiPhi.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingBandQ/StrippingBbbar2PhiPhi.py
index 2c308991a8d9592619777fb7aad4c619a4a40437..fd4e526f5796889d5eb13efd1f1fca7adfbf4a97 100644
--- a/Phys/StrippingSelections/python/StrippingSelections/StrippingBandQ/StrippingBbbar2PhiPhi.py
+++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingBandQ/StrippingBbbar2PhiPhi.py
@@ -21,12 +21,10 @@ confBbbar2PhiPhi = Bbbar2PhiPhiConf( name = 'Bbbar2PhiPhi', config = config_Bbba
 stream.appendLines( confBbbar2PhiPhi.lines() )
 '''
 
-from StandardParticles import StdNoPIDsProtons, StdNoPIDsPions, StdNoPIDsDownPions
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
+from PhysSelPython.Wrappers import DataOnDemand, Selection
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = ['Simone Stracka']
 __date__ = '10/03/2015'
 __all__ = (
diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingBandQ/StrippingBc2EtacMu.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingBandQ/StrippingBc2EtacMu.py
index c0e64ca5c35b4aab42f067e70aaf18cbe0accaf2..ce1d72039c532c0cfe3bddf32096f808952b47a6 100644
--- a/Phys/StrippingSelections/python/StrippingSelections/StrippingBandQ/StrippingBc2EtacMu.py
+++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingBandQ/StrippingBc2EtacMu.py
@@ -15,9 +15,8 @@ Module for B_c->eta_c mu
 
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand, AutomaticData
+from PhysSelPython.Wrappers import DataOnDemand, Selection
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = ['Valeriia Zhovkovska']
 __date__ = '15/03/2019'
 __version__ = '$Revision: 1.0 $'
diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingBandQ/StrippingBc2EtacSL.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingBandQ/StrippingBc2EtacSL.py
index 2d376003a4c6571aaa08defa85c4fe790ab35c60..4fa26a1cb105f28e64c752c38b40f8e46a55a8fc 100644
--- a/Phys/StrippingSelections/python/StrippingSelections/StrippingBandQ/StrippingBc2EtacSL.py
+++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingBandQ/StrippingBc2EtacSL.py
@@ -23,9 +23,8 @@ B_c->eta_c tau, with eta_c->K_s K pi and tau->3pi
 
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand, AutomaticData
+from PhysSelPython.Wrappers import DataOnDemand, Selection
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = ['Valeriia Zhovkovska']
 __date__ = '24/06/2021'
 __version__ = '$Revision: 1.1 $'
diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingBandQ/StrippingBc2JpsiHBDT.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingBandQ/StrippingBc2JpsiHBDT.py
index d973f13d2bc8b32c5045776e5b5d3f96bc618e74..7b5a84a9de9b55f09a9ef0da7469b5cc113c4602 100644
--- a/Phys/StrippingSelections/python/StrippingSelections/StrippingBandQ/StrippingBc2JpsiHBDT.py
+++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingBandQ/StrippingBc2JpsiHBDT.py
@@ -18,7 +18,6 @@ from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = ['Jibo He']
 __date__ = '02/11/2013'
 __version__ = '$Revision: 2.0 $'
diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingBandQ/StrippingBc2JpsiMuXNew.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingBandQ/StrippingBc2JpsiMuXNew.py
index 946bad8366ac6019498b9d14e89f0a8899cf70d4..bd156feb81f0deaaf2a07b14df76bcbbcdd03d5c 100644
--- a/Phys/StrippingSelections/python/StrippingSelections/StrippingBandQ/StrippingBc2JpsiMuXNew.py
+++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingBandQ/StrippingBc2JpsiMuXNew.py
@@ -18,7 +18,6 @@ from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = ['Jibo He']
 __date__ = '02/09/2010'
 __version__ = '$Revision: 2.0 $'
diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingBandQ/StrippingCC2DD.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingBandQ/StrippingCC2DD.py
index 58f89513ddb6f5ae23ad89c616deb7d8f0c6f719..39a30438368c27a6a42f57688de187a8b1135e72 100644
--- a/Phys/StrippingSelections/python/StrippingSelections/StrippingBandQ/StrippingCC2DD.py
+++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingBandQ/StrippingCC2DD.py
@@ -22,8 +22,7 @@ Module for construction of CC->D D, where CC is a particle decaying to D D
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 __author__ = ['Lucio Anderlini', 'Andrea Bizzeti']
 __date__ = '2015-12-01'
 __version__ = '$Revision: 0.4 $'
diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingBandQ/StrippingCcbar2Baryons.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingBandQ/StrippingCcbar2Baryons.py
index e5a87f652fa30a90026cc6172bb112eb157c1e0f..3e235742a82cc6b6eef181ba5871e7096a9e965d 100644
--- a/Phys/StrippingSelections/python/StrippingSelections/StrippingBandQ/StrippingCcbar2Baryons.py
+++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingBandQ/StrippingCcbar2Baryons.py
@@ -20,7 +20,6 @@ stream.appendLines( [
 ])
 '''
 
-from StandardParticles import StdNoPIDsProtons, StdNoPIDsPions, StdNoPIDsDownPions
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingBandQ/StrippingCcbar2KsKpi.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingBandQ/StrippingCcbar2KsKpi.py
index b6b5864ff95625b5e45b988663cfea44c0f42cdc..4fc4ffd7e775d5d46e7701adb4802707efae0b7c 100644
--- a/Phys/StrippingSelections/python/StrippingSelections/StrippingBandQ/StrippingCcbar2KsKpi.py
+++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingBandQ/StrippingCcbar2KsKpi.py
@@ -18,9 +18,8 @@ Module for Charmonium->Ks K pi, including three lines
 
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand, AutomaticData
+from PhysSelPython.Wrappers import DataOnDemand, Selection
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = ['Valeriia Zhovkovska']
 __date__ = '07/03/2019'
 __version__ = '$Revision: 1.0 $'
diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingBandQ/StrippingCcbar2LambdaLambda.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingBandQ/StrippingCcbar2LambdaLambda.py
index 8ce57a0eb47c3385d8d6e68abe18bd6e59dabdd6..a92e180d7ab857844ebe8f02f80e01b0e6d59a97 100644
--- a/Phys/StrippingSelections/python/StrippingSelections/StrippingBandQ/StrippingCcbar2LambdaLambda.py
+++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingBandQ/StrippingCcbar2LambdaLambda.py
@@ -18,14 +18,12 @@ Apply very loose P/PT cuts on proton and pions
 '''
 
 from StandardParticles import StdAllLoosePions,  StdAllLooseProtons
-from StandardParticles import StdLoosePions, StdNoPIDsDownPions, StdNoPIDsDownProtons
-from StandardParticles import StdNoPIDsProtons
-from GaudiKernel.SystemOfUnits import MeV, GeV, mm, picosecond
+from StandardParticles import StdNoPIDsDownPions, StdNoPIDsDownProtons
+from GaudiKernel.SystemOfUnits import GeV, MeV, mm
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = ['Andrii Usachov', 'Jinlin Fu', 'Ziyi Wang']
 __date__ = '20/06/2021'
 __version__ = '$Revision: 0.1 $'
diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingBandQ/StrippingCcbar2LstLambda.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingBandQ/StrippingCcbar2LstLambda.py
index 0c317712061ae5a153e89bd41b8390a4fc74e187..4937ef3626431e3998bb3086fe7c656fa4ec9e57 100644
--- a/Phys/StrippingSelections/python/StrippingSelections/StrippingBandQ/StrippingCcbar2LstLambda.py
+++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingBandQ/StrippingCcbar2LstLambda.py
@@ -12,14 +12,10 @@
 Module for selecting Ccbar->LstLambda detached line, with loose PT, PID cuts. 
 '''
 
-from StandardParticles import StdAllLoosePions, StdAllLooseKaons
-from StandardParticles import StdLoosePions, StdNoPIDsDownPions, StdLooseKaons, StdLooseDownKaons
-from StandardParticles import StdNoPIDsProtons, StdNoPIDsKaons
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = ['Andrii Usachov']
 __date__ = '23/11/2017'
 
diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingBandQ/StrippingCcbar2LstLst.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingBandQ/StrippingCcbar2LstLst.py
index cf2d3319f4c8d473c85741f08945e6d15bd1722b..fb7af606490052a513bd2a8433237fcbfca14aa4 100644
--- a/Phys/StrippingSelections/python/StrippingSelections/StrippingBandQ/StrippingCcbar2LstLst.py
+++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingBandQ/StrippingCcbar2LstLst.py
@@ -12,12 +12,10 @@
 Module for selecting Ccbar->LstLst detached line, with loose PT, PID cuts. 
 '''
 
-from StandardParticles import StdNoPIDsProtons, StdNoPIDsKaons
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
+from PhysSelPython.Wrappers import DataOnDemand, Selection
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = ['Andrii Usachov']
 __date__ = '12/01/2017'
 
@@ -58,19 +56,19 @@ class Ccbar2LstLstConf(LineBuilder):
         self.name = name
         self.config = config
 
-        TRCHI2DOF = config['TRCHI2DOF']
-        KaonProbNNk = config['KaonProbNNk']
-        KaonPTSec = config['KaonPTSec']
-        ProtonProbNNp = config['ProtonProbNNp']
-        ProtonP = config['ProtonP']
-        ProtonPTSec = config['ProtonPTSec']
-        LstVtxChi2 = config['LstVtxChi2']
-        LstMinMass = config['LstMinMass']
-        LstMaxMass = config['LstMaxMass']
-        CombMaxMass = config['CombMaxMass']
-        CombMinMass = config['CombMinMass']
-        MaxMass = config['MaxMass']
-        MinMass = config['MinMass']
+        config['TRCHI2DOF']
+        config['KaonProbNNk']
+        config['KaonPTSec']
+        config['ProtonProbNNp']
+        config['ProtonP']
+        config['ProtonPTSec']
+        config['LstVtxChi2']
+        config['LstMinMass']
+        config['LstMaxMass']
+        config['CombMaxMass']
+        config['CombMinMass']
+        config['MaxMass']
+        config['MinMass']
 
         self.DetachedProtonForLst = self.createSubSel(OutputList="DetachedProtonForLst" + self.name,
                                                       InputList=DataOnDemand(
diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingBandQ/StrippingCcbar2PPPiPi.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingBandQ/StrippingCcbar2PPPiPi.py
index 28b6a56f5499cd8ecbce8b1d1e366f216f123073..91e5c78c655288eb933c6478d1eafcaee3904f84 100644
--- a/Phys/StrippingSelections/python/StrippingSelections/StrippingBandQ/StrippingCcbar2PPPiPi.py
+++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingBandQ/StrippingCcbar2PPPiPi.py
@@ -12,12 +12,11 @@
 Module for selecting charmonium -> p pbar pi pi 
 '''
 
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
+from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
 from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
-from Gaudi.Configuration import *
 __author__ = ['Jibo He']
 __date__ = '12/11/2015'
 __version__ = '$Revision: 1.0 $'
diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingBandQ/StrippingCcbar2PhiPhi.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingBandQ/StrippingCcbar2PhiPhi.py
index c21b9fa874a5dccb0d9c373c28e255bbe309ea95..101a8e21ba087c6c991fe35e18471728a0abe2e3 100644
--- a/Phys/StrippingSelections/python/StrippingSelections/StrippingBandQ/StrippingCcbar2PhiPhi.py
+++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingBandQ/StrippingCcbar2PhiPhi.py
@@ -21,12 +21,10 @@ confCcbar2PhiPhi = Ccbar2PhiPhiConf( name = 'Ccbar2PhiPhi', config = config_Ccba
 stream.appendLines( confCcbar2PhiPhi.lines() )
 '''
 
-from StandardParticles import StdNoPIDsProtons, StdNoPIDsPions, StdNoPIDsDownPions
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
+from PhysSelPython.Wrappers import DataOnDemand, Selection
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = ['Jibo He']
 __date__ = '20/01/2012'
 
diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingBandQ/StrippingCcbar2PhiPhiDetached.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingBandQ/StrippingCcbar2PhiPhiDetached.py
index 9cece8aa8a316b6c48d7062407ae3c5e4a4703e3..8d48d19f4b11b35402f710baec49d8b99bec7f11 100644
--- a/Phys/StrippingSelections/python/StrippingSelections/StrippingBandQ/StrippingCcbar2PhiPhiDetached.py
+++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingBandQ/StrippingCcbar2PhiPhiDetached.py
@@ -15,12 +15,10 @@ Inherited from StrippingCcbar2PhiPhi.py; moved To FullDST
 
 '''
 
-from StandardParticles import StdNoPIDsProtons, StdNoPIDsPions, StdNoPIDsDownPions
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
+from PhysSelPython.Wrappers import DataOnDemand, Selection
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = ['Jibo He, Liupan An']
 __date__ = '11/01/2017'
 
diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingBandQ/StrippingCcbar2PhiPhiPiPi.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingBandQ/StrippingCcbar2PhiPhiPiPi.py
index 3255f0fb24ce2bf3d5dedf3d48901b1a3b7fdf4c..8ded03963ceb90126c111e3d53772e2529b17348 100644
--- a/Phys/StrippingSelections/python/StrippingSelections/StrippingBandQ/StrippingCcbar2PhiPhiPiPi.py
+++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingBandQ/StrippingCcbar2PhiPhiPiPi.py
@@ -12,12 +12,11 @@
 Module for selecting charmonium -> phi phi pi pi 
 '''
 
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
+from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
 from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
-from Gaudi.Configuration import *
 __author__ = ['Andrii Usachov']
 __date__ = '10/04/2017'
 __version__ = '$Revision: 1.1 $'
@@ -60,12 +59,12 @@ class Ccbar2PhiPhiPiPiConf(LineBuilder):
         self.name = name
         self.config = config
 
-        PhiVtxChi2 = config['PhiVtxChi2']
-        PhiMassW = config['PhiMassW']
-        KaonPT = config['KaonPT']
-        TRCHI2DOF = config['TRCHI2DOF']
-        KaonProbNNk = config['KaonProbNNk']
-        KaonIPCHI2 = config['KaonIPCHI2']
+        config['PhiVtxChi2']
+        config['PhiMassW']
+        config['KaonPT']
+        config['TRCHI2DOF']
+        config['KaonProbNNk']
+        config['KaonIPCHI2']
 
         self.SelPions = self.createSubSel(OutputList=self.name + "SelPions",
                                           InputList=DataOnDemand(
diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingBandQ/StrippingCcbar2PpbarNew.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingBandQ/StrippingCcbar2PpbarNew.py
index 7b897199b13de2dc141c8f7cbc7d68b45c57f609..247fee87e88715cbf6df1707199f9b596c0115a8 100644
--- a/Phys/StrippingSelections/python/StrippingSelections/StrippingBandQ/StrippingCcbar2PpbarNew.py
+++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingBandQ/StrippingCcbar2PpbarNew.py
@@ -18,9 +18,8 @@ Module for Charmonium->p pbar, including three lines
 
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
+from PhysSelPython.Wrappers import Selection
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 __author__ = ['Jibo He']
 __date__ = '03/10/2010'
 __version__ = '$Revision: 1.2 $'
diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingBandQ/StrippingChiCJPsiGammaConv.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingBandQ/StrippingChiCJPsiGammaConv.py
index 0974ad33bc785e6c21ccfbd8abd76c1de3c8330d..13c82277579b4165c559b3e45a8dc8a26f329028 100644
--- a/Phys/StrippingSelections/python/StrippingSelections/StrippingBandQ/StrippingChiCJPsiGammaConv.py
+++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingBandQ/StrippingChiCJPsiGammaConv.py
@@ -11,8 +11,7 @@
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
-from Configurables import FilterDesktop, CombineParticles, OfflineVertexFitter
-from Gaudi.Configuration import *
+from Configurables import CombineParticles, FilterDesktop
 __author__ = 'Edwige Tournefier'
 __date__ = '08/06/2012'
 __version__ = '$ 1.0 $'
diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingBandQ/StrippingDiMuonForXsection.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingBandQ/StrippingDiMuonForXsection.py
index 99d45c194f644de10f8a90371ed1079dcd2e147e..7ceb214bd70cc59ffa52391a7a3321cce9dba642 100644
--- a/Phys/StrippingSelections/python/StrippingSelections/StrippingBandQ/StrippingDiMuonForXsection.py
+++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingBandQ/StrippingDiMuonForXsection.py
@@ -16,7 +16,6 @@ from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
-from Gaudi.Configuration import *
 __author__ = ['Jibo He']
 __date__ = '28/03/2012'
 __version__ = '$Revision: 1.0 $'
diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingBandQ/StrippingDiMuonNew.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingBandQ/StrippingDiMuonNew.py
index 7c60c2e0a15b0e700724dae73d54a428fd669c7a..dd539e9d69fb0fa229c32fd245d281db456c4fed 100644
--- a/Phys/StrippingSelections/python/StrippingSelections/StrippingBandQ/StrippingDiMuonNew.py
+++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingBandQ/StrippingDiMuonNew.py
@@ -60,7 +60,6 @@ from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand, EventSelection
 from Configurables import LoKi__VoidFilter
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
-from Gaudi.Configuration import *
 __author__ = ['Jibo He']
 __date__ = '30/09/2010'
 __version__ = '$Revision: 1.0 $'
diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingBandQ/StrippingEtap2pipimumu.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingBandQ/StrippingEtap2pipimumu.py
index f03d28c2c9530e818efb5b81288a8e6a209e3ccb..89f19ca3d73d076e07c224f3c29ffd9def76e9f2 100644
--- a/Phys/StrippingSelections/python/StrippingSelections/StrippingBandQ/StrippingEtap2pipimumu.py
+++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingBandQ/StrippingEtap2pipimumu.py
@@ -13,9 +13,7 @@ from StandardParticles import StdAllLooseMuons, StdAllLoosePions, StdAllLooseKao
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, OfflineVertexFitter
-from Gaudi.Configuration import *
-from copy import copy
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop
 __author__ = ['Xabier Cid Vidal']
 # inspired by StrippingD2XMuMuSSConf, from Malcolm John, B. Viaud and O. Kochebina
 __date__ = '10/3/2020'
@@ -178,10 +176,10 @@ class StrippingEtap2pipimumuConf(LineBuilder):
 
         LineBuilder.__init__(self, name, config)
 
-        Ds2EtapLine_name = name+"_Ds2Etap"
-        Bu2EtapLine_name = name+"_Bu2Etap"
-        Ds2Phi3PiLine_name = name+"_Ds2Phi3Pi"
-        Bu2JPsiKLine_name = name+"_Bu2JPsiK"
+        name+"_Ds2Etap"
+        name+"_Bu2Etap"
+        name+"_Ds2Phi3Pi"
+        name+"_Bu2JPsiK"
 
         # 1 : Make pions and kaons
         selPionsEta = makeDaughters(
diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingBandQ/StrippingHeavyBaryons.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingBandQ/StrippingHeavyBaryons.py
index 92ada56965cd1abcfbbc08effe25cf9e9723c757..5547236ca6930272e5d54f7e2525f36a05c695fc 100644
--- a/Phys/StrippingSelections/python/StrippingSelections/StrippingBandQ/StrippingHeavyBaryons.py
+++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingBandQ/StrippingHeavyBaryons.py
@@ -12,14 +12,10 @@
 Stripping line for HeavyBaryons studies : Xi_b-, Xi_b0 and Omega_b-
 Author: Yasmine Amhis
 '''
-from GaudiKernel.SystemOfUnits import MeV
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
-from StandardParticles import StdAllLoosePions, StdAllLooseKaons
-from StandardParticles import StdLoosePions, StdNoPIDsDownPions, StdLooseKaons, StdLooseDownKaons
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = ['Yasmine Amhis', 'updated by Vitalii Lisovskyi']
 __date__ = '19/05/2011'
 __version__ = '$Revision: 1.5 $'
diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingBandQ/StrippingInclusiveCharmBaryons.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingBandQ/StrippingInclusiveCharmBaryons.py
index 9e29771ddaf4fc3cd785402e1a97d9d43b6606ea..de3a1066b5ee29dc0aabf9b3bd15eab9da0aee69 100644
--- a/Phys/StrippingSelections/python/StrippingSelections/StrippingBandQ/StrippingInclusiveCharmBaryons.py
+++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingBandQ/StrippingInclusiveCharmBaryons.py
@@ -17,13 +17,10 @@ Author: M. Stahl
 Notes: Be creative!
 '''
 from PhysSelPython.Wrappers import Selection, AutomaticData
-import math
 from LoKiProtoParticles.decorators import *
 from LoKiArrayFunctors.decorators import *
 from LoKiPhys.decorators import *
-from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-from Configurables import FilterDesktop
-from PhysConf.Selections import FilterSelection, CombineSelection, Combine4BodySelection, Combine3BodySelection, LimitSelection, MergedSelection
+from PhysConf.Selections import Combine3BodySelection, Combine4BodySelection, FilterSelection, MergedSelection
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 __author__ = ['Marian Stahl']
diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingBandQ/StrippingInclusiveDoubleD.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingBandQ/StrippingInclusiveDoubleD.py
index 9372dd979fd52cd3e9f34725fde38533be716847..9454a8ad63da11230bfbc141844adb02ff4b29ef 100644
--- a/Phys/StrippingSelections/python/StrippingSelections/StrippingBandQ/StrippingInclusiveDoubleD.py
+++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingBandQ/StrippingInclusiveDoubleD.py
@@ -18,12 +18,9 @@ Author: M. Stahl
 Notes: Be creative!
 '''
 from PhysSelPython.Wrappers import Selection, AutomaticData
-import math
 from LoKiProtoParticles.decorators import *
 from LoKiArrayFunctors.decorators import *
 from LoKiPhys.decorators import *
-from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-from Configurables import FilterDesktop
 from PhysConf.Selections import FilterSelection, CombineSelection, Combine3BodySelection, MergedSelection
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingBandQ/StrippingLb2EtacKp.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingBandQ/StrippingLb2EtacKp.py
index fa5c47368a954e4a868152465451cab11bf405b2..2596756ef885be2fb8c43b99c5aaa99d162d6f07 100644
--- a/Phys/StrippingSelections/python/StrippingSelections/StrippingBandQ/StrippingLb2EtacKp.py
+++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingBandQ/StrippingLb2EtacKp.py
@@ -17,7 +17,6 @@ from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
-from Gaudi.Configuration import *
 __author__ = ['Liming Zhang', 'Xuesong Liu']
 __date__ = '23/11/2016'
 __version__ = '$Revision: 2.0$'
diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingBandQ/StrippingLb2L0X3872.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingBandQ/StrippingLb2L0X3872.py
index 0ef3e6ee6ba74c285b56b587d2fc3c0e7803324b..c9b94fd994845c1188d78d325a6c685e4534a067 100644
--- a/Phys/StrippingSelections/python/StrippingSelections/StrippingBandQ/StrippingLb2L0X3872.py
+++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingBandQ/StrippingLb2L0X3872.py
@@ -15,7 +15,6 @@ from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = 'Xijun Wang'
 __date__ = '2021-3-18'
 __version__ = 'Stripping28'
diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingBandQ/StrippingOmegab2XicKpi.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingBandQ/StrippingOmegab2XicKpi.py
index 8a70403dd8fa18dfaddeb8195f9451277a91f501..d421f354b44c7aabc1d6b1a430c6eb0805291530 100644
--- a/Phys/StrippingSelections/python/StrippingSelections/StrippingBandQ/StrippingOmegab2XicKpi.py
+++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingBandQ/StrippingOmegab2XicKpi.py
@@ -25,8 +25,7 @@ __all__ = ('Omegab2XicKpiConf',
            'makeOmegab2XicKpi',
            'default_config')
 
-from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingBandQ/StrippingOmegabDecays.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingBandQ/StrippingOmegabDecays.py
index 6cb9b0c8ab26d14b40905a6b266eb3f859e415cb..445c8816a29eef4ec56c715fd44e85bbab2a5a0f 100644
--- a/Phys/StrippingSelections/python/StrippingSelections/StrippingBandQ/StrippingOmegabDecays.py
+++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingBandQ/StrippingOmegabDecays.py
@@ -26,8 +26,7 @@ __all__ = ('OmegabDecaysConf', 'makeXic', 'makeOmegac', 'makeXic0',
            'makeOmegab2Omegacpi', 'makeOmegab2Omegacpi0pi',
            'makeOmegab2Omegacgammapi', 'default_config')
 
-from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingBandQ/StrippingOniaPhotoProduction.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingBandQ/StrippingOniaPhotoProduction.py
index 19c34eb3ad0d3c307e04c899fe215ee9911a2a3c..97685305212a68cd9bc2a94ad4f1ee4362dc0f7f 100644
--- a/Phys/StrippingSelections/python/StrippingSelections/StrippingBandQ/StrippingOniaPhotoProduction.py
+++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingBandQ/StrippingOniaPhotoProduction.py
@@ -32,7 +32,6 @@ from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from StandardParticles import StdAllLooseMuons
 from GaudiKernel.SystemOfUnits import GeV
-from Configurables import HCRawBankDecoderHlt
 
 default_config = {
     'JpsiPhotoProduction':
diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingBandQ/StrippingOniaPhotoProductionPrescaled.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingBandQ/StrippingOniaPhotoProductionPrescaled.py
index 3438f58588193fe8d418039e961472c72ab32630..f29c13fc38c4072fa17c7b7693e3b5bdb09959ea 100644
--- a/Phys/StrippingSelections/python/StrippingSelections/StrippingBandQ/StrippingOniaPhotoProductionPrescaled.py
+++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingBandQ/StrippingOniaPhotoProductionPrescaled.py
@@ -27,7 +27,6 @@ from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from StandardParticles import StdAllLooseMuons
 from GaudiKernel.SystemOfUnits import GeV
-from Configurables import HCRawBankDecoderHlt
 
 default_config = {
     'JpsiPhotoProductionPrescaled':
diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingBandQ/StrippingPPMuMu.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingBandQ/StrippingPPMuMu.py
index cfa93241546b8cb1958f0c080bce3ed3974eb196..1e28adc9f8419151808afa067316d7a0f98387fb 100644
--- a/Phys/StrippingSelections/python/StrippingSelections/StrippingBandQ/StrippingPPMuMu.py
+++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingBandQ/StrippingPPMuMu.py
@@ -12,12 +12,11 @@
 Module for selecting Hc -> p pbar mu mu
 '''
 
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
+from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
 from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
-from Gaudi.Configuration import *
 __author__ = ['Liupan An']
 __date__ = '18/05/2017'
 __version__ = '$Revision: 1.0 $'
diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingBandQ/StrippingXibc.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingBandQ/StrippingXibc.py
index ed73d91a4d03fe2ff6427b7cd54ccc7ed18aeaa7..d0446cddfd42feba526eaf11c9d8cf13a4160779 100644
--- a/Phys/StrippingSelections/python/StrippingSelections/StrippingBandQ/StrippingXibc.py
+++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingBandQ/StrippingXibc.py
@@ -47,17 +47,11 @@ __all__ = ('XibcBuilder'  # LineBuilder class specialization
            )
 
 
-from Gaudi.Configuration import *
-
 from Configurables import FilterDesktop, CombineParticles
 from PhysSelPython.Wrappers import Selection, AutomaticData, MergedSelection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 
-from CommonParticles.StdLooseLambda import StdLooseLambdaLL, StdLooseLambdaDD
-from GaudiKernel.SystemOfUnits import MeV, GeV, mm
-from Configurables import TisTosParticleTagger
-
 
 default_name = "Xibc"
 
diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingBandQ/StrippingXibcBDT.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingBandQ/StrippingXibcBDT.py
index 5520ac91aac71eded5064eb9daf551c6b35891fe..28b1ca4c2d5b6567ed207d4b3cd2e8dcd52a9324 100644
--- a/Phys/StrippingSelections/python/StrippingSelections/StrippingBandQ/StrippingXibcBDT.py
+++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingBandQ/StrippingXibcBDT.py
@@ -33,8 +33,6 @@ from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticle
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, MergedSelection, DataOnDemand
-from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays
-from Gaudi.Configuration import *
 __author__ = ['Jibo He']
 __date__ = '20/11/2016'
 __version__ = '$Revision: 1.0 $'
diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingBandQ/StrippingXiccBDT.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingBandQ/StrippingXiccBDT.py
index 0fda677dfb8d63acd803c2278c95da8b32d22700..7dde23cf7ee6e3329158f6ed2ef36ed1b1c5655c 100644
--- a/Phys/StrippingSelections/python/StrippingSelections/StrippingBandQ/StrippingXiccBDT.py
+++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingBandQ/StrippingXiccBDT.py
@@ -30,9 +30,7 @@ Xicc+  -> D+ p+ K-
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, MergedSelection, DataOnDemand
-from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays
-from Gaudi.Configuration import *
+from PhysSelPython.Wrappers import DataOnDemand, Selection
 __author__ = ['Jibo He']
 __date__ = '20/11/2016'
 __version__ = '$Revision: 1.0 $'
diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingBnoC/StrippingB24pLines.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingBnoC/StrippingB24pLines.py
index db2b4d65bb393a5a34824d87b65ca2bcc983b9f0..a6b52e064494dc23ad635b49c2dc94e4e49e48a2 100644
--- a/Phys/StrippingSelections/python/StrippingSelections/StrippingBnoC/StrippingB24pLines.py
+++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingBnoC/StrippingB24pLines.py
@@ -54,12 +54,10 @@ Exported symbols (use python help!):
    - 
 """
 
-from GaudiKernel.PhysicalConstants import c_light
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
-from Configurables import FilterDesktop, CombineParticles, DaVinci__N4BodyDecays
-from Gaudi.Configuration import *
+from Configurables import DaVinci__N4BodyDecays
 __author__ = ["Pietro Marino", "Oliver Gruenberg"]
 __date__ = "13.10.2017"
 __version__ = "$Revision: 3.0 $"
diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingBnoC/StrippingB2CharmlessInclusive.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingBnoC/StrippingB2CharmlessInclusive.py
index 056df1189d8c6e124a4dcb4201ec68d8ac1fc40d..8ae9f04166a6ba66089d684f07c4dfc79cbbc333 100644
--- a/Phys/StrippingSelections/python/StrippingSelections/StrippingBnoC/StrippingB2CharmlessInclusive.py
+++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingBnoC/StrippingB2CharmlessInclusive.py
@@ -16,9 +16,8 @@ from StandardParticles import StdLooseKsDD, StdLooseKsLL
 from StandardParticles import StdNoPIDsPions, StdLooseAllPhotons, StdLooseMergedPi0, StdLooseResolvedPi0
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand, SimpleSelection, MergedSelection
+from PhysSelPython.Wrappers import MergedSelection, Selection, SimpleSelection
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = ['Fred Blanc', 'Luca Pescatore']
 __date__ = '23/01/2019'
 __version__ = '$Revision: 3.0 $'
diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingBnoC/StrippingB2HHBDT.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingBnoC/StrippingB2HHBDT.py
index 79abd1433d68c905afd21b1351f2f1e6bf262fe2..766ad5b73bd949e01c06a43874566f2577422d8f 100644
--- a/Phys/StrippingSelections/python/StrippingSelections/StrippingBnoC/StrippingB2HHBDT.py
+++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingBnoC/StrippingB2HHBDT.py
@@ -24,16 +24,13 @@ __all__ = ('B2HHBDTLines',
            'applyBDT',
            'default_config')
 
-from Gaudi.Configuration import *
 
-from GaudiKernel.SystemOfUnits import *
-
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 from StandardParticles import StdNoPIDsPions
 
 from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
-from StrippingUtils.Utils import LineBuilder, checkConfig
+from StrippingUtils.Utils import LineBuilder
 
 
 default_config = {
diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingBnoC/StrippingB2HHPi0.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingBnoC/StrippingB2HHPi0.py
index 41030075a469c796d59ab39ed5a28a7259e9bfd5..e86c40013531bba411d27490eba92f97be414bac 100644
--- a/Phys/StrippingSelections/python/StrippingSelections/StrippingBnoC/StrippingB2HHPi0.py
+++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingBnoC/StrippingB2HHPi0.py
@@ -27,9 +27,8 @@ __all__ = ('StrippingB2HHPi0Conf',
            'makeB2HHPi0M',
            'default_config')
 
-from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from PhysSelPython.Wrappers import Selection, DataOnDemand
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
+from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from StandardParticles import StdNoPIDsPions, StdLooseMergedPi0, StdLooseResolvedPi0
diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingBnoC/StrippingB2KShh.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingBnoC/StrippingB2KShh.py
index f404e2a87328dc23eb64929a9a9f3cd002ddadcf..2dcd40aee03deb0e241de124f68de39f1abe783b 100644
--- a/Phys/StrippingSelections/python/StrippingSelections/StrippingBnoC/StrippingB2KShh.py
+++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingBnoC/StrippingB2KShh.py
@@ -25,7 +25,6 @@ __version__ = 'Stripping24r1/Stripping26r1'
 __all__ = {'B2KShhConf',
            'default_config'}
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, DaVinci__N3BodyDecays
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingBnoC/StrippingB2KShhh.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingBnoC/StrippingB2KShhh.py
index f95cf109667b3401f5eb904c78285279c34d00b5..07d236ac77af02d637424d32f3f4e637192ba3e1 100644
--- a/Phys/StrippingSelections/python/StrippingSelections/StrippingBnoC/StrippingB2KShhh.py
+++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingBnoC/StrippingB2KShhh.py
@@ -27,13 +27,13 @@ __all__ = ('B2KShhhConf',
 
 from Gaudi.Configuration import *
 
-from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N4BodyDecays
+from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays
 from StandardParticles import StdNoPIDsPions, StdNoPIDsKaons  # ipchi2 cut
 from StandardParticles import StdLooseKsDD, StdLooseKsLL
 
-from PhysSelPython.Wrappers import Selection, MergedSelection
+from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
-from StrippingUtils.Utils import LineBuilder, checkConfig
+from StrippingUtils.Utils import LineBuilder
 
 from Configurables import FilterDesktop
 
diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingBnoC/StrippingB2Ksthh.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingBnoC/StrippingB2Ksthh.py
index 94a25a2714e9626cb22e6966b9ad7a1955d78eb9..a39998cb04eef71b62a1bf9337b6fb914d58a917 100644
--- a/Phys/StrippingSelections/python/StrippingSelections/StrippingBnoC/StrippingB2Ksthh.py
+++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingBnoC/StrippingB2Ksthh.py
@@ -22,7 +22,6 @@ __version__ = 'Stripping26'
 __all__ = {'B2KsthhConf',
            'default_config'}
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
@@ -176,7 +175,7 @@ class B2KsthhConf(LineBuilder):
         _massCutHigh = "(AM<(5279+%s)*MeV)" % config['B_Mhigh']
         _aptCut = "(APT>%s*MeV)" % config['B_APTmin']
         _daugMedPtCut = "(ANUM(PT>%s*MeV)>=2)" % config['BDaug_MedPT_PT']
-        _daugMaxPtIPCut = "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['BDaug_MaxPT_IP']
+        "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['BDaug_MaxPT_IP']
         _daugPtSumCut = "((APT1+APT2+APT3)>%s*MeV)" % config['BDaug_PTsum']
 
         _combCuts = _aptCut
diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingBnoC/StrippingB2LambdapppLines.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingBnoC/StrippingB2LambdapppLines.py
index 0ec9c6a5d1fcdda0149e8b14dea2ba22646ce64f..0ba12bf37a1af7f76282b079a6bb65d8b1d21f7e 100644
--- a/Phys/StrippingSelections/python/StrippingSelections/StrippingBnoC/StrippingB2LambdapppLines.py
+++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingBnoC/StrippingB2LambdapppLines.py
@@ -23,7 +23,6 @@ __date__ = '05/02/2021'
 __version__ = 'Stripping29r2p2'
 __all__ = 'B2LambdapppLinesConf'
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
@@ -214,8 +213,8 @@ class B2LambdapppLinesConf(LineBuilder):
         _vtxCut = "(VFASPF(VCHI2)<%s)   " % config['Lambda_DD_VtxChi2']
         _fdChi2Cut = "(BPVVDCHI2>%s)" % config['Lambda_DD_FDChi2']
         _momCut = "(P>%s*MeV)" % config['Lambda_DD_Pmin']
-        _trkGhostProbCut1 = "(CHILDCUT((TRGHOSTPROB<%s),1))" % config['Trk_GhostProb']
-        _trkGhostProbCut2 = "(CHILDCUT((TRGHOSTPROB<%s),2))" % config['Trk_GhostProb']
+        "(CHILDCUT((TRGHOSTPROB<%s),1))" % config['Trk_GhostProb']
+        "(CHILDCUT((TRGHOSTPROB<%s),2))" % config['Trk_GhostProb']
 
         _allCuts = _momCut
         _allCuts += '&'+_massCut
@@ -270,8 +269,8 @@ class B2LambdapppLinesConf(LineBuilder):
         _vtxCut = "(VFASPF(VCHI2)<%s)   " % config['Lambda_DD_VtxChi2']
         _fdChi2Cut = "(BPVVDCHI2>%s)" % config['Lambda_DD_FDChi2']
         _momCut = "(P>%s*MeV)" % config['Lambda_DD_Pmin']
-        _trkGhostProbCut1 = "(CHILDCUT((TRGHOSTPROB<%s),1))" % config['Trk_GhostProb']
-        _trkGhostProbCut2 = "(CHILDCUT((TRGHOSTPROB<%s),2))" % config['Trk_GhostProb']
+        "(CHILDCUT((TRGHOSTPROB<%s),1))" % config['Trk_GhostProb']
+        "(CHILDCUT((TRGHOSTPROB<%s),2))" % config['Trk_GhostProb']
 
         _allCuts = _momCut
         _allCuts += '&'+_massCut
@@ -304,7 +303,7 @@ class B2LambdapppLinesConf(LineBuilder):
         _massCutHigh = "(AM<(5279+%s)*MeV)" % config['B0_Mhigh']
         _aptCut = "(APT>%s*MeV)" % config['B0_APTmin']
         _daugMedPtCut = "(ANUM(PT>%s*MeV)>=2)" % config['B0Daug_MedPT_PT']
-        _daugMaxPtIPCut = "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['B0Daug_MaxPT_IP']
+        "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['B0Daug_MaxPT_IP']
         _maxDocaChi2Cut = "(ACUTDOCACHI2(%s,''))" % config['B0Daug_DD_maxDocaChi2']
         _daugPtSumCut = "((APT1+APT2+APT3+APT4)>%s*MeV)" % config['B0Daug_DD_PTsum']
 
@@ -436,7 +435,7 @@ class B2LambdapppLinesConf(LineBuilder):
         _massCutHigh = "(AM<(5279+%s)*MeV)" % config['B0_Mhigh']
         _aptCut = "(APT>%s*MeV)" % config['B0_APTmin']
         _daugMedPtCut = "(ANUM(PT>%s*MeV)>=2)" % config['B0Daug_MedPT_PT']
-        _daugMaxPtIPCut = "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['B0Daug_MaxPT_IP']
+        "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['B0Daug_MaxPT_IP']
         _maxDocaChi2Cut = "(ACUTDOCACHI2(%s,''))" % config['B0Daug_LD_maxDocaChi2']
         _daugPtSumCut = "((APT1+APT2+APT3+APT4)>%s*MeV)" % config['B0Daug_LD_PTsum']
 
@@ -452,7 +451,7 @@ class B2LambdapppLinesConf(LineBuilder):
         _vtxChi2Cut = "(VFASPF(VCHI2)<%s)" % config['B0_VtxChi2']
         _diraCut = "(BPVDIRA>%s)" % config['B0_Dira']
         _ipChi2Cut = "(MIPCHI2DV(PRIMARY)<%s)" % config['B0_LD_IPCHI2wrtPV']
-        _fdCut = "(VFASPF(VMINVDDV(PRIMARY))>%s)" % config['B0_FDwrtPV']
+        "(VFASPF(VMINVDDV(PRIMARY))>%s)" % config['B0_FDwrtPV']
         _fdChi2Cut = "(BPVVDCHI2>%s)" % config['B0_LD_FDChi2']
 
         _motherCuts = _ptCut
diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingBnoC/StrippingB2TwoBaryons.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingBnoC/StrippingB2TwoBaryons.py
index 8911a3d3bdc4a0add9f550c63095470ab59d4fef..93fef262a5bd7d8cd0abd1063e287bef85404e66 100644
--- a/Phys/StrippingSelections/python/StrippingSelections/StrippingBnoC/StrippingB2TwoBaryons.py
+++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingBnoC/StrippingB2TwoBaryons.py
@@ -31,11 +31,10 @@ from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
 from StandardParticles import StdLooseProtons
 from StandardParticles import StdNoPIDsPions as Pions
-from CommonParticles.StdLooseLambda import StdLooseLambdaLL, StdLooseLambdaDD
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
-from StrippingUtils.Utils import LineBuilder, checkConfig
-from GaudiKernel.SystemOfUnits import MeV, GeV, mm, ns
+from StrippingUtils.Utils import LineBuilder
+from GaudiKernel.SystemOfUnits import GeV, MeV, mm
 
 default_config = {'NAME': 'B2TwoBaryons',
                   'WGs': ['BnoC'],
@@ -157,7 +156,7 @@ class B2TwoBaryonLines(LineBuilder):
 
         B2PPbarName = name + "B2PPbar"
 
-        B2PPSameSignName = name + "B2PPSameSign"
+        name + "B2PPSameSign"
 
         B2Lp_dd_name = name+'B2PLambdabarDD'
         B2Lp_ll_name = name+'B2PLambdabarLL'
diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingBnoC/StrippingB2XEta.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingBnoC/StrippingB2XEta.py
index e1adec50004bf9392e263cc5cb3ba465d4e08bf7..95fbd42162ff7cf67819bcb2ccbe2b4f88c30155 100644
--- a/Phys/StrippingSelections/python/StrippingSelections/StrippingBnoC/StrippingB2XEta.py
+++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingBnoC/StrippingB2XEta.py
@@ -25,9 +25,7 @@ from StandardParticles import StdLoosePions as Pions
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, DaVinci__N3BodyDecays
-from PhysSelPython.Wrappers import DataOnDemand, Selection, SelectionSequence, MergedSelection
-from GaudiKernel import SystemOfUnits as Units
-from Gaudi.Configuration import *
+from PhysSelPython.Wrappers import DataOnDemand, MergedSelection, Selection
 __author__ = ['Timothy Williams']
 __date__ = '1/12/2016'
 __version__ = 'Stripping26r1'
@@ -564,7 +562,7 @@ class B2XEtaConf(LineBuilder):
         _trackCuts = _track_PT+'&'+_track_Chi2+'&'+_track_GPCut+'&'+_track_PIDCut
         _combCuts = _massCut+'&'+_docaCut
         _combCut12Doca = "ACHI2DOCA(1,2)<%s" % config['eta_DOCA']
-        _combCut12Vtx = "(VFASPF(VCHI2/VDOF)<%s)" % config['eta_vtxChi2']
+        "(VFASPF(VCHI2/VDOF)<%s)" % config['eta_vtxChi2']
         _combCut12 = _combCut12Doca
 
         # _eta3Pi=CombineParticles("eta3Pi",
@@ -592,7 +590,7 @@ class B2XEtaConf(LineBuilder):
         _trackCuts = _track_PT+'&'+_track_Chi2+'&'+_track_GPCut+'&'+_track_PIDCut
         _combCuts = _massCut+'&'+_docaCut
         _combCut12Doca = "ACHI2DOCA(1,2)<%s" % config['eta_prime_DOCA']
-        _combCut12Vtx = "(VFASPF(VCHI2/VDOF)<%s)" % config['eta_prime_vtxChi2']
+        "(VFASPF(VCHI2/VDOF)<%s)" % config['eta_prime_vtxChi2']
         _combCut12 = _combCut12Doca
 
         # _etap=CombineParticles("etap",
@@ -883,7 +881,7 @@ class B2XEtaConf(LineBuilder):
         _combCuts = _massCut+'&'+_docaCut
         _allCuts = _PTCut+'&'+_vtxCut+'&'+_diraCut+'&'+_IPChi2Cut
         _combCut12Doca = "ACHI2DOCA(1,2)<%s" % config['LbDaug_LL_maxDocaChi2']
-        _combCut12Vtx = "(VFASPF(VCHI2/VDOF)<%s)" % config['Lb_VtxChi2']
+        "(VFASPF(VCHI2/VDOF)<%s)" % config['Lb_VtxChi2']
         _combCut12 = _combCut12Doca
 
         _Lb2pKetap = DaVinci__N3BodyDecays(DecayDescriptor="[Lambda_b0 -> p+ K- eta_prime]cc",
@@ -921,7 +919,7 @@ class B2XEtaConf(LineBuilder):
         _combCuts = _massCut
         _allCuts = _PTCut+'&'+_IPChi2Cut+'&'+_vtxCut+'&'+_diraCut
         _combCut12Doca = "ACHI2DOCA(1,2)<%s" % config['LbDaug_LL_maxDocaChi2']
-        _combCut12Vtx = "(VFASPF(VCHI2/VDOF)<%s)" % config['Lb_VtxChi2']
+        "(VFASPF(VCHI2/VDOF)<%s)" % config['Lb_VtxChi2']
         _combCut12 = _combCut12Doca
 
         _Lb2pKeta3Pi = DaVinci__N3BodyDecays(DecayDescriptor="[Lambda_b0 -> p+ K- eta]cc",
diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingBnoC/StrippingB2a1Pi.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingBnoC/StrippingB2a1Pi.py
index 29c0766744b242c4ed1be4817cca727495bcb265..9f701cc986294843a275fb204128fb9f3c88fb1d 100644
--- a/Phys/StrippingSelections/python/StrippingSelections/StrippingBnoC/StrippingB2a1Pi.py
+++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingBnoC/StrippingB2a1Pi.py
@@ -17,7 +17,6 @@ from Configurables import DaVinci__N4BodyDecays
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
-from Gaudi.Configuration import *
 __author__ = ['Daniel Vieira, Jibo He']
 __date__ = '01/12/2016'
 __version__ = '$Revision: 1.0 $'
diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingBnoC/StrippingB2hhpipiPhsSpcCut.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingBnoC/StrippingB2hhpipiPhsSpcCut.py
index 08e1d2943eafcfa9ad7d1764a6d5aab6ce3c9526..9fe5c82af0b14937c33c30fd9627961fa0731c0a 100644
--- a/Phys/StrippingSelections/python/StrippingSelections/StrippingBnoC/StrippingB2hhpipiPhsSpcCut.py
+++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingBnoC/StrippingB2hhpipiPhsSpcCut.py
@@ -17,7 +17,6 @@ from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = ['Daniel Vieira']
 __date__ = '29/11/2018'
 __version__ = '$Revision: 1.0 $'
diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingBnoC/StrippingB2pphh.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingBnoC/StrippingB2pphh.py
old mode 100755
new mode 100644
index 3ca4b3b8698468a5e9192f982a9e957cc8f04fcd..5ffc4a205258784dd7d6fa4f2db5b17ae8cab900
--- a/Phys/StrippingSelections/python/StrippingSelections/StrippingBnoC/StrippingB2pphh.py
+++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingBnoC/StrippingB2pphh.py
@@ -25,16 +25,13 @@ __all__ = ('B2pphhConf',
            )
 
 
-from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop
+from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
 # from Configurables import DaVinci__N4BodyDecays
 from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays
 
-from StandardParticles import StdAllNoPIDsKaons, StdAllNoPIDsPions, StdAllNoPIDsProtons
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from Configurables import LoKi__VoidFilter as VoidFilter
 
 default_config = {
     'NAME': 'B2pphh',
diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingBnoC/StrippingBc2hhh_BnoC.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingBnoC/StrippingBc2hhh_BnoC.py
index cc0952e7ed4c72dc5b618028ac8bc563928c126d..21b92fa5aab68df4d68f10c50e59c126b546bd31 100644
--- a/Phys/StrippingSelections/python/StrippingSelections/StrippingBnoC/StrippingBc2hhh_BnoC.py
+++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingBnoC/StrippingBc2hhh_BnoC.py
@@ -23,13 +23,11 @@ Exported symbols (use python help!):
    - makeppK_excl  
 '''
 
-from Configurables import LoKi__VoidFilter as VoidFilter
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection
 import StandardParticles
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 __author__ = ['Alvaro Gomes', 'Adlene Hicheur']
 __date__ = '31/08/2014'
 __version__ = '$Revision: 1.5 $'
diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingBnoC/StrippingBs2KKhh.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingBnoC/StrippingBs2KKhh.py
index cc743704a31afe9960dc904fcabf1a694c0af26c..1f66a1746034805023be6fad668962c1444b5bf3 100644
--- a/Phys/StrippingSelections/python/StrippingSelections/StrippingBnoC/StrippingBs2KKhh.py
+++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingBnoC/StrippingBs2KKhh.py
@@ -27,7 +27,6 @@ from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop
-from Gaudi.Configuration import *
 __author__ = ['Sean Benson', 'Adam Morris', 'Laurence Carson']
 __date__ = '22/11/2016'
 __version__ = '3.2'
diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingBnoC/StrippingBs2KSKS_Run2.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingBnoC/StrippingBs2KSKS_Run2.py
index 629ca8140bd72d6380100393e840bf791f2f2cd9..6afaa37fab4f411e76010a848c09d7d72e5a05d9 100644
--- a/Phys/StrippingSelections/python/StrippingSelections/StrippingBnoC/StrippingBs2KSKS_Run2.py
+++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingBnoC/StrippingBs2KSKS_Run2.py
@@ -22,15 +22,11 @@ __date__ = '13/09/2016'
 __version__ = 'Run2'
 __all__ = {'Bs2KSKSConf', 'default_config'}
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
+from PhysSelPython.Wrappers import DataOnDemand, Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 
-from StandardParticles import StdNoPIDsPions as Pions
-from StandardParticles import StdNoPIDsDownPions as DownPions
-
 
 default_config = {
     'NAME': 'Bs2KSKS',
diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingBnoC/StrippingBs2Kst_0Kst_0.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingBnoC/StrippingBs2Kst_0Kst_0.py
index 1792d39779b6c777714cf764c9c63f95a9aa76d3..ada24235be261d5f47f53047325233ba3176b326 100644
--- a/Phys/StrippingSelections/python/StrippingSelections/StrippingBnoC/StrippingBs2Kst_0Kst_0.py
+++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingBnoC/StrippingBs2Kst_0Kst_0.py
@@ -19,11 +19,8 @@ Exported symbols (use python help!):
 
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, SelectionSequence, DataOnDemand
+from PhysSelPython.Wrappers import DataOnDemand, Selection
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-from CommonParticles.Utils import *
-from LHCbKernel.Configuration import *
-from Gaudi.Configuration import *
 __author__ = ['Brais Sanmartin Sedes']
 __date__ = '12/11/2015'
 __version__ = '5.1'
diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingBnoC/StrippingBs2PhiKst0.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingBnoC/StrippingBs2PhiKst0.py
index ceb8daa24373fc0cd210ec42fdbc56fd456f51e4..0c1ff7d620f2ef3058536bb8bbba7bedc35b168a 100644
--- a/Phys/StrippingSelections/python/StrippingSelections/StrippingBnoC/StrippingBs2PhiKst0.py
+++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingBnoC/StrippingBs2PhiKst0.py
@@ -20,11 +20,8 @@ Exported symbols (use python help!):
 
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, SelectionSequence, DataOnDemand
+from PhysSelPython.Wrappers import DataOnDemand, Selection
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-from CommonParticles.Utils import *
-from LHCbKernel.Configuration import *
-from Gaudi.Configuration import *
 __author__ = ['Brais Sanmartin Sedes']
 __date__ = '01/12/2015'
 __version__ = '5.0'
diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingBnoC/StrippingBs2PhiPhi.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingBnoC/StrippingBs2PhiPhi.py
index 0f280a3a06ba478759dc6e19bf80e278c15e5d40..1124dcdfd432c594fe79f1bc1e0b70fc24f9d21f 100644
--- a/Phys/StrippingSelections/python/StrippingSelections/StrippingBnoC/StrippingBs2PhiPhi.py
+++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingBnoC/StrippingBs2PhiPhi.py
@@ -23,13 +23,10 @@ Exports the following stripping lines as instance data members:
 '''
 
 from StandardParticles import StdAllLooseANNKaons as MyLooseKaons
-from StandardParticles import StdLooseANNUpKaons as MyLooseUpKaons
-import StandardParticles
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
+from PhysSelPython.Wrappers import Selection
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 __author__ = ['Sean Benson']
 __date__ = '2013/08/15'
 __version__ = '3.0'
diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingBnoC/StrippingBu2KSh.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingBnoC/StrippingBu2KSh.py
index c20e2b517354f75fd95c5fdb10df32120f6a94ad..19a07b4fb4e96e5bfa5e548af2c1c8fb62036be0 100644
--- a/Phys/StrippingSelections/python/StrippingSelections/StrippingBnoC/StrippingBu2KSh.py
+++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingBnoC/StrippingBu2KSh.py
@@ -23,7 +23,6 @@ __date__ = '16/12/2020'
 __version__ = 'Stripping28'
 __all__ = 'Bu2KShConf'
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
@@ -258,7 +257,7 @@ class Bu2KShConf(LineBuilder):
 
         _massCutLow = "(AM>(5279-%s)*MeV)" % config['B_Mlow']
         _massCutHigh = "(AM<(5279+%s)*MeV)" % config['B_Mhigh']
-        _daugMaxPtIPCut = "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['BDaug_MaxPT_IP']
+        "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['BDaug_MaxPT_IP']
         _daugPtSumCut = "((APT1+APT2)>%s*MeV)" % config['BDaug_DD_PTsum']
 
         _combCuts = _massCutLow
diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingBnoC/StrippingBu2Ksthh.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingBnoC/StrippingBu2Ksthh.py
index 5a06d1502605fd2037a6b16043d5efb150ce86d5..032717bced65040c1e6edaf12520110a1398cd1d 100644
--- a/Phys/StrippingSelections/python/StrippingSelections/StrippingBnoC/StrippingBu2Ksthh.py
+++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingBnoC/StrippingBu2Ksthh.py
@@ -23,7 +23,6 @@ __version__ = 'Stripping26'
 __all__ = {'Bu2KsthhConf',
            'default_config'}
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
@@ -302,7 +301,7 @@ class Bu2KsthhConf(LineBuilder):
         _massCutHigh = "(AM<(5279+%s)*MeV)" % config['B_Mhigh']
         _aptCut = "(APT>%s*MeV)" % config['B_APTmin']
         _daugMedPtCut = "(ANUM(PT>%s*MeV)>=2)" % config['BDaug_MedPT_PT']
-        _daugMaxPtIPCut = "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['BDaug_MaxPT_IP']
+        "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['BDaug_MaxPT_IP']
         _maxDocaChi2Cut = "(ACUTDOCACHI2(%s,''))" % config['BDaug_DD_maxDocaChi2']
         _daugPtSumCut = "((APT1+APT2+APT3)>%s*MeV)" % config['BDaug_DD_PTsum']
 
@@ -359,7 +358,7 @@ class Bu2KsthhConf(LineBuilder):
         _massCutHigh = "(AM<(5279+%s)*MeV)" % config['B_Mhigh']
         _aptCut = "(APT>%s*MeV)" % config['B_APTmin']
         _daugMedPtCut = "(ANUM(PT>%s*MeV)>=2)" % config['BDaug_MedPT_PT']
-        _daugMaxPtIPCut = "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['BDaug_MaxPT_IP']
+        "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['BDaug_MaxPT_IP']
         _maxDocaChi2Cut = "(ACUTDOCACHI2(%s,''))" % config['BDaug_LL_maxDocaChi2']
         _daugPtSumCut = "((APT1+APT2+APT3)>%s*MeV)" % config['BDaug_LL_PTsum']
 
diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingBnoC/StrippingBu2hhh.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingBnoC/StrippingBu2hhh.py
index 890eba4692dbe06517c0d7aee8f51d320cca8a64..62ede4129b7f2bd6ff173b27d26ebf7e47e4e6ea 100644
--- a/Phys/StrippingSelections/python/StrippingSelections/StrippingBnoC/StrippingBu2hhh.py
+++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingBnoC/StrippingBu2hhh.py
@@ -22,13 +22,11 @@ Exported symbols (use python help!):
    - makepph_incl
 '''
 
-from Configurables import LoKi__VoidFilter as VoidFilter
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection
 import StandardParticles
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 __author__ = ['Irina Nasteva', 'Jussara Miranda', 'Alvaro Gomes']
 __date__ = '19/05/2017'
 __version__ = 'Stripping29'
diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingBnoC/StrippingBu2rho0rhoPlus.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingBnoC/StrippingBu2rho0rhoPlus.py
index 6ff36ce6304e5d819eb96fe6ca06587bb1baa6cc..51df1d5067b9100ee67537610b0005b048a5d51f 100644
--- a/Phys/StrippingSelections/python/StrippingSelections/StrippingBnoC/StrippingBu2rho0rhoPlus.py
+++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingBnoC/StrippingBu2rho0rhoPlus.py
@@ -21,7 +21,6 @@ from StrippingUtils.Utils import LineBuilder, checkConfig
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = "Jason E Andrews"
 __date__ = "26/11/2016"
 __version__ = "4.0"
diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingBnoC/StrippingButo5h.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingBnoC/StrippingButo5h.py
index be4eeb8a2dc0617afde7aab5929540d3bc8d05c7..65e1b29f0dde00492a6a5432e53292b9bc4c81a7 100644
--- a/Phys/StrippingSelections/python/StrippingSelections/StrippingBnoC/StrippingButo5h.py
+++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingBnoC/StrippingButo5h.py
@@ -23,13 +23,11 @@ Exported symbols (use python help!):
    - makeppKpipi_excl
 '''
 
-from Configurables import LoKi__VoidFilter as VoidFilter
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection
 import StandardParticles
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 __author__ = ['Luiz Gustavo de Oliveira',
               'Alvaro Gomes', 'Bruno Souza de Paula']
 __date__ = '22/Aug/2014'
diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingBnoC/StrippingD2HHBDT.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingBnoC/StrippingD2HHBDT.py
index 6bee345112d54e258044f31f0e7d809849b112f7..98ef43000bc5732a81fe2e10bace645263334787 100644
--- a/Phys/StrippingSelections/python/StrippingSelections/StrippingBnoC/StrippingD2HHBDT.py
+++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingBnoC/StrippingD2HHBDT.py
@@ -23,14 +23,13 @@ __all__ = ('D2HHBDTLines',
            'makeD2HHBDT',
            'default_config')
 
-from Gaudi.Configuration import *
 
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
 from StandardParticles import StdNoPIDsKaons, StdAllNoPIDsPions
 
 from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
-from StrippingUtils.Utils import LineBuilder, checkConfig
+from StrippingUtils.Utils import LineBuilder
 
 
 default_config = {
diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingBnoC/StrippingHb2Charged2Body.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingBnoC/StrippingHb2Charged2Body.py
index 11da99218434ae71c894fa73b708dca4ee60de5d..3b3424d2fb6688333e151f52793701a7a2c00dbe 100644
--- a/Phys/StrippingSelections/python/StrippingSelections/StrippingBnoC/StrippingHb2Charged2Body.py
+++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingBnoC/StrippingHb2Charged2Body.py
@@ -23,14 +23,13 @@ __all__ = ('Hb2Charged2BodyLines',
            'makeB2Charged2Body',
            'default_config')
 
-from Gaudi.Configuration import *
 
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-from StandardParticles import StdNoPIDsPions, StdLooseProtons, StdLooseKaons
+from StandardParticles import StdNoPIDsPions
 
 from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
-from StrippingUtils.Utils import LineBuilder, checkConfig
+from StrippingUtils.Utils import LineBuilder
 
 
 default_config = {
diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingBnoC/StrippingHb2V0V0h.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingBnoC/StrippingHb2V0V0h.py
index 6b1c9eb94b261dbc185e979f0314ffe2bd69f930..f3104c9b58e73817c70f7fa7e3d68a0b9ecf0860 100644
--- a/Phys/StrippingSelections/python/StrippingSelections/StrippingBnoC/StrippingHb2V0V0h.py
+++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingBnoC/StrippingHb2V0V0h.py
@@ -22,7 +22,6 @@ __date__ = '10/02/2017'
 __version__ = 'Stripping28'
 __all__ = 'Hb2V0V0hConf'
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingBnoC/StrippingLb2V0hh.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingBnoC/StrippingLb2V0hh.py
index f63034e02f45426009146384bed4036d16056a26..e896944db6cf521ad12d86186f9bda930b5bfd87 100644
--- a/Phys/StrippingSelections/python/StrippingSelections/StrippingBnoC/StrippingLb2V0hh.py
+++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingBnoC/StrippingLb2V0hh.py
@@ -25,7 +25,6 @@ __date__ = '11/01/2017'
 __version__ = 'Stripping28'
 __all__ = 'Lb2V0hhConf'
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
@@ -211,8 +210,8 @@ class Lb2V0hhConf(LineBuilder):
         _vtxCut = "(VFASPF(VCHI2)<%s)   " % config['Lambda_DD_VtxChi2']
         _fdChi2Cut = "(BPVVDCHI2>%s)" % config['Lambda_DD_FDChi2']
         _momCut = "(P>%s*MeV)" % config['Lambda_DD_Pmin']
-        _trkGhostProbCut1 = "(CHILDCUT((TRGHOSTPROB<%s),1))" % config['Trk_GhostProb']
-        _trkGhostProbCut2 = "(CHILDCUT((TRGHOSTPROB<%s),2))" % config['Trk_GhostProb']
+        "(CHILDCUT((TRGHOSTPROB<%s),1))" % config['Trk_GhostProb']
+        "(CHILDCUT((TRGHOSTPROB<%s),2))" % config['Trk_GhostProb']
 
         _allCuts = _momCut
         _allCuts += '&'+_massCut
@@ -268,8 +267,8 @@ class Lb2V0hhConf(LineBuilder):
         _vtxCut = "(VFASPF(VCHI2)<%s)   " % config['Lambda_DD_VtxChi2']
         _fdChi2Cut = "(BPVVDCHI2>%s)" % config['Lambda_DD_FDChi2']
         _momCut = "(P>%s*MeV)" % config['Lambda_DD_Pmin']
-        _trkGhostProbCut1 = "(CHILDCUT((TRGHOSTPROB<%s),1))" % config['Trk_GhostProb']
-        _trkGhostProbCut2 = "(CHILDCUT((TRGHOSTPROB<%s),2))" % config['Trk_GhostProb']
+        "(CHILDCUT((TRGHOSTPROB<%s),1))" % config['Trk_GhostProb']
+        "(CHILDCUT((TRGHOSTPROB<%s),2))" % config['Trk_GhostProb']
 
         _allCuts = _momCut
         _allCuts += '&'+_massCut
@@ -302,7 +301,7 @@ class Lb2V0hhConf(LineBuilder):
         _massCutHigh = "(AM<(5619+%s)*MeV)" % config['Lb_2bodyMhigh']
         _aptCut = "(APT>%s*MeV)" % config['Lb_APTmin']
         _daugMedPtCut = "(ANUM(PT>%s*MeV)>=2)" % config['LbDaug_MedPT_PT']
-        _daugMaxPtIPCut = "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP']
+        "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP']
         _maxDocaChi2Cut = "(ACUTDOCACHI2(%s,''))" % config['LbDaug_DD_maxDocaChi2']
         _daugPtSumCut = "(APT1>%s*MeV)" % config['Lbh_DD_PTMin']
 
@@ -353,7 +352,7 @@ class Lb2V0hhConf(LineBuilder):
         _massCutHigh = "(AM<(5619+%s)*MeV)" % config['Lb_Mhigh']
         _aptCut = "(APT>%s*MeV)" % config['Lb_APTmin']
         _daugMedPtCut = "(ANUM(PT>%s*MeV)>=2)" % config['LbDaug_MedPT_PT']
-        _daugMaxPtIPCut = "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP']
+        "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP']
         _maxDocaChi2Cut = "(ACUTDOCACHI2(%s,''))" % config['LbDaug_DD_maxDocaChi2']
         _daugPtSumCut = "((APT1+APT2+APT3)>%s*MeV)" % config['LbDaug_DD_PTsum']
 
@@ -369,7 +368,7 @@ class Lb2V0hhConf(LineBuilder):
         _vtxChi2Cut = "(VFASPF(VCHI2)<%s)" % config['Lb_VtxChi2']
         _diraCut = "(BPVDIRA>%s)" % config['Lb_DD_Dira']
         _ipChi2Cut = "(MIPCHI2DV(PRIMARY)<%s)" % config['Lb_DD_IPCHI2wrtPV']
-        _fdCut = "(VFASPF(VMINVDDV(PRIMARY))>%s)" % config['Lb_FDwrtPV']
+        "(VFASPF(VMINVDDV(PRIMARY))>%s)" % config['Lb_FDwrtPV']
         _fdChi2Cut = "(BPVVDCHI2>%s)" % config['Lb_DD_FDChi2']
 
         _motherCuts = _ptCut
@@ -541,7 +540,7 @@ class Lb2V0hhConf(LineBuilder):
         _massCutHigh = "(AM<(5619+%s)*MeV)" % config['Lb_2bodyMhigh']
         _aptCut = "(APT>%s*MeV)" % config['Lb_APTmin']
         _daugMedPtCut = "(ANUM(PT>%s*MeV)>=2)" % config['LbDaug_MedPT_PT']
-        _daugMaxPtIPCut = "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP']
+        "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP']
         _maxDocaChi2Cut = "(ACUTDOCACHI2(%s,''))" % config['LbDaug_LD_maxDocaChi2']
         _daugPtSumCut = "(APT1>%s*MeV)" % config['Lbh_LD_PTMin']
 
@@ -592,7 +591,7 @@ class Lb2V0hhConf(LineBuilder):
         _massCutHigh = "(AM<(5619+%s)*MeV)" % config['Lb_Mhigh']
         _aptCut = "(APT>%s*MeV)" % config['Lb_APTmin']
         _daugMedPtCut = "(ANUM(PT>%s*MeV)>=2)" % config['LbDaug_MedPT_PT']
-        _daugMaxPtIPCut = "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP']
+        "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP']
         _maxDocaChi2Cut = "(ACUTDOCACHI2(%s,''))" % config['LbDaug_LD_maxDocaChi2']
         _daugPtSumCut = "((APT1+APT2+APT3)>%s*MeV)" % config['LbDaug_LD_PTsum']
 
@@ -608,7 +607,7 @@ class Lb2V0hhConf(LineBuilder):
         _vtxChi2Cut = "(VFASPF(VCHI2)<%s)" % config['Lb_VtxChi2']
         _diraCut = "(BPVDIRA>%s)" % config['Lb_LD_Dira']
         _ipChi2Cut = "(MIPCHI2DV(PRIMARY)<%s)" % config['Lb_LD_IPCHI2wrtPV']
-        _fdCut = "(VFASPF(VMINVDDV(PRIMARY))>%s)" % config['Lb_FDwrtPV']
+        "(VFASPF(VMINVDDV(PRIMARY))>%s)" % config['Lb_FDwrtPV']
         _fdChi2Cut = "(BPVVDCHI2>%s)" % config['Lb_LD_FDChi2']
 
         _motherCuts = _ptCut
diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingBnoC/StrippingLb2V0pp.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingBnoC/StrippingLb2V0pp.py
index d92d1478ca2c73294da21c0b6bc19613f859f611..c412d7f27a1feaee550033f21cd6465948758d57 100644
--- a/Phys/StrippingSelections/python/StrippingSelections/StrippingBnoC/StrippingLb2V0pp.py
+++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingBnoC/StrippingLb2V0pp.py
@@ -24,7 +24,6 @@ __date__ = '06/01/2019'
 __version__ = 'Stripping29r2p1'
 __all__ = 'Lb2V0ppConf'
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
@@ -210,8 +209,8 @@ class Lb2V0ppConf(LineBuilder):
         _vtxCut = "(VFASPF(VCHI2)<%s)   " % config['Lambda_DD_VtxChi2']
         _fdChi2Cut = "(BPVVDCHI2>%s)" % config['Lambda_DD_FDChi2']
         _momCut = "(P>%s*MeV)" % config['Lambda_DD_Pmin']
-        _trkGhostProbCut1 = "(CHILDCUT((TRGHOSTPROB<%s),1))" % config['Trk_GhostProb']
-        _trkGhostProbCut2 = "(CHILDCUT((TRGHOSTPROB<%s),2))" % config['Trk_GhostProb']
+        "(CHILDCUT((TRGHOSTPROB<%s),1))" % config['Trk_GhostProb']
+        "(CHILDCUT((TRGHOSTPROB<%s),2))" % config['Trk_GhostProb']
 
         _allCuts = _momCut
         _allCuts += '&'+_massCut
@@ -266,8 +265,8 @@ class Lb2V0ppConf(LineBuilder):
         _vtxCut = "(VFASPF(VCHI2)<%s)   " % config['Lambda_DD_VtxChi2']
         _fdChi2Cut = "(BPVVDCHI2>%s)" % config['Lambda_DD_FDChi2']
         _momCut = "(P>%s*MeV)" % config['Lambda_DD_Pmin']
-        _trkGhostProbCut1 = "(CHILDCUT((TRGHOSTPROB<%s),1))" % config['Trk_GhostProb']
-        _trkGhostProbCut2 = "(CHILDCUT((TRGHOSTPROB<%s),2))" % config['Trk_GhostProb']
+        "(CHILDCUT((TRGHOSTPROB<%s),1))" % config['Trk_GhostProb']
+        "(CHILDCUT((TRGHOSTPROB<%s),2))" % config['Trk_GhostProb']
 
         _allCuts = _momCut
         _allCuts += '&'+_massCut
@@ -300,7 +299,7 @@ class Lb2V0ppConf(LineBuilder):
         _massCutHigh = "(AM<(5619+%s)*MeV)" % config['Lb_2bodyMhigh']
         _aptCut = "(APT>%s*MeV)" % config['Lb_APTmin']
         _daugMedPtCut = "(ANUM(PT>%s*MeV)>=2)" % config['LbDaug_MedPT_PT']
-        _daugMaxPtIPCut = "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP']
+        "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP']
         _maxDocaChi2Cut = "(ACUTDOCACHI2(%s,''))" % config['LbDaug_DD_maxDocaChi2']
         _daugPtSumCut = "(APT1>%s*MeV)" % config['Lbh_DD_PTMin']
 
@@ -351,7 +350,7 @@ class Lb2V0ppConf(LineBuilder):
         _massCutHigh = "(AM<(5619+%s)*MeV)" % config['Lb_Mhigh']
         _aptCut = "(APT>%s*MeV)" % config['Lb_APTmin']
         _daugMedPtCut = "(ANUM(PT>%s*MeV)>=2)" % config['LbDaug_MedPT_PT']
-        _daugMaxPtIPCut = "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP']
+        "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP']
         _maxDocaChi2Cut = "(ACUTDOCACHI2(%s,''))" % config['LbDaug_DD_maxDocaChi2']
         _daugPtSumCut = "((APT1+APT2+APT3)>%s*MeV)" % config['LbDaug_DD_PTsum']
 
@@ -540,7 +539,7 @@ class Lb2V0ppConf(LineBuilder):
         _massCutHigh = "(AM<(5619+%s)*MeV)" % config['Lb_2bodyMhigh']
         _aptCut = "(APT>%s*MeV)" % config['Lb_APTmin']
         _daugMedPtCut = "(ANUM(PT>%s*MeV)>=2)" % config['LbDaug_MedPT_PT']
-        _daugMaxPtIPCut = "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP']
+        "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP']
         _maxDocaChi2Cut = "(ACUTDOCACHI2(%s,''))" % config['LbDaug_LD_maxDocaChi2']
         _daugPtSumCut = "(APT1>%s*MeV)" % config['Lbh_LD_PTMin']
 
@@ -591,7 +590,7 @@ class Lb2V0ppConf(LineBuilder):
         _massCutHigh = "(AM<(5619+%s)*MeV)" % config['Lb_Mhigh']
         _aptCut = "(APT>%s*MeV)" % config['Lb_APTmin']
         _daugMedPtCut = "(ANUM(PT>%s*MeV)>=2)" % config['LbDaug_MedPT_PT']
-        _daugMaxPtIPCut = "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP']
+        "(AVAL_MAX(MIPDV(PRIMARY),PT)>%s)" % config['LbDaug_MaxPT_IP']
         _maxDocaChi2Cut = "(ACUTDOCACHI2(%s,''))" % config['LbDaug_LD_maxDocaChi2']
         _daugPtSumCut = "((APT1+APT2+APT3)>%s*MeV)" % config['LbDaug_LD_PTsum']
 
@@ -607,7 +606,7 @@ class Lb2V0ppConf(LineBuilder):
         _vtxChi2Cut = "(VFASPF(VCHI2)<%s)" % config['Lb_VtxChi2']
         _diraCut = "(BPVDIRA>%s)" % config['Lb_LD_Dira']
         _ipChi2Cut = "(MIPCHI2DV(PRIMARY)<%s)" % config['Lb_LD_IPCHI2wrtPV']
-        _fdCut = "(VFASPF(VMINVDDV(PRIMARY))>%s)" % config['Lb_FDwrtPV']
+        "(VFASPF(VMINVDDV(PRIMARY))>%s)" % config['Lb_FDwrtPV']
         _fdChi2Cut = "(BPVVDCHI2>%s)" % config['Lb_LD_FDChi2']
 
         _motherCuts = _ptCut
diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingBnoC/StrippingXb23ph.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingBnoC/StrippingXb23ph.py
index 44ba838d436b418c4eaef7372eccd95c28426134..ef24837631cfc50b46aabe0cc7dba0c8cdeb66fd 100644
--- a/Phys/StrippingSelections/python/StrippingSelections/StrippingBnoC/StrippingXb23ph.py
+++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingBnoC/StrippingXb23ph.py
@@ -22,7 +22,6 @@ from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, DaVinci__N4Body
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection
-from Gaudi.Configuration import *
 __author__ = ['Jinlin Fu', 'Maurizio Martinelli', 'Andrea Merli']
 __date__ = '12/11/2015'
 __version__ = 'v1r0'
diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingBnoC/StrippingXb2p3h.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingBnoC/StrippingXb2p3h.py
index d07d7e52c17b8a01201968b3a1b929751c31bc9d..2c10d1f20bf15892c5e8ef6a5861130250a0a8ae 100644
--- a/Phys/StrippingSelections/python/StrippingSelections/StrippingBnoC/StrippingXb2p3h.py
+++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingBnoC/StrippingXb2p3h.py
@@ -22,7 +22,6 @@ from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, DaVinci__N4Body
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection
-from Gaudi.Configuration import *
 __author__ = ['Jan Mickelle V. Maratas', 'Stephane Monteil', 'Andrea Merli']
 __date__ = '01/04/2016'
 __version__ = 'v1r0'
diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingBnoC/StrippingXb2p3h_raw.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingBnoC/StrippingXb2p3h_raw.py
index 54b56a99649dbbae2fa5505485204b16e7c17175..7b8a9c8dd3a6a8c7980cb3157c119b8bb1331c8c 100644
--- a/Phys/StrippingSelections/python/StrippingSelections/StrippingBnoC/StrippingXb2p3h_raw.py
+++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingBnoC/StrippingXb2p3h_raw.py
@@ -27,7 +27,6 @@ from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, DaVinci__N4Body
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection
-from Gaudi.Configuration import *
 __author__ = ['Gediminas Sarpis', 'Hendrik Jage']
 __date__ = '06/04/2021'
 __version__ = 'v1r0'
diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingBnoC/StrippingXb2phh.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingBnoC/StrippingXb2phh.py
index ae62ac803dcda11696229820fa7bcb3737c75114..35432dcb4a93cdbf47f1ec738735037534d82c07 100644
--- a/Phys/StrippingSelections/python/StrippingSelections/StrippingBnoC/StrippingXb2phh.py
+++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingBnoC/StrippingXb2phh.py
@@ -22,7 +22,6 @@ from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, DaVinci__N3Body
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection
-from Gaudi.Configuration import *
 __author__ = ['Jan Mickelle V. Maratas', 'Stephane Monteil', 'Thomas Latham']
 __date__ = '24/11/2016'
 __version__ = 'v1r0'
diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingBnoC/StrippingXib2LbXLb2ph.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingBnoC/StrippingXib2LbXLb2ph.py
index 2f1d600f02b741a026b3e2f28b3f1017b3d73a94..6f8394542abca63eac6f7c229f3b310eaa651423 100644
--- a/Phys/StrippingSelections/python/StrippingSelections/StrippingBnoC/StrippingXib2LbXLb2ph.py
+++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingBnoC/StrippingXib2LbXLb2ph.py
@@ -21,7 +21,6 @@ __version__ = "1.0"
 __all__ = ("Xib2LbXLb2phLines",
            "default_config")
 
-from Gaudi.Configuration import *
 
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop
 from StandardParticles import (StdAllNoPIDsPions,
@@ -30,7 +29,7 @@ from StandardParticles import (StdAllNoPIDsPions,
 
 from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
-from StrippingUtils.Utils import LineBuilder, checkConfig
+from StrippingUtils.Utils import LineBuilder
 
 
 default_config = {
diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingCalib/StrippingCharmFromBSemiForHadronAsy.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingCalib/StrippingCharmFromBSemiForHadronAsy.py
index c458c3e6c38ed0b1337c2e69289afaa140b1e0f3..98fad852e24de6fd9dc371c05e6185a34f3863c8 100644
--- a/Phys/StrippingSelections/python/StrippingSelections/StrippingCalib/StrippingCharmFromBSemiForHadronAsy.py
+++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingCalib/StrippingCharmFromBSemiForHadronAsy.py
@@ -19,14 +19,12 @@ __author__ = ['Mika Vesterinen']
 __date__ = '10/03/2013'
 __version__ = '$Revision: 0.0 $'
 
-from Gaudi.Configuration import *
 
 from Configurables import FilterDesktop, CombineParticles
 from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from StandardParticles import StdAllLoosePions, StdLoosePions, StdLooseMuons, StdLooseKaons, StdLooseProtons
-from Configurables import TisTosParticleTagger
+from StandardParticles import StdLooseKaons, StdLooseMuons, StdLoosePions
 
 __all__ = ('CharmFromBSemiForHadronAsyAllLinesConf',
            'TOSFilter',
diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingCalib/StrippingCharmFromBSemiForProtonPID.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingCalib/StrippingCharmFromBSemiForProtonPID.py
index 6c6f284aa3e1a4515a633a71cb0e569c1bd4ad6f..4afa986a85d324f44e240132151f3ef9c83846fe 100644
--- a/Phys/StrippingSelections/python/StrippingSelections/StrippingCalib/StrippingCharmFromBSemiForProtonPID.py
+++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingCalib/StrippingCharmFromBSemiForProtonPID.py
@@ -18,12 +18,11 @@ __author__ = ['Mika Vesterinen']
 __date__ = '19/03/2013'
 __version__ = '$Revision: 0.0 $'
 
-from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from StandardParticles import StdLoosePions, StdLooseMuons, StdLooseKaons, StdLooseProtons, StdNoPIDsProtons
+from StandardParticles import StdLooseKaons, StdLooseMuons, StdLoosePions, StdNoPIDsProtons
 
 __all__ = ('CharmFromBSemiForProtonPIDAllLinesConf',
            'default_config')
diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingCalib/StrippingD02KPiPi0.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingCalib/StrippingD02KPiPi0.py
index b8f25c6552ad8b11e685418ec13a2ac622d2bef8..7fd939520aebcb1dc21eb98628f0836710acb20c 100644
--- a/Phys/StrippingSelections/python/StrippingSelections/StrippingCalib/StrippingD02KPiPi0.py
+++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingCalib/StrippingD02KPiPi0.py
@@ -25,9 +25,8 @@ __all__ = ('StrippingD02KPiPi0Conf',
            'makeD02KPiPi0M',
            'default_config')
 
-from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from PhysSelPython.Wrappers import Selection, DataOnDemand
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
+from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from StandardParticles import StdTightPions, StdTightKaons, StdLooseMergedPi0, StdLooseResolvedPi0
diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingCalib/StrippingD02KPiPi0DalitzPartReco.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingCalib/StrippingD02KPiPi0DalitzPartReco.py
index ac92a6c8cd5234f3436c2a8b2ed17b8fbf90700a..c14b9b11f394fd5c53a93657f063a53eb32b8e66 100644
--- a/Phys/StrippingSelections/python/StrippingSelections/StrippingCalib/StrippingD02KPiPi0DalitzPartReco.py
+++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingCalib/StrippingD02KPiPi0DalitzPartReco.py
@@ -8,9 +8,7 @@
 # granted to it by virtue of its status as an Intergovernmental Organization  #
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
-import logging
 from StrippingUtils.Utils import LineBuilder
-from Gaudi.Configuration import *
 __author__ = ['Greg Ciezarek', 'Liang Sun', 'Adam Davis']
 __date__ = '18/05/2017'
 __version__ = '$Revision: 0.01 $'
@@ -75,7 +73,6 @@ class D2KPiPi0_PartRecoBuilder(LineBuilder):
     def __init__(self, name, config):
         LineBuilder.__init__(self, name, config)
         self._config = config
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
 
         # self.GECs = { "Code":"( recSummaryTrack(LHCb.RecSummary.nLongTracks, TrLONG) < %(GEC_nLongTrk)s )" % config,
         #              "Preambulo": ["from LoKiTracks.decorators import *"]}
diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingCalib/StrippingD02KPiPi0ForPid.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingCalib/StrippingD02KPiPi0ForPid.py
index 6f502e7b92276310034a27e5fd188203063b8350..1f1c5f4a96bfdb04ae00ab2d5fb2184b92015419 100644
--- a/Phys/StrippingSelections/python/StrippingSelections/StrippingCalib/StrippingD02KPiPi0ForPid.py
+++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingCalib/StrippingD02KPiPi0ForPid.py
@@ -26,9 +26,8 @@ __all__ = ('StrippingD02KPiPi0ForPidConf',
            'makeD02KPiPi0R',
            'default_config')
 
-from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from PhysSelPython.Wrappers import Selection, DataOnDemand
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
+from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from StandardParticles import StdTightPions, StdTightKaons, StdLoosePi02gg
diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingCalib/StrippingD0ForBXX.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingCalib/StrippingD0ForBXX.py
index bd7db7dbc518eb886e4f9c11699b772d11dd126b..b5eea4d7cb0b283585ff2aa80e59a84aa67c7051 100644
--- a/Phys/StrippingSelections/python/StrippingSelections/StrippingCalib/StrippingD0ForBXX.py
+++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingCalib/StrippingD0ForBXX.py
@@ -20,7 +20,7 @@ from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from StandardParticles import StdLoosePions, StdLooseKaons, StdLooseProtons, StdAllLoosePions
+from StandardParticles import StdAllLoosePions, StdLooseKaons, StdLoosePions
 
 
 name = 'confD0forBXX'
diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingCalib/StrippingDst2D0Pi.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingCalib/StrippingDst2D0Pi.py
index 358d6686a90229ac8215c49a120d8d39a24f3782..950314e237b7c1d7dce7b114455055e68e74337a 100644
--- a/Phys/StrippingSelections/python/StrippingSelections/StrippingCalib/StrippingDst2D0Pi.py
+++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingCalib/StrippingDst2D0Pi.py
@@ -40,9 +40,8 @@ __all__ = ('StrippingDst2D0PiConf',
            'makeDst2D0Pi',
            'default_config')
 
-from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from PhysSelPython.Wrappers import Selection, DataOnDemand
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
+from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from StandardParticles import StdTightPions, StdTightKaons, StdLooseAllPhotons, StdNoPIDsPions, StdLooseEta2gg, StdLoosePi02gg
diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingCalib/StrippingDstarD02hhPi0PartRecoForPhotonCalib.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingCalib/StrippingDstarD02hhPi0PartRecoForPhotonCalib.py
index c047319a0d29671f7d4c7014634dc5022216c4b1..64e2e664295d9a3c9a8838dc88b17ef52239465f 100644
--- a/Phys/StrippingSelections/python/StrippingSelections/StrippingCalib/StrippingDstarD02hhPi0PartRecoForPhotonCalib.py
+++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingCalib/StrippingDstarD02hhPi0PartRecoForPhotonCalib.py
@@ -33,15 +33,15 @@ from Gaudi.Configuration import *
 
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 from StandardParticles import StdAllNoPIDsPions, StdNoPIDsPions, StdNoPIDsKaons
-from StandardParticles import StdLooseAllPhotons, StdLooseResolvedPi0, StdLooseMergedPi0
+from StandardParticles import StdLooseAllPhotons
 
 from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
-from StrippingUtils.Utils import LineBuilder, checkConfig
+from StrippingUtils.Utils import LineBuilder
 
 from Configurables import FilterDesktop
 
-from GaudiKernel.SystemOfUnits import GeV, MeV, picosecond, mm
+from GaudiKernel.SystemOfUnits import GeV, MeV, picosecond
 
 default_config = {
     'NAME': 'DstarD2hhGammaCalib',
diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingCalib/StrippingElectronID.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingCalib/StrippingElectronID.py
index 72e0b978a3903918cb2e81036f8a3395dc92c2ac..56eb58e212609824a2c911d14ada1ceb27e0fc98 100644
--- a/Phys/StrippingSelections/python/StrippingSelections/StrippingCalib/StrippingElectronID.py
+++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingCalib/StrippingElectronID.py
@@ -23,9 +23,8 @@ stream.appendLines( [
 
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand
+from PhysSelPython.Wrappers import Selection
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = ['Jibo He', 'Vitalii Lisovskyi']
 __date__ = '21/06/2021'
 __version__ = '$Revision: 1.2 $'
diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingCalib/StrippingElectronRecoEff.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingCalib/StrippingElectronRecoEff.py
index c19ff961c1db5ef3bfbfb03a4d9133a4c8888bdf..bdb2892004f5f8e6c93bb551bb939895eca5eb63 100644
--- a/Phys/StrippingSelections/python/StrippingSelections/StrippingCalib/StrippingElectronRecoEff.py
+++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingCalib/StrippingElectronRecoEff.py
@@ -17,17 +17,15 @@ from StandardParticles import StdAllLoosePions as Hlt2Pions
 from StandardParticles import StdAllLooseKaons as Hlt2Kaons
 from StandardParticles import StdNoPIDsElectrons as Hlt2Electrons
 from StandardParticles import StdNoPIDsMuons as Hlt2Muons
-from TrackFitter.ConfiguredFitters import (ConfiguredEventFitter,
-                                           ConfiguredForwardStraightLineEventFitter)
+from TrackFitter.ConfiguredFitters import ConfiguredEventFitter
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import DataOnDemand, MergedSelection
 from PhysConf.Selections import L0TOSSelection
 from PhysConf.Selections import Hlt1TOSSelection
 from PhysConf.Selections import Hlt2TOSSelection
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 from StrippingUtils.Utils import LineBuilder
-from GaudiKernel.SystemOfUnits import GeV, MeV, mm
+from GaudiKernel.SystemOfUnits import MeV, mm
 from Gaudi.Configuration import *
 __author__ = ['Adam Davis', 'Laurent Dufour', 'V. V. Gligorov']
 __date__ = '14/1/2018'
@@ -45,10 +43,9 @@ from PhysSelPython.Wrappers import Selection, Hlt1Selection, Hlt2Selection, L0Se
 from SelPy.utils import (UniquelyNamedObject,
                          ClonableObject,
                          SelectionBase)
-from Configurables import (DecodeVeloRawBuffer, FastVeloTracking, TrackPrepareVelo,
-                           NoPIDsParticleMaker, DataOnDemandSvc, ChargedProtoParticleMaker,
-                           PrTrackAssociator, DelegatingTrackSelector, TrackContainerCopy, TrackAssociator,
-                           TrackStateInitAlg, TrackStateInitTool)
+from Configurables import (FastVeloTracking, NoPIDsParticleMaker, DataOnDemandSvc,
+                           ChargedProtoParticleMaker, DelegatingTrackSelector, TrackContainerCopy,
+                           TrackStateInitAlg)
 
 default_config = {'NAME': 'ElectronRecoEff',
                   'WGs': ['Calib'],
@@ -287,7 +284,6 @@ class StrippingElectronRecoEffLines(LineBuilder):
     def __init__(self, name, config):
         LineBuilder.__init__(self, name, config)
 
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
         self._config = config
         self.name = name
 
@@ -571,7 +567,7 @@ class StrippingElectronRecoEffLines(LineBuilder):
         )
 
     def DetachedEEKPair(self, _name):
-        configuration = self._config["DetachedEEK"]
+        self._config["DetachedEEK"]
 
         _DetachedEEKPair = self.getCPForEEK("DetachedEEK")
         _DetachedEEKPair_Sel = Selection("SelEEK_for_"+_name,
@@ -591,7 +587,7 @@ class StrippingElectronRecoEffLines(LineBuilder):
         return line
 
     def DetachedEEKstarPair(self, _name):
-        configuration = self._config["DetachedEEKstar"]
+        self._config["DetachedEEKstar"]
 
         _DetachedEEKstarPair = self.getCPForEEK("DetachedEEKstar")
         _DetachedEEKstarPair_Sel = Selection("SelEEKstar_for_"+_name,
@@ -611,7 +607,7 @@ class StrippingElectronRecoEffLines(LineBuilder):
         return line
 
     def DetachedEEPhiPair(self, _name):
-        configuration = self._config["DetachedEEPhi"]
+        self._config["DetachedEEPhi"]
 
         _DetachedEEPhiPair = self.getCPForEEK("DetachedEEPhi")
         _DetachedEEPhiPair_Sel = Selection("SelEEPhi_for_"+_name,
@@ -882,7 +878,6 @@ class StrippingElectronRecoEffLines(LineBuilder):
     def MakeVeloTracks(self, prefilter):
         if self._config["DoVeloDecoding"]:
             from DAQSys.Decoders import DecoderDB
-            from DAQSys.DecoderClass import decodersForBank
             decs = []
             vdec = DecoderDB["DecodeVeloRawBuffer/createBothVeloClusters"]
             vdec.Active = True
diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingCalib/StrippingEta2MuMuGamma.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingCalib/StrippingEta2MuMuGamma.py
index d630ed353d2eb2d94d19a56b244c69c9caf27e10..be5c53aa3ff42aae5af4ba267827e15e06181149 100644
--- a/Phys/StrippingSelections/python/StrippingSelections/StrippingCalib/StrippingEta2MuMuGamma.py
+++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingCalib/StrippingEta2MuMuGamma.py
@@ -25,12 +25,10 @@ __all__ = ('StrippingEta2MuMuGammaConf',
            'makeMuMuGamma',
            'default_config')
 
-from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from PhysSelPython.Wrappers import Selection, DataOnDemand
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
+from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from StandardParticles import StdTightPions, StdTightKaons, StdLooseAllPhotons, StdNoPIDsPions, StdLooseEta2gg
 from StandardParticles import StdAllLooseGammaDD, StdAllLooseGammaLL, StdAllLooseMuons
 
 default_config = {
diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingCalib/StrippingJPsiForSL.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingCalib/StrippingJPsiForSL.py
index 66d3cf569e7e3d642fb1e90689c09009970a9f91..f83a469f0d79f559f3b8f1ce7fa0a29617c07287 100644
--- a/Phys/StrippingSelections/python/StrippingSelections/StrippingCalib/StrippingJPsiForSL.py
+++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingCalib/StrippingJPsiForSL.py
@@ -20,11 +20,10 @@ __version__ = '$Revision: 0.1 $'
 
 from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from PhysSelPython.Wrappers import Selection, DataOnDemand
+from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from StandardParticles import StdLoosePions, StdLooseMuons, StdLooseKaons, StdLooseProtons, StdNoPIDsPions, StdNoPIDsMuons, StdLooseMergedPi0, StdLooseResolvedPi0, StdLooseElectrons, StdNoPIDsKaons
-from Configurables import TisTosParticleTagger
+from StandardParticles import StdNoPIDsKaons, StdNoPIDsMuons
 
 __all__ = ('JPsiForSLAllLinesConf',
            'confdict')
diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingCalib/StrippingK23PiForDownstreamTrackEff.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingCalib/StrippingK23PiForDownstreamTrackEff.py
index 5e95ecb40bf4a7b0d570152c6cb5a85c2e157431..9ea071dc760c1a4d2e8adb1bd47ddd464f85a7d1 100644
--- a/Phys/StrippingSelections/python/StrippingSelections/StrippingCalib/StrippingK23PiForDownstreamTrackEff.py
+++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingCalib/StrippingK23PiForDownstreamTrackEff.py
@@ -14,10 +14,6 @@ one missing pion, using the corrected mass
 '''
 
 from StrippingUtils.Utils import LineBuilder
-from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = ['Michel De Cian']
 __date__ = '19/12/2018'
 __version__ = '$Revision: 1.0 $'
@@ -269,8 +265,8 @@ class K23PiForDownstreamTrackEffConf(LineBuilder):
         if self._dipionSelSSNarrowDownstream is not None:
             return self._dipionSelSSNarrowDownstream
 
-        from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
+        from GaudiConfUtils.ConfigurableGenerators import CombineParticles
+        from PhysSelPython.Wrappers import Selection
 
         _k2pipi = CombineParticles(
             DecayDescriptors=["[phi(1020) -> pi+ pi+]cc"],
@@ -293,8 +289,8 @@ class K23PiForDownstreamTrackEffConf(LineBuilder):
         if self._dipionSelSSNarrowLong is not None:
             return self._dipionSelSSNarrowLong
 
-        from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
+        from GaudiConfUtils.ConfigurableGenerators import CombineParticles
+        from PhysSelPython.Wrappers import Selection
 
         _k2pipi = CombineParticles(
             DecayDescriptors=["[phi(1020) -> pi+ pi+]cc"],
@@ -317,8 +313,8 @@ class K23PiForDownstreamTrackEffConf(LineBuilder):
         if self._dipionSelSSWide is not None:
             return self._dipionSelSSWide
 
-        from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
+        from GaudiConfUtils.ConfigurableGenerators import CombineParticles
+        from PhysSelPython.Wrappers import Selection
 
         _k2pipi = CombineParticles(
             DecayDescriptors=["[phi(1020) -> pi+ pi+]cc"],
@@ -342,8 +338,8 @@ class K23PiForDownstreamTrackEffConf(LineBuilder):
         if self._dipionSelOSNarrowDownstream is not None:
             return self._dipionSelOSNarrowDownstream
 
-        from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
+        from GaudiConfUtils.ConfigurableGenerators import CombineParticles
+        from PhysSelPython.Wrappers import Selection
 
         # Cut out the Kshort
         mCut = self._dipionSelectionNarrow() + " & (ADMASS('KS0') > 40)"
@@ -370,8 +366,8 @@ class K23PiForDownstreamTrackEffConf(LineBuilder):
         if self._dipionSelOSNarrowLong is not None:
             return self._dipionSelOSNarrowLong
 
-        from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
+        from GaudiConfUtils.ConfigurableGenerators import CombineParticles
+        from PhysSelPython.Wrappers import Selection
 
         # Cut out the Kshort
         mCut = self._dipionSelectionNarrow() + " & (ADMASS('KS0') > 40)"
@@ -398,8 +394,8 @@ class K23PiForDownstreamTrackEffConf(LineBuilder):
         if self._dipionSelOSWide is not None:
             return self._dipionSelOSWide
 
-        from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
+        from GaudiConfUtils.ConfigurableGenerators import CombineParticles
+        from PhysSelPython.Wrappers import Selection
 
         # Cut out the Kshort
         mCut = self._dipionSelectionWide() + " & (ADMASS('KS0') > 40)"
@@ -427,8 +423,8 @@ class K23PiForDownstreamTrackEffConf(LineBuilder):
         # if self._tripionSelDipionSS is not None:
         #   return self._tripionSelDipionSS
 
-        from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
+        from GaudiConfUtils.ConfigurableGenerators import CombineParticles
+        from PhysSelPython.Wrappers import Selection
 
         _k2pipipi = CombineParticles(
             DecayDescriptors=["[K+ -> phi(1020) pi-]cc"],
@@ -449,8 +445,8 @@ class K23PiForDownstreamTrackEffConf(LineBuilder):
         # if self._tripionSelDipionOS is not None:
         #   return self._tripionSelDipionOS
 
-        from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
+        from GaudiConfUtils.ConfigurableGenerators import CombineParticles
+        from PhysSelPython.Wrappers import Selection
 
         _k2pipipi = CombineParticles(
             DecayDescriptors=["[K+ -> phi(1020) pi+]cc"],
diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingCalib/StrippingLowPtMuID.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingCalib/StrippingLowPtMuID.py
index e464daa38af084e2fe15b4361cf28811d5f35524..3d23ab459b03643fbc73c746b15dc3c53ffa71ed 100644
--- a/Phys/StrippingSelections/python/StrippingSelections/StrippingCalib/StrippingLowPtMuID.py
+++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingCalib/StrippingLowPtMuID.py
@@ -19,12 +19,9 @@ largely cloned from line written by 'S.Furcas', 'G.Lanfranchi', 'M.Palutan', 'A.
 
 from StandardParticles import StdAllNoPIDsMuons
 from StrippingUtils.Utils import LineBuilder
-from Configurables import LoKi__Hybrid__CoreFactory as CoreFactory
-from Configurables import LoKi__VoidFilter as VoidFilter
-from PhysSelPython.Wrappers import DataOnDemand, Selection, SelectionSequence, MergedSelection
+from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 __author__ = ['G.Ciezarek', ]
 __date__ = '03/12/2015'
 __version__ = '$Revision: 1.0 $'
diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingCalib/StrippingMuIDCalib.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingCalib/StrippingMuIDCalib.py
index fa526c7de7798e9c785db1267e66b84f2fbda70c..5315ade7f441c7b2d725f402698ad8b2e8264931 100644
--- a/Phys/StrippingSelections/python/StrippingSelections/StrippingCalib/StrippingMuIDCalib.py
+++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingCalib/StrippingMuIDCalib.py
@@ -22,15 +22,12 @@ lb = builder( 'MuIDCalib', config_params )
 
 '''
 
-from StandardParticles import StdAllNoPIDsKaons, StdAllNoPIDsMuons, StdAllNoPIDsPions, StdAllNoPIDsProtons
+from StandardParticles import StdAllNoPIDsMuons
 from StandardParticles import StdNoPIDsKaons, StdNoPIDsMuons, StdNoPIDsPions, StdNoPIDsProtons
 from StrippingUtils.Utils import LineBuilder
-from Configurables import LoKi__Hybrid__CoreFactory as CoreFactory
-from Configurables import LoKi__VoidFilter as VoidFilter
-from PhysSelPython.Wrappers import DataOnDemand, Selection, SelectionSequence, MergedSelection
+from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 __author__ = ['S.Furcas', 'G.Lanfranchi',
               'M.Palutan', 'A.Sarti', 'D.Milanes', 'MuID Team']
 __date__ = '23/08/2011'
diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingCalib/StrippingNoPIDDstarWithD02RSKPi.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingCalib/StrippingNoPIDDstarWithD02RSKPi.py
index d2de08dbec94193a1a842401d5c2bbf7cb15672f..a43c58f879dc5fbfd3c8f5d9c3709d83caba97d9 100644
--- a/Phys/StrippingSelections/python/StrippingSelections/StrippingCalib/StrippingNoPIDDstarWithD02RSKPi.py
+++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingCalib/StrippingNoPIDDstarWithD02RSKPi.py
@@ -13,10 +13,8 @@
 from StandardParticles import StdAllNoPIDsKaons, StdAllNoPIDsPions
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from LHCbKernel.Configuration import *
-from Gaudi.Configuration import *
+from PhysSelPython.Wrappers import Selection
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 __author__ = ['Philip Xing', 'Andrew Powell']
 __date__ = '23rd August 2012'
 __version__ = '$Revision: 7.0 $'
@@ -29,7 +27,7 @@ Configurable for the RICH calibration using D*+ -> pi+ D0( K- pi+).
 __all__ = ('NoPIDDstarWithD02RSKPiConf', 'default_config')
 
 
-from GaudiKernel.SystemOfUnits import mm, cm, MeV, GeV
+from GaudiKernel.SystemOfUnits import GeV, MeV
 # from Configurables import FilterDesktop, CombineParticles
 
 
diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingCalib/StrippingNoPIDDstarWithD02RSKPi_Brem.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingCalib/StrippingNoPIDDstarWithD02RSKPi_Brem.py
index 23bbe71b41d1702d6293e9593e02c6febd2218b4..9232160ade3bbee50b593bf6d6993a3bfd5989ad 100644
--- a/Phys/StrippingSelections/python/StrippingSelections/StrippingCalib/StrippingNoPIDDstarWithD02RSKPi_Brem.py
+++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingCalib/StrippingNoPIDDstarWithD02RSKPi_Brem.py
@@ -10,15 +10,12 @@
 ###############################################################################
 
 from CommonParticles.Utils import trackSelector, updateDoD
-from Configurables import NoPIDsParticleMaker, CombinedParticleMaker
-from Gaudi.Configuration import *
+from Configurables import NoPIDsParticleMaker
 from StandardParticles import StdAllNoPIDsKaons, StdAllNoPIDsPions, StdAllNoPIDsElectrons
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand, AutomaticData
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from LHCbKernel.Configuration import *
-from Gaudi.Configuration import *
+from PhysSelPython.Wrappers import AutomaticData, Selection
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 __author__ = 'Vitalii Lisovskyi'
 __date__ = '15/03/2021'
 __version__ = '$Revision: 0.0 $'
@@ -29,7 +26,7 @@ Configurable for the RICH calibration using D*+ -> pi+ D0( K- pi+) for hadron->e
 '''
 
 
-from GaudiKernel.SystemOfUnits import mm, cm, MeV, GeV
+from GaudiKernel.SystemOfUnits import GeV, MeV
 # from Configurables import FilterDesktop, CombineParticles
 
 
@@ -649,7 +646,7 @@ def brempion_PMaker(name,
                                        Particle='pion')
     algorithm_pi.AddBremPhotonTo = ['pi+']
     # configure the track selector
-    selector_pi = trackSelector(algorithm_pi)
+    trackSelector(algorithm_pi)
     # configure Data-On-Demand service
     updateDoD(algorithm_pi)
     # finally: define the symbol
@@ -694,7 +691,7 @@ def bremkaon_PMaker(name,
                                       Particle='kaon')
     algorithm_K.AddBremPhotonTo = ['K+']
     # configure the track selector
-    selector_K = trackSelector(algorithm_K)
+    trackSelector(algorithm_K)
     # configure Data-On-Demand service
     updateDoD(algorithm_K)
     # finally: define the symbol
diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingCalib/StrippingPIDCalib.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingCalib/StrippingPIDCalib.py
index e82b56942c59e477e1ffb32c01de970afd9167d4..e6940ae61dbda7b537d24906799f4de48712e814 100644
--- a/Phys/StrippingSelections/python/StrippingSelections/StrippingCalib/StrippingPIDCalib.py
+++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingCalib/StrippingPIDCalib.py
@@ -35,9 +35,7 @@ from Configurables import DaVinci__N3BodyDecays
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
 from Configurables import CombineParticles
-from Gaudi.Configuration import *
 __author__ = ['Lucio Anderlini']
 __date__ = '25/02/2015'
 __version__ = '$Revision: 1.0 $'
diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingCalib/StrippingTrackEffD0ToKPi.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingCalib/StrippingTrackEffD0ToKPi.py
index c9b3c9d601a65f088de7340302fbce473317e417..ee9bc7b3c33e1df66f060255828429ab64903996 100644
--- a/Phys/StrippingSelections/python/StrippingSelections/StrippingCalib/StrippingTrackEffD0ToKPi.py
+++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingCalib/StrippingTrackEffD0ToKPi.py
@@ -17,7 +17,7 @@ from Configurables import FilterDesktop, CombineParticles
 from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from StandardParticles import StdLooseKaons, StdLoosePions, StdAllLoosePions, StdAllNoPIDsPions
+from StandardParticles import StdAllLoosePions, StdLooseKaons, StdLoosePions
 from SelPy.utils import (UniquelyNamedObject,
                          ClonableObject,
                          SelectionBase)
diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingCalib/StrippingTrackEffDownMuon.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingCalib/StrippingTrackEffDownMuon.py
old mode 100755
new mode 100644
index 02a389d2ce842d2ac2deac2f9caa869297babc56..ac589d4b1348cd5d250ce067700134d7879f4b9a
--- a/Phys/StrippingSelections/python/StrippingSelections/StrippingCalib/StrippingTrackEffDownMuon.py
+++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingCalib/StrippingTrackEffDownMuon.py
@@ -49,35 +49,27 @@ __all__ = ('StrippingTrackEffDownMuonConf',
 # FIXME Write includes in a cleaner way
 from Gaudi.Configuration import *
 from LHCbKernel.Configuration import *
-from DAQSys.DecoderClass import Decoder
 from Configurables import GaudiSequencer
 from Configurables import UnpackTrack, ChargedProtoParticleMaker, DelegatingTrackSelector, TrackSelector, BestPIDParticleMaker
-from TrackFitter.ConfiguredFitters import ConfiguredFit
 from Configurables import TrackStateInitAlg
 from StrippingConf.StrippingLine import StrippingLine
-from Configurables import ChargedProtoParticleAddMuonInfo, MuonIDAlgLite
+from Configurables import ChargedProtoParticleAddMuonInfo
 from MuonID import ConfiguredMuonIDs
 from Configurables import ChargedProtoCombineDLLsAlg, ProtoParticleMUONFilter
-from PhysSelPython.Wrappers import Selection, DataOnDemand
+from PhysSelPython.Wrappers import Selection
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
 from StandardParticles import StdLooseMuons
 
 from StrippingUtils.Utils import LineBuilder
-from Configurables import LoKi__VoidFilter
-from os import environ
 from Gaudi.Configuration import *
-import GaudiKernel.ProcessJobOptions
-from GaudiKernel.SystemOfUnits import mm
 
 from GaudiConfUtils.ConfigurableGenerators import TisTosParticleTagger
 from StandardParticles import StdAllLooseMuons
 from Configurables import GaudiSequencer
 from Configurables import TrackToDST
-from Configurables import TrackSys
 from Configurables import PatSeeding, PatSeedingTool, PatLongLivedTracking
-from PhysSelPython.Wrappers import AutomaticData
 # Get the fitters
-from TrackFitter.ConfiguredFitters import ConfiguredFit, ConfiguredFitSeed, ConfiguredFitDownstream
+from TrackFitter.ConfiguredFitters import ConfiguredFitDownstream
 from PatAlgorithms import PatAlgConf
 
 from SelPy.utils import (UniquelyNamedObject,
diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingCalib/StrippingTrackEffMuonTT.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingCalib/StrippingTrackEffMuonTT.py
index 84b931c726b79044897787992617070caa220d92..aae7dfa49bb3687d2925d5d54a86204f51bd020c 100644
--- a/Phys/StrippingSelections/python/StrippingSelections/StrippingCalib/StrippingTrackEffMuonTT.py
+++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingCalib/StrippingTrackEffMuonTT.py
@@ -65,11 +65,10 @@ __all__ = ('StrippingTrackEffMuonTTConf',
            'makeBJpsiKTrackEff',
            'filterHLT2ForBJpsiK')
 
-from Gaudi.Configuration import *
-from PhysSelPython.Wrappers import Selection, DataOnDemand, ChargedProtoParticleSelection
+from PhysSelPython.Wrappers import ChargedProtoParticleSelection, Selection
 from StrippingConf.StrippingLine import StrippingLine
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from StrippingUtils.Utils import LineBuilder, checkConfig
+from StrippingUtils.Utils import LineBuilder
 from StandardParticles import StdLooseKaons, StdLooseMuons, StdAllLooseMuons
 
 
diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingCalib/StrippingTrackEffVeloMuon.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingCalib/StrippingTrackEffVeloMuon.py
index c7da7abeddda6483ce8d3b57a6b3083ee07bdafe..3f821c02445e084449fcec8a684ab687eb7dca9a 100644
--- a/Phys/StrippingSelections/python/StrippingSelections/StrippingCalib/StrippingTrackEffVeloMuon.py
+++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingCalib/StrippingTrackEffVeloMuon.py
@@ -29,25 +29,17 @@
 from SelPy.utils import (UniquelyNamedObject,
                          ClonableObject,
                          SelectionBase)
-from Configurables import TrackEventCloneKiller, VeloMuonBuilder
-from Configurables import TrackStateInitAlg, TrackEventFitter, TrackPrepareVelo, TrackContainerCopy, Tf__PatVeloSpaceTool, StandaloneMuonRec
+from Configurables import VeloMuonBuilder
+from Configurables import StandaloneMuonRec, TrackPrepareVelo
 from Configurables import CombineParticles
-from Configurables import TrackKalmanFilter, TrackMasterExtrapolator
-from Configurables import TrackEventFitter, TrackMasterFitter
-from TrackFitter.ConfiguredFitters import ConfiguredFit
-from PhysSelPython.Wrappers import AutomaticData
-from Configurables import TrackSys
 from Configurables import GaudiSequencer
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, TisTosParticleTagger
 from StandardParticles import StdLooseMuons
 from StrippingUtils.Utils import LineBuilder
-from Configurables import TrackCloneFinder
 from StrippingConf.StrippingLine import StrippingLine
 from Configurables import FastVeloTracking
-from Configurables import ChargedProtoParticleMaker, NoPIDsParticleMaker, DataOnDemandSvc, DelegatingTrackSelector, TrackSelector, CombinedParticleMaker, BestPIDParticleMaker
-from PhysSelPython.Wrappers import Selection, SelectionSequence, DataOnDemand
-from LHCbKernel.Configuration import *
-from Gaudi.Configuration import *
+from Configurables import ChargedProtoParticleMaker, DataOnDemandSvc, DelegatingTrackSelector, NoPIDsParticleMaker, TrackSelector
+from PhysSelPython.Wrappers import Selection
 __author__ = ['Flavio Archilli']
 __date__ = '30/10/2019'
 __version__ = '$Revision: 0.1 $'
@@ -159,8 +151,6 @@ class StrippingTrackEffVeloMuonConf(LineBuilder):
 
         _config = self.config[confLine]
 
-        _pchargeCut = None
-        _tchargeCut = None
         _tagCharge = None
         _probeCharge = None
         _chargename = None
diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingB2ppipiSigmacmm_Lcpi.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingB2ppipiSigmacmm_Lcpi.py
index 316195569102a380d44bcad73ab40d9b4b2ffcc8..25cd049b1fac0d99feae2dbf2e80a306df5abcd1 100644
--- a/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingB2ppipiSigmacmm_Lcpi.py
+++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingB2ppipiSigmacmm_Lcpi.py
@@ -31,12 +31,11 @@ __all__ = ('StrippingB2ppipiSigmacmm_Lcpi_Conf', 'makepifromSigmacmm', 'makeThre
            )
 
 from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, ConjugateNeutralPID, DaVinci__N3BodyDecays
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N3BodyDecays, FilterDesktop
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
-from StrippingUtils.Utils import checkConfig, LineBuilder
+from StrippingUtils.Utils import LineBuilder
 from GaudiKernel.SystemOfUnits import MeV, GeV, mm
-from copy import copy
 
 name = 'StrippingB2ppipiSigmacmm_Lcpi'
 
diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingBs2st2pKpipipi.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingBs2st2pKpipipi.py
index e71b5b307174aab16443a06ddea637e54f075fe7..41168201d309b7b385822ac32b1c7b78e38f4c15 100644
--- a/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingBs2st2pKpipipi.py
+++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingBs2st2pKpipipi.py
@@ -23,7 +23,6 @@ from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, DaVinci__N4Body
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection
-from Gaudi.Configuration import *
 __author__ = ['Matt Rudolph']
 __date__ = '2021/3/14'
 __version__ = 'v1r0'
diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingChargedHyperons.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingChargedHyperons.py
index 920c9faefc12697a4686bb708606c7aefce7c812..1e9ecbdf32eac322732659ae13423893f4c17ced 100644
--- a/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingChargedHyperons.py
+++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingChargedHyperons.py
@@ -21,13 +21,9 @@ __version__ = '$Revision: 1.0 $'
 __all__ = ('StrippingChargedHyperonsConf', 'default_config')
 
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from StandardParticles import StdLoosePions, StdNoPIDsDownPions, StdLooseKaons, StdLooseDownKaons
-from StandardParticles import StdAllLoosePions, StdAllLooseKaons
 
 from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
-from PhysSelPython.Wrappers import MultiSelectionSequence
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from GaudiKernel.SystemOfUnits import MeV, mm, picosecond
diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingCharm2PPX.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingCharm2PPX.py
index 8f420ab23681879eda33d3f11a9c1854083e6f5d..1776621bc50d11dd212c17cc7c967c25e7570f68 100644
--- a/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingCharm2PPX.py
+++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingCharm2PPX.py
@@ -26,7 +26,7 @@ __all__ = (
     'StrippingCharm2PPXConf'  # ???
 )
 
-from GaudiKernel.SystemOfUnits import MeV, GeV, mm, mrad
+from GaudiKernel.SystemOfUnits import GeV, MeV, mm
 from Configurables import CombineParticles, FilterDesktop
 # from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop, DaVinci__N3BodyDecays
 from StandardParticles import (
diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingCharmForVub.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingCharmForVub.py
index addb5112d833323e807d80a2fcd5d1c6ef104d89..196b7aca8b732e4ce87cfa408c9240c9d4ca9fe8 100644
--- a/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingCharmForVub.py
+++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingCharmForVub.py
@@ -31,9 +31,8 @@ __all__ = ('CharmForVubConf',
            'makeDstarD02HMuNu')
 
 from Gaudi.Configuration import *
-from Configurables import SubstitutePID
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
+from PhysSelPython.Wrappers import MergedSelection, Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from StandardParticles import StdLooseMuons, StdLooseKaons, StdAllLoosePions, StdLoosePions
diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingCharmWeakDecays.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingCharmWeakDecays.py
index 62cf538da90f04787baab5c812393440f86c3b23..72c36178501074aeada4d5d7f91bd305c974ec78 100644
--- a/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingCharmWeakDecays.py
+++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingCharmWeakDecays.py
@@ -28,7 +28,7 @@ __all__ = ('CharmWeakDecaysConf',
            'default_config')
 
 from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingCharmedBaryonSL.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingCharmedBaryonSL.py
index a291ecd272b561373b3f063a5349fc46f8d4a708..d47b5088fcebbccdaff3d207db786ed6ca9d508c 100644
--- a/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingCharmedBaryonSL.py
+++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingCharmedBaryonSL.py
@@ -37,16 +37,12 @@ __version__ = '$Revision: 0.1 $'
 __all__ = ('StrippingCharmedBaryonSL', 'default_config')
 
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from StandardParticles import StdLoosePions, StdNoPIDsDownPions, StdLooseKaons, StdLooseDownKaons
-from StandardParticles import StdAllLoosePions, StdAllLooseKaons, StdLooseMuons, StdAllLooseProtons, StdAllLooseMuons, StdAllVeryLooseMuons
+from StandardParticles import StdAllLooseKaons, StdAllLoosePions, StdAllLooseProtons, StdLooseMuons
 from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
-from PhysSelPython.Wrappers import MultiSelectionSequence
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from GaudiKernel.SystemOfUnits import MeV, GeV, mm, picosecond
-import sys
+from GaudiKernel.SystemOfUnits import GeV, MeV, mm
 
 
 default_name = 'CharmedBaryonSL'
diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingD02KSKS.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingD02KSKS.py
index 048a0f735673d789716920a6b813f3734a817158..2e831b063d5dd66449d672d2c0c14659bb9d9210 100644
--- a/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingD02KSKS.py
+++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingD02KSKS.py
@@ -25,9 +25,8 @@ __date__ = '15/05/2014'
 __version__ = 'Stripping23'
 __all__ = 'D02KSKSConf'
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
+from PhysSelPython.Wrappers import DataOnDemand, Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 
@@ -556,7 +555,7 @@ class D02KSKSConf(LineBuilder):
         _daughterCuts = "(TRGHOSTPROB <=%s )" % config['slowPi_LLL_TRGHOSTPROB']
 
         # 40
-        _vertexChi2_cut = "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_LL']
+        "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_LL']
 
         # 200
         _combCuts = "(ADAMASS('D*(2010)+') < %s*MeV)" % config['Dst_mass_LL']
@@ -593,7 +592,7 @@ class D02KSKSConf(LineBuilder):
         _daughterCuts = "(TRGHOSTPROB <=%s )" % config['slowPi_LLU_TRGHOSTPROB']
 
         # 40
-        _vertexChi2_cut = "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_LL']
+        "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_LL']
 
         # 200
         _combCuts = "(ADAMASS('D*(2010)+') < %s*MeV)" % config['Dst_mass_LL']
@@ -630,7 +629,7 @@ class D02KSKSConf(LineBuilder):
         _daughterCuts = "(TRGHOSTPROB <=%s )" % config['slowPi_LDL_TRGHOSTPROB']
 
         # 40
-        _vertexChi2_cut = "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_LD']
+        "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_LD']
 
         # 200
         _combCuts = "(ADAMASS('D*(2010)+') < %s*MeV)" % config['Dst_mass_LD']
@@ -667,7 +666,7 @@ class D02KSKSConf(LineBuilder):
         _daughterCuts = "(TRGHOSTPROB <=%s )" % config['slowPi_LDU_TRGHOSTPROB']
 
         # 40
-        _vertexChi2_cut = "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_LD']
+        "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_LD']
 
         # 200
         _combCuts = "(ADAMASS('D*(2010)+') < %s*MeV)" % config['Dst_mass_LD']
@@ -704,7 +703,7 @@ class D02KSKSConf(LineBuilder):
         _daughterCuts = "(TRGHOSTPROB <=%s )" % config['slowPi_DDL_TRGHOSTPROB']
 
         # 40
-        _vertexChi2_cut = "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_DD']
+        "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_DD']
 
         # 200
         _combCuts = "(ADAMASS('D*(2010)+') < %s*MeV)" % config['Dst_mass_DD']
@@ -741,7 +740,7 @@ class D02KSKSConf(LineBuilder):
         _daughterCuts = "(TRGHOSTPROB <=%s )" % config['slowPi_DDU_TRGHOSTPROB']
 
         # 40
-        _vertexChi2_cut = "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_DD']
+        "(VFASPF(VCHI2/VDOF) < %s)" % config['Dst_vertexChi2_DD']
 
         # 200
         _combCuts = "(ADAMASS('D*(2010)+') < %s*MeV)" % config['Dst_mass_DD']
diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingD2HHHKs.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingD2HHHKs.py
index e5639b90812290f4e2226c3b0c140285aa788b00..8b56f2ae08f0d364c45bed96aa90657daee77a7d 100644
--- a/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingD2HHHKs.py
+++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingD2HHHKs.py
@@ -22,19 +22,18 @@ __version__ = '$Revision: 0.1 $'
 __all__ = ('D2HHHKsLines',
            'default_config')
 
-from Gaudi.Configuration import *
 
-from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N4BodyDecays
+from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays
 from StandardParticles import StdNoPIDsPions, StdNoPIDsKaons
 from StandardParticles import StdLooseKsDD, StdLooseKsLL
 
 from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
-from StrippingUtils.Utils import LineBuilder, checkConfig
+from StrippingUtils.Utils import LineBuilder
 
 from Configurables import FilterDesktop
 
-from GaudiKernel.SystemOfUnits import GeV, MeV, picosecond, mm
+from GaudiKernel.SystemOfUnits import MeV, mm, picosecond
 
 
 default_config = {
diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingD2HHHPi0.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingD2HHHPi0.py
index 6083359069ac88d66ad4d2d0c3f6c4a785962da6..8557b0ed7b6ea3312ecd34ede82d7cbd720f6775 100644
--- a/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingD2HHHPi0.py
+++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingD2HHHPi0.py
@@ -22,19 +22,18 @@ __version__ = '$Revision: 0.1 $'
 __all__ = ('D2HHHPi0Lines',
            'default_config')
 
-from Gaudi.Configuration import *
 
-from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N4BodyDecays
+from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays
 from StandardParticles import StdNoPIDsPions, StdNoPIDsKaons
 from StandardParticles import StdLooseResolvedPi0, StdLooseMergedPi0
 
 from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
-from StrippingUtils.Utils import LineBuilder, checkConfig
+from StrippingUtils.Utils import LineBuilder
 
 from Configurables import FilterDesktop
 
-from GaudiKernel.SystemOfUnits import GeV, MeV, picosecond, mm
+from GaudiKernel.SystemOfUnits import GeV, MeV, picosecond
 
 
 default_config = {
diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingD2HMuNu.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingD2HMuNu.py
index eacf772b484ddd36fae5781e3451f92b15a3cd88..efe5ef8931f1ac093eb21df5364224c7ac12261d 100644
--- a/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingD2HMuNu.py
+++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingD2HMuNu.py
@@ -9,9 +9,7 @@
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
 
-import logging
 from StrippingUtils.Utils import LineBuilder
-from Gaudi.Configuration import *
 __author__ = ['Liang Sun', 'Adam Davis']
 __date__ = '03/19/2021'
 __version__ = '$Revision: 0.02 $'
@@ -97,7 +95,6 @@ class D2HLepNuBuilder(LineBuilder):
     def __init__(self, name, config):
         LineBuilder.__init__(self, name, config)
         self._config = config
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
 
         self.GECs = {"Code": "( recSummaryTrack(LHCb.RecSummary.nLongTracks, TrLONG) < %(GEC_nLongTrk)s )" % config,
                      "Preambulo": ["from LoKiTracks.decorators import *"]}
diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingD2KPiPiMuNu.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingD2KPiPiMuNu.py
index 7e19b796afb9529fe10c5a20b76141f6ff62f901..c3359cfd14f536eceeb83494769c53cfb7b8ed62 100644
--- a/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingD2KPiPiMuNu.py
+++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingD2KPiPiMuNu.py
@@ -9,9 +9,7 @@
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
 
-import logging
 from StrippingUtils.Utils import LineBuilder
-from Gaudi.Configuration import *
 __author__ = ['Liang Sun']
 __date__ = '07/05/2019'
 __version__ = '$Revision: 0.01 $'
@@ -103,7 +101,6 @@ class D2KPiPiMuNuBuilder(LineBuilder):
     def __init__(self, name, config):
         LineBuilder.__init__(self, name, config)
         self._config = config
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
 
         self.GECs = {"Code": "( recSummaryTrack(LHCb.RecSummary.nLongTracks, TrLONG) < %(GEC_nLongTrk)s )" % config,
                      "Preambulo": ["from LoKiTracks.decorators import *"]}
@@ -200,7 +197,7 @@ class D2KPiPiMuNuBuilder(LineBuilder):
 
         from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
         from PhysSelPython.Wrappers import Selection
-        from StandardParticles import StdLooseMuons, StdAllLooseMuons, StdAllNoPIDsMuons
+        from StandardParticles import StdAllLooseMuons, StdAllNoPIDsMuons
         _mu = FilterDesktop(Code=self._NominalMuSelection() % self._config)
         _mupid = StdAllLooseMuons
         if self._config["NoPIDmu"]:
diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingD2KS0H_conf.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingD2KS0H_conf.py
index d58964475590bc2e6571bcd929685425e3694bc1..e5b9f6c8683eaaab3109aca8686f163c2f08aef0 100644
--- a/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingD2KS0H_conf.py
+++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingD2KS0H_conf.py
@@ -44,9 +44,9 @@ from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticle
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StandardParticles import StdLoosePions, StdLooseKaons
 from StrippingConf.StrippingLine import StrippingLine
-from StrippingUtils.Utils import LineBuilder, checkConfig
+from StrippingUtils.Utils import LineBuilder
 from Configurables import TisTosParticleTagger
-from GaudiKernel.SystemOfUnits import GeV, MeV, picosecond, mm
+from GaudiKernel.SystemOfUnits import MeV, mm, picosecond
 
 default_name = 'D2KS0H'
 
diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingD2PiPi0.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingD2PiPi0.py
index d9497b537d62b4f47d50823fd91deba0eb2349fa..3ac31a1bcad019f7cd123dfa6682935c986f1026 100644
--- a/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingD2PiPi0.py
+++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingD2PiPi0.py
@@ -33,7 +33,7 @@ __all__ = (
 
 )
 
-from GaudiKernel.SystemOfUnits import MeV, GeV, mrad, picosecond
+from GaudiKernel.SystemOfUnits import MeV, picosecond
 
 from StandardParticles import (
     StdAllNoPIDsKaons,
@@ -51,7 +51,7 @@ from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 
 # from Configurables import CombineParticles, FilterDesktop
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, ConjugateNeutralPID, DaVinci__N3BodyDecays
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N3BodyDecays
 
 default_config = {
     'D2Pi0H': {
diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingD2XMuMuSS.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingD2XMuMuSS.py
index 6cb43802872df951b5676b3b0a91f42091655f73..f2ecc06f375c01960838df612bae449a097161ea 100644
--- a/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingD2XMuMuSS.py
+++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingD2XMuMuSS.py
@@ -9,14 +9,13 @@
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
 
-from StandardParticles import StdAllLooseElectrons, StdAllNoPIDsElectrons
+from StandardParticles import StdAllLooseElectrons
 from StandardParticles import StdAllLooseKaons, StdAllLoosePions, StdAllLooseMuons, StdAllNoPIDsPions, StdAllNoPIDsKaons
-from StandardParticles import StdLooseKaons, StdLoosePions, StdLooseMuons, StdNoPIDsPions, StdNoPIDsKaons, StdLooseProtons, StdAllNoPIDsProtons
+from StandardParticles import StdAllNoPIDsProtons, StdLooseKaons, StdLooseMuons, StdLoosePions, StdLooseProtons
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, OfflineVertexFitter
-from Gaudi.Configuration import *
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop
 import copy
 __author__ = ['Malcolm John', 'B. Viaud', 'O. Kochebina']
 __date__ = '25/6/2012'
diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingD2hh.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingD2hh.py
index 51c213ed2d3c259435dcd6aef0631877156b6bb0..a370c49abb16101fe062f7fa9fd7c27efecb37e3 100644
--- a/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingD2hh.py
+++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingD2hh.py
@@ -24,7 +24,6 @@ __all__ = ('D2hhBuilder',
 '''
 This file contains stripping lines for time-dependent two-body charm analyses of mixing, yCP, and A_Gamma
 '''
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
@@ -129,7 +128,7 @@ class D2hhBuilder(LineBuilder):
         stdNoPIDsPions = StdAllNoPIDsPions
 
         d2kpi_name = name+'PromptD2KPi'
-        d0RS_name = name+'PromptD0RS'
+        name+'PromptD0RS'
         d0WS_name = name+'PromptD0WS'
         d2kk_name = name+'PromptD2KK'
         d2pipi_name = name+'PromptD2PiPi'
diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingD2hhh_FTcalib.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingD2hhh_FTcalib.py
index 1ec2a52397a24a0cbc076e1b808944bfc5bf21da..eb622bead0fbe08c7b00587f38e94c60ed0a8ade 100644
--- a/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingD2hhh_FTcalib.py
+++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingD2hhh_FTcalib.py
@@ -29,13 +29,10 @@ __version__ = '$Revision: 0.0 $'
 __all__ = ('D2hhhFTCalibConf',
            'makeStdD2hhhFT')
 
-from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
+from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from StandardParticles import (StdNoPIDsPions,
-                               StdTightKaons)
 
 name = "D2hhhFTCalib"
 # Cuts to be implemented vy the Stripping team in Stripping Settings
@@ -254,7 +251,6 @@ def globalEventCutFilter(name,
     if MaxTrSIZE == None:
         return None
 
-    from Configurables import LoKi__VoidFilter as VoidFilter
     from Configurables import LoKi__Hybrid__CoreFactory as CoreFactory
     modules = CoreFactory('CoreFactory').Modules
     for i in ['LoKiTracks.decorators']:
diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingD2hhh_conf.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingD2hhh_conf.py
index 436d8a20ebfa69a07273b9fc952667e306a823fd..49374bf7789c8403fcf3e4660b179452634cef16 100644
--- a/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingD2hhh_conf.py
+++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingD2hhh_conf.py
@@ -38,8 +38,7 @@ from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticle
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from StandardParticles import (StdNoPIDsPions,
-                               StdTightKaons)
+from StandardParticles import StdNoPIDsPions
 
 name = "D2hhh"
 # Cuts to be implemented vy the Stripping team in Stripping Settings
@@ -717,7 +716,6 @@ def globalEventCutFilter(name,
     if MaxTrSIZE == None:
         return None
 
-    from Configurables import LoKi__VoidFilter as VoidFilter
     from Configurables import LoKi__Hybrid__CoreFactory as CoreFactory
     modules = CoreFactory('CoreFactory').Modules
     for i in ['LoKiTracks.decorators']:
diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingDstarD02xx.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingDstarD02xx.py
index ce2ac8d8facde4ad7816e78bcb9fd402160bb81a..e052e20eec4a83a6f489851d64e937c3ee00b05f 100644
--- a/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingDstarD02xx.py
+++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingDstarD02xx.py
@@ -22,8 +22,7 @@ __all__ = ('StrippingDstarD02xxConf', 'combinetwobody', 'combineDstar', 'default
             where xx = {mu mu, pi pi, pi mu, k mu, ... }
             
 '''
-from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingDstarD0ToHHPi0.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingDstarD0ToHHPi0.py
index fd5188441bc83f651edf601e0fc081e5761b90a2..9f366f1a65e17dac9704f2cda14ac7c90073bb1d 100644
--- a/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingDstarD0ToHHPi0.py
+++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingDstarD0ToHHPi0.py
@@ -17,13 +17,11 @@ Module for D* tagged D0 -> hhpi0.
 Supersedes StrippingDstarD2hhpi0
 """
 
-from Gaudi.Configuration import *
 from Configurables import FilterDesktop, CombineParticles, OfflineVertexFitter
 from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from StandardParticles import StdAllLoosePions, StdLoosePions, StdLooseKaons, StdLooseResolvedPi0, StdLooseMergedPi0
-from Configurables import TisTosParticleTagger
 
 __all__ = ('DstarD0ToHHPi0AllLinesBuilder',
            'DstarMaker',
diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingDstarD2HHHH.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingDstarD2HHHH.py
index 79b905d65e08f76846da8aeebd29e1bd52022454..15c8bc47e0445328a0083162a53a4335865cca1b 100644
--- a/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingDstarD2HHHH.py
+++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingDstarD2HHHH.py
@@ -22,16 +22,15 @@ __version__ = '$Revision: 1.0 $'
 __all__ = ('DstarD2HHHHLines',
            'default_config')
 
-from Gaudi.Configuration import *
 
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N4BodyDecays
 from StandardParticles import StdAllNoPIDsPions, StdNoPIDsPions, StdNoPIDsKaons
 
 from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
-from StrippingUtils.Utils import LineBuilder, checkConfig
+from StrippingUtils.Utils import LineBuilder
 
-from GaudiKernel.SystemOfUnits import GeV, MeV, picosecond, mm
+from GaudiKernel.SystemOfUnits import MeV, picosecond
 
 
 default_config = {
diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingDstarD2KSHHPi0.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingDstarD2KSHHPi0.py
index bef9e3302843c26f34162c9fe043e91e2deefc77..bcfa561602e9ac949fda9edba160941b4c6f72fa 100644
--- a/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingDstarD2KSHHPi0.py
+++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingDstarD2KSHHPi0.py
@@ -21,18 +21,17 @@ __version__ = '$Revision: 1.1 $'
 __all__ = ('DstarD2KSHHPi0Lines',
            'default_config')
 
-from Gaudi.Configuration import *
 
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N4BodyDecays
 from StandardParticles import StdAllNoPIDsPions, StdNoPIDsPions, StdNoPIDsKaons, StdLooseResolvedPi0, StdLooseMergedPi0, StdLooseKsDD, StdLooseKsLL
 
 from PhysSelPython.Wrappers import Selection, MergedSelection
 from StrippingConf.StrippingLine import StrippingLine
-from StrippingUtils.Utils import LineBuilder, checkConfig
+from StrippingUtils.Utils import LineBuilder
 
 from Configurables import FilterDesktop
 
-from GaudiKernel.SystemOfUnits import GeV, MeV, picosecond, mm
+from GaudiKernel.SystemOfUnits import MeV, mm, picosecond
 
 
 default_config = {
diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingDstarD2KShh.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingDstarD2KShh.py
index 0446a490bf8b78aaa6a090c0170ee5d84241b931..8bb88c690db0782705ee07f1579b03266ff72d96 100644
--- a/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingDstarD2KShh.py
+++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingDstarD2KShh.py
@@ -34,7 +34,6 @@ __all__ = ('DstarD2KShhBuilder',
            'makeD2KShh',
            'makeDstar')
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingDstarD2XGamma.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingDstarD2XGamma.py
index e7b224211810ea09aab099a5340dcc8c20dbd784..20835582f83db206c0f03a8161bb60b333bd4f72 100644
--- a/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingDstarD2XGamma.py
+++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingDstarD2XGamma.py
@@ -32,7 +32,6 @@ __version__ = '$Revision: 0.5 $'
 __all__ = ('DstarD2XGammaLines',
            'default_config')
 
-from Gaudi.Configuration import *
 
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 from StandardParticles import StdAllNoPIDsPions, StdNoPIDsPions, StdNoPIDsKaons
@@ -40,11 +39,11 @@ from StandardParticles import StdLooseAllPhotons, StdAllLooseGammaLL, StdAllLoos
 
 from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
-from StrippingUtils.Utils import LineBuilder, checkConfig
+from StrippingUtils.Utils import LineBuilder
 
 from Configurables import FilterDesktop
 
-from GaudiKernel.SystemOfUnits import GeV, MeV, picosecond, mm
+from GaudiKernel.SystemOfUnits import GeV, MeV, picosecond
 
 default_config = {
     'NAME': 'DstarD2XGamma',
diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingDstarPromptWithD02HHHH.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingDstarPromptWithD02HHHH.py
index 13343e4031d3c9fe7ad9b92cfb6f3c3fff754d98..22e9ffd46fd5a0b8ab4623cae0293fe3c10c129d 100644
--- a/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingDstarPromptWithD02HHHH.py
+++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingDstarPromptWithD02HHHH.py
@@ -36,11 +36,10 @@ __version__ = '$Revision: 1.2 $'
 __all__ = ('DstarPromptWithD02HHHHConf', 'makeD02hhhh',
            'makePromptDstar', 'default_config')
 
-from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, ConjugateNeutralPID
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles, ConjugateNeutralPID
 from PhysSelPython.Wrappers import Selection, MergedSelection
 from StrippingConf.StrippingLine import StrippingLine
-from StrippingUtils.Utils import checkConfig, LineBuilder
+from StrippingUtils.Utils import LineBuilder
 from GaudiKernel.SystemOfUnits import MeV, GeV, mm
 from copy import copy
 
diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingDstarPromptWithD02HHMuMu.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingDstarPromptWithD02HHMuMu.py
index e83ad60bb1ff3c30f6cfd21e7ea0e2fb6ead7646..a1c41727aab9df91366ea29963944e783d29f676 100644
--- a/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingDstarPromptWithD02HHMuMu.py
+++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingDstarPromptWithD02HHMuMu.py
@@ -29,11 +29,10 @@ __version__ = '$Revision: 2.0 $'
 __all__ = ('DstarPromptWithD02HHLLConf', 'makeD02hhll',
            'makePromptDstar', 'default_config')
 
-from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, ConjugateNeutralPID
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles, ConjugateNeutralPID
 from PhysSelPython.Wrappers import Selection, MergedSelection
 from StrippingConf.StrippingLine import StrippingLine
-from StrippingUtils.Utils import checkConfig, LineBuilder
+from StrippingUtils.Utils import LineBuilder
 from GaudiKernel.SystemOfUnits import MeV, GeV, mm
 from copy import copy
 
diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingExcitedDsSpectroscopy.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingExcitedDsSpectroscopy.py
index 6b08898929e9ee290d51640d43d073b4a548a98b..dadd6c5c25c094fb4e5dfdef695cd98af0384ee1 100644
--- a/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingExcitedDsSpectroscopy.py
+++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingExcitedDsSpectroscopy.py
@@ -321,7 +321,6 @@ def globalEventCutFilter(name,
     if MaxTrSIZE == None:
         return None
 
-    from Configurables import LoKi__VoidFilter as VoidFilter
     from Configurables import LoKi__Hybrid__CoreFactory as CoreFactory
     modules = CoreFactory('CoreFactory').Modules
     for i in ['LoKiTracks.decorators']:
diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingHc2V02H.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingHc2V02H.py
index c55a09ec52497f96d0d9333a1489935bbf3c3448..937669104501a4b75267fac361085e0e99535056 100644
--- a/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingHc2V02H.py
+++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingHc2V02H.py
@@ -29,7 +29,7 @@ __all__ = (
 )
 
 from GaudiKernel.SystemOfUnits import MeV, GeV, mm, mrad
-from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop, DaVinci__N3BodyDecays
+from GaudiConfUtils.ConfigurableGenerators import DaVinci__N3BodyDecays, FilterDesktop
 # from StandardParticles import StdNoPIDsPions as InputPionsPiPi
 # from StandardParticles import StdNoPIDsKaons as InputKaons
 
diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingHc2V03H.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingHc2V03H.py
index d3888168faa1cbed51e85b5dd40fa51f82370dcd..2c9fd008996a8b8f7f34cbf4a6617f8d731b378b 100644
--- a/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingHc2V03H.py
+++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingHc2V03H.py
@@ -24,11 +24,9 @@ __date__ = '13/10/2017'
 __all__ = ('default_config', 'StrippingHc2V03HConf')
 
 from GaudiKernel.SystemOfUnits import MeV, GeV, mm, mrad
-from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop, DaVinci__N4BodyDecays
+from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays, FilterDesktop
 from StandardParticles import StdAllLoosePions as InputPions
 from StandardParticles import StdAllLooseKaons as InputKaons
-from StandardParticles import StdVeryLooseLambdaLL as InputLambdasLL
-from StandardParticles import StdLooseLambdaDD as InputLambdasDD
 
 from PhysSelPython.Wrappers import Selection, MergedSelection, DataOnDemand
 from StrippingUtils.Utils import LineBuilder
diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingHc2V2H.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingHc2V2H.py
index 1cc1e18bb59332589773894f931054575d3bd57d..62f83f01a95c995d84514559ea3eb725d34e7335 100644
--- a/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingHc2V2H.py
+++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingHc2V2H.py
@@ -29,8 +29,6 @@ from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDeskto
 from StandardParticles import StdNoPIDsDownPions as InputDownPions
 from StandardParticles import StdNoPIDsPions as InputPions
 from StandardParticles import StdNoPIDsKaons as InputKaons
-from StandardParticles import StdLooseLambdaLL as InputLambdasLL
-from StandardParticles import StdLooseLambdaDD as InputLambdasDD
 
 from PhysSelPython.Wrappers import Selection, MergedSelection, DataOnDemand
 from StrippingUtils.Utils import LineBuilder
diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingHc2V3H.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingHc2V3H.py
index 8860909e6ec1c8f2862b43d64f75e5158a1c67e3..05d0ef19028d88f3cf40161b0e7b207226c117e3 100644
--- a/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingHc2V3H.py
+++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingHc2V3H.py
@@ -31,8 +31,6 @@ from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDeskto
 from StandardParticles import StdNoPIDsDownPions as InputDownPions
 from StandardParticles import StdNoPIDsPions as InputPions
 from StandardParticles import StdNoPIDsKaons as InputKaons
-from StandardParticles import StdLooseLambdaLL as InputLambdasLL
-from StandardParticles import StdLooseLambdaDD as InputLambdasDD
 
 from PhysSelPython.Wrappers import Selection, MergedSelection, DataOnDemand
 from StrippingUtils.Utils import LineBuilder
diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingKKPiPi.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingKKPiPi.py
index cedaab2089da1034f1207a1c958ba82c6e694ba7..767a1fdbf50445fb204987a0cc70c2f97dfb5421 100644
--- a/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingKKPiPi.py
+++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingKKPiPi.py
@@ -12,12 +12,11 @@
 Module for selecting [cs][ubar dbar] -> K+ K+ pi- pi-
 '''
 
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
+from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
 from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
-from Gaudi.Configuration import *
 __author__ = ['Mengzhen Wang']
 __date__ = '10/10/2017'
 __version__ = '$Revision: 1.0 $'
diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingLambdac2V03H.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingLambdac2V03H.py
index 8c19d9d3aeebd29855bd2d76b366fe9611b08aaf..9689bee39c9e7d84a61e56605ba3bb5f443ec5d1 100644
--- a/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingLambdac2V03H.py
+++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingLambdac2V03H.py
@@ -27,7 +27,7 @@ __all__ = (
 )
 
 from GaudiKernel.SystemOfUnits import MeV, GeV, mm, mrad
-from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop, DaVinci__N4BodyDecays
+from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays, FilterDesktop
 from StandardParticles import StdNoPIDsPions as InputPions
 from StandardParticles import StdNoPIDsKaons as InputKaons
 from StandardParticles import StdLooseLambdaLL as InputLambdasLL
diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingLambdacForNeutronPID.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingLambdacForNeutronPID.py
index ae08b01f2aa31c0c228ec259a500e8cc1745c997..a730881c70c46e14ca9ec93433ab423fefc51804 100644
--- a/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingLambdacForNeutronPID.py
+++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingLambdacForNeutronPID.py
@@ -17,12 +17,10 @@ Exported selection makers: 'makeLc', 'makeSigmac', 'makeSigmacWS',
 
 """
 
-from GaudiKernel.PhysicalConstants import c_light
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 __author__ = ['Marco Pappagallo']
 __date__ = '17/03/2021'
 __version__ = '$Revision: 1.0 $'
diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingLc2L0LLpi.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingLc2L0LLpi.py
index 0165e116e9da33c044fd297b7fa4c1090c6cbf39..0a027afeb1d2d303ea6a37758bc2b3bf4bb5f79d 100644
--- a/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingLc2L0LLpi.py
+++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingLc2L0LLpi.py
@@ -12,17 +12,10 @@
 Module for selecting Lambda_c+->Lambda pi+
 '''
 
-from StandardParticles import (StdAllLoosePions, StdLooseProtons,
-                               StdLoosePions, StdNoPIDsUpPions)
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from StandardParticles import StdLooseAllPhotons, StdVeryLooseAllPhotons
-from Configurables import LoKi__VoidFilter
-from PhysSelPython.Wrappers import MergedSelection
-from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
-from Gaudi.Configuration import *
 __author__ = ['Guiyun Ding', 'Jiesheng Yu', 'Yuehong Xie']
 __date__ = '28/11/2016'
 __version__ = '$Revision: 2.0$'
diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingNeutralCBaryons.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingNeutralCBaryons.py
index 5cd5cf6bbca6fb372979b6519826d752a41a07f4..147241ad24ab468c7b7eb3cc624b5ea9b5b4e2e6 100644
--- a/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingNeutralCBaryons.py
+++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingNeutralCBaryons.py
@@ -31,13 +31,9 @@ __version__ = '$Revision: 1.1 $'
 __all__ = ('StrippingNeutralCBaryonsConf', 'default_config')
 
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from StandardParticles import StdLoosePions, StdNoPIDsDownPions, StdLooseKaons, StdLooseDownKaons
-from StandardParticles import StdAllLoosePions, StdAllLooseKaons, StdAllLooseProtons
 
 from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
-from PhysSelPython.Wrappers import MultiSelectionSequence
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from GaudiKernel.SystemOfUnits import MeV, mm, picosecond
diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingXcpToLambdaKSHp.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingXcpToLambdaKSHp.py
index 91757124df0a6c7aba56e01ec5212dc42c93a446..90176344c31ebcbf2d879f7e4fd54e3819a7d972 100644
--- a/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingXcpToLambdaKSHp.py
+++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingXcpToLambdaKSHp.py
@@ -11,8 +11,6 @@
 """
 Exclusive lines for Xc+ -> Lambda0 KS0 h+
 """
-from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-from Configurables import FilterDesktop
 from PhysConf.Selections import FilterSelection, Combine3BodySelection, MergedSelection
 from PhysSelPython.Wrappers import AutomaticData
 from StrippingUtils.Utils import LineBuilder
diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingXcpToXiPipHp.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingXcpToXiPipHp.py
index 8e47ddfa3566920bc32d53b21a332c5650139e6d..5a28d5b8ff5d02d3ec80f2e18a466d53f88f3cb1 100644
--- a/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingXcpToXiPipHp.py
+++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingXcpToXiPipHp.py
@@ -13,10 +13,8 @@ Stripping lines for Xic+ -> Xi- pi+ pi+, Lc+ -> Xi- pi+ K+ and Xic+ -> Xi- pi+ K
 The lines are used to complement the inclusive Xi Turbo lines by adding
 Velo raw banks to study if the Xi- can be reconstructed as an upstream track.
 """
-from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-from Configurables import FilterDesktop
 from PhysConf.Selections import (
-    FilterSelection, CombineSelection, Combine3BodySelection, MergedSelection)
+    FilterSelection, CombineSelection, Combine3BodySelection)
 from PhysSelPython.Wrappers import AutomaticData
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingXic2HHH.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingXic2HHH.py
index e34807cd11d54a2a33e0a1189dffe5a4b8d17475..32300611aa84de3bdf0390670c07b3849c390e20 100644
--- a/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingXic2HHH.py
+++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingXic2HHH.py
@@ -8,18 +8,15 @@
 # granted to it by virtue of its status as an Intergovernmental Organization  #
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
-from StandardParticles import StdNoPIDsPions, StdNoPIDsKaons, StdNoPIDsProtons, StdAllNoPIDsProtons
-from Configurables import TisTosParticleTagger
+from StandardParticles import StdNoPIDsKaons, StdNoPIDsPions, StdNoPIDsProtons
 from StrippingUtils.Utils import LineBuilder
-from PhysSelPython.Wrappers import MultiSelectionSequence
-from PhysSelPython.Wrappers import Selection, DataOnDemand, AutomaticData, MergedSelection
+from PhysSelPython.Wrappers import DataOnDemand, MergedSelection, Selection
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
 from Configurables import FilterDesktop, CombineParticles
 from LHCbKernel.Configuration import *
-from GaudiKernel.SystemOfUnits import MeV, mm, ns
+from GaudiKernel.SystemOfUnits import MeV, mm
 from StrippingConf.StrippingLine import StrippingLine
 from Gaudi.Configuration import *
-import re
 all
 ''' Xic+ and Theta+ lines Designed by Yury Shcheglov, Alexey Dzyuba, Nelya Sagidova to study Xic+ and Theta+ particles '''
 
diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingXicToSigmaKPi.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingXicToSigmaKPi.py
index 71b78eea79c254b8f1342818a4da5f885c3873cc..d6856b0e1d9b501ecb11f6e51aec7b5e300d7d50 100644
--- a/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingXicToSigmaKPi.py
+++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingXicToSigmaKPi.py
@@ -15,7 +15,7 @@ Exclusive lines for Xic+ -> Sigma0 KS0 pi+, Xic0 -> Sigma0 K- pi+ and Xic+ -> Si
 from CommonParticles.Utils import updateDoD
 from GaudiKernel.SystemOfUnits import MeV
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-from Configurables import (FilterDesktop, ResolvedPi0Maker, PhotonMaker)
+from Configurables import (ResolvedPi0Maker, PhotonMaker)
 from PhysConf.Selections import (FilterSelection, Combine3BodySelection,
                                  MergedSelection, SimpleSelection)
 from PhysSelPython.Wrappers import AutomaticData
diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingXicc.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingXicc.py
index 2468c2d79739511bfdefe170463aa125124d506e..45478d9be226dbd5e3fdd09b0ff769294d99d064 100644
--- a/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingXicc.py
+++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingXicc.py
@@ -52,9 +52,6 @@ from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticle
 from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from StandardParticles import StdAllLoosePions, StdAllLooseKaons, StdAllLooseProtons
-from StandardParticles import StdLoosePions
-from CommonParticles.StdLooseLambda import StdLooseLambdaLL, StdLooseLambdaDD
 from GaudiKernel.SystemOfUnits import MeV, GeV, mm
 from Configurables import TisTosParticleTagger
 
diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingXiccSL.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingXiccSL.py
index f5880e4d7a88ed9c0a4cf4e205003df5ac3ef7f6..d77d3c9301880fb517fa10a13186f9583159f3b6 100644
--- a/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingXiccSL.py
+++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingCharm/StrippingXiccSL.py
@@ -38,17 +38,12 @@ __version__ = '$Revision: 0.3 $'
 __all__ = ('StrippingXiccSL', 'default_config')
 
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from StandardParticles import StdLoosePions, StdNoPIDsDownPions, StdLooseKaons, StdLooseDownKaons
-from StandardParticles import StdAllLoosePions, StdAllLooseKaons, StdLooseMuons, StdAllLooseProtons, StdAllLooseMuons, StdAllVeryLooseMuons
 from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
-from PhysSelPython.Wrappers import MultiSelectionSequence
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from GaudiKernel.SystemOfUnits import MeV, GeV, mm, picosecond
+from GaudiKernel.SystemOfUnits import GeV, MeV, mm
 from Configurables import TisTosParticleTagger
-import sys
 
 
 default_name = 'XiccSL'
@@ -400,7 +395,7 @@ class StrippingXiccSL(LineBuilder):
         _strCutMoth_Zero = "(CHILD(VFASPF(VZ),1) - VFASPF(VZ) > %(Omegacc_Lc_delta_VZ_Min)s)" \
             "& (BPVDIRA > %(Omegacc_Zero_BPVDIRA_Min)s)" % self.config
 
-        _strCutMoth2 = _strChi2Moth2 + '&' + _strCutMoth
+        _strChi2Moth2 + '&' + _strCutMoth
         _strCutMoth2_Zero = _strChi2Moth2 + '&' + _strCutMoth_Zero
 
         ''' Stripping Omega_cc+ -> Omega_c0 mu+ '''
diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingIFT/StrippingHeL2ppppi.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingIFT/StrippingHeL2ppppi.py
index 8e3831dccd93ea545d6bf6f807d397dfcfde7b34..8a38168041b6b03e929ec6060a465f11bee1d413 100644
--- a/Phys/StrippingSelections/python/StrippingSelections/StrippingIFT/StrippingHeL2ppppi.py
+++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingIFT/StrippingHeL2ppppi.py
@@ -22,7 +22,6 @@ from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, DaVinci__N4Body
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection
-from Gaudi.Configuration import *
 __author__ = ['Hendrik Jage', 'Gediminas Sarpis']
 __date__ = '19/03/2021'
 __version__ = 'v1r0'
diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingIFT/StrippingHeMedian.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingIFT/StrippingHeMedian.py
index 46870fe2fe39e2196a3ab3621968cdffd177e5e1..940b716b24722cacb37acba8ce977affa0d57d72 100644
--- a/Phys/StrippingSelections/python/StrippingSelections/StrippingIFT/StrippingHeMedian.py
+++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingIFT/StrippingHeMedian.py
@@ -19,15 +19,12 @@ __version__ = 'v0r1'
 
 __all__ = ('HeMedianConf', 'default_config')
 
-from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
 
 from StandardParticles import StdAllNoPIDsProtons as Protons
-from PhysSelPython.Wrappers import Selection, DataOnDemand, SimpleSelection
+from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from Configurables import LoKi__VoidFilter as VoidFilter
 
 default_config = {
     'NAME': 'HeMedian',
diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingIFT/StrippingHeNOverflows.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingIFT/StrippingHeNOverflows.py
index 6e86f2745180d1fa6f865250139d4f7d553895b6..2b79ea417fb63eeff1d14b5e6a3a086911223d6f 100644
--- a/Phys/StrippingSelections/python/StrippingSelections/StrippingIFT/StrippingHeNOverflows.py
+++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingIFT/StrippingHeNOverflows.py
@@ -19,15 +19,12 @@ __version__ = 'v0r1'
 
 __all__ = ('HeNOverflowsConf', 'default_config')
 
-from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
 
 from StandardParticles import StdAllNoPIDsProtons as Protons
-from PhysSelPython.Wrappers import Selection, DataOnDemand, SimpleSelection
+from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from Configurables import LoKi__VoidFilter as VoidFilter
 
 default_config = {
     'NAME': 'HeNOverflows',
diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingIFT/StrippingHeavyIonD02KPiPi0.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingIFT/StrippingHeavyIonD02KPiPi0.py
index 3e380b9342ba9bebae1a3195dcadf08a1b598fc9..8ffdf55b27ce401ff26b2fe355cc99597f755347 100644
--- a/Phys/StrippingSelections/python/StrippingSelections/StrippingIFT/StrippingHeavyIonD02KPiPi0.py
+++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingIFT/StrippingHeavyIonD02KPiPi0.py
@@ -25,9 +25,8 @@ __all__ = ('StrippingHeavyIonD02KPiPi0Conf',
            'makeD02KPiPi0M',
            'default_config')
 
-from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from PhysSelPython.Wrappers import Selection, DataOnDemand
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
+from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from StandardParticles import StdTightPions, StdTightKaons, StdLooseMergedPi0, StdLooseResolvedPi0
diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingIFT/StrippingHeavyIonDiMuon.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingIFT/StrippingHeavyIonDiMuon.py
index 7006c283f4dc99f27a96ed4a998d84e5b1ad4cd0..b23478e8ffe6a49582c92df2422aeacc0c7cf127 100644
--- a/Phys/StrippingSelections/python/StrippingSelections/StrippingIFT/StrippingHeavyIonDiMuon.py
+++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingIFT/StrippingHeavyIonDiMuon.py
@@ -17,8 +17,7 @@ from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 from StandardParticles import StdAllLooseMuons
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand
-from Gaudi.Configuration import *
+from PhysSelPython.Wrappers import Selection
 __author__ = ['Emilie MAURICE']
 __date__ = ''
 __version__ = '$Revision: 2.0 $'
diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingIFT/StrippingHeavyIonDst2D0KPiForPID.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingIFT/StrippingHeavyIonDst2D0KPiForPID.py
index 4282eb3c7b386840ce3bb3a47569a6a981e3194c..c3ba0aa8f46df637625d1f88481903dd9414f15e 100644
--- a/Phys/StrippingSelections/python/StrippingSelections/StrippingIFT/StrippingHeavyIonDst2D0KPiForPID.py
+++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingIFT/StrippingHeavyIonDst2D0KPiForPID.py
@@ -13,10 +13,8 @@
 from StandardParticles import StdAllNoPIDsKaons, StdAllNoPIDsPions
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from LHCbKernel.Configuration import *
-from Gaudi.Configuration import *
+from PhysSelPython.Wrappers import Selection
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 __author__ = ['Philip Xing', 'Andrew Powell']
 __date__ = '23rd August 2012'
 __version__ = '$Revision: 7.0 $'
@@ -36,7 +34,7 @@ Usage:
 __all__ = ('HeavyIonDst2D0KPiForPIDConf', 'default_config', "D0", "Dstar")
 
 
-from GaudiKernel.SystemOfUnits import mm, cm, MeV, GeV
+from GaudiKernel.SystemOfUnits import GeV, MeV
 # from Configurables import FilterDesktop, CombineParticles
 
 
diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingIFT/StrippingHeavyIonOthercc.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingIFT/StrippingHeavyIonOthercc.py
index d762548461ded44c7162840ccf9c84cab20bd60b..d4ecc7b6f1705d691173810a8a986c9de46b53f4 100644
--- a/Phys/StrippingSelections/python/StrippingSelections/StrippingIFT/StrippingHeavyIonOthercc.py
+++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingIFT/StrippingHeavyIonOthercc.py
@@ -17,8 +17,7 @@ from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 from StandardParticles import StdNoPIDsElectrons, StdLooseProtons, StdLooseMuons
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand
-from Gaudi.Configuration import *
+from PhysSelPython.Wrappers import Selection
 __author__ = ['Emilie MAURICE']
 __date__ = ''
 __version__ = '$Revision: 1.0 $'
diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingIFT/StrippingHeavyIonPIDCalib.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingIFT/StrippingHeavyIonPIDCalib.py
index df8b9c18c542aa0b4edb413fca9457fc1b99b7d4..9b8d406ef75205f110369c006e8f733db08aa179 100644
--- a/Phys/StrippingSelections/python/StrippingSelections/StrippingIFT/StrippingHeavyIonPIDCalib.py
+++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingIFT/StrippingHeavyIonPIDCalib.py
@@ -37,7 +37,6 @@ from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
 from Gaudi.Configuration import *
 __author__ = ['Yanxi ZHANG']
 __date__ = '25/02/2015'
diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingIFT/StrippingHeavyIonTopology.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingIFT/StrippingHeavyIonTopology.py
index 19f3d03c95644de38c49321c5c0b7fb0636739e4..8308d72b5faed1731235c6cd48d682ca5b65d690 100644
--- a/Phys/StrippingSelections/python/StrippingSelections/StrippingIFT/StrippingHeavyIonTopology.py
+++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingIFT/StrippingHeavyIonTopology.py
@@ -12,13 +12,9 @@
 Module for selecting specific topology
 '''
 
-from Configurables import FilterDesktop, CombineParticles
-from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-from StandardParticles import StdAllLooseMuons, StdAllLoosePions, StdAllNoPIDsPions, StdLoosePhotons
+from Configurables import FilterDesktop
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand
-from Gaudi.Configuration import *
 __author__ = ['Emilie MAURICE']
 __date__ = ''
 __version__ = '$Revision: 1.0 $'
diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingIFT/StrippingHeavyIonTrackEffDownMuon.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingIFT/StrippingHeavyIonTrackEffDownMuon.py
index 4b221c471786b20ec59036a3b26e4f2096a6eea3..bd21417c5bdd6eabcfe4b156766331a8bd76155f 100644
--- a/Phys/StrippingSelections/python/StrippingSelections/StrippingIFT/StrippingHeavyIonTrackEffDownMuon.py
+++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingIFT/StrippingHeavyIonTrackEffDownMuon.py
@@ -43,34 +43,26 @@ __all__ = ('HeavyIonTrackEffDownMuonConf',
 # FIXME Write includes in a cleaner way
 from Gaudi.Configuration import *
 from LHCbKernel.Configuration import *
-from DAQSys.DecoderClass import Decoder
 from Configurables import GaudiSequencer
 from Configurables import UnpackTrack, ChargedProtoParticleMaker, DelegatingTrackSelector, TrackSelector, BestPIDParticleMaker
-from TrackFitter.ConfiguredFitters import ConfiguredFit
 from Configurables import TrackStateInitAlg
 from StrippingConf.StrippingLine import StrippingLine
-from Configurables import ChargedProtoParticleAddMuonInfo, MuonIDAlgLite
+from Configurables import ChargedProtoParticleAddMuonInfo
 from MuonID import ConfiguredMuonIDs
 from Configurables import ChargedProtoCombineDLLsAlg, ProtoParticleMUONFilter
-from PhysSelPython.Wrappers import Selection, DataOnDemand
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
+from PhysSelPython.Wrappers import Selection
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 
 from StrippingUtils.Utils import LineBuilder
-from Configurables import LoKi__VoidFilter
-from os import environ
 from Gaudi.Configuration import *
-import GaudiKernel.ProcessJobOptions
-from GaudiKernel.SystemOfUnits import mm
 
 from GaudiConfUtils.ConfigurableGenerators import TisTosParticleTagger
 from StandardParticles import StdAllLooseMuons
 from Configurables import GaudiSequencer
 from Configurables import TrackToDST
-from Configurables import TrackSys
 from Configurables import PatSeeding, PatSeedingTool, PatLongLivedTracking
-from PhysSelPython.Wrappers import AutomaticData
 # Get the fitters
-from TrackFitter.ConfiguredFitters import ConfiguredFit, ConfiguredFitSeed, ConfiguredFitDownstream
+from TrackFitter.ConfiguredFitters import ConfiguredFitDownstream
 from PatAlgorithms import PatAlgConf
 
 from SelPy.utils import (UniquelyNamedObject,
diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingIFT/StrippingHeavyIonTrackEffMuonTT.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingIFT/StrippingHeavyIonTrackEffMuonTT.py
index d45ec02acda032c5c4f8402c30d1bc094a63cceb..e2e32a543831c9767d793bae28337b3992789b78 100644
--- a/Phys/StrippingSelections/python/StrippingSelections/StrippingIFT/StrippingHeavyIonTrackEffMuonTT.py
+++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingIFT/StrippingHeavyIonTrackEffMuonTT.py
@@ -62,12 +62,11 @@ __all__ = ('HeavyIonTrackEffMuonTTConf',
            'makeBJpsiKTrackEff',
            'filterHLT2ForBJpsiK')
 
-from Gaudi.Configuration import *
-from PhysSelPython.Wrappers import Selection, DataOnDemand, ChargedProtoParticleSelection
+from PhysSelPython.Wrappers import ChargedProtoParticleSelection, Selection
 from StrippingConf.StrippingLine import StrippingLine
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from StrippingUtils.Utils import LineBuilder, checkConfig
-from StandardParticles import StdLooseKaons, StdLooseMuons, StdAllLooseMuons
+from StrippingUtils.Utils import LineBuilder
+from StandardParticles import StdAllLooseMuons, StdLooseKaons
 
 
 from Configurables import (MuonCombRec,
diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingIFT/StrippingHeavyIonTrackEffVeloMuon.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingIFT/StrippingHeavyIonTrackEffVeloMuon.py
index c0bb11bf8fca29661adbf8ebd509a6eceec327a5..38f843265825d75998c1de6ae518bf039af67a84 100644
--- a/Phys/StrippingSelections/python/StrippingSelections/StrippingIFT/StrippingHeavyIonTrackEffVeloMuon.py
+++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingIFT/StrippingHeavyIonTrackEffVeloMuon.py
@@ -40,17 +40,14 @@ __all__ = ('HeavyIonTrackEffVeloMuonConf',
            )
 
 
-from Gaudi.Configuration import *
-from LHCbKernel.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 # from Configurables import CombineParticles
-from PhysSelPython.Wrappers import Selection, SelectionSequence, DataOnDemand
-from Configurables import ChargedProtoParticleMaker, NoPIDsParticleMaker, DataOnDemandSvc, DelegatingTrackSelector, TrackSelector, CombinedParticleMaker, BestPIDParticleMaker
+from PhysSelPython.Wrappers import Selection
+from Configurables import ChargedProtoParticleMaker, DataOnDemandSvc, DelegatingTrackSelector, NoPIDsParticleMaker, TrackSelector
 from Configurables import FastVeloTracking
 
 from StrippingConf.StrippingLine import StrippingLine
-from Configurables import TrackStateInitAlg, TrackEventFitter, TrackPrepareVelo, TrackContainerCopy, Tf__PatVeloSpaceTool, StandaloneMuonRec
-from Configurables import TrackCloneFinder
+from Configurables import StandaloneMuonRec, TrackPrepareVelo
 from StrippingUtils.Utils import LineBuilder
 # changed from StdLooseMuons, yanxi
 from StandardParticles import StdAllLooseMuons
@@ -59,14 +56,9 @@ from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, TisTosParticleT
 # from Configurables import TisTosParticleTagger
 
 from Configurables import GaudiSequencer
-from Configurables import TrackSys
-from PhysSelPython.Wrappers import AutomaticData
 # Get the fitters
-from TrackFitter.ConfiguredFitters import ConfiguredFit
 
-from Configurables import TrackEventCloneKiller, VeloMuonBuilder
-from Configurables import TrackEventFitter, TrackMasterFitter
-from Configurables import TrackKalmanFilter, TrackMasterExtrapolator
+from Configurables import VeloMuonBuilder
 # from TrackFitter.ConfiguredFitters import ConfiguredFastFitter
 # from Configurables import TrackCloneFinder
 
diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingIFT/StrippingLb2V0pphh.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingIFT/StrippingLb2V0pphh.py
index 3ee7aeb4f38f8798b68eecc011e8af5189ed2af7..e7e59c7c8ac1dca0c6c0a9e08e0c83725d6facc0 100644
--- a/Phys/StrippingSelections/python/StrippingSelections/StrippingIFT/StrippingLb2V0pphh.py
+++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingIFT/StrippingLb2V0pphh.py
@@ -24,7 +24,6 @@ __date__ = '19/03/2021'
 __version__ = 'v1r0'
 __all__ = {'Lb2V0pphhConf', 'default_config'}
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
 from PhysSelPython.Wrappers import Selection, DataOnDemand, SimpleSelection
 from StrippingConf.StrippingLine import StrippingLine
diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingIFT/StrippingLb2dpX.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingIFT/StrippingLb2dpX.py
index c5a28128f1c971f8267afd05042345d05e19e0d1..ad0fc42d4ffbb2955abf25f92475e3c4281e6d14 100644
--- a/Phys/StrippingSelections/python/StrippingSelections/StrippingIFT/StrippingLb2dpX.py
+++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingIFT/StrippingLb2dpX.py
@@ -24,7 +24,6 @@ __all__ = ('Lb2dpXConf',
            )
 
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop
 
 from StandardParticles import StdAllNoPIDsPions as Pions
@@ -33,7 +32,6 @@ from StandardParticles import StdAllNoPIDsKaons as Kaons
 from PhysSelPython.Wrappers import Selection, SimpleSelection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from Configurables import LoKi__VoidFilter as VoidFilter
 
 default_config = {
     'NAME': 'Lb2dpX',
diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingMiniBias/StrippingBadEvents.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingMiniBias/StrippingBadEvents.py
index 4d837a2f722d72d1c7683e8f61d6316db037f332..460036843530f41526b7139b73c204dba3cf9160 100644
--- a/Phys/StrippingSelections/python/StrippingSelections/StrippingMiniBias/StrippingBadEvents.py
+++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingMiniBias/StrippingBadEvents.py
@@ -8,7 +8,6 @@
 # granted to it by virtue of its status as an Intergovernmental Organization  #
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
-from PhysSelPython.Wrappers import Selection
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 __author__ = 'Andrea Contu'
diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingMiniBias/StrippingMiniBias.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingMiniBias/StrippingMiniBias.py
index 7ba890fe41b117c0dcaaac7777296c741c397754..f791c6cd1cfac775c9b2357307a4044a5100eb87 100644
--- a/Phys/StrippingSelections/python/StrippingSelections/StrippingMiniBias/StrippingMiniBias.py
+++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingMiniBias/StrippingMiniBias.py
@@ -8,7 +8,6 @@
 # granted to it by virtue of its status as an Intergovernmental Organization  #
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
-from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 __author__ = 'Patrick Koppenburg'
diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingQEE/DisplVertices_Utils.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingQEE/DisplVertices_Utils.py
index f9e3c9136e46dcf7697209e381ff7735b840ed2e..bcd9752464adf9657cb3a290918226a7d0f05341 100644
--- a/Phys/StrippingSelections/python/StrippingSelections/StrippingQEE/DisplVertices_Utils.py
+++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingQEE/DisplVertices_Utils.py
@@ -14,12 +14,11 @@ Utilities for displaced vertex stripping: wrapper class around PatPV3D
 
 __all__ = ("SelectionFromAlgorithmWithTools", "SelectionPatPV3DWrapper")
 
-from GaudiConfUtils import isConfigurable
 
 from SelPy.utils import (UniquelyNamedObject, ClonableObject, SelectionBase, compatibleSequences,
-                         IncompatibleInputLocations, CloneCallable, makeOutputLocation, setOutputLocation)
+                         IncompatibleInputLocations, makeOutputLocation, setOutputLocation)
 
-from PhysSelPython.Wrappers import checkConfigurable, checkName
+from PhysSelPython.Wrappers import checkName
 
 
 def connectToRequiredSelections(selection, inputSetter):
diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingQEE/StrippingA1MuMu.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingQEE/StrippingA1MuMu.py
old mode 100755
new mode 100644
index 91e62b0b649d88ac57d91a3cf24db5351e7b19de..281aebf4be79ceaf5c90e7533eb04d49847e5185
--- a/Phys/StrippingSelections/python/StrippingSelections/StrippingQEE/StrippingA1MuMu.py
+++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingQEE/StrippingA1MuMu.py
@@ -23,11 +23,9 @@ A_1 -> mu+ mu-, based on functionality from StrippingDiMuonNew by Jibo He.
 
 """
 
-from Gaudi.Configuration import *
-from LHCbKernel.Configuration import *
 
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
-from PhysSelPython.Wrappers import Selection, DataOnDemand, SimpleSelection
+from PhysSelPython.Wrappers import SimpleSelection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from GaudiKernel.SystemOfUnits import MeV
diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingQEE/StrippingA2MuMu.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingQEE/StrippingA2MuMu.py
index 64c106858ef1dd3206b2083b5ea5e630aec55ae8..cd47529d168278a387e79f1f772ca7cf3b1d8040 100644
--- a/Phys/StrippingSelections/python/StrippingSelections/StrippingQEE/StrippingA2MuMu.py
+++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingQEE/StrippingA2MuMu.py
@@ -22,7 +22,7 @@ from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from StandardParticles import StdAllLooseMuons, StdAllNoPIDsMuons
+from StandardParticles import StdAllLooseMuons
 from GaudiKernel.SystemOfUnits import GeV
 
 
diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingQEE/StrippingA2MuMuSameSign.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingQEE/StrippingA2MuMuSameSign.py
index 5911c40e36b1e66721231826c818abbc79aed758..a89a6a8b5ff2bf6571b4fe0fcaeb93088567f2a5 100644
--- a/Phys/StrippingSelections/python/StrippingSelections/StrippingQEE/StrippingA2MuMuSameSign.py
+++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingQEE/StrippingA2MuMuSameSign.py
@@ -22,7 +22,7 @@ from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from StandardParticles import StdAllLooseMuons, StdAllNoPIDsMuons
+from StandardParticles import StdAllLooseMuons
 from GaudiKernel.SystemOfUnits import GeV
 
 
diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingQEE/StrippingALP2TauTau.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingQEE/StrippingALP2TauTau.py
index a5398df14e536d20fbd7844f5841009a5b4a5ecd..db69855d7696c5ca2cf73c0a13c8653f621c1eac 100644
--- a/Phys/StrippingSelections/python/StrippingSelections/StrippingQEE/StrippingALP2TauTau.py
+++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingQEE/StrippingALP2TauTau.py
@@ -9,12 +9,10 @@
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
 
-from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, OfflineVertexFitter
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop
 from PhysSelPython.Wrappers import Selection, DataOnDemand, SimpleSelection
 from StrippingConf.StrippingLine import StrippingLine
 from GaudiKernel.SystemOfUnits import MeV, GeV, mm
-from CommonParticles import StdAllNoPIDsPions
 from StrippingUtils.Utils import LineBuilder
 
 '''
diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingQEE/StrippingB2EHNLLines.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingQEE/StrippingB2EHNLLines.py
index 0a74c48c6421c6ba225775eef6c8f6c0caae34ea..a3e372506454305727e3814f5b881be54e8e1c07 100644
--- a/Phys/StrippingSelections/python/StrippingSelections/StrippingQEE/StrippingB2EHNLLines.py
+++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingQEE/StrippingB2EHNLLines.py
@@ -28,9 +28,8 @@ __version__ = '$Revision: 2.0 $'
 
 __all__ = ('B2EHNLLines', 'default_config')
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from StandardParticles import StdAllNoPIDsPions, StdLoosePions, StdLooseMuons, StdLooseDownMuons, StdNoPIDsDownPions, StdLooseElectrons, StdNoPIDsDownElectrons
+from StandardParticles import StdLooseDownMuons, StdLooseElectrons, StdLooseMuons, StdLoosePions, StdNoPIDsDownElectrons, StdNoPIDsDownPions
 from PhysSelPython.Wrappers import CombineSelection, DataOnDemand, Selection, MergedSelection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingQEE/StrippingB2LLP2HH.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingQEE/StrippingB2LLP2HH.py
index 073c098c3a38cbbfb2655b777880011ad219247a..179fe2f52ea095317c5a39508a99a578c806ae3a 100644
--- a/Phys/StrippingSelections/python/StrippingSelections/StrippingQEE/StrippingB2LLP2HH.py
+++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingQEE/StrippingB2LLP2HH.py
@@ -18,13 +18,11 @@ __date__ = '25/01/2019'
 
 __all__ = ('B2LLPV0_sConf', 'default_config')
 
-from Gaudi.Configuration import *
 from StandardParticles import StdAllNoPIDsPions
 from PhysSelPython.Wrappers import CombineSelection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from GaudiKernel.SystemOfUnits import GeV
-from LoKiPhys.functions import SOURCE, SIZE
 
 default_config = {
     'NAME': 'B2LLPV0',
diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingQEE/StrippingB2MuHNLLines.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingQEE/StrippingB2MuHNLLines.py
index 1b9907eed90607183570f83ae0f41e52fc421408..ababbe64f50dd1ca13074c06e1006ca7144a37fc 100644
--- a/Phys/StrippingSelections/python/StrippingSelections/StrippingQEE/StrippingB2MuHNLLines.py
+++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingQEE/StrippingB2MuHNLLines.py
@@ -28,9 +28,8 @@ __version__ = '$Revision: 2.0 $'
 
 __all__ = ('B2MuHNLLines', 'default_config')
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from StandardParticles import StdAllNoPIDsPions, StdLoosePions, StdLooseMuons, StdLooseDownMuons, StdNoPIDsDownPions, StdLooseElectrons, StdNoPIDsDownElectrons
+from StandardParticles import StdLooseDownMuons, StdLooseElectrons, StdLooseMuons, StdLoosePions, StdNoPIDsDownElectrons, StdNoPIDsDownPions
 from PhysSelPython.Wrappers import CombineSelection, DataOnDemand, Selection, MergedSelection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingQEE/StrippingConvertedPhoton.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingQEE/StrippingConvertedPhoton.py
index 75d6970b1df2c63c192f20d524128d15f914343b..6a24e6a634b2578b9537332d82053d30b73013fd 100644
--- a/Phys/StrippingSelections/python/StrippingSelections/StrippingQEE/StrippingConvertedPhoton.py
+++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingQEE/StrippingConvertedPhoton.py
@@ -23,7 +23,7 @@ __all__ = (
 
 from Gaudi.Configuration import *
 from CommonParticles.Utils import *
-from GaudiKernel.SystemOfUnits import MeV, GeV, mm
+from GaudiKernel.SystemOfUnits import MeV, mm
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
 from Configurables import (DiElectronMaker,
                            ProtoParticleCALOFilter,
@@ -31,9 +31,7 @@ from Configurables import (DiElectronMaker,
                            LoKi__VertexFitter,
                            )
 from PhysSelPython.Wrappers import (Selection,
-                                    SimpleSelection,
-                                    MergedSelection,
-                                    AutomaticData)
+                                    MergedSelection)
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 
diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingQEE/StrippingDY2MuMu.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingQEE/StrippingDY2MuMu.py
index 9c7c8a7706d666e3fac7a8f8316de58468cc8b74..6a28183b934ae8110dbdef65c4d96d44dd261b82 100644
--- a/Phys/StrippingSelections/python/StrippingSelections/StrippingQEE/StrippingDY2MuMu.py
+++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingQEE/StrippingDY2MuMu.py
@@ -26,9 +26,8 @@ __author__ = ['J. Anderson']
 
 __all__ = 'DY2MuMuConf', 'default_config'
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-from PhysSelPython.Wrappers import Selection, SimpleSelection
+from PhysSelPython.Wrappers import SimpleSelection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from StandardParticles import StdAllLooseMuons
diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingQEE/StrippingDY2ee.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingQEE/StrippingDY2ee.py
index e1e5fb0bec27db97687652501ba17ba46baca814..25b226c2dcf544b3b1e376446c208bdd7c266ceb 100644
--- a/Phys/StrippingSelections/python/StrippingSelections/StrippingQEE/StrippingDY2ee.py
+++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingQEE/StrippingDY2ee.py
@@ -20,9 +20,8 @@ __author__ = ['S.Bifani', 'D.Ward']
 
 __all__ = ('DY2eeConf', 'default_config')
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-from PhysSelPython.Wrappers import Selection, DataOnDemand
+from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from StandardParticles import StdAllNoPIDsElectrons
diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingQEE/StrippingDisplVertices.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingQEE/StrippingDisplVertices.py
index 5b0be7ca6bf6610767d8a683238e401caadf2f20..ce06625eaa039ad6c4e22c1a114beaf965dbb3b8 100644
--- a/Phys/StrippingSelections/python/StrippingSelections/StrippingQEE/StrippingDisplVertices.py
+++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingQEE/StrippingDisplVertices.py
@@ -40,7 +40,6 @@ __all__ = ('DisplVerticesConf', 'default_config')
 
 from Gaudi.Configuration import *
 from GaudiKernel import SystemOfUnits as units
-from LHCbKernel.Configuration import DEBUG, VERBOSE
 
 import logging
 logger = logging.getLogger(__name__)
diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingQEE/StrippingDitau.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingQEE/StrippingDitau.py
old mode 100755
new mode 100644
index fa049324f79a44e720a641aa2ed2cdc857f4435e..3e2dd3df509a4ead7bb1a73e4cccd6e5f2e99c0f
--- a/Phys/StrippingSelections/python/StrippingSelections/StrippingQEE/StrippingDitau.py
+++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingQEE/StrippingDitau.py
@@ -155,8 +155,7 @@ Derived from works of S.Farry & P. Ilten
 
 """
 
-import os
-from GaudiKernel.SystemOfUnits import MeV, GeV, micrometer
+from GaudiKernel.SystemOfUnits import GeV, MeV
 from PhysSelPython.Wrappers import Selection, SimpleSelection, PassThroughSelection, MergedSelection, AutomaticData
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
@@ -894,7 +893,7 @@ def Tuples():
 
     """
     import re
-    from DecayTreeTuple.Configuration import DecayTreeTuple, EventTuple
+    from DecayTreeTuple.Configuration import DecayTreeTuple
 
     seq = GaudiSequencer('TupleSeq')
     seq.ModeOR = True
diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingQEE/StrippingExotica.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingQEE/StrippingExotica.py
old mode 100755
new mode 100644
index 53d4e78dbc02f72bc606ac4946ac8b3d4ffca135..8fde59168275d4997d6cc3f329999fbc92fcaee8
--- a/Phys/StrippingSelections/python/StrippingSelections/StrippingQEE/StrippingExotica.py
+++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingQEE/StrippingExotica.py
@@ -30,7 +30,7 @@ Hlt2ExoticaPrmptDiMuonHighMass
 from GaudiKernel.SystemOfUnits import MeV, GeV, mm, picosecond
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-from PhysSelPython.Wrappers import Selection, SimpleSelection, MergedSelection, AutomaticData
+from PhysSelPython.Wrappers import AutomaticData, SimpleSelection
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 
diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingQEE/StrippingFullDiJets.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingQEE/StrippingFullDiJets.py
index 9f9b7b90a54554d0ddb97629f1717b25aa1ff1a4..cf5af4522353ef4302dda2251df7b6096c0bbf73 100644
--- a/Phys/StrippingSelections/python/StrippingSelections/StrippingQEE/StrippingFullDiJets.py
+++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingQEE/StrippingFullDiJets.py
@@ -9,14 +9,10 @@
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
 
-from Gaudi.Configuration import *
-from Configurables import FilterDesktop, CombineParticles, LoKi__VertexFitter
+from Configurables import CombineParticles, LoKi__VertexFitter
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from StandardParticles import StdJets
-from CommonParticles.Utils import *
-from Configurables import FilterJet
 from GaudiKernel.SystemOfUnits import GeV
 
 __author__ = "Xabier Cid Vidal", "Cedric Potterat", "William Barter"
diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingQEE/StrippingGluinos.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingQEE/StrippingGluinos.py
index 0867cc3c369e7f5b06dfb5d1909d7eeda820e3f0..8070b81f174dd132e7ec9c150bbe87dc5befc9b9 100644
--- a/Phys/StrippingSelections/python/StrippingSelections/StrippingQEE/StrippingGluinos.py
+++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingQEE/StrippingGluinos.py
@@ -10,11 +10,10 @@
 ###############################################################################
 from Configurables import FilterDesktop, JetVertexAlg
 from CommonParticles.Utils import *
-from LoKiPhys.functions import SOURCE, SIZE
 from GaudiKernel.SystemOfUnits import GeV
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import FilterSelection, PassThroughSelection, DataOnDemand
+from PhysSelPython.Wrappers import FilterSelection, PassThroughSelection
 from StandardParticles import StdJets
 from Gaudi.Configuration import *
 __author__ = ['Xabier Cid Vidal', 'Carlos Vazquez Sierra', 'Igor Kostiuk']
diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingQEE/StrippingLFVExotica.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingQEE/StrippingLFVExotica.py
old mode 100755
new mode 100644
index 88da9dcd829a1905c1264408cac8e2e94c89b89f..fef9c145f071f0ab2fe36aeab16fc22bc5d9a283
--- a/Phys/StrippingSelections/python/StrippingSelections/StrippingQEE/StrippingLFVExotica.py
+++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingQEE/StrippingLFVExotica.py
@@ -174,7 +174,7 @@ def create_stdjets(strob, line_location, stdjets_name_ban):
         strob.StdJetsNoJetIDBan = [myconf1]
 
     # configure Data-On-Demand service
-    locations = updateDoD(myconf1)
+    updateDoD(myconf1)
 
 
 relInfoJetsVars = ["JETNOMU1PX", "JETNOMU1PY", "JETNOMU1PZ", "JETNOMU1PT", "JETNOMU1JETWIDTH", "JETNOMU1NNTAG", "JETNOMU1MNF", "JETNOMU2PX", "JETNOMU2PY", "JETNOMU2PZ", "JETNOMU2PT", "JETNOMU2JETWIDTH", "JETNOMU2NNTAG", "JETNOMU2MNF", "JETNOMU3PX", "JETNOMU3PY",
diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingQEE/StrippingLLP2HH.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingQEE/StrippingLLP2HH.py
index 00c3a16a5b5121112043a13bce9b73a6fc558213..f3d787247a298460c19f1c5cad9114e1b7b2343e 100644
--- a/Phys/StrippingSelections/python/StrippingSelections/StrippingQEE/StrippingLLP2HH.py
+++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingQEE/StrippingLLP2HH.py
@@ -18,13 +18,11 @@ __date__ = '23/06/2021'
 
 __all__ = ('LLPV0_sConf', 'default_config')
 
-from Gaudi.Configuration import *
 from StandardParticles import StdAllNoPIDsPions
 from PhysSelPython.Wrappers import CombineSelection, PassThroughSelection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from GaudiKernel.SystemOfUnits import GeV, picosecond
-from LoKiPhys.functions import SOURCE, SIZE
 
 default_config = {
     'NAME': 'LLPV0',
diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingQEE/StrippingLLP2Hadrons.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingQEE/StrippingLLP2Hadrons.py
index 4db1eeb4fc5effa1706b7725ce0ebd5c721b0060..3aec384d4ea923e83a375c12b704df908bf8ceef 100644
--- a/Phys/StrippingSelections/python/StrippingSelections/StrippingQEE/StrippingLLP2Hadrons.py
+++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingQEE/StrippingLLP2Hadrons.py
@@ -14,10 +14,9 @@
 Stripping lines selecting scalar long-lived particles decaying to hadrons
 """
 
-from GaudiKernel.SystemOfUnits import MeV, GeV, mm, picosecond
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-from PhysSelPython.Wrappers import Selection, SimpleSelection, MergedSelection, AutomaticData
+from PhysSelPython.Wrappers import AutomaticData, MergedSelection, Selection
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 
diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingQEE/StrippingLLP2Jets.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingQEE/StrippingLLP2Jets.py
index 8619ba15a78cfb147e8f2c955611f8cdd44bd2ba..9c25c3202184e96ffba87e12971ec43ac9362246 100644
--- a/Phys/StrippingSelections/python/StrippingSelections/StrippingQEE/StrippingLLP2Jets.py
+++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingQEE/StrippingLLP2Jets.py
@@ -18,7 +18,6 @@ __date__ = '25/01/2019'
 
 __all__ = ('LLP2Jets_sConf', 'default_config')
 
-from Gaudi.Configuration import *
 from Configurables import JetVertexAlg
 from StandardParticles import StdJets
 from CommonParticles.Utils import updateDoD
diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingQEE/StrippingLLP2MuX.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingQEE/StrippingLLP2MuX.py
index 5e11c78ecc6608d63fed19b2c7da80329d8b6164..6aa23424c0d1301265496b3cb2b3aa90d102171f 100644
--- a/Phys/StrippingSelections/python/StrippingSelections/StrippingQEE/StrippingLLP2MuX.py
+++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingQEE/StrippingLLP2MuX.py
@@ -16,7 +16,6 @@ from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import AutomaticData, Selection
 from GaudiKernel import SystemOfUnits as units
-from LHCbKernel.Configuration import *
 __author__ = "Pieter David"
 __date__ = "2014-08-28"
 __all__ = ("LLP2MuXConf", "default_config")
diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingQEE/StrippingLambdaDecaysDM.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingQEE/StrippingLambdaDecaysDM.py
index bc00d02ab9e92a936cf638348bad0d0c5359e894..a5598540a06cde096db44bd5262255253d5b0e48 100644
--- a/Phys/StrippingSelections/python/StrippingSelections/StrippingQEE/StrippingLambdaDecaysDM.py
+++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingQEE/StrippingLambdaDecaysDM.py
@@ -13,18 +13,14 @@
 Lines for searches on DM candidates produced from Lambda decays (arXiv:2101.02706).
 """
 
-from Gaudi.Configuration import *
-from LHCbKernel.Configuration import *
 
-from CommonParticles.Utils import *
-from CommonParticles import StdAllNoPIDsPions
 from StandardParticles import StdAllLooseKaons, StdAllLooseProtons, StdAllLoosePions
 
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from GaudiKernel.SystemOfUnits import MeV, picosecond, millimeter
+from GaudiKernel.SystemOfUnits import MeV, millimeter
 
 __author__ = ['Xabier Cid Vidal', 'Carlos Vazquez Sierra', 'Saul Lopez Solino']
 __date__ = '18/03/2021'
diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingQEE/StrippingLb2dp.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingQEE/StrippingLb2dp.py
old mode 100755
new mode 100644
index cf2bf7494c36f78187f495fe46a2fcfe068338e0..cbd7593f597ef30b0f56f7070b78fe66905549e5
--- a/Phys/StrippingSelections/python/StrippingSelections/StrippingQEE/StrippingLb2dp.py
+++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingQEE/StrippingLb2dp.py
@@ -23,15 +23,11 @@ __all__ = ('Lb2dpConf',
            )
 
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop
-from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays
 
-from StandardParticles import StdAllNoPIDsPions, StdAllNoPIDsProtons,  StdAllNoPIDsKaons
 from PhysSelPython.Wrappers import Selection, DataOnDemand, SimpleSelection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from Configurables import LoKi__VoidFilter as VoidFilter
 
 default_config = {
     'NAME': 'Lb2dp',
diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingQEE/StrippingMicroDiJets.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingQEE/StrippingMicroDiJets.py
index bad4ad03547afb3eb1d9a6db8a0584899cd101c9..6334bd68bc3e5b0ba62caddeaae6ed5407bb4f92 100644
--- a/Phys/StrippingSelections/python/StrippingSelections/StrippingQEE/StrippingMicroDiJets.py
+++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingQEE/StrippingMicroDiJets.py
@@ -10,13 +10,12 @@
 ###############################################################################
 
 from Gaudi.Configuration import *
-from Configurables import FilterDesktop, CombineParticles, LoKi__VertexFitter
+from Configurables import CombineParticles
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from StandardParticles import StdJets
 from CommonParticles.Utils import *
-from Configurables import FilterJet, ClearDaughters
+from Configurables import ClearDaughters
 from GaudiKernel.SystemOfUnits import GeV
 
 __author__ = "Xabier Cid Vidal", "Cedric Potterat", "William Barter"
diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingQEE/StrippingMuMuSS.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingQEE/StrippingMuMuSS.py
index 2624678f1fc33a1d4e6229645bb86db4dda018d1..36fb89fcb7c0d8920bb6af3e43213c4dc04aa22c 100644
--- a/Phys/StrippingSelections/python/StrippingSelections/StrippingQEE/StrippingMuMuSS.py
+++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingQEE/StrippingMuMuSS.py
@@ -26,7 +26,7 @@ __author__ = (
 )
 
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-from PhysSelPython.Wrappers import Selection, SimpleSelection
+from PhysSelPython.Wrappers import SimpleSelection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from StandardParticles import StdAllLooseMuons
diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingQEE/StrippingSbarSCorrelations.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingQEE/StrippingSbarSCorrelations.py
index 578635fa7ef787c7ed772e61fa98a130acd5ab9f..9c45d8c730a8ea34174573f64728abd920769a54 100644
--- a/Phys/StrippingSelections/python/StrippingSelections/StrippingQEE/StrippingSbarSCorrelations.py
+++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingQEE/StrippingSbarSCorrelations.py
@@ -21,10 +21,8 @@ Long tracks only
 from GaudiKernel.SystemOfUnits import MeV, GeV
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
-from StandardParticles import StdAllNoPIDsPions, StdTightKaons, StdAllNoPIDsProtons
+from PhysSelPython.Wrappers import DataOnDemand, Selection
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = ['Florin MACIUC']
 __date__ = '24/08/2013'
 __version__ = '$Revision: 1.0 $'
diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingQEE/StrippingStrangeBaryons.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingQEE/StrippingStrangeBaryons.py
index f3dd8ebdec4e50abd2bed892959740435ac5d9b5..2405f0e9c6f1695dd9f652d6aae992473b3135a2 100644
--- a/Phys/StrippingSelections/python/StrippingSelections/StrippingQEE/StrippingStrangeBaryons.py
+++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingQEE/StrippingStrangeBaryons.py
@@ -18,14 +18,10 @@ Xi -> Lambda pi,   Omega -> Lambda K
 LLL DDL DDD
 '''
 
-from GaudiKernel.SystemOfUnits import MeV
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
-from CommonParticles import StdLooseLambda
-from StandardParticles import StdLoosePions, StdNoPIDsDownPions, StdLooseKaons, StdLooseDownKaons, StdLooseProtons, StdNoPIDsDownProtons
+from PhysSelPython.Wrappers import DataOnDemand, Selection
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = ['Mihai Straticiuc', 'Florin Maciuc', 'Nguyen Thi Dung']
 __date__ = '26/06/2012'
 __version__ = '$Revision: 0.3 $'
diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingQEE/StrippingStrangeBaryonsNoPID.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingQEE/StrippingStrangeBaryonsNoPID.py
index 668986b834d39169c5ae15803bf5d5fb33cff67b..208ab8bad23a5e36e2a0a609a82dd6ca2fc9d012 100644
--- a/Phys/StrippingSelections/python/StrippingSelections/StrippingQEE/StrippingStrangeBaryonsNoPID.py
+++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingQEE/StrippingStrangeBaryonsNoPID.py
@@ -18,12 +18,10 @@ Xi -> Lambda pi,   Omega -> Lambda K
 LLL
 '''
 
-from GaudiKernel.SystemOfUnits import MeV
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
+from PhysSelPython.Wrappers import DataOnDemand, Selection
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = ['Florin Maciuc']
 __date__ = '13/01/2014'
 __version__ = '$Revision: 0.0 $'
diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingQEE/StrippingTaggedJets.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingQEE/StrippingTaggedJets.py
old mode 100755
new mode 100644
index 295b8a41d2618b3fecf00a4f5a1b7c033637686d..bb3326270087d013f8ced34035ee104c1c23848b
--- a/Phys/StrippingSelections/python/StrippingSelections/StrippingQEE/StrippingTaggedJets.py
+++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingQEE/StrippingTaggedJets.py
@@ -10,11 +10,10 @@
 ###############################################################################
 
 from Gaudi.Configuration import *
-from Configurables import FilterDesktop, CombineParticles, LoKi__VertexFitter
+from Configurables import CombineParticles, LoKi__VertexFitter
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from StandardParticles import StdJets
 from CommonParticles.Utils import *
 from Configurables import FilterJet
 from GaudiKernel.SystemOfUnits import GeV
diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingQEE/StrippingW2nH.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingQEE/StrippingW2nH.py
index cc373f666cb49309b9f3e2efe0dae8e52ac260a4..22eacc1d77ba55838726dc481db0fa8f76e6bf1d 100644
--- a/Phys/StrippingSelections/python/StrippingSelections/StrippingQEE/StrippingW2nH.py
+++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingQEE/StrippingW2nH.py
@@ -26,7 +26,6 @@ from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from StandardParticles import StdAllNoPIDsPions
 from GaudiKernel.SystemOfUnits import GeV
-from GaudiKernel.SystemOfUnits import MeV
 
 
 default_config = {
diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingQEE/StrippingWJets.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingQEE/StrippingWJets.py
old mode 100755
new mode 100644
index ae80ec7c3f67ef962664ed45183a235fcd9c9d4f..48a0b2de2b4dc719b98a7a0de39e0eae96ed4f4f
--- a/Phys/StrippingSelections/python/StrippingSelections/StrippingQEE/StrippingWJets.py
+++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingQEE/StrippingWJets.py
@@ -22,14 +22,12 @@ They are then cover a phasespace complementarily on each other.
 
 """
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
 from Configurables import CombineParticles, LoKi__VertexFitter
 from PhysSelPython.Wrappers import Selection, SimpleSelection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from StandardParticles import StdAllLooseMuons, StdAllNoPIDsElectrons, StdJets
-from CommonParticles.Utils import *
 from GaudiKernel.SystemOfUnits import GeV, MeV
 
 
diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingQEE/StrippingWRareDecay.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingQEE/StrippingWRareDecay.py
index de1eaf98e07a599774f9667406768492a892a465..f599f543313af3af803cfd1ae503077a399fbebb 100644
--- a/Phys/StrippingSelections/python/StrippingSelections/StrippingQEE/StrippingWRareDecay.py
+++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingQEE/StrippingWRareDecay.py
@@ -21,8 +21,7 @@ from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from GaudiKernel.SystemOfUnits import MeV, GeV, mm, picosecond
-from Gaudi.Configuration import *
+from GaudiKernel.SystemOfUnits import MeV, picosecond
 __author__ = ['Hang Yin', 'Qundong Han']
 __date__ = '11/29/2016'
 __version__ = '$Revision: 2.0 $'
diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingQEE/StrippingWe.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingQEE/StrippingWe.py
index 0820e8b431f0bb8891ac3f88f980c3fcbe0a181c..3e509fb26655db393ee396f8d85f74a24b0c62d7 100644
--- a/Phys/StrippingSelections/python/StrippingSelections/StrippingQEE/StrippingWe.py
+++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingQEE/StrippingWe.py
@@ -21,7 +21,6 @@ We control: StdAllNoPIDsElectrons, PRS>50Mev & E_ECal/P>0.1 & E_HCal/P<0.05 & pT
 __all__ = 'WeConf', 'default_config'
 __author__ = 'S. Bifani', 'D. Ward'
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
 from PhysSelPython.Wrappers import SimpleSelection
 from StrippingConf.StrippingLine import StrippingLine
diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingQEE/StrippingZ02ee.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingQEE/StrippingZ02ee.py
index e797011998c7d9201276f70cdabaa1b30ae4d70f..f6977308a75475dc2fd7e695d713190194177820 100644
--- a/Phys/StrippingSelections/python/StrippingSelections/StrippingQEE/StrippingZ02ee.py
+++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingQEE/StrippingZ02ee.py
@@ -23,7 +23,6 @@ __all__ = (
     'default_config',
 )
 
-from Gaudi.Configuration import *
 from GaudiKernel.SystemOfUnits import GeV, MeV
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 from PhysSelPython.Wrappers import SimpleSelection
diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingQEE/StrippingZ02nH.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingQEE/StrippingZ02nH.py
index 2f8d8eb612b1c353cf08c5e72ca77ae205eb7a72..35de5f4d789850497ba9aa5b71430ef065284077 100644
--- a/Phys/StrippingSelections/python/StrippingSelections/StrippingQEE/StrippingZ02nH.py
+++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingQEE/StrippingZ02nH.py
@@ -26,7 +26,6 @@ from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from StandardParticles import StdAllNoPIDsPions
 from GaudiKernel.SystemOfUnits import GeV
-from GaudiKernel.SystemOfUnits import MeV
 
 
 default_config = {
diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingQEE/StrippingZ0RareDecay.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingQEE/StrippingZ0RareDecay.py
index 57c2091f2ac6a4efcb43bd28c4251acba348f513..e181b28533d1769723804e5ccc2d55ce3dfbccea 100644
--- a/Phys/StrippingSelections/python/StrippingSelections/StrippingQEE/StrippingZ0RareDecay.py
+++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingQEE/StrippingZ0RareDecay.py
@@ -22,8 +22,7 @@ __version__ = '$Revision: 2.0 $'
 
 __all__ = 'default_config', 'Z0RareDecayConf'
 
-from Gaudi.Configuration import *
-from GaudiKernel.SystemOfUnits import MeV, GeV, mm
+from GaudiKernel.SystemOfUnits import MeV
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
 from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
 from StrippingConf.StrippingLine import StrippingLine
diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingQEE/depreciated/StrippingDijets.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingQEE/depreciated/StrippingDijets.py
index f0793d3411791797729ad540397e458f4646f78b..975321a6b30b00b6f80aee11878eb20ba9d16b84 100644
--- a/Phys/StrippingSelections/python/StrippingSelections/StrippingQEE/depreciated/StrippingDijets.py
+++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingQEE/depreciated/StrippingDijets.py
@@ -15,8 +15,7 @@
 __all__ = ('DijetsConf',
            'default_config')
 
-from Gaudi.Configuration import *
-from GaudiKernel.SystemOfUnits import MeV, GeV, mm
+from GaudiKernel.SystemOfUnits import GeV, MeV
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingQEE/depreciated/StrippingHighPtTopoJets.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingQEE/depreciated/StrippingHighPtTopoJets.py
index 73ca61d9e7e0914a21b65e40361131e8f38c026d..6078cdec364615de35d547f813533d0a763afeef 100644
--- a/Phys/StrippingSelections/python/StrippingSelections/StrippingQEE/depreciated/StrippingHighPtTopoJets.py
+++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingQEE/depreciated/StrippingHighPtTopoJets.py
@@ -21,8 +21,6 @@ __all__ = ('default_config', 'HighPtTopoJetsConf')
 # \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\#
 
 
-from Gaudi.Configuration import *
-from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from PhysSelPython.Wrappers import EventSelection
diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingQEE/depreciated/StrippingJets.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingQEE/depreciated/StrippingJets.py
index 02e5fc43080729f2f38d0bc0bde65232a21f0202..55abf24d99577dcb8f10b30fda8803015b0c09f0 100644
--- a/Phys/StrippingSelections/python/StrippingSelections/StrippingQEE/depreciated/StrippingJets.py
+++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingQEE/depreciated/StrippingJets.py
@@ -15,13 +15,11 @@
 __all__ = ('JetsConf',
            'default_config')
 
-from Gaudi.Configuration import *
-from GaudiKernel.SystemOfUnits import MeV, GeV, mm
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
+from GaudiKernel.SystemOfUnits import GeV, MeV
+from PhysSelPython.Wrappers import MergedSelection, Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
-from JetAccessories.JetMaker_Config import JetMakerConf
 from StandardParticles import StdJets, StdAllNoPIDsPions
 from Configurables import CombineParticles
 from Configurables import TopologicalTagging
diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/Beauty2Charm_LoKiCuts.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/Beauty2Charm_LoKiCuts.py
index ce5265655cf518aa12121d3a5728d84c36da26cd..666cef80aacee423a071365fe7281c63e506e27d 100644
--- a/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/Beauty2Charm_LoKiCuts.py
+++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/Beauty2Charm_LoKiCuts.py
@@ -10,11 +10,6 @@
 ###############################################################################
 # \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\#
 
-from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
-from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-from PhysSelPython.Wrappers import Selection, MergedSelection
-from StandardParticles import StdNoPIDsPions, StdNoPIDsKaons
 
 # \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\#
 
diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingB02Lcmu_pKpi.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingB02Lcmu_pKpi.py
index 3d6992fd337683bf5bcf97e994e4fd64705add4f..93bd54fbf8871329e8e7bcb95f7722d9913e1cff 100644
--- a/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingB02Lcmu_pKpi.py
+++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingB02Lcmu_pKpi.py
@@ -14,7 +14,6 @@ from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = ['Nikita Beliy', 'Jibo He']
 __date__ = '28/11/2016'
 __version__ = '$Revision: 1.0 $'
diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingB23MuLines.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingB23MuLines.py
index a6e53abda621d1f1b0efe6185553c1b46aae67e6..15ea2076dcaea1a75c4fec8295e895be19887b4a 100644
--- a/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingB23MuLines.py
+++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingB23MuLines.py
@@ -55,13 +55,11 @@ __all__ = ("B23MuLinesConf",
 
 #############################################################################
 
-from Gaudi.Configuration import *
-from Configurables import FilterDesktop, CombineParticles, DaVinci__N3BodyDecays
+from Configurables import DaVinci__N3BodyDecays
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 # from StrippingSelections.Utils import checkConfig
-from GaudiKernel.PhysicalConstants import c_light
 
 #############################################################################
 
diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingB2DibaryonMuMu.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingB2DibaryonMuMu.py
index 3244d01c63302e316fc5389d89d96ffeeae19328..7c9eae26a3a3acea16b7970f07b704ca3dec2abd 100644
--- a/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingB2DibaryonMuMu.py
+++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingB2DibaryonMuMu.py
@@ -10,9 +10,8 @@
 ###############################################################################
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection, AutomaticData
+from PhysSelPython.Wrappers import MergedSelection, Selection
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, DaVinci__N3BodyDecays
-from Gaudi.Configuration import *
 __author__ = 'Vitalii Lisovskyi; based on Bu2LLK lines'
 __date__ = '04/09/2019'
 __version__ = '$Revision: 1 $'
@@ -112,7 +111,6 @@ class B2DibaryonMuMuConf(LineBuilder):
         # 2 : Make Dileptons
 
         from StandardParticles import StdLooseDiMuon as DiMuons
-        MuonID = "(HASMUON)&(ISMUON)"
         DiMuonID = "(2 == NINTREE((ABSID==13)&(HASMUON)&(ISMUON)))"
 
         SelDiMuon = self._filterDiLepton("SelDiMuonsFor" + self._name,
diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingB2EtaMuMu.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingB2EtaMuMu.py
index b614d11a7b9702109f6bc31332fcc68aef2d3cd9..6a856fa995234718f36df2e31af89417225452fa 100644
--- a/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingB2EtaMuMu.py
+++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingB2EtaMuMu.py
@@ -12,13 +12,12 @@
 B->etamumuselection
 '''
 
-from StandardParticles import StdAllNoPIDsMuons, StdAllLooseMuons
+from StandardParticles import StdAllNoPIDsMuons
 from StandardParticles import StdNoPIDsPions, StdLooseAllPhotons, StdLooseMergedPi0, StdLooseResolvedPi0
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand, SimpleSelection, MergedSelection
+from PhysSelPython.Wrappers import MergedSelection, Selection, SimpleSelection
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = ['Fred Blanc']
 __date__ = '04/09/2019'
 __version__ = '$Revision: 1.0 $'
diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingB2KLLXInclusive.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingB2KLLXInclusive.py
index a9d2ffd4e4d8d6444da6c3df3731248c13fce6e7..61a740d6b5d3d92a7f2015b59a5021738a7a2958 100644
--- a/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingB2KLLXInclusive.py
+++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingB2KLLXInclusive.py
@@ -19,15 +19,12 @@ __all__ = ('B2KLLXInclusiveConf', 'default_config')
 Stripping selection for inclusively selected B->KmumuX decays.
 """
 
-from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop
+from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
 
 from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from LHCbKernel.Configuration import *  # check if needed
-from Configurables import SubstitutePID
-from Configurables import SubPIDMMFilter
 
 
 #################
@@ -333,7 +330,6 @@ class B2KLLXInclusiveConf(LineBuilder):
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         CombineDiMuon = CombineParticles()
         CombineDiMuon.DecayDescriptors = ["[B+ -> J/psi(1S) K+]cc"]
-        sel_name = "InclKLL"
         CombineDiMuon.MotherCut = self.InclKLLCut
         # choose
         leptons = self.InclLeptons
diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingB2KSKSMuMu.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingB2KSKSMuMu.py
index 60fc5ccbd40bc95a884b69e2b2b8c7d93b722665..b1a382095c4fd701f38e4fcada71554ecba26858 100644
--- a/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingB2KSKSMuMu.py
+++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingB2KSKSMuMu.py
@@ -10,9 +10,8 @@
 ###############################################################################
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection, AutomaticData
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, DaVinci__N3BodyDecays
-from Gaudi.Configuration import *
+from PhysSelPython.Wrappers import MergedSelection, Selection
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop
 __author__ = 'Vitalii Lisovskyi'
 __date__ = '18/06/2021'
 __version__ = '$Revision: 1 $'
@@ -72,7 +71,6 @@ class B2KSKSMuMuConf(LineBuilder):
         # Make Dileptons
 
         from StandardParticles import StdLooseDiMuon as DiMuons
-        MuonID = "(HASMUON)&(ISMUON)"
         DiMuonID = "(2 == NINTREE((ABSID==13)&(HASMUON)&(ISMUON)&(PROBNNmu>0.01)))"
 
         SelDiMuon = self._filterDiLepton("SelDiMuonsFor" + self._name,
diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingB2KstTauTau.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingB2KstTauTau.py
index 4bfb173d10ad2284c0c5e807ef7e994004f53eac..df476bc07228f66e5de7c80c69a4831bd6f17797 100644
--- a/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingB2KstTauTau.py
+++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingB2KstTauTau.py
@@ -16,8 +16,7 @@ from StandardParticles import StdTightMuons
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, OfflineVertexFitter, DaVinci__N3BodyDecays
-from Gaudi.Configuration import *
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N3BodyDecays, FilterDesktop
 __author__ = [' G. Mancinelli, J. Serrano, F. Polci, T. Fulghesu']
 __date__ = '15/08/2014'
 __version__ = '$Revision: 0.1 $'
diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingB2LLXBDT.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingB2LLXBDT.py
index 33ad8193f48b0db42c11b2b0fdb770bc37fa1794..b45675d8906a352a37b4bdd5ca92e02e5c6279bf 100644
--- a/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingB2LLXBDT.py
+++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingB2LLXBDT.py
@@ -20,8 +20,6 @@ from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticle
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, MergedSelection
-from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays
-from Gaudi.Configuration import *
 __author__ = ['Jibo He']
 __date__ = '20/11/2015'
 __version__ = '$Revision: 1.0 $'
@@ -261,7 +259,7 @@ class B2LLXBDTConf(LineBuilder):
         """
         Kshort, both LL and DD
         """
-        from StandardParticles import StdLooseKsDD, StdLooseKsLL
+        from StandardParticles import StdLooseKsDD
 
         self.SelKsDD = self.createSubSel(OutputList=self.name + "SelKsDD",
                                          InputList=StdLooseKsDD,
@@ -297,7 +295,7 @@ class B2LLXBDTConf(LineBuilder):
         """
         Lambda, both LL and DD
         """
-        from StandardParticles import StdLooseLambdaDD, StdLooseLambdaLL
+        from StandardParticles import StdLooseLambdaDD
 
         self.SelLambdaDD = self.createSubSel(OutputList=self.name + "SelLambdaDD",
                                              InputList=StdLooseLambdaDD,
diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingB2LLXBDTSS.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingB2LLXBDTSS.py
index 6547c8d92952608cbce068992079d7eefcc9788f..9a503cdbdc4e4f4133951d4b663f5d7157875f5a 100644
--- a/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingB2LLXBDTSS.py
+++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingB2LLXBDTSS.py
@@ -20,8 +20,6 @@ from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticle
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, MergedSelection
-from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays
-from Gaudi.Configuration import *
 __author__ = ['Jibo He', 'Yanting Fan', 'Angel Campoverde']
 __date__ = '17/06/2021'
 __version__ = '$Revision: 1.0 $'
@@ -228,7 +226,7 @@ class B2LLXBDTSSConf(LineBuilder):
         """
         Di letpons
         """
-        from StandardParticles import StdDiElectronFromTracks, StdLooseDiMuon, StdAllLooseANNElectrons, StdLooseDiMuonSameSign, StdAllLooseMuons
+        from StandardParticles import StdAllLooseANNElectrons, StdAllLooseMuons, StdLooseDiMuonSameSign
 
         self.SelDiElectron = self.createCombinationSel(OutputList=self.name + "SelDiElectron",
                                                        DecayDescriptor="[J/psi(1S) -> e+ e+]cc",
@@ -296,7 +294,7 @@ class B2LLXBDTSSConf(LineBuilder):
         """
         Kshort, both LL and DD
         """
-        from StandardParticles import StdLooseKsDD, StdLooseKsLL
+        from StandardParticles import StdLooseKsDD
 
         self.SelKsDD = self.createSubSel(OutputList=self.name + "SelKsDD",
                                          InputList=StdLooseKsDD,
@@ -332,7 +330,7 @@ class B2LLXBDTSSConf(LineBuilder):
         """
         Lambda, both LL and DD
         """
-        from StandardParticles import StdLooseLambdaDD, StdLooseLambdaLL
+        from StandardParticles import StdLooseLambdaDD
 
         self.SelLambdaDD = self.createSubSel(OutputList=self.name + "SelLambdaDD",
                                              InputList=StdLooseLambdaDD,
diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingB2LLXBDT_Calib.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingB2LLXBDT_Calib.py
index 56119a8defd7314f20eac2f2f78263f57aa6849c..28e6f3608431fba0221fc067bd66c5cf7a6f355a 100644
--- a/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingB2LLXBDT_Calib.py
+++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingB2LLXBDT_Calib.py
@@ -19,9 +19,7 @@ Note:
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, MergedSelection
-from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays
-from Gaudi.Configuration import *
+from PhysSelPython.Wrappers import Selection
 __author__ = ['Jibo He', 'Yanting Fan']
 __date__ = '10/03/2021'
 __version__ = '$Revision: 1.0 $'
@@ -194,7 +192,7 @@ class B2LLXBDT_CalibConf(LineBuilder):
         """
         Di letpons
         """
-        from StandardParticles import StdDiElectronFromTracks, StdLooseDiMuon, StdAllNoPIDsElectrons, StdAllNoPIDsMuons
+        from StandardParticles import StdAllNoPIDsElectrons, StdAllNoPIDsMuons
 
         self.SelDiElectron = self.createCombinationSel(OutputList=self.name + "SelDiElectron",
                                                        DecayDescriptor='J/psi(1S) -> e+ e-',
diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingB2Lambda0ELines.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingB2Lambda0ELines.py
index dcb376b6317e21a82d05511d6642d51a9139b1e0..beaae1e2b2d8fdb3ab6922b0b597f4f3735074b1 100644
--- a/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingB2Lambda0ELines.py
+++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingB2Lambda0ELines.py
@@ -21,7 +21,6 @@ __all__ = ('B2Lambda0ELines',
            'default_config')
 
 from StandardParticles import StdLoosePions, StdLooseElectrons, StdNoPIDsDownElectrons, StdNoPIDsDownPions
-from Configurables import TisTosParticleTagger
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingB2Lambda0MuLines.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingB2Lambda0MuLines.py
index e758feafbbaf38bbf2c16b62697aeccc5044b5c0..8c8ebee90e957bb0642c7fb649a57f03d93eef97 100644
--- a/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingB2Lambda0MuLines.py
+++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingB2Lambda0MuLines.py
@@ -21,7 +21,6 @@ __all__ = ('B2Lambda0MuLines',
            'default_config')
 
 from StandardParticles import StdLoosePions, StdLooseMuons, StdLooseDownMuons, StdNoPIDsDownPions
-from Configurables import TisTosParticleTagger
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingB2Lambda0MuOSLines.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingB2Lambda0MuOSLines.py
index 389b9bf695c2932c173a4ee768404acc14c2b153..4186a8554984cb039f3d149cda4700f95f9a9753 100644
--- a/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingB2Lambda0MuOSLines.py
+++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingB2Lambda0MuOSLines.py
@@ -21,7 +21,6 @@ __all__ = ('B2Lambda0MuOSLines',
            'default_config')
 
 from StandardParticles import StdLoosePions, StdLooseMuons, StdLooseDownMuons, StdNoPIDsDownPions
-from Configurables import TisTosParticleTagger
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingB2Lambda0SSMuMu3PiLines.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingB2Lambda0SSMuMu3PiLines.py
index b829fcd48cd4d244f39b998208c83dfea4c65343..f47c81735abc7cb47558594658aaf83f1ca7bc36 100644
--- a/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingB2Lambda0SSMuMu3PiLines.py
+++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingB2Lambda0SSMuMu3PiLines.py
@@ -21,7 +21,6 @@ __all__ = ('B2Lambda0SSMuMu3PiLines',
            'default_config')
 
 from StandardParticles import StdLoosePions, StdLooseMuons, StdLooseDownMuons, StdNoPIDsDownPions
-from Configurables import TisTosParticleTagger
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingB2MuMuMuMuLines.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingB2MuMuMuMuLines.py
index fa05d51ee2de3b49393863f88c1ea5b92412691c..290a038e170fc100b3d53f6d44d47d6e193f2ebd 100644
--- a/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingB2MuMuMuMuLines.py
+++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingB2MuMuMuMuLines.py
@@ -21,7 +21,7 @@ from Beauty2Charm_LoKiCuts import LoKiCuts
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
-from Configurables import FilterDesktop, CombineParticles
+from Configurables import CombineParticles
 from Gaudi.Configuration import *
 __author__ = ['Diego Martinez Santos', 'Johannes Albrecht',
               'Konstantinos A. Petridis', 'Alexander Baranov']
diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingB2OCMuMu.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingB2OCMuMu.py
index 85a7ae0f507641e942a8a8d127a0bfe50d047eb6..be3956da72885c84a4baf22412ecf87c0af293fa 100644
--- a/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingB2OCMuMu.py
+++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingB2OCMuMu.py
@@ -9,14 +9,10 @@
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop  # as FilterDesktop_GC
-from GaudiKernel.SystemOfUnits import MeV
-from CommonParticles.Utils import updateDoD
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection, AutomaticData
-from Configurables import (ResolvedPi0Maker, PhotonMaker)
+from PhysSelPython.Wrappers import DataOnDemand, MergedSelection, Selection
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N3BodyDecays, DaVinci__N4BodyDecays
-from Gaudi.Configuration import *
 __author__ = 'Vitalii Lisovskyi'
 __date__ = '05/03/2021'
 __version__ = '$Revision: 0 $'
@@ -76,9 +72,7 @@ class B2OCMuMuConf(LineBuilder):
         BcLine_name = name+"Bc"
         BcNoPointLine_name = name+"BcNoPoint"
 
-        from StandardParticles import StdLoosePions as Pions
         from StandardParticles import StdLooseKaons as Kaons
-        from StandardParticles import StdLooseProtons as Protons
         from StandardParticles import StdAllNoPIDsPions as AllPions
         from StandardParticles import StdAllNoPIDsKaons as AllKaons
         from StandardParticles import StdAllNoPIDsProtons as AllProtons
diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingB2XLL.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingB2XLL.py
old mode 100755
new mode 100644
index 893c8f7d24822aaf5128c145a0ea679b0efd25cc..54c9d8dbdf1774215b4f2574855ce20420b67924
--- a/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingB2XLL.py
+++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingB2XLL.py
@@ -10,9 +10,8 @@
 ###############################################################################
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection, AutomaticData
+from PhysSelPython.Wrappers import MergedSelection, Selection
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = 'Raja Nandakumar, Fergus Wilson, Stefania Ricciardi'
 __date__ = '04/11/2015'
 __version__ = '$Revision: 0 $'
diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingB2XMuMu.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingB2XMuMu.py
index 018806639a8b82fc54e5d95d7cd845f454943b0a..e0f7a0afc6c02fc2f49bd755a2c0b78caaec7987 100644
--- a/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingB2XMuMu.py
+++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingB2XMuMu.py
@@ -19,7 +19,6 @@ __version__ = '$Revision: 1.2 $'
 __all__ = ('B2XMuMuConf', 'default_config')
 
 
-from Gaudi.Configuration import *
 from LHCbKernel.Configuration import *  # check if needed
 
 
diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingB2XMuTauMuonic.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingB2XMuTauMuonic.py
index 1273eebf7e8d1885ba9abc40fa20e1d3c391f3f5..822bfb329fc0e318ff8ade55ecd4efe9b18e20cb 100644
--- a/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingB2XMuTauMuonic.py
+++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingB2XMuTauMuonic.py
@@ -22,8 +22,6 @@ __version__ = '$Revision: 0.0 $'
 
 __all__ = ('B2XMuTauMuonicConf', 'default_config')
 
-from Gaudi.Configuration import *
-from LHCbKernel.Configuration import *
 
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop
 
diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingB2XTau.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingB2XTau.py
index 89967ffc1bd10cb56544c7233004d1b229731f9c..9050443393da5af1c9abb3eee3ba2e1eda76009d 100644
--- a/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingB2XTau.py
+++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingB2XTau.py
@@ -8,16 +8,13 @@
 # granted to it by virtue of its status as an Intergovernmental Organization  #
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
-from StandardParticles import StdAllLoosePions, StdAllNoPIDsPions
-from copy import deepcopy
 from StandardParticles import StdLooseKaons
-from StandardParticles import StdLoosePions, StdTightPions
-from StandardParticles import StdNoPIDsKaons, StdNoPIDsPions, StdTightMuons
+from StandardParticles import StdLoosePions
+from StandardParticles import StdNoPIDsPions, StdTightMuons
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, OfflineVertexFitter, DaVinci__N3BodyDecays
-from Gaudi.Configuration import *
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N3BodyDecays, FilterDesktop
 __author__ = ['G. Dujany, G. Mancinelli, J. Serrano']
 __date__ = '24/05/2010,15/01/2014, 19/10/2017'
 __version__ = '$Revision: 1.3 $'
diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingB2XTauMu.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingB2XTauMu.py
index 1539daf38aad3280d179e42101b30c7b9367dc90..3bf392ac2eb839b14fbb1f75d9e94e760e94edd9 100644
--- a/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingB2XTauMu.py
+++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingB2XTauMu.py
@@ -25,8 +25,6 @@ __all__ = ('B2XTauMuConf',
            'default_config')
 
 
-from Gaudi.Configuration import *
-
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
 from PhysSelPython.Wrappers import Selection, MergedSelection
 from StrippingConf.StrippingLine import StrippingLine
diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingB2XTauTau.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingB2XTauTau.py
index 44cd40b223f3cc0f18f50a09a1e6f2fad19f1ae6..f25de253e9360d45277265567601c6f09dd87a01 100644
--- a/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingB2XTauTau.py
+++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingB2XTauTau.py
@@ -14,8 +14,7 @@ from StandardParticles import StdNoPIDsPions, StdLoosePions
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand, SimpleSelection
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, OfflineVertexFitter, DaVinci__N3BodyDecays
-from Gaudi.Configuration import *
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N3BodyDecays, FilterDesktop
 __author__ = [' L. Pescatore', 'F. Blanc']
 __date__ = '12/03/2019'
 __version__ = '$Revision: 0.1$'
@@ -23,7 +22,6 @@ __version__ = '$Revision: 0.1$'
 # Stripping line for B->Htautau
 
 from GaudiKernel.SystemOfUnits import MeV
-from GaudiKernel.SystemOfUnits import mm
 """
   B->KstarTauTau, B->KTauTau, B->PhiTauTau, B->Eta'TauTau
 """
diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingB2XTauTauMuonic.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingB2XTauTauMuonic.py
index 8ce4944ccdbdd71ca39f7044dba39236880a5017..78d80371d2fdd0f4ab78c18f71e97947016836b2 100644
--- a/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingB2XTauTauMuonic.py
+++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingB2XTauTauMuonic.py
@@ -23,8 +23,6 @@ __version__ = '$Revision: 0.1 $'
 
 __all__ = ('B2XTauTauMuonicConf', 'default_config')
 
-from Gaudi.Configuration import *
-from LHCbKernel.Configuration import *
 
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop, DaVinci__N3BodyDecays
 
diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingBLVLines.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingBLVLines.py
index 8bf68933cf866f19e4931849021862745276afe7..a5196ce34b14f3f32b717e3c7fcb254e2f21f2fa 100644
--- a/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingBLVLines.py
+++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingBLVLines.py
@@ -95,8 +95,7 @@ __all__ = ("BLVLinesConf",
 
 ###################################################################################################
 
-from Gaudi.Configuration import *
-from Configurables import FilterDesktop, CombineParticles, DaVinci__N3BodyDecays
+from Configurables import CombineParticles, DaVinci__N3BodyDecays
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingBaryonicLFV.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingBaryonicLFV.py
index a346ce2d29aade7bc06633bf054c0e8f5d5f1ccd..85c93efc5e1805384253264789630d08f7da5cad 100644
--- a/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingBaryonicLFV.py
+++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingBaryonicLFV.py
@@ -32,14 +32,12 @@ __version__ = '$Revision: 0.0 $'
 __all__ = ('BaryonicLFVConf', 'default_config')
 
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import DaVinci__N3BodyDecays as Combine3Particles
 from GaudiConfUtils.ConfigurableGenerators import DaVinci__N5BodyDecays as Combine5Particles
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from GaudiKernel.PhysicalConstants import c_light
 
 default_config = {
     'NAME': 'BaryonicLFV',
diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingBd2KSLLX.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingBd2KSLLX.py
index 419b0f7505b9bb8f7a0008bd6bd040167c12c60a..54c987ef8b72fd7e148a11fb44cebadb12188639 100644
--- a/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingBd2KSLLX.py
+++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingBd2KSLLX.py
@@ -10,9 +10,8 @@
 ###############################################################################
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection, AutomaticData
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, DaVinci__N3BodyDecays
-from Gaudi.Configuration import *
+from PhysSelPython.Wrappers import MergedSelection, Selection
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop
 __author__ = 'SB'
 __date__ = '08/10/2017'
 __version__ = '$Revision: 1 $'
@@ -47,15 +46,8 @@ class Bd2KSLLXConf(LineBuilder):
         mmXLine_name = name + "_mm"
         eeXLine_name = name + "_ee"
 
-        from StandardParticles import StdLoosePions as Pions
-        from StandardParticles import StdLooseKaons as Kaons
-        from StandardParticles import StdLooseKstar2Kpi as Kstars
-        from StandardParticles import StdLoosePhi2KK as Phis
         from StandardParticles import StdLooseKsLL as KshortsLL
         from StandardParticles import StdLooseKsDD as KshortsDD
-        from StandardParticles import StdLooseLambdaLL as LambdasLL
-        from StandardParticles import StdLooseLambdaDD as LambdasDD
-        from StandardParticles import StdLooseLambdastar2pK as Lambdastars
 
         SelKshortsLL = self._filterHadron(name="KshortsLLFor" + self._name,
                                           sel=KshortsLL,
@@ -64,12 +56,10 @@ class Bd2KSLLXConf(LineBuilder):
                                           sel=KshortsDD,
                                           params=config)
 
-        from StandardParticles import StdDiElectronFromTracks as DiElectronsFromTracks
         from StandardParticles import StdLooseDiElectron as DiElectrons
         from StandardParticles import StdLooseDiMuon as DiMuons
 
-        ElecID = "(PIDe > %(PIDe)s)" % config
-        MuonID = "(HASMUON)&(ISMUON)"
+        "(PIDe > %(PIDe)s)" % config
 
         DiElectronID = "(2 == NINTREE((ABSID==11)&(PIDe > %(PIDe)s)))" % config
         DiMuonID = "(2 == NINTREE((ABSID==13)&(HASMUON)&(ISMUON)))"
diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingBd2eeKstarBDT.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingBd2eeKstarBDT.py
index 1a6b3547113e58f48bff1e36952cfc3fb4d30295..6776dcdf27807a56103010584c7a22734b4a8a3f 100644
--- a/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingBd2eeKstarBDT.py
+++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingBd2eeKstarBDT.py
@@ -18,7 +18,6 @@ from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = ['Marie-Helene Schune', 'Jibo He']
 __date__ = '20/01/2012'
 __version__ = '$Revision: 1.0 $'
diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingBeauty2MajoLep.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingBeauty2MajoLep.py
index 1c734bb1d50cad23296af38cdba5155be75087a1..61c847aced349d945e821dd2bde9314ce08d72fb 100644
--- a/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingBeauty2MajoLep.py
+++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingBeauty2MajoLep.py
@@ -19,12 +19,10 @@ __version__ = 'V0.2'
 __all__ = ('Beauty2MajoLepConf',
            'default_config')
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
+from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from GaudiKernel.SystemOfUnits import *
 
 from StandardParticles import StdAllNoPIDsMuons as Muons
 from StandardParticles import StdAllNoPIDsPions as Pions
@@ -424,7 +422,7 @@ class Beauty2MajoLepConf(LineBuilder):
     def makeMu(self, name, config):
         # define all the cuts
         _bachPtCut = "(PT>%s*MeV)" % config['Lep_PTmin']
-        _bachIPChi2Cut = "(MIPCHI2DV(PRIMARY) > %s)" % config['Lep_IPChi2min']
+        "(MIPCHI2DV(PRIMARY) > %s)" % config['Lep_IPChi2min']
         _trkGPCut = "(TRGHOSTPROB<%s)" % config['Trk_GhostProb']
         _pidMuon = '(ISMUON)'
 
@@ -860,7 +858,7 @@ class Beauty2MajoLepConf(LineBuilder):
 
         _massCutHigh = "(AM<(%s*MeV))" % config['Majo_AMhigh']
         _docaCut = "(ADOCACHI2CUT(%s, ''))" % config['Majo_DocaChi2']
-        _massCutLow = "(AM>(%s*MeV))" % config['Majo_AMlow']
+        "(AM>(%s*MeV))" % config['Majo_AMlow']
 
         _combCuts = _massCutHigh + '&'+_docaCut
 
@@ -893,7 +891,7 @@ class Beauty2MajoLepConf(LineBuilder):
 
         _massCutHigh = "(AM<(%s*MeV))" % config['Majo_AMhigh']
         _docaCut = "(ADOCACHI2CUT(%s, ''))" % config['Majo_DocaChi2']
-        _massCutLow = "(AM>(%s*MeV))" % config['Majo_AMlow']
+        "(AM>(%s*MeV))" % config['Majo_AMlow']
         _combCuts = _massCutHigh + '&'+_docaCut
 
         _ptCut = "(PT>%s*MeV)" % config['Majo_PTmin']
@@ -1111,7 +1109,7 @@ class Beauty2MajoLepConf(LineBuilder):
 
         _massCutLow = "(AM>(%s*MeV))" % config['AM_Mlow']
         _massCutHigh = "(AM<(%s*MeV))" % config['AM_Mhigh']
-        _docaCut = "(ADOCACHI2CUT(%s, ''))" % config['Majo_DocaChi2']
+        "(ADOCACHI2CUT(%s, ''))" % config['Majo_DocaChi2']
 
         _combCuts = _massCutLow+'&'+_massCutHigh
 
diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingBeauty2XGamma.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingBeauty2XGamma.py
index d21b9a25bc2714ed14237d6218c1dad601dc1240..05e9c9cf0af28c167f2cc98f655c56f432f3ea6b 100644
--- a/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingBeauty2XGamma.py
+++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingBeauty2XGamma.py
@@ -12,7 +12,7 @@
 B-> X Gamma selections
 '''
 
-from StandardParticles import StdAllNoPIDsKaons, StdAllNoPIDsPions, StdLooseAllPhotons, StdLooseMergedPi0, StdLooseResolvedPi0, StdAllLooseGammaDD, StdAllLooseGammaLL, StdAllNoPIDsProtons
+from StandardParticles import StdAllLooseGammaDD, StdAllLooseGammaLL, StdAllNoPIDsPions, StdLooseAllPhotons, StdLooseMergedPi0, StdLooseResolvedPi0
 from Configurables import TisTosParticleTagger
 from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays as Combine4Particles
 from GaudiConfUtils.ConfigurableGenerators import DaVinci__N3BodyDecays as Combine3Particles
diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingBs2MuMuGamma.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingBs2MuMuGamma.py
index 0cfb5425d7a51fe618e72a66a2e6e2062510e41d..f1f37c46035071eccb7cf880d283aafb532e0b8f 100644
--- a/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingBs2MuMuGamma.py
+++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingBs2MuMuGamma.py
@@ -15,7 +15,7 @@ Authors: Meril Reboud, Jean-Francois Marchand
 """
 
 ########################################################################
-from StrippingUtils.Utils import LineBuilder, checkConfig
+from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Combine3BodySelection
 from StandardParticles import StdLooseMuons, StdLooseAllPhotons
diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingBs2MuMuLines.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingBs2MuMuLines.py
index 28fab868cccc6d58e46553f2585cd743326a977c..8bf0a80a0ffc3aa0267bf6dfb6cc948d4a90331a 100644
--- a/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingBs2MuMuLines.py
+++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingBs2MuMuLines.py
@@ -26,7 +26,7 @@ from Gaudi.Configuration import *
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
-from Configurables import FilterDesktop, CombineParticles
+from Configurables import CombineParticles
 from JetAccessories.JetMaker_Config import JetMakerConf
 from CommonParticles.Utils import *
 from Gaudi.Configuration import *
@@ -159,7 +159,7 @@ def create_stdjets(strob, line_location, stdjets_name_ban, stdjets_name_addb):
         strob.StdJetsNoJetIDBan = [myconf1]
 
     # configure Data-On-Demand service
-    locations = updateDoD(myconf1)
+    updateDoD(myconf1)
 
     myconf2 = JetMakerConf(stdjets_name_addb,
                            Inputs=['Phys/PFParticles/Particles', line_location],
@@ -173,7 +173,7 @@ def create_stdjets(strob, line_location, stdjets_name_ban, stdjets_name_addb):
         strob.StdJetsNoJetIDAddB = [myconf2]
 
     # configure Data-On-Demand service
-    locations = updateDoD(myconf2)
+    updateDoD(myconf2)
 
 ##########################################
 
diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingBs2gammagamma.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingBs2gammagamma.py
index c9930debcb2ccccce2049ad31333cbad37dedf9b..6a5687b6925e10b4b0d3db8e5eb980c03ae5ffdf 100644
--- a/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingBs2gammagamma.py
+++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingBs2gammagamma.py
@@ -21,16 +21,11 @@ Exports the following stripping lines as instance data members:
 - Bs2gammagamma_NoConvWideLine  : wide line with 0 conversions
 '''
 
-from Configurables import (DiElectronMaker, ProtoParticleCALOFilter,
-                           ParticleTransporter, BremAdder)
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop  # , CombineParticles
-from CommonParticles import StdLooseAllPhotons
-from CommonParticles import StdAllLooseGammaConversion
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
 from Configurables import CombineParticles
-from Gaudi.Configuration import *
 __author__ = ['Sean Benson']
 __date__ = '2016/04/08'
 __version__ = '1.2'
diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingBs2st2KKMuX.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingBs2st2KKMuX.py
index 86d2fbe036d44821a158f2fba4fe7e558c1d3d55..22e9c5c994936c1db65ca0b5c70f9d8f5601bd3b 100644
--- a/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingBs2st2KKMuX.py
+++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingBs2st2KKMuX.py
@@ -22,9 +22,8 @@ Stripping lines:
 from StandardParticles import StdLooseMuons, StdLooseKaons, StdAllLooseKaons, StdMassConstrainedJpsi2MuMu
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand
+from PhysSelPython.Wrappers import Selection
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = ['Jianchun Wang']
 __date__ = '03/22/2015'
 __version__ = '$Revision: 0.0 $'
diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingBu2LLK.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingBu2LLK.py
index 1389759595e92bafa372681f8efb4b4b0b010b83..80bf866570af75a51beac3d3bc5214c97aed49f3 100644
--- a/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingBu2LLK.py
+++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingBu2LLK.py
@@ -10,7 +10,7 @@
 ###############################################################################
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection, AutomaticData
+from PhysSelPython.Wrappers import DataOnDemand, MergedSelection, Selection
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, DaVinci__N3BodyDecays, DaVinci__N5BodyDecays
 from Gaudi.Configuration import *
 __author__ = 'Patrick Koppenburg, Alex Shires, Thomas Blake, Luca Pescatore, Simone Bifani, Yasmine Amhis, Paula Alvarez Cartelle, Harry Cliff, Rafael Silva Coutinho, Guido Andreassi, Mick Mulder, Maarten van Veghel, John Smeaton, Vitalii Lisovskyi, Biplab Dey'
@@ -1733,7 +1733,6 @@ class Bu2LLKConf(LineBuilder):
         from StandardParticles import StdLooseMuons as Muons
         # from CommonParticles import StdLooseDetachedTau
         # Taus = DataOnDemand(Location = "Phys/StdLooseDetachedTau3pi/Particles")
-        from CommonParticles import StdTightDetachedTau
         Taus = DataOnDemand(Location="Phys/StdTightDetachedTau3pi/Particles")
 
         _DecayDescriptor = "[J/psi(1S) -> mu+ tau-]cc"
@@ -2080,7 +2079,6 @@ class Bu2LLKConf(LineBuilder):
 #################################################################################################################################
 
     def _storeInputBremPhotons(self, linename, outputlocprefix="Leptonic/Phys/", photonloc="Phys/StdVeryLooseAllPhotons/Particles"):
-        from PhysSelPython.Wrappers import FilterSelection, DataOnDemand, SelectionSequence
         from Configurables import (CopyParticles, ParticleCloner,
                                    ProtoParticleCloner, CaloHypoCloner,
                                    CaloClusterCloner)
diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingBu2MajoLep.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingBu2MajoLep.py
index 5a96cdedd562ea723f6b2b20d6b2cf30f98f517f..850c2f87ccfaddc8f68a9b6e087f3f6d41cebbb1 100644
--- a/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingBu2MajoLep.py
+++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingBu2MajoLep.py
@@ -19,12 +19,10 @@ __version__ = 'V0.9'
 __all__ = ('Bu2MajoLepConf',
            'default_config')
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
+from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from GaudiKernel.SystemOfUnits import *
 
 from StandardParticles import StdLooseMuons as Muons
 from StandardParticles import StdLoosePions as Pions
diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingBu2MuNu.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingBu2MuNu.py
index 19ce21e90e54ca7bc0f65d55187d37c95520c6d9..4163901dd65f50c70f659de9c335932f2c9649fa 100644
--- a/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingBu2MuNu.py
+++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingBu2MuNu.py
@@ -25,12 +25,11 @@ __all__ = ('Bu2MuNuConf',
            'default_config')
 
 from Gaudi.Configuration import *
-from PhysSelPython.Wrappers import Selection, DataOnDemand
+from PhysSelPython.Wrappers import DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from StandardParticles import StdTightMuons, StdTightANNMuons
 from CommonParticles.Utils import *
-from Configurables import FilterDesktop, CombineParticles
+from Configurables import FilterDesktop
 from JetAccessories.JetMaker_Config import JetMakerConf
 
 default_name = 'Bu2MuNu'
@@ -72,7 +71,7 @@ def create_stdjets(strobj, line_location, stdjets_name_ban):
         strobj.StdJetsNoJetIDBan = [myconf1]
 
     # configure Data-On-Demand service
-    locations = updateDoD(myconf1)
+    updateDoD(myconf1)
 
 
 relInfoJetsVars = ["JETNOMU1PX", "JETNOMU1PY", "JETNOMU1PZ", "JETNOMU1PT", "JETNOMU1JETWIDTH", "JETNOMU1NNTAG", "JETNOMU1MNF", "JETNOMU2PX", "JETNOMU2PY", "JETNOMU2PZ", "JETNOMU2PT", "JETNOMU2JETWIDTH", "JETNOMU2NNTAG",
@@ -255,7 +254,7 @@ class Bu2MuNuConf(LineBuilder):
                                            JetIDCut=False).algorithms[0]
 
         # configure Data-On-Demand service
-        locations = updateDoD(StdJetsNoJetIDNoBan)
+        updateDoD(StdJetsNoJetIDNoBan)
 
         # add the jets with the specific banning
         create_stdjets(self, self.ControlLine.outputLocation(),
diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingD23MuLines.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingD23MuLines.py
index 9d9153bde02604dd6518511524323b953c58b810..a119c6aadabeb6405ae23f48d28004723f035a3b 100644
--- a/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingD23MuLines.py
+++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingD23MuLines.py
@@ -51,12 +51,11 @@ __all__ = ("D23MuLinesConf",
 #############################################################################
 
 from Gaudi.Configuration import *
-from Configurables import FilterDesktop, CombineParticles, DaVinci__N3BodyDecays
+from Configurables import DaVinci__N3BodyDecays
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 # from StrippingSelections.Utils import checkConfig
-from GaudiKernel.PhysicalConstants import c_light
 
 #############################################################################
 
diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingDarkBoson.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingDarkBoson.py
index 754d0f38050b7a4694b6c0d51d824b1e808d61c3..e79bed1bf4d9ba4dcb692145cb4e20d25fe0063e 100644
--- a/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingDarkBoson.py
+++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingDarkBoson.py
@@ -17,23 +17,18 @@ Author: M. Williams, D. Craik
 from Configurables import DiElectronMaker, ProtoParticleCALOFilter
 from GaudiConfUtils.ConfigurableGenerators import DaVinci__N3BodyDecays
 from CommonParticles.Utils import *
-from copy import deepcopy
 from Configurables import SubstitutePID
 from StandardParticles import StdAllLooseGammaLL, StdAllLooseGammaDD, \
     StdAllLooseElectrons, StdLooseAllPhotons  # , StdDiElectronFromTracks
 from Beauty2Charm_LoKiCuts import LoKiCuts
 from StandardParticles import StdAllNoPIDsPions, StdAllNoPIDsKaons, \
-    StdAllNoPIDsProtons, StdNoPIDsUpPions, StdAllLooseMuons, \
-    StdLooseDownMuons
-from Configurables import LoKi__VoidFilter
+    StdAllLooseMuons, StdLooseDownMuons
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import EventSelection
 from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
 from Gaudi.Configuration import *
-import re
 __author__ = ['Mike Williams', 'Dan Craik']
 
 moduleName = 'DarkBoson'
@@ -364,7 +359,7 @@ class DarkBosonConf(LineBuilder):
         mmDDX = makeX(
             'MuMuDD', default_config['XDD'], 'KS0 -> mu+ mu-', [muDX])
         kkX = makeX('KK', default_config['XLL'], 'KS0 -> K+ K-', [kX])
-        kkDDX = makeX('KKDD', default_config['XDD'], 'KS0 -> K+ K-', [kDX])
+        makeX('KKDD', default_config['XDD'], 'KS0 -> K+ K-', [kDX])
         pipiX = makeX(
             'PiPi', default_config['XLLhard'], 'KS0 -> pi+ pi-', [piX])
         pipiDDX = makeX(
@@ -419,7 +414,7 @@ class DarkBosonConf(LineBuilder):
             'PiPiSSDD', default_config['XDD'], '[KS0 -> pi+ pi+]cc', [piDX])
         preSS = default_config['Prescales']['SS']
 
-        preDD = default_config['Prescales']['DD']
+        default_config['Prescales']['DD']
         preKK = default_config['Prescales']['KK']
 
         j = makeJ(default_config['J'], [muJ])
@@ -630,7 +625,7 @@ class DarkBosonConf(LineBuilder):
         kst = filterKst()
         self._makeBLine('B2JKst', ['[B0 -> J/psi(1S) K*(892)0]cc'],
                         [j, kst], default_config['B2KX'])
-        rho = makeRho([piB])
+        makeRho([piB])
         # self._makeBLine('B2RhoX2MuMu',['B0 -> rho(770)0 KS0'],[rho,mmX],
         #                default_config['B2HHX'])
         # self._makeBLine('B2RhoX2MuMuDD',['B0 -> rho(770)0 KS0'],[rho,mmDDX],
diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingDoubleSLForRX.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingDoubleSLForRX.py
index f7e5ccc228e7525247584f38f94bf53502f3cdea..3116bd40e9e8d6da906924d79ac8c85fabf37565 100644
--- a/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingDoubleSLForRX.py
+++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingDoubleSLForRX.py
@@ -19,7 +19,6 @@ from GaudiConfUtils.ConfigurableGenerators import (CombineParticles,
                                                    DaVinci__N3BodyDecays)
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from Gaudi.Configuration import *
 __author__ = 'M. Kreps, T. Blake, D. Loh'
 __date__ = '10/11/2016'
 __version__ = '$Revision: 1.0$'
diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingHypb2L0HGamma.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingHypb2L0HGamma.py
index 83e2745fd58ace3d154d5c84e17588243850ee63..e33667deb325d3bc47009996d2c37915a3a42fd3 100644
--- a/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingHypb2L0HGamma.py
+++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingHypb2L0HGamma.py
@@ -16,8 +16,8 @@ __all__ = ('Hypb2L0HGammaConf',
            'default_config', )
 
 from Gaudi.Configuration import *
-from Configurables import FilterDesktop, CombineParticles, TisTosParticleTagger
-from PhysSelPython.Wrappers import Selection, MergedSelection, DataOnDemand
+from Configurables import CombineParticles, FilterDesktop
+from PhysSelPython.Wrappers import DataOnDemand, Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from StandardParticles import StdLooseAllPhotons
@@ -495,7 +495,7 @@ def tisTosSelection(sel, TISTOSdict):
 
 
 def makevelotracks(name):
-    from Configurables import FastVeloTracking, TrackPrepareVelo, DecodeVeloRawBuffer, TrackEventFitter, TrackStateInitAlg,  TrackContainerCopy
+    from Configurables import FastVeloTracking, TrackContainerCopy, TrackStateInitAlg
     from TrackFitter.ConfiguredFitters import ConfiguredEventFitter
 
     MyFastVeloTracking = FastVeloTracking(
diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingK0s2XXMuMu.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingK0s2XXMuMu.py
index 454c44356bf363573cfae8fad85f13e9b83e92ea..dc8a94331712da6fda2d902eeaadf4a4c7f30f0f 100644
--- a/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingK0s2XXMuMu.py
+++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingK0s2XXMuMu.py
@@ -19,9 +19,7 @@ from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection
 from StandardParticles import StdAllLoosePions, StdAllLooseMuons
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-from GaudiKernel.PhysicalConstants import c_light
-from GaudiKernel.SystemOfUnits import MeV, m, mm, picosecond
-from Gaudi.Configuration import *
+from GaudiKernel.SystemOfUnits import MeV, mm, picosecond
 __author__ = ['Miguel Ramos Pernas']
 __date__ = '10/10/2017'
 __version__ = '$Revision: 0.00 $'
diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingKshort2Leptons.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingKshort2Leptons.py
index 83456277a05a2d15a84b3c40618055fab95e052a..d92e0c670b0be9bdf5477406d71070e64f531e88 100644
--- a/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingKshort2Leptons.py
+++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingKshort2Leptons.py
@@ -11,7 +11,6 @@
 from SelPy.utils import (UniquelyNamedObject,
                          ClonableObject,
                          SelectionBase)
-from itertools import product
 from Configurables import ChargedProtoParticleMaker, NoPIDsParticleMaker, DelegatingTrackSelector, CombineParticles, LoKi__VertexFitter
 from CommonParticles.Utils import *
 from StandardParticles import StdNoPIDsUpElectrons
@@ -23,11 +22,9 @@ from StandardParticles import StdNoPIDsDownPions
 from StandardParticles import StdAllNoPIDsPions
 from StandardParticles import StdLooseDownMuons
 from StandardParticles import StdAllLooseMuons
-from StandardParticles import StdAllNoPIDsMuons
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection
-from GaudiConfUtils.ConfigurableGenerators import DaVinci__N3BodyDecays as Combine3Particles
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
 from Gaudi.Configuration import *
 __author__ = ['Adrian Casais Vidal', 'Carla Marin',
diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingKshort2MuMuMuMu.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingKshort2MuMuMuMu.py
index 86a943e5a6fb41852c6a9f29c92389947b9c890f..81ef82f2043ed504638103a44bd0a0e915d41771 100644
--- a/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingKshort2MuMuMuMu.py
+++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingKshort2MuMuMuMu.py
@@ -15,15 +15,12 @@ derived, in large measure, from StrippingKshort2PiPiMuMu.py
 '''
 
 from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays
-from GaudiKernel.SystemOfUnits import MeV
-from StandardParticles import StdNoPIDsDownPions, StdLooseDownMuons
-from StandardParticles import StdAllLoosePions, StdAllLooseMuons, StdAllNoPIDsPions
-from StandardParticles import StdLoosePions, StdLooseMuons, StdNoPIDsPions
+from StandardParticles import StdLooseDownMuons
+from StandardParticles import StdAllLooseMuons
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
+from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
 __author__ = ['Mike Sokoloff']
 __date__ = '07 January 2014'
 __version__ = '$Revision: 0.1 $'
diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingKshort2PiPiMuMu.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingKshort2PiPiMuMu.py
index 0955f65fa0e2efdcb575b1c11a7ad439f53a1944..07b134c737342e2921702f4d74fa30eda7121cf9 100644
--- a/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingKshort2PiPiMuMu.py
+++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingKshort2PiPiMuMu.py
@@ -10,15 +10,12 @@
 ###############################################################################
 
 from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays
-from GaudiKernel.SystemOfUnits import MeV
 from StandardParticles import StdNoPIDsDownPions, StdLooseDownMuons
-from StandardParticles import StdAllLoosePions, StdAllLooseMuons, StdAllNoPIDsPions
-from StandardParticles import StdLoosePions, StdLooseMuons, StdNoPIDsPions
+from StandardParticles import StdAllLooseMuons, StdAllLoosePions
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
+from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
 __author__ = ['Mike Sokoloff']
 __date__ = '25/10/2012'
 __version__ = '$Revision: 0.1 $'
diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingKshort2eePiPi.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingKshort2eePiPi.py
index 45b59c0fd9ae49240a75a9caff9e2ff006af5fa5..832334778db6e7c5c42f3ac70aab3b7cd6ca4026 100644
--- a/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingKshort2eePiPi.py
+++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingKshort2eePiPi.py
@@ -16,7 +16,6 @@ from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection
 from GaudiConfUtils.ConfigurableGenerators import DaVinci__N3BodyDecays as Combine3Particles
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
-from Gaudi.Configuration import *
 __author__ = ['Carla Marin']
 __date__ = '23/11/2016'
 __version__ = '$1.1 $'
diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingLFVLines.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingLFVLines.py
index 4a7726e9b33f8cb67d0e0e1c4052c9f7f01e78b5..279eff2f3e813fb4043b2104ebb0bf7955e48339 100644
--- a/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingLFVLines.py
+++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingLFVLines.py
@@ -23,14 +23,12 @@ __all__ = ('LFVLinesConf',
            'default_config',
            )
 
-from Gaudi.Configuration import *
 # from Configurables import FilterDesktop, CombineParticles
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, DaVinci__N3BodyDecays
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N3BodyDecays
 from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from GaudiKernel.PhysicalConstants import c_light
-from GaudiKernel.SystemOfUnits import GeV, MeV, mm
+from GaudiKernel.SystemOfUnits import MeV, mm
 from copy import deepcopy
 #
 # Configure related info tools
@@ -1284,7 +1282,7 @@ class LFVLinesConf(LineBuilder):
         hemu_name = name+'B2heMu'
         pmu_name = name+'B2hMu'
         bu_name = name+'Bu2KJPsiee'
-        taumu_name = name+'B2TauMu'
+        name+'B2TauMu'
         htaumu_name = name+'B2hTauMu'
         muetap_gamma_name = name+'Tau2MuEtaP2pipig'
         muetap_pi_name = name+'Tau2MuEtaP2pipipi'
@@ -1778,7 +1776,6 @@ def makeB2TauMu(name):
         "& (BPVVDCHI2> 225)"\
         "& (BPVIPCHI2()< 25) "
 
-    from CommonParticles import StdLooseDetachedTau, StdLooseDipion
     _stdLooseMuons = DataOnDemand(Location="Phys/StdLooseMuons/Particles")
     _stdLooseDetachedTaus = DataOnDemand(
         Location="Phys/StdLooseDetachedTau3pi/Particles")
@@ -2418,7 +2415,6 @@ def makeB2hTauMu(name):
                           "& (BPVVDCHI2> 225)"\
                           "& (BPVIPCHI2()< 16) "  # maybe 16
 
-    from CommonParticles import StdLooseDetachedTau, StdLooseDipion
     _stdLooseMuons = DataOnDemand(Location="Phys/StdLooseMuons/Particles")
     _stdLooseDetachedTaus = DataOnDemand(
         Location="Phys/StdLooseDetachedTau3pi/Particles")
diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingLb2L0Gamma.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingLb2L0Gamma.py
index 802119884510c53e5cf00d3e4788223b09ab5a71..bfcf8336af14cb0e5ff39ae2da6502181e9066d9 100644
--- a/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingLb2L0Gamma.py
+++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingLb2L0Gamma.py
@@ -25,9 +25,6 @@ __date__ = "14.11.2016"
 __version__ = "2.0"
 __all__ = ("default_config", "StrippingLb2L0GammaConf")
 
-import os
-
-from Gaudi.Configuration import *
 
 from Configurables import CombineParticles
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
@@ -36,9 +33,7 @@ from PhysSelPython.Wrappers import Selection, MergedSelection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 
-from StandardParticles import StdAllNoPIDsPions, StdAllNoPIDsProtons
 from StandardParticles import StdLooseAllPhotons, StdAllLooseGammaDD, StdAllLooseGammaLL
-from StandardParticles import StdVeryLooseDetachedKst2Kpi
 from StandardParticles import StdLooseJpsi2MuMu
 
 default_config = {'NAME': 'Lb2L0Gamma',
diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingLc23MuLines.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingLc23MuLines.py
index b2244bd7aa9f116d9783ce03a8fc1944cde17b39..3d97e939f7633e3e700dd756976cae1b815955f7 100644
--- a/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingLc23MuLines.py
+++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingLc23MuLines.py
@@ -68,12 +68,11 @@ __all__ = ("Lc23MuLinesConf",
 ###################################################################################################
 
 from Gaudi.Configuration import *
-from Configurables import FilterDesktop, CombineParticles, DaVinci__N3BodyDecays, DaVinci__N4BodyDecays
+from Configurables import CombineParticles, DaVinci__N3BodyDecays, DaVinci__N4BodyDecays
 # from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from GaudiKernel.PhysicalConstants import c_light
 
 ###################################################################################################
 
diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingMultiLepton.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingMultiLepton.py
index afbfe24d38ca0ad99bb80d52c8473be1c8076e1a..c83aa90e0286b93a0882a2d1617fe54f9de8d006 100644
--- a/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingMultiLepton.py
+++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingMultiLepton.py
@@ -12,8 +12,8 @@ from CommonParticles.Utils import *
 from GaudiKernel.SystemOfUnits import *
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection, AutomaticData
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, DaVinci__N3BodyDecays, DaVinci__N4BodyDecays, DaVinci__N5BodyDecays, DaVinci__N6BodyDecays
+from PhysSelPython.Wrappers import DataOnDemand, MergedSelection, Selection
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N3BodyDecays, DaVinci__N4BodyDecays, FilterDesktop
 from Gaudi.Configuration import *
 __author__ = 'Vitalii Lisovskyi'
 __date__ = '05/03/2021'
@@ -100,14 +100,11 @@ class MultiLeptonConf(LineBuilder):
         Jpsi2Mu3EDetLine_name = name+'_Jpsi2Mu3EDetached'
         Jpsi2Mu3EPromptLine_name = name+'_Jpsi2Mu3EPrompt'
 
-        from StandardParticles import StdLoosePions as Pions
         from StandardParticles import StdLooseKaons as Kaons
-        from StandardParticles import StdLooseProtons as Protons
         from StandardParticles import StdVeryLooseKsLL as KshortsLL
         from StandardParticles import StdLooseKsDD as KshortsDD
         from StandardParticles import StdVeryLooseLambdaLL as LambdasLL
         from StandardParticles import StdLooseLambdaDD as LambdasDD
-        from StandardParticles import StdLooseLambdaLD as LambdasLD
         from StandardParticles import StdLoosePhi2KK as Phi2KK
         from StandardParticles import StdLooseKstar2Kpi as KstartoKpi
         from StandardParticles import StdLooseLambdastar2pK as Lstar
diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingPhiToKSKS.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingPhiToKSKS.py
index ff157859dd3877ab38f9cad234fb49a80418e50d..1a62ef5db16a204dc0a3d66d1fd1d1f75d4a04d4 100644
--- a/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingPhiToKSKS.py
+++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingPhiToKSKS.py
@@ -23,8 +23,7 @@ from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from StandardParticles import StdAllLooseKaons, StdAllLooseMuons
-from Configurables import FitDecayTrees
-from PhysSelPython.Wrappers import AutomaticData, MergedSelection
+from PhysSelPython.Wrappers import MergedSelection
 
 __all__ = ('PhiToKSKSAllLinesConf',
            'TOSFilter',
diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingRareBaryonicMuMu.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingRareBaryonicMuMu.py
index e3c0eaddce01018392bdba4b396503b925c88a07..51ba747a021efc15c1337eff37065053e6f7babf 100644
--- a/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingRareBaryonicMuMu.py
+++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingRareBaryonicMuMu.py
@@ -12,11 +12,10 @@ from GaudiKernel.SystemOfUnits import MeV
 from CommonParticles.Utils import updateDoD
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection, AutomaticData
+from PhysSelPython.Wrappers import AutomaticData, MergedSelection, Selection
 from Configurables import (ResolvedPi0Maker, PhotonMaker)
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles, DaVinci__N3BodyDecays, DaVinci__N4BodyDecays
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop as FilterDesktop_GC
-from Gaudi.Configuration import *
 __author__ = 'Vitalii Lisovskyi'
 __date__ = '26/02/2021'
 __version__ = '$Revision: 0 $'
@@ -343,7 +342,6 @@ class RareBaryonicMuMuConf(LineBuilder):
         # 2 : Make Dileptons
 
         from StandardParticles import StdLooseDiMuon as DiMuons
-        MuonID = "(HASMUON)&(ISMUON)"
         DiMuonID = "(2 == NINTREE((ABSID==13)&(HASMUON)&(ISMUON)))"
         DiElectronID = "(2 == NINTREE((ABSID==11)&(PIDe>0)))"
 
diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingRareNStrange.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingRareNStrange.py
index a24627bc3e07197df367fefe4a22da371088d698..ff85ddd9295400d397f4543aa160622a121c5a9b 100644
--- a/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingRareNStrange.py
+++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingRareNStrange.py
@@ -10,9 +10,8 @@
 ###############################################################################
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection, AutomaticData
+from PhysSelPython.Wrappers import Selection
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = 'Diego Martinez Santos, Carlos Vazquez, Xabier Cid, Jessica Prisciandaro'
 __date__ = '08/05/2015'
 __version__ = '$Revision: Not sure $'
diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingRareStrange.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingRareStrange.py
index 6f7264e1db8f4045b2b139a11daa3e90056e3c44..bba73d994ee42cf94a9237f00597a4d7be7cc54d 100644
--- a/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingRareStrange.py
+++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingRareStrange.py
@@ -59,15 +59,11 @@ __all__ = ('RareStrangeLinesConf',
 from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 from GaudiConfUtils.ConfigurableGenerators import DaVinci__N3BodyDecays as Combine3Particles
-from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays as Combine4Particles
-from CommonParticles import StdNoPIDsDownElectrons
 from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from GaudiKernel.PhysicalConstants import c_light
-from StandardParticles import (StdAllNoPIDsPions, StdNoPIDsDownPions,
-                               StdLoosePions, StdLooseDownMuons,
-                               StdLooseMergedPi0, StdLooseResolvedPi0, StdLooseDalitzPi0)
+from StandardParticles import (StdLooseMergedPi0, StdLooseResolvedPi0,
+                               StdLooseDalitzPi0)
 
 # from CommonParticles.StdLooseDalitzPi0 import (StdLoosePi02gee, StdLoosePi024e)
 
@@ -2786,7 +2782,7 @@ def makeLambdaPPiEE(name, config, inputs):
 
 
 def makevelotracks(name):
-    from Configurables import FastVeloTracking, TrackPrepareVelo, DecodeVeloRawBuffer, TrackEventFitter, TrackStateInitAlg,  TrackContainerCopy
+    from Configurables import FastVeloTracking, TrackContainerCopy, TrackStateInitAlg
     from TrackFitter.ConfiguredFitters import ConfiguredEventFitter
 
     MyFastVeloTracking = FastVeloTracking(
diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingS2Hyperons.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingS2Hyperons.py
index 4b77564a243f8b801f636bd39f17d13862c59259..cc3f28a66decb2a00ca4d54e588542b898c3d5d5 100644
--- a/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingS2Hyperons.py
+++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingS2Hyperons.py
@@ -18,13 +18,9 @@ __version__ = '$Revision: 1.0 $'
 __all__ = ('StrippingS2HyperonsConf', 'default_config')
 
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from StandardParticles import StdLoosePions, StdNoPIDsDownPions, StdLooseKaons, StdLooseDownKaons
-from StandardParticles import StdAllLoosePions, StdAllLooseKaons
 
 from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
-from PhysSelPython.Wrappers import MultiSelectionSequence
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from GaudiKernel.SystemOfUnits import MeV, mm, picosecond
diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingSb2PKMuXPi.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingSb2PKMuXPi.py
index 1a58f8ff04bce6f56de5c4ab5c3629cf15490947..c9a1d99c746dfb072966681ef100532dfcb168de 100644
--- a/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingSb2PKMuXPi.py
+++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingSb2PKMuXPi.py
@@ -12,9 +12,8 @@
 
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
-from PhysSelPython.Wrappers import Selection, MergedSelection, AutomaticData
+from PhysSelPython.Wrappers import MergedSelection, Selection
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = "Dan Thompson; based on combination of Bu2LLK lines and Bs2st2KKMuXLine"
 __date__ = "14/06/2021"
 __version__ = "$Revision: 1$"
diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingStrangeHadrons.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingStrangeHadrons.py
index 5c16fb7fd63ec1f15df76e17b03a96af7c5a4c61..e2488a937f3c160c5d1dc0bbb81310ee8ff58466 100644
--- a/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingStrangeHadrons.py
+++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingStrangeHadrons.py
@@ -35,23 +35,12 @@ __all__ = ('default_config',
            'StrangeHadronsConf',
            )
 
-import os
 
-from Gaudi.Configuration import *
-
-from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-
-from GaudiConfUtils.ConfigurableGenerators import DaVinci__N3BodyDecays as Combine3Particles
-from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays as Combine4Particles
-from CommonParticles import StdNoPIDsDownElectrons
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
+from PhysSelPython.Wrappers import DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from GaudiKernel.PhysicalConstants import c_light
 from GaudiKernel.SystemOfUnits import MeV
 
-from StandardParticles import StdAllNoPIDsPions, StdLoosePions, StdLooseProtons, StdAllLoosePions, StdAllLooseMuons
-from StandardParticles import StdLooseAllPhotons
 ##
 from PhysConf.Selections import CombineSelection
 
diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingStrangeSL.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingStrangeSL.py
index 5134ef5434ea3f244733fc6ac26485b868c228fb..26590be4ba73ad6710f007e7e831cea2a4a4b23a 100644
--- a/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingStrangeSL.py
+++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingStrangeSL.py
@@ -36,23 +36,12 @@ __all__ = ('default_config',
            'StrangeSLConf',
            )
 
-import os
 
-from Gaudi.Configuration import *
-
-from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-
-from GaudiConfUtils.ConfigurableGenerators import DaVinci__N3BodyDecays as Combine3Particles
-from GaudiConfUtils.ConfigurableGenerators import DaVinci__N4BodyDecays as Combine4Particles
-from CommonParticles import StdNoPIDsDownElectrons
-from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
+from PhysSelPython.Wrappers import DataOnDemand, Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from GaudiKernel.PhysicalConstants import c_light
 from GaudiKernel.SystemOfUnits import MeV
 
-from StandardParticles import StdAllNoPIDsPions, StdLoosePions, StdLooseProtons, StdAllLoosePions, StdAllLooseMuons, StdAllLooseElectrons
-from StandardParticles import StdLooseMergedPi0, StdLooseResolvedPi0, StdLooseDalitzPi0
 from PhysConf.Selections import CombineSelection
 
 default_config = {
diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingTau23MuLines.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingTau23MuLines.py
index d2bc92f6cce7f5bd010c90bfbed1d26ec6298dc4..f76088d68ebb79ec8363df3707e480e3955aa4fe 100644
--- a/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingTau23MuLines.py
+++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingTau23MuLines.py
@@ -36,7 +36,6 @@ from GaudiConfUtils.ConfigurableGenerators import DaVinci__N5BodyDecays as Combi
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from GaudiKernel.PhysicalConstants import c_light
 
 default_config = {
     'NAME': 'Tau23Mu',
@@ -74,7 +73,7 @@ class Tau23MuLinesConf(LineBuilder):
         tau_name = name+'Tau23Mu'
         tau_name_DST = name+'Tau23Mu_DST'
         tau_name_DST_3mu = name+'Tau23Mu_DST_3mu'
-        ds23PiTIS_name = name+'Ds23PiTIS'
+        name+'Ds23PiTIS'
         ds23Pi_name = name+'Ds23Pi'
         ds2PhiPi_name = name+'Ds2PhiPi'
         ds2PhiPi_name_DST = name+'Ds2PhiPi_DST'
diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingTau2LambdaMuLines.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingTau2LambdaMuLines.py
index 6f7caa01d008433cca4a3184d6bdfeb2a9bcd909..2e5401740f914b698345c335bfe29788f1e7ed2e 100644
--- a/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingTau2LambdaMuLines.py
+++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingTau2LambdaMuLines.py
@@ -16,12 +16,10 @@ Exported symbols (use python help!):
    - 
 '''
 
-from GaudiKernel.PhysicalConstants import c_light
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
-from Configurables import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
+from Configurables import CombineParticles
 __author__ = ['Marcin Chrzaszcz']
 __date__ = '14/12/2012'
 __version__ = '$Revision: 1.0 $'
diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingZVTOP.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingZVTOP.py
index f4ee63f69c4320486335e4fa797004ccb36ecca4..6b5cbfa74e249908ea9e854e9c0f238ebdd2d9cf 100644
--- a/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingZVTOP.py
+++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingRD/StrippingZVTOP.py
@@ -9,14 +9,12 @@
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
 from Configurables import TopoTauAlg, TopoVertexTool
-from StandardParticles import StdLooseKaons
-from StandardParticles import StdLoosePions, StdTightPions
-from StandardParticles import StdNoPIDsKaons, StdNoPIDsPions
+from StandardParticles import StdLoosePions
+from StandardParticles import StdNoPIDsPions
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles, OfflineVertexFitter
-from Gaudi.Configuration import *
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop
 __author__ = ['Giampi Mancinelli', 'Julien Cogan', 'Justine Serrano']
 
 __date__ = '14/01/2014'
diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingSL/StrippingB23MuNu.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingSL/StrippingB23MuNu.py
index 73f06f15243522a9ee6fbe3cdad49e8549ea82f5..b59d48fb8b976f7da0abc2b960db7c139bd1f7d6 100644
--- a/Phys/StrippingSelections/python/StrippingSelections/StrippingSL/StrippingB23MuNu.py
+++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingSL/StrippingB23MuNu.py
@@ -19,15 +19,12 @@ __all__ = ('B23MuNuConf', 'default_config')
 Stripping selection for B to three muons and a neutrino.
 """
 
-from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop
 
-from PhysSelPython.Wrappers import Selection, AutomaticData, MergedSelection
+from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from LHCbKernel.Configuration import *  # check if needed
-from Configurables import SubstitutePID
-from Configurables import SubPIDMMFilter
 
 
 #################
@@ -282,7 +279,6 @@ class B23MuNuConf(LineBuilder):
         )
 
         # specify leptons to identify the muon candidate
-        RelInfoTools_fake_mumue = RelInfoTools_fake
         # RelInfoTools_fake_mumue[0] = { "Type" : "RelInfoMuonIDPlus",
         #                     "Variables" : ["MU_BDT"],
         #                     "DaughterLocations"  : {
@@ -416,15 +412,13 @@ class B23MuNuConf(LineBuilder):
         """
         Creates Jpsi as proxy for dimuon
         """
-        from PhysSelPython.Wrappers import AutomaticData, Selection, SelectionSequence, DataOnDemand, MergedSelection
+        from PhysSelPython.Wrappers import Selection
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         # from Configurables import CombineParticles
 
         CombineJpsi = CombineParticles(DecayDescriptors=["J/psi(1S) -> mu+ mu-", "[J/psi(1S) -> mu+ mu+]cc"],
                                        MotherCut="ALL")
 
-        sel_name = "Jpsi"
-
         from PhysSelPython.Wrappers import Selection
         SelJpsi = Selection("Sel_" + self.name + "_Jpsi", Algorithm=CombineJpsi,
                             RequiredSelections=[self.Muons])
@@ -434,15 +428,13 @@ class B23MuNuConf(LineBuilder):
         """
         Creates Jpsi as proxy for dielectron
         """
-        from PhysSelPython.Wrappers import AutomaticData, Selection, SelectionSequence, DataOnDemand, MergedSelection
+        from PhysSelPython.Wrappers import Selection
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         # from Configurables import CombineParticles
 
         CombineJpsi = CombineParticles(DecayDescriptors=["J/psi(1S) -> e+ e-", "[J/psi(1S) -> e+ e+]cc"],
                                        MotherCut="ALL")
 
-        sel_name = "Jpsi"
-
         from PhysSelPython.Wrappers import Selection
         SelJpsi = Selection("Sel_" + self.name + "_Jpsiee", Algorithm=CombineJpsi,
                             RequiredSelections=[self.Electrons])
diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingSL/StrippingB2DMuForTauMu.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingSL/StrippingB2DMuForTauMu.py
index bbb6591f636c547192b1c9759ebfeedf27b88e2b..8bd9a436ea3d941e0b4ec5b3610d262206579753 100644
--- a/Phys/StrippingSelections/python/StrippingSelections/StrippingSL/StrippingB2DMuForTauMu.py
+++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingSL/StrippingB2DMuForTauMu.py
@@ -18,12 +18,10 @@ __version__ = '$Revision: 2.0 $'
 
 from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from PhysSelPython.Wrappers import Selection, DataOnDemand
+from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from StandardParticles import StdLoosePions, StdAllLooseMuons, StdLooseKaons, StdLooseProtons, StdAllLoosePions, StdLooseMergedPi0, StdLooseResolvedPi0, StdAllNoPIDsMuons, StdLooseANNUpPions
-from Configurables import ConjugateNeutralPID
-from PhysSelPython.Wrappers import MergedSelection
+from StandardParticles import StdAllLooseMuons, StdAllNoPIDsMuons, StdLooseKaons, StdLoosePions, StdLooseProtons
 
 __all__ = ('B2DMuForTauMuconf',
            # 'makeb2DMuX',
diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingSL/StrippingB2DMuNuX.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingSL/StrippingB2DMuNuX.py
index 51c5a39b0e68d79ff13fd973b9049f68df623cb8..3ffd86fc01b71b7801c6bd140f16f695e248450c 100644
--- a/Phys/StrippingSelections/python/StrippingSelections/StrippingSL/StrippingB2DMuNuX.py
+++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingSL/StrippingB2DMuNuX.py
@@ -13,14 +13,13 @@ __date__ = '23/07/2010'
 __version__ = '$Revision: 5.0 $'
 
 from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
+from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
 from PhysSelPython.Wrappers import Selection
-from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from StandardParticles import StdLoosePions, StdLooseMuons, StdLooseKaons, StdLooseProtons, StdLooseElectrons
 from StandardParticles import StdNoPIDsPions, StdNoPIDsKaons, StdNoPIDsProtons, StdNoPIDsMuons
 from StrippingB2DMuNuXUtils import *
-from GaudiKernel.SystemOfUnits import MeV, GeV, cm, mm
+from GaudiKernel.SystemOfUnits import GeV, MeV, mm
 
 __all__ = ('B2DMuNuXAllLinesConf',
            'default_config')
diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingSL/StrippingB2DMuNuXUtils.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingSL/StrippingB2DMuNuXUtils.py
index 34c3af4e61a9d753aa459abad0af31e3fe01da0e..efaa9d2a15bbc424b459896d227733451f06e069 100644
--- a/Phys/StrippingSelections/python/StrippingSelections/StrippingSL/StrippingB2DMuNuXUtils.py
+++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingSL/StrippingB2DMuNuXUtils.py
@@ -13,11 +13,9 @@ __date__ = '06/03/2015'
 __version__ = '$Revision: 0.0 $'
 
 from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from StrippingConf.StrippingLine import StrippingLine
-from StrippingUtils.Utils import LineBuilder
-from StandardParticles import StdLoosePions, StdLooseMuons, StdLooseKaons, StdLooseProtons, StdNoPIDsPions, StdLooseElectrons, StdNoPIDsMuons
 
 
 def BtoDlnuLine(module_name,
diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingSL/StrippingB2Dlnu.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingSL/StrippingB2Dlnu.py
index 0c8d00bd94717af821926626f5446a85cb20a902..b05a05c95319c31661cfe61524eca70e234905c3 100644
--- a/Phys/StrippingSelections/python/StrippingSelections/StrippingSL/StrippingB2Dlnu.py
+++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingSL/StrippingB2Dlnu.py
@@ -17,12 +17,10 @@ __version__ = '$Revision: 1.0 $'
 
 from Gaudi.Configuration import *
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from PhysSelPython.Wrappers import Selection, DataOnDemand
+from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from StandardParticles import StdLoosePions, StdLooseMuons, StdLooseKaons, StdLooseProtons, StdAllLoosePions, StdLooseMergedPi0, StdLooseResolvedPi0, StdAllNoPIDsMuons, StdLooseANNUpPions, StdLooseElectrons
-from Configurables import ConjugateNeutralPID
-from PhysSelPython.Wrappers import MergedSelection
+from StandardParticles import StdAllNoPIDsMuons, StdLooseElectrons, StdLooseKaons, StdLooseMuons, StdLoosePions
 
 __all__ = ('B2DMuForLNuconf',
            # 'makeb2DMuX',
diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingSL/StrippingB2Dst0MuNu.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingSL/StrippingB2Dst0MuNu.py
index 3f6fd96ade4433b51152a37ee46ccbd072892fbe..e98d2b4850975113ec77abeed5a53c59a6ba950c 100644
--- a/Phys/StrippingSelections/python/StrippingSelections/StrippingSL/StrippingB2Dst0MuNu.py
+++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingSL/StrippingB2Dst0MuNu.py
@@ -12,12 +12,11 @@ __author__ = ['Michel De Cian']
 __date__ = '12/12/2018'
 __version__ = '$Revision: 0.0 $'
 
-from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from PhysSelPython.Wrappers import Selection, DataOnDemand
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
+from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from StandardParticles import StdLoosePions, StdLooseMuons, StdLooseKaons, StdAllLoosePions, StdAllLooseElectrons, StdLooseResolvedPi0, StdLooseMergedPi0, StdLooseDalitzPi0
+from StandardParticles import StdAllLooseElectrons, StdLooseDalitzPi0, StdLooseKaons, StdLooseMergedPi0, StdLooseMuons, StdLoosePions, StdLooseResolvedPi0
 
 __all__ = ('B2Dst0MuNuAllLinesConf',
            'TOSFilter',
diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingSL/StrippingB2DstMuNuIncl.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingSL/StrippingB2DstMuNuIncl.py
index 6abd041bf344194b0ad86747d5d5622ae5fdddf9..3a91f70e613b554c2c0d5b7095d89a8eb3c67f3d 100644
--- a/Phys/StrippingSelections/python/StrippingSelections/StrippingSL/StrippingB2DstMuNuIncl.py
+++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingSL/StrippingB2DstMuNuIncl.py
@@ -12,9 +12,8 @@ __author__ = ['Mika Vesterinen']
 __date__ = '04/04/2015'
 __version__ = '$Revision: 0.0 $'
 
-from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from PhysSelPython.Wrappers import Selection, DataOnDemand
+from GaudiConfUtils.ConfigurableGenerators import CombineParticles
+from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
 from StandardParticles import StdLoosePions, StdLooseMuons, StdLooseKaons, StdAllLoosePions
diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingSL/StrippingB2Invis.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingSL/StrippingB2Invis.py
index 59745cf95a2bca024482d13cbd55b7e541adc062..8839d6b97306b18d1dbfbdbbe8f6ad75be31223c 100644
--- a/Phys/StrippingSelections/python/StrippingSelections/StrippingSL/StrippingB2Invis.py
+++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingSL/StrippingB2Invis.py
@@ -15,12 +15,7 @@ __version__ = '$Revision: 0.0 $'
 These are some lines for measuring the BF of Lc->pKpi and Ds->KKpi
 """
 
-from Gaudi.Configuration import *
-from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from PhysSelPython.Wrappers import Selection, DataOnDemand
-from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from StandardParticles import StdLoosePions, StdLooseMuons, StdLooseKaons, StdAllLoosePions
 
 __all__ = ('B2InvisAllLinesConf',
            'default_config')
@@ -267,7 +262,7 @@ class B2InvisAllLinesConf(LineBuilder):
     ##### B+ Filter #####
     def _BpFilter(self):
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-        from PhysSelPython.Wrappers import Selection, MergedSelection
+        from PhysSelPython.Wrappers import Selection
 
         _XuPi = CombineParticles(
             DecayDescriptors=["[B+ -> Delta++ pi-]cc"], ReFitPVs=True)
@@ -284,7 +279,7 @@ class B2InvisAllLinesConf(LineBuilder):
     ##### B+ same-sign Filter #####
     def _Bp_SSFilter(self):
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-        from PhysSelPython.Wrappers import Selection, MergedSelection
+        from PhysSelPython.Wrappers import Selection
 
         _XuPi = CombineParticles(
             DecayDescriptors=["[B+ -> Delta++ pi+]cc"], ReFitPVs=True)
@@ -301,7 +296,7 @@ class B2InvisAllLinesConf(LineBuilder):
     ##### B+ fake proton Filter #####
     def _Bp_fakeP_Filter(self):
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-        from PhysSelPython.Wrappers import Selection, MergedSelection
+        from PhysSelPython.Wrappers import Selection
 
         _XuPi = CombineParticles(
             DecayDescriptors=["[B+ -> Delta++ pi-]cc"], ReFitPVs=True)
diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingSL/StrippingB2PPbarMuForTauMu.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingSL/StrippingB2PPbarMuForTauMu.py
index ab951b0dfdbe3c2477ad4d89c79ee826f8481641..94a83f33e4ac596cf3fc5d5e11a0581d31138c26 100644
--- a/Phys/StrippingSelections/python/StrippingSelections/StrippingSL/StrippingB2PPbarMuForTauMu.py
+++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingSL/StrippingB2PPbarMuForTauMu.py
@@ -9,9 +9,7 @@
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
 
-import logging
 from StrippingUtils.Utils import LineBuilder
-from Gaudi.Configuration import *
 __author__ = ['Mark Smith']
 __date__ = '17/10/2016'
 __version__ = '$Revision: 1.0 $'
@@ -107,8 +105,6 @@ class B2PPbarMuForTauMuBuilder(LineBuilder):
     def __init__(self, name, config):
         LineBuilder.__init__(self, name, config)
 
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
-
         self.GECs = {"Code": "( recSummary(LHCb.RecSummary.nSPDhits,'Raw/Spd/Digits') < %(GEC_nSPDHits)s )" % config,
                      "Preambulo": ["from LoKiTracks.decorators import *"]}
 
@@ -448,7 +444,7 @@ class B2PPbarMuForTauMuBuilder(LineBuilder):
     ###### B->ppMuNu Signal ######
     def _bhad2PMuX_B(self):
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-        from PhysSelPython.Wrappers import Selection, MergedSelection
+        from PhysSelPython.Wrappers import Selection
 
         _pMu = CombineParticles(
             DecayDescriptors=self._config["DECAYS"], ReFitPVs=True)
@@ -465,7 +461,7 @@ class B2PPbarMuForTauMuBuilder(LineBuilder):
     ###### B->ppMuNu Signal for Topo Line ######
     def _bhad2PMuX_BTopo(self):
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-        from PhysSelPython.Wrappers import Selection, MergedSelection
+        from PhysSelPython.Wrappers import Selection
 
         _pMu = CombineParticles(
             DecayDescriptors=self._config["DECAYS"], ReFitPVs=True)
@@ -482,7 +478,7 @@ class B2PPbarMuForTauMuBuilder(LineBuilder):
     ###### B->ppMuNu Same-Sign protons ######
     def _bhad2PMuX_B_SS(self):
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-        from PhysSelPython.Wrappers import Selection, MergedSelection
+        from PhysSelPython.Wrappers import Selection
 
         _pMu = CombineParticles(
             DecayDescriptors=self._config["DECAYS"], ReFitPVs=True)
diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingSL/StrippingB2XTauNu.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingSL/StrippingB2XTauNu.py
index 27a551c0cc74fe90670dcf8b6c0c1e819d4b7bd3..4a7e33c3bb5ed47f37817f68d2d2bf8c8021dda7 100644
--- a/Phys/StrippingSelections/python/StrippingSelections/StrippingSL/StrippingB2XTauNu.py
+++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingSL/StrippingB2XTauNu.py
@@ -762,7 +762,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         self.__MakeB0d2DdoubleStar2PiDstar02GammaD0TauNuNonPhysTau__()
 
         from StrippingConf.StrippingLine import StrippingLine
-        from PhysSelPython.Wrappers import SelectionSequence
 
         # TisTos filter
         def filterTisTos(name, Input, myTisTosSpecs):
@@ -1633,7 +1632,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
     def __MakeTau23pi__(self):
 
         from PhysSelPython.Wrappers import DataOnDemand
-        from CommonParticles import StdLooseDetachedTauNoPID
 
         self.tau23piSel = DataOnDemand(Location=self.tau_path)
 
@@ -1699,7 +1697,7 @@ class B2XTauNuAllLinesConf(LineBuilder):
     def __FilterD02K3pi__(self):
 
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
+        from PhysSelPython.Wrappers import Selection
         from StandardParticles import StdLoosePions, StdLooseKaons
 
         CombD02K3pi = CombineParticles(
@@ -1720,7 +1718,7 @@ class B2XTauNuAllLinesConf(LineBuilder):
     def __FilterD02K3piForDst__(self):
 
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
+        from PhysSelPython.Wrappers import Selection
         from StandardParticles import StdLoosePions, StdLooseKaons
 
         CombD02K3piForDst = CombineParticles(
@@ -1741,7 +1739,7 @@ class B2XTauNuAllLinesConf(LineBuilder):
     def __FilterDstarD02K3pi__(self):
 
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
+        from PhysSelPython.Wrappers import Selection
         from StandardParticles import StdAllLoosePions
 
         CombDstar2piD02K3pi = CombineParticles(
@@ -1759,7 +1757,7 @@ class B2XTauNuAllLinesConf(LineBuilder):
     def __FilterDstarD02K3piWS__(self):
 
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
+        from PhysSelPython.Wrappers import Selection
         from StandardParticles import StdAllLoosePions
 
         CombDstar2piD02K3piWS = CombineParticles(
@@ -1850,7 +1848,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
 
         from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseJpsi2MuMu
 
         JpsiForBc = FilterDesktop(
             Code=self.totalJpsiCut
@@ -1869,7 +1866,7 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
 
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
+        from PhysSelPython.Wrappers import Selection
         from StandardParticles import StdLoosePions
 
         CombDdoubleStar02DstarPi = CombineParticles(
@@ -1889,8 +1886,7 @@ class B2XTauNuAllLinesConf(LineBuilder):
         [B0 -> D*- tau+]cc
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
+        from PhysSelPython.Wrappers import Selection
 
         # MyStdLooseDetachedTau = DataOnDemand(Location = 'Phys/StdLooseDetachedTau3pi/Particles')
         # MyStdLooseDetachedTau = DataOnDemand(Location = self.tau_path)
@@ -1914,8 +1910,7 @@ class B2XTauNuAllLinesConf(LineBuilder):
         [B0 -> D*- tau+ with wrong sign pion in the D*]cc
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
+        from PhysSelPython.Wrappers import Selection
 
         # MyStdLooseDetachedTau = DataOnDemand(Location = 'Phys/StdLooseDetachedTau3pi/Particles')
         # MyStdLooseDetachedTau = DataOnDemand(Location = self.tau_path)
@@ -1941,8 +1936,7 @@ class B2XTauNuAllLinesConf(LineBuilder):
         use of wrong charge combination is useful for background subtraction
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
+        from PhysSelPython.Wrappers import Selection
 
         # MyStdLooseDetachedTau = DataOnDemand(Location = 'Phys/StdLooseDetachedTau3pi/Particles')
         # MyStdLooseDetachedTau = DataOnDemand(Location = self.tau_path)
@@ -1968,7 +1962,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTauNonPhys
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3piNonPhys/Particles')
@@ -1992,8 +1985,7 @@ class B2XTauNuAllLinesConf(LineBuilder):
         [B0 -> D*- tau+ with wrong sign pion in the D*]cc
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
+        from PhysSelPython.Wrappers import Selection
 
         # MyStdLooseDetachedTau = DataOnDemand(Location = 'Phys/StdLooseDetachedTau3pi/Particles')
         # MyStdLooseDetachedTau = DataOnDemand(Location = self.tau_path)
@@ -2018,8 +2010,7 @@ class B2XTauNuAllLinesConf(LineBuilder):
         [B0 -> D*-(->D0(->K3pi) pi-) tau+]cc
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
+        from PhysSelPython.Wrappers import Selection
 
         # MyStdLooseDetachedTau = DataOnDemand(Location = 'Phys/StdLooseDetachedTau3pi/Particles')
         # MyStdLooseDetachedTau = DataOnDemand(Location = self.tau_path)
@@ -2045,8 +2036,7 @@ class B2XTauNuAllLinesConf(LineBuilder):
         [B0 -> D*-(->D0(->K3pi) pi-) tau+ with wrong sign pion in the D*]cc
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
+        from PhysSelPython.Wrappers import Selection
 
         # MyStdLooseDetachedTau = DataOnDemand(Location = 'Phys/StdLooseDetachedTau3pi/Particles')
         # MyStdLooseDetachedTau = DataOnDemand(Location = self.tau_path)
@@ -2072,8 +2062,7 @@ class B2XTauNuAllLinesConf(LineBuilder):
         [B0 -> D*-(->D0(->K3pi) pi-) tau+ with wrong sign pion in the D*]cc
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
+        from PhysSelPython.Wrappers import Selection
 
         # MyStdLooseDetachedTau = DataOnDemand(Location = 'Phys/StdLooseDetachedTau3pi/Particles')
         # MyStdLooseDetachedTau = DataOnDemand(Location = self.tau_path)
@@ -2100,8 +2089,7 @@ class B2XTauNuAllLinesConf(LineBuilder):
         use of wrong charge combination is useful for background subtraction
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
+        from PhysSelPython.Wrappers import Selection
 
         # MyStdLooseDetachedTau = DataOnDemand(Location = 'Phys/StdLooseDetachedTau3pi/Particles')
         # MyStdLooseDetachedTau = DataOnDemand(Location = self.tau_path)
@@ -2129,7 +2117,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTauNonPhys
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3piNonPhys/Particles')
@@ -2155,8 +2142,7 @@ class B2XTauNuAllLinesConf(LineBuilder):
         [B- -> D0(->K3pi) tau-]cc
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
+        from PhysSelPython.Wrappers import Selection
 
         # MyStdLooseDetachedTau = DataOnDemand(Location = 'Phys/StdLooseDetachedTau3pi/Particles')
         # MyStdLooseDetachedTau = DataOnDemand(Location = self.tau_path)
@@ -2183,8 +2169,7 @@ class B2XTauNuAllLinesConf(LineBuilder):
         use of wrong charge combination is useful for background subtraction
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
+        from PhysSelPython.Wrappers import Selection
 
         # MyStdLooseDetachedTau = DataOnDemand(Location = 'Phys/StdLooseDetachedTau3pi/Particles')
         # MyStdLooseDetachedTau = DataOnDemand(Location = self.tau_path)
@@ -2213,7 +2198,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTauNonPhys
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3piNonPhys/Particles')
@@ -2241,8 +2225,7 @@ class B2XTauNuAllLinesConf(LineBuilder):
         [B0 -> D- tau+]cc
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
+        from PhysSelPython.Wrappers import Selection
 
         # MyStdLooseDetachedTau = DataOnDemand(Location = 'Phys/StdLooseDetachedTau3pi/Particles')
         # MyStdLooseDetachedTau = DataOnDemand(Location = self.tau_path)
@@ -2268,8 +2251,7 @@ class B2XTauNuAllLinesConf(LineBuilder):
         use of wrong charge combination is useful for background subtraction
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
+        from PhysSelPython.Wrappers import Selection
 
         # MyStdLooseDetachedTau = DataOnDemand(Location = 'Phys/StdLooseDetachedTau3pi/Particles')
         # MyStdLooseDetachedTau = DataOnDemand(Location = self.tau_path)
@@ -2296,7 +2278,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTauNonPhys
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3piNonPhys/Particles')
@@ -2320,8 +2301,7 @@ class B2XTauNuAllLinesConf(LineBuilder):
         [B- -> D0 tau-]cc
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
+        from PhysSelPython.Wrappers import Selection
 
         # MyStdLooseDetachedTau = DataOnDemand(Location = 'Phys/StdLooseDetachedTau3pi/Particles')
         # MyStdLooseDetachedTau = DataOnDemand(Location = self.tau_path)
@@ -2347,8 +2327,7 @@ class B2XTauNuAllLinesConf(LineBuilder):
         use of wrong charge combination is useful for background subtraction
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
+        from PhysSelPython.Wrappers import Selection
 
         # MyStdLooseDetachedTau = DataOnDemand(Location = 'Phys/StdLooseDetachedTau3pi/Particles')
         # MyStdLooseDetachedTau = DataOnDemand(Location = self.tau_path)
@@ -2376,7 +2355,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTauNonPhys
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3piNonPhys/Particles')
@@ -2401,8 +2379,7 @@ class B2XTauNuAllLinesConf(LineBuilder):
         [B_c+ -> J/psi(1S) tau+]cc
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
+        from PhysSelPython.Wrappers import Selection
 
         # MyStdLooseDetachedTau = DataOnDemand(Location = 'Phys/StdLooseDetachedTau3pi/Particles')
         # MyStdLooseDetachedTau = DataOnDemand(Location = self.tau_path)
@@ -2428,7 +2405,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTauNonPhys
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3piNonPhys/Particles')
@@ -2452,8 +2428,7 @@ class B2XTauNuAllLinesConf(LineBuilder):
         [B_s0 -> D_s- tau+]cc
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
+        from PhysSelPython.Wrappers import Selection
 
         # MyStdLooseDetachedTau = DataOnDemand(Location = 'Phys/StdLooseDetachedTau3pi/Particles')
         # MyStdLooseDetachedTau = DataOnDemand(Location = self.tau_path)
@@ -2479,8 +2454,7 @@ class B2XTauNuAllLinesConf(LineBuilder):
         use of wrong charge combination is useful for background subtraction
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
+        from PhysSelPython.Wrappers import Selection
 
         # MyStdLooseDetachedTau = DataOnDemand(Location = 'Phys/StdLooseDetachedTau3pi/Particles')
         # MyStdLooseDetachedTau = DataOnDemand(Location = self.tau_path)
@@ -2507,7 +2481,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTauNonPhys
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3piNonPhys/Particles')
@@ -2532,8 +2505,7 @@ class B2XTauNuAllLinesConf(LineBuilder):
         [Lambda_b0 -> Lambda_c+ tau-]cc
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
+        from PhysSelPython.Wrappers import Selection
 
         # MyStdLooseDetachedTau = DataOnDemand(Location = 'Phys/StdLooseDetachedTau3pi/Particles')
         # MyStdLooseDetachedTau = DataOnDemand(Location = self.tau_path)
@@ -2561,8 +2533,7 @@ class B2XTauNuAllLinesConf(LineBuilder):
         use of wrong charge combination is useful for background subtraction
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
+        from PhysSelPython.Wrappers import Selection
 
         # MyStdLooseDetachedTau = DataOnDemand(Location = 'Phys/StdLooseDetachedTau3pi/Particles')
         # MyStdLooseDetachedTau = DataOnDemand(Location = self.tau_path)
@@ -2588,8 +2559,7 @@ class B2XTauNuAllLinesConf(LineBuilder):
         [Lambda_b0 -> p+ tau-]cc
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
+        from PhysSelPython.Wrappers import Selection
 
         # MyStdLooseDetachedTau = DataOnDemand(Location = 'Phys/StdLooseDetachedTau3pi/Particles')
         # MyStdLooseDetachedTau = DataOnDemand(Location = self.tau_path)
@@ -2614,8 +2584,7 @@ class B2XTauNuAllLinesConf(LineBuilder):
         use of wrong charge combination is useful for background subtraction
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
+        from PhysSelPython.Wrappers import Selection
 
         # MyStdLooseDetachedTau = DataOnDemand(Location = 'Phys/StdLooseDetachedTau3pi/Particles')
         # MyStdLooseDetachedTau = DataOnDemand(Location = self.tau_path)
@@ -2641,7 +2610,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTauNonPhys
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3piNonPhys/Particles')
@@ -2668,8 +2636,7 @@ class B2XTauNuAllLinesConf(LineBuilder):
         use of inverted vertex cut only first, should boost the overall efficiency
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
+        from PhysSelPython.Wrappers import Selection
 
         # MyStdLooseDetachedTau = DataOnDemand(Location = 'Phys/StdLooseDetachedTau3pi/Particles')
         # MyStdLooseDetachedTau = DataOnDemand(Location = self.tau_path)
@@ -2695,8 +2662,7 @@ class B2XTauNuAllLinesConf(LineBuilder):
         use of inverted vertex cut only first, should boost the overall efficiency
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
+        from PhysSelPython.Wrappers import Selection
 
         # MyStdLooseDetachedTau = DataOnDemand(Location = 'Phys/StdLooseDetachedTau3pi/Particles')
         # MyStdLooseDetachedTau = DataOnDemand(Location = self.tau_path)
@@ -2720,8 +2686,7 @@ class B2XTauNuAllLinesConf(LineBuilder):
         Also useful for studying background in B0 -> D* tau nu when pi- from D** decay is missed
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
+        from PhysSelPython.Wrappers import Selection
 
         # MyStdLooseDetachedTau = DataOnDemand(Location = 'Phys/StdLooseDetachedTau3pi/Particles')
         # MyStdLooseDetachedTau = DataOnDemand(Location = self.tau_path)
@@ -2746,8 +2711,7 @@ class B2XTauNuAllLinesConf(LineBuilder):
         Also useful for studying WS background in B0 -> D* tau nu when pi+ from D** decay is missed
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
+        from PhysSelPython.Wrappers import Selection
 
         # MyStdLooseDetachedTau = DataOnDemand(Location = 'Phys/StdLooseDetachedTau3pi/Particles')
         # MyStdLooseDetachedTau = DataOnDemand(Location = self.tau_path)
@@ -2773,7 +2737,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTauNonPhys
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3piNonPhys/Particles')
@@ -2798,7 +2761,7 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
 
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
+        from PhysSelPython.Wrappers import Selection
         from StandardParticles import StdLooseResolvedPi0
 
         CombDStar02Pi0D0 = CombineParticles(
@@ -2817,8 +2780,7 @@ class B2XTauNuAllLinesConf(LineBuilder):
         [B- -> D*0 tau-]cc
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
+        from PhysSelPython.Wrappers import Selection
 
         # MyStdLooseDetachedTau = DataOnDemand(Location = 'Phys/StdLooseDetachedTau3pi/Particles')
         # MyStdLooseDetachedTau = DataOnDemand(Location = self.tau_path)
@@ -2842,8 +2804,7 @@ class B2XTauNuAllLinesConf(LineBuilder):
         use of wrong charge combination is useful for background subtraction
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
+        from PhysSelPython.Wrappers import Selection
 
         # MyStdLooseDetachedTau = DataOnDemand(Location = 'Phys/StdLooseDetachedTau3pi/Particles')
         # MyStdLooseDetachedTau = DataOnDemand(Location = self.tau_path)
@@ -2868,7 +2829,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3piNonPhys/Particles')
@@ -2892,7 +2852,7 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
 
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
+        from PhysSelPython.Wrappers import Selection
         from StandardParticles import StdLooseAllPhotons
 
         CombDStar02GammaD0 = CombineParticles(
@@ -2911,8 +2871,7 @@ class B2XTauNuAllLinesConf(LineBuilder):
         [B- -> D*0 tau-]cc
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
+        from PhysSelPython.Wrappers import Selection
 
         # MyStdLooseDetachedTau = DataOnDemand(Location = 'Phys/StdLooseDetachedTau3pi/Particles')
         # MyStdLooseDetachedTau = DataOnDemand(Location = self.tau_path)
@@ -2936,8 +2895,7 @@ class B2XTauNuAllLinesConf(LineBuilder):
         use of wrong charge combination is useful for background subtraction
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
+        from PhysSelPython.Wrappers import Selection
 
         # MyStdLooseDetachedTau = DataOnDemand(Location = 'Phys/StdLooseDetachedTau3pi/Particles')
         # MyStdLooseDetachedTau = DataOnDemand(Location = self.tau_path)
@@ -2962,7 +2920,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3piNonPhys/Particles')
@@ -2985,7 +2942,7 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
 
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
+        from PhysSelPython.Wrappers import Selection
         from StandardParticles import StdLoosePions
 
         CombDdoubleStar2PiDstar02Pi0D0 = CombineParticles(
@@ -3004,8 +2961,7 @@ class B2XTauNuAllLinesConf(LineBuilder):
         [B0 -> (D_1(2420)- -> D*0 pi-) tau+]cc
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
+        from PhysSelPython.Wrappers import Selection
 
         # MyStdLooseDetachedTau = DataOnDemand(Location = 'Phys/StdLooseDetachedTau3pi/Particles')
         # MyStdLooseDetachedTau = DataOnDemand(Location = self.tau_path)
@@ -3029,8 +2985,7 @@ class B2XTauNuAllLinesConf(LineBuilder):
         use of wrong charge combination is useful for background subtraction
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
+        from PhysSelPython.Wrappers import Selection
 
         # MyStdLooseDetachedTau = DataOnDemand(Location = 'Phys/StdLooseDetachedTau3pi/Particles')
         # MyStdLooseDetachedTau = DataOnDemand(Location = self.tau_path)
@@ -3055,7 +3010,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3piNonPhys/Particles')
@@ -3078,7 +3032,7 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
 
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
+        from PhysSelPython.Wrappers import Selection
         from StandardParticles import StdLoosePions
 
         CombDdoubleStar2PiDstar02GammaD0 = CombineParticles(
@@ -3097,8 +3051,7 @@ class B2XTauNuAllLinesConf(LineBuilder):
         [B0 -> (D_1(2420)- -> D*0 pi-) tau+]cc
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
+        from PhysSelPython.Wrappers import Selection
 
         # MyStdLooseDetachedTau = DataOnDemand(Location = 'Phys/StdLooseDetachedTau3pi/Particles')
         # MyStdLooseDetachedTau = DataOnDemand(Location = self.tau_path)
@@ -3122,8 +3075,7 @@ class B2XTauNuAllLinesConf(LineBuilder):
         use of wrong charge combination is useful for background subtraction
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
+        from PhysSelPython.Wrappers import Selection
 
         # MyStdLooseDetachedTau = DataOnDemand(Location = 'Phys/StdLooseDetachedTau3pi/Particles')
         # MyStdLooseDetachedTau = DataOnDemand(Location = self.tau_path)
@@ -3148,7 +3100,6 @@ class B2XTauNuAllLinesConf(LineBuilder):
         """
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection, DataOnDemand
-        from CommonParticles import StdLooseDetachedTau
 
         MyStdLooseDetachedTau = DataOnDemand(
             Location='Phys/StdLooseDetachedTau3piNonPhys/Particles')
diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingSL/StrippingB2XuENu.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingSL/StrippingB2XuENu.py
index 73ab1a2a4e2c0a0a1016fb4040cc2e6b7b36c884..b59084d7969d22b0c34cc4c7c11b62ae657ce530 100644
--- a/Phys/StrippingSelections/python/StrippingSelections/StrippingSL/StrippingB2XuENu.py
+++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingSL/StrippingB2XuENu.py
@@ -9,9 +9,7 @@
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
 
-import logging
 from StrippingUtils.Utils import LineBuilder
-from Gaudi.Configuration import *
 __author__ = ['Phillip Urquijo, Alessandra Borgia', 'Michel De Cian']
 __date__ = '11/01/2019'
 __version__ = '$Revision: 1.6 $'
@@ -243,7 +241,7 @@ class B2XuENuBuilder(LineBuilder):
     def __init__(self, name, config):
         LineBuilder.__init__(self, name, config)
         self.config = config
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
+        from PhysSelPython.Wrappers import DataOnDemand
         self._stdVeryLooseKsLL = DataOnDemand(
             "Phys/StdVeryLooseKsLL/Particles")
         self._stdLooseKsLD = DataOnDemand("Phys/StdLooseKsLD/Particles")
@@ -734,7 +732,7 @@ class B2XuENuBuilder(LineBuilder):
 
     # Bs -> K*/Kspi e nu lines
     def _Kstar_line(self):
-        NoPS = self.config['NoPrescales']
+        self.config['NoPrescales']
         from StrippingConf.StrippingLine import StrippingLine
         return StrippingLine(self._name+'Bs2Kstar_Line', prescale=1.0,
                              FILTER=self.GECs,
@@ -1055,8 +1053,8 @@ class B2XuENuBuilder(LineBuilder):
         if self._KSSel is not None:
             return self._KSSel
 
-        from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
+        from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
+        from PhysSelPython.Wrappers import Selection
 
         _code = FilterDesktop(Code=self._NominalKsSelection() % self._config)
 
@@ -1141,7 +1139,6 @@ class B2XuENuBuilder(LineBuilder):
 
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection
-        from StandardParticles import StdLoosePions
 
         _rho770 = CombineParticles(
             DecayDescriptors=["rho(770)0 -> pi- pi+"],
@@ -1171,7 +1168,6 @@ class B2XuENuBuilder(LineBuilder):
 
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection
-        from StandardParticles import StdLoosePions
 
         _rho770NoPID = CombineParticles(
             DecayDescriptors=["rho(770)0 -> pi- pi+"],
@@ -1201,7 +1197,6 @@ class B2XuENuBuilder(LineBuilder):
 
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection
-        from StandardParticles import StdLoosePions
 
         _rho770WS = CombineParticles(
             DecayDescriptors=["[rho(770)0 -> pi+ pi+]cc"],
@@ -1229,7 +1224,6 @@ class B2XuENuBuilder(LineBuilder):
 
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection
-        from StandardParticles import StdLoosePions
 
         _rho770SB = CombineParticles(
             DecayDescriptors=["rho(770)0 -> pi+ pi-"],
@@ -1341,7 +1335,7 @@ class B2XuENuBuilder(LineBuilder):
 
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection
-        from StandardParticles import StdLoosePions, StdLooseElectrons
+        from StandardParticles import StdLoosePions
 
         _Ksh = CombineParticles(
             DecayDescriptor="KS0 -> e- pi+",
@@ -1369,7 +1363,7 @@ class B2XuENuBuilder(LineBuilder):
 
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection
-        from StandardParticles import StdLoosePions, StdLooseElectrons
+        from StandardParticles import StdLoosePions
 
         _Ksh = CombineParticles(
             DecayDescriptor="KS0 -> e+ pi-",
diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingSL/StrippingB2XuMuNu.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingSL/StrippingB2XuMuNu.py
index e990a0f5fca381288d278a31edfe8c4be451c2d9..7dbf8f670c004436033f2172b635cf83469f0692 100644
--- a/Phys/StrippingSelections/python/StrippingSelections/StrippingSL/StrippingB2XuMuNu.py
+++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingSL/StrippingB2XuMuNu.py
@@ -9,9 +9,7 @@
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
 
-import logging
 from StrippingUtils.Utils import LineBuilder
-from Gaudi.Configuration import *
 __author__ = ['Phillip Urquijo, Alessandra Borgia', 'Michel De Cian']
 __date__ = '11/01/2019'
 __version__ = '$Revision: 1.6 $'
@@ -238,7 +236,7 @@ class B2XuMuNuBuilder(LineBuilder):
     def __init__(self, name, config):
         LineBuilder.__init__(self, name, config)
         self.config = config
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
+        from PhysSelPython.Wrappers import DataOnDemand
         self._stdVeryLooseKsLL = DataOnDemand(
             "Phys/StdVeryLooseKsLL/Particles")
         self._stdLooseKsLD = DataOnDemand("Phys/StdLooseKsLD/Particles")
@@ -733,7 +731,7 @@ class B2XuMuNuBuilder(LineBuilder):
 
     # Bs -> K*/Kspi mu nu lines
     def _Kstar_line(self):
-        NoPS = self.config['NoPrescales']
+        self.config['NoPrescales']
         from StrippingConf.StrippingLine import StrippingLine
         return StrippingLine(self._name+'Bs2Kstar_Line', prescale=1.0,
                              FILTER=self.GECs,
@@ -1052,8 +1050,8 @@ class B2XuMuNuBuilder(LineBuilder):
         if self._KSSel is not None:
             return self._KSSel
 
-        from GaudiConfUtils.ConfigurableGenerators import CombineParticles, FilterDesktop
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
+        from GaudiConfUtils.ConfigurableGenerators import FilterDesktop
+        from PhysSelPython.Wrappers import Selection
 
         _code = FilterDesktop(Code=self._NominalKsSelection() % self._config)
 
@@ -1138,7 +1136,6 @@ class B2XuMuNuBuilder(LineBuilder):
 
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection
-        from StandardParticles import StdLoosePions
 
         _rho770 = CombineParticles(
             DecayDescriptors=["rho(770)0 -> pi- pi+"],
@@ -1168,7 +1165,6 @@ class B2XuMuNuBuilder(LineBuilder):
 
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection
-        from StandardParticles import StdLoosePions
 
         _rho770NoPID = CombineParticles(
             DecayDescriptors=["rho(770)0 -> pi- pi+"],
@@ -1198,7 +1194,6 @@ class B2XuMuNuBuilder(LineBuilder):
 
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection
-        from StandardParticles import StdLoosePions
 
         _rho770WS = CombineParticles(
             DecayDescriptors=["[rho(770)0 -> pi+ pi+]cc"],
@@ -1226,7 +1221,6 @@ class B2XuMuNuBuilder(LineBuilder):
 
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection
-        from StandardParticles import StdLoosePions
 
         _rho770SB = CombineParticles(
             DecayDescriptors=["rho(770)0 -> pi+ pi-"],
@@ -1338,7 +1332,7 @@ class B2XuMuNuBuilder(LineBuilder):
 
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection
-        from StandardParticles import StdLoosePions, StdLooseMuons
+        from StandardParticles import StdLoosePions
 
         _Ksh = CombineParticles(
             DecayDescriptor="KS0 -> mu- pi+",
@@ -1366,7 +1360,7 @@ class B2XuMuNuBuilder(LineBuilder):
 
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection
-        from StandardParticles import StdLoosePions, StdLooseMuons
+        from StandardParticles import StdLoosePions
 
         _Ksh = CombineParticles(
             DecayDescriptor="KS0 -> mu+ pi-",
diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingSL/StrippingBc2Bs.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingSL/StrippingBc2Bs.py
index 599af631e5a48c5d8dddb043536ff0c3b5437f7b..dd86fee48fdfdc2ccf98c400e81825f4b3a016f8 100644
--- a/Phys/StrippingSelections/python/StrippingSelections/StrippingSL/StrippingBc2Bs.py
+++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingSL/StrippingBc2Bs.py
@@ -11,9 +11,7 @@
 __author__ = ['Adam Davis']
 __date__ = '12/03/2021'
 __version__ = '$Revision: 1.0 $'
-from Gaudi.Configuration import *
 from StrippingUtils.Utils import LineBuilder
-import logging
 
 """
 Selections for Bc -> Bs X
@@ -173,7 +171,6 @@ class Bc2BsBuilder(LineBuilder):
     def __init__(self, name, config):
         LineBuilder.__init__(self, name, config)
         self.config = config
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
         # GECs for # long tracks
         self.GECs = {"Code": "( recSummaryTrack(LHCb.RecSummary.nLongTracks, TrLONG) < %(GEC_nLongTrk)s )" % config,
                      "Preambulo": ["from LoKiTracks.decorators import *"]}
@@ -492,7 +489,6 @@ class Bc2BsBuilder(LineBuilder):
             return self._Ds2KKpiSel
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection
-        from StandardParticles import StdAllLoosePions, StdAllLooseKaons
 
         _Ds2KKpi = CombineParticles(
             DecayDescriptors=["[D_s+ -> K+ K- pi+]cc"],
@@ -515,7 +511,6 @@ class Bc2BsBuilder(LineBuilder):
 
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection
-        from StandardParticles import StdAllLoosePions, StdAllLooseKaons
 
         _Phi2KK = CombineParticles(
             DecayDescriptors=["phi(1020) -> K+ K-"],
@@ -537,7 +532,6 @@ class Bc2BsBuilder(LineBuilder):
 
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection
-        from StandardParticles import StdAllLooseMuons
 
         _Jpsi2mumu = CombineParticles(
             DecayDescriptors=["J/psi(1S) -> mu+ mu-"],
@@ -582,7 +576,6 @@ class Bc2BsBuilder(LineBuilder):
 
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection
-        from StandardParticles import StdAllLoosePions
 
         _Bs2DsPi = CombineParticles(
             DecayDescriptors=["[ B_s0 -> D_s- pi+ ]cc",
@@ -605,7 +598,6 @@ class Bc2BsBuilder(LineBuilder):
 
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
         from PhysSelPython.Wrappers import Selection
-        from StandardParticles import StdAllLooseKaons
 
         _Bs2DsK = CombineParticles(
             DecayDescriptors=["[ B_s0 -> D_s- K+ ]cc", "[B_s0 -> D_s+ K+]cc"],
diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingSL/StrippingCharmFromBSemiForHadronAsy.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingSL/StrippingCharmFromBSemiForHadronAsy.py
index a80fcb301fa6917bd97160506a3b0a679ff40777..ddaec2925512363daba54947938f97bdafffeb41 100644
--- a/Phys/StrippingSelections/python/StrippingSelections/StrippingSL/StrippingCharmFromBSemiForHadronAsy.py
+++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingSL/StrippingCharmFromBSemiForHadronAsy.py
@@ -25,8 +25,7 @@ from Configurables import FilterDesktop, CombineParticles
 from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from StandardParticles import StdAllLoosePions, StdLoosePions, StdLooseMuons, StdLooseKaons, StdLooseProtons
-from Configurables import TisTosParticleTagger
+from StandardParticles import StdLooseKaons, StdLooseMuons, StdLoosePions
 
 __all__ = ('CharmFromBSemiForHadronAsyAllLinesConf',
            'TOSFilter',
diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingSL/StrippingLb2LcMuNuX_Lc2L0Pi.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingSL/StrippingLb2LcMuNuX_Lc2L0Pi.py
index 827fcbc76e3e951b79048e280c55f4b9d1a24165..230adf6c801b1d0b8445131c844c55c702a3469f 100644
--- a/Phys/StrippingSelections/python/StrippingSelections/StrippingSL/StrippingLb2LcMuNuX_Lc2L0Pi.py
+++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingSL/StrippingLb2LcMuNuX_Lc2L0Pi.py
@@ -16,14 +16,13 @@ __author__ = ['Scott Ely']
 __date__ = '23/01/2019'
 __version__ = '$Revision: 1.0 $'
 
-from Gaudi.Configuration import *
 from Configurables import FilterDesktop, CombineParticles
-from PhysSelPython.Wrappers import Selection, DataOnDemand
+from PhysSelPython.Wrappers import Selection
 from StrippingConf.StrippingLine import StrippingLine
 from StrippingUtils.Utils import LineBuilder
-from StandardParticles import StdLoosePions, StdLooseMuons, StdLooseKaons, StdLooseProtons, StdLooseElectrons, StdVeryLooseLambdaLL, StdLooseLambdaLL, StdLooseLambdaDD
-from StandardParticles import StdNoPIDsPions, StdNoPIDsKaons, StdNoPIDsProtons, StdNoPIDsMuons
-from GaudiKernel.SystemOfUnits import MeV, GeV, cm, mm
+from StandardParticles import StdLooseLambdaDD, StdLooseMuons, StdLoosePions, StdVeryLooseLambdaLL
+from StandardParticles import StdNoPIDsMuons
+from GaudiKernel.SystemOfUnits import GeV, MeV, mm
 
 __all__ = ('Lb2LcMuNuX_Lc2L0PiConf', 'default_config')
 
diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingSL/StrippingLb2pMuNuVub.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingSL/StrippingLb2pMuNuVub.py
index cd969d689449a9dc069bd745b4acbc62f683dfda..e74c7de20e90982142bcf10f66be4a6cb90689e6 100644
--- a/Phys/StrippingSelections/python/StrippingSelections/StrippingSL/StrippingLb2pMuNuVub.py
+++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingSL/StrippingLb2pMuNuVub.py
@@ -9,9 +9,7 @@
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
 
-import logging
 from StrippingUtils.Utils import LineBuilder
-from Gaudi.Configuration import *
 __author__ = ['William Sutcliffe']
 __date__ = '19/01/2014'
 __version__ = '$Revision: 1.0 $'
@@ -137,8 +135,6 @@ class Lb2pMuNuVubBuilder(LineBuilder):
     def __init__(self, name, config):
         LineBuilder.__init__(self, name, config)
 
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
-
         self.GECs = {"Code": "( recSummaryTrack(LHCb.RecSummary.nLongTracks, TrLONG) < %(GEC_nLongTrk)s )" % config,
                      "Preambulo": ["from LoKiTracks.decorators import *"]}
 
diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingSL/StrippingSemilepISR.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingSL/StrippingSemilepISR.py
index 9003d470acd7115962091a7193ffb0bd6a6fa9c8..9d2d80fb96c93bb8fdbd3557b03ab8a7cc70090c 100644
--- a/Phys/StrippingSelections/python/StrippingSelections/StrippingSL/StrippingSemilepISR.py
+++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingSL/StrippingSemilepISR.py
@@ -26,7 +26,7 @@ from StrippingUtils.Utils import LineBuilder
 from StandardParticles import StdLoosePions, StdLooseMuons, StdLooseKaons, StdLooseProtons, StdLooseElectrons
 from StandardParticles import StdNoPIDsPions, StdNoPIDsKaons, StdNoPIDsProtons, StdNoPIDsMuons
 # from StrippingSemilepISRUtils import *
-from GaudiKernel.SystemOfUnits import MeV, GeV, cm, mm
+from GaudiKernel.SystemOfUnits import GeV, MeV, mm
 from CommonParticles.Utils import *
 
 __all__ = ('SemilepISRAllLinesConf',
diff --git a/Phys/StrippingSelections/python/StrippingSelections/StrippingSL/Strippingbhad2PMuX.py b/Phys/StrippingSelections/python/StrippingSelections/StrippingSL/Strippingbhad2PMuX.py
index e89305332152e8ebc4ee1e72a7f10cd8d9d2dfae..f46738721f8dbfce869e840a1aa8cbb13c6fdd2f 100644
--- a/Phys/StrippingSelections/python/StrippingSelections/StrippingSL/Strippingbhad2PMuX.py
+++ b/Phys/StrippingSelections/python/StrippingSelections/StrippingSL/Strippingbhad2PMuX.py
@@ -9,9 +9,7 @@
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
 
-import logging
 from StrippingUtils.Utils import LineBuilder
-from Gaudi.Configuration import *
 __author__ = ['William Sutcliffe', 'Patrick Owen']
 __date__ = '02/12/2015'
 __version__ = '$Revision: 2.0 $'
@@ -132,8 +130,6 @@ class bhad2PMuXBuilder(LineBuilder):
     def __init__(self, name, config):
         LineBuilder.__init__(self, name, config)
 
-        from PhysSelPython.Wrappers import Selection, DataOnDemand
-
         self.GECs = {"Code": "( recSummaryTrack(LHCb.RecSummary.nLongTracks, TrLONG) < %(GEC_nLongTrk)s )" % config,
                      "Preambulo": ["from LoKiTracks.decorators import *"]}
 
@@ -455,7 +451,7 @@ class bhad2PMuXBuilder(LineBuilder):
     ###### Lb->pMuNu High M_corr Opposite Sign ######
     def _bhad2PMuX_Lb(self):
         from GaudiConfUtils.ConfigurableGenerators import CombineParticles
-        from PhysSelPython.Wrappers import Selection, MergedSelection
+        from PhysSelPython.Wrappers import Selection
 
         _pMu = CombineParticles(
             DecayDescriptors=self._config["DECAYS"], ReFitPVs=True)
diff --git a/Phys/StrippingSelections/tests/coordinators/DV-Stripping25-Stripping.py b/Phys/StrippingSelections/tests/coordinators/DV-Stripping25-Stripping.py
index e2b92b9b448255ccb9604e6fe0e67f08b50fbfbe..70da4ddf570e699d06bd865c1dcdf1d8a86e7f62 100644
--- a/Phys/StrippingSelections/tests/coordinators/DV-Stripping25-Stripping.py
+++ b/Phys/StrippingSelections/tests/coordinators/DV-Stripping25-Stripping.py
@@ -25,7 +25,7 @@ from Configurables import ProcStatusCheck
 from StrippingArchive import strippingArchive
 from StrippingArchive.Utils import buildStreams
 from StrippingSettings.Utils import strippingConfiguration
-from StrippingConf.Configuration import StrippingConf, StrippingStream
+from StrippingConf.Configuration import StrippingConf
 from Configurables import DecodeRawEvent
 from Configurables import TrackStateProvider
 from Gaudi.Configuration import *
diff --git a/Phys/StrippingSelections/tests/coordinators/DV-Stripping27-Stripping.py b/Phys/StrippingSelections/tests/coordinators/DV-Stripping27-Stripping.py
index 85475108a0822e7dd218804561d2e52cc65b76f4..44b31cf0ae0daa1707b932b462cdf56c98eb4550 100644
--- a/Phys/StrippingSelections/tests/coordinators/DV-Stripping27-Stripping.py
+++ b/Phys/StrippingSelections/tests/coordinators/DV-Stripping27-Stripping.py
@@ -21,11 +21,11 @@ from DSTWriters.Configuration import (SelDSTWriter,
                                       stripDSTStreamConf,
                                       stripDSTElements
                                       )
-from Configurables import ProcStatusCheck, GaudiSequencer
+from Configurables import ProcStatusCheck
 from StrippingArchive import strippingArchive
 from StrippingArchive.Utils import buildStreams
 from StrippingSettings.Utils import strippingConfiguration
-from StrippingConf.Configuration import StrippingConf, StrippingStream
+from StrippingConf.Configuration import StrippingConf
 from Configurables import TrackSys
 from Configurables import DecodeRawEvent
 from Configurables import TrackStateProvider
diff --git a/Phys/StrippingSelections/tests/coordinators/TestFromSelections.py b/Phys/StrippingSelections/tests/coordinators/TestFromSelections.py
old mode 100755
new mode 100644
index 6c97ff3e88475919924165dd1460599865c9d85f..6fd6fd4938d0bec06d7b0a2f2633906ab5a7047b
--- a/Phys/StrippingSelections/tests/coordinators/TestFromSelections.py
+++ b/Phys/StrippingSelections/tests/coordinators/TestFromSelections.py
@@ -29,7 +29,7 @@ from Configurables import AuditorSvc, ChronoAuditor
 from Configurables import TimingAuditor, SequencerTimerTool
 from DSTWriters.microdstelements import *
 from Configurables import ProcStatusCheck
-from StrippingSelections.Utils import lineBuilder, buildStreams
+from StrippingSelections.Utils import buildStreams
 from Gaudi.Configuration import *
 from Configurables import DaVinci
 from StrippingConf.Configuration import StrippingConf
diff --git a/Phys/StrippingSelections/tests/coordinators/TestFromSelectionsNoFT.py b/Phys/StrippingSelections/tests/coordinators/TestFromSelectionsNoFT.py
old mode 100755
new mode 100644
index a397db70e554d3b1746293c4f0d9d0815d47c281..51a7832a6b455ad11afe7f26466e2d74c434e7c1
--- a/Phys/StrippingSelections/tests/coordinators/TestFromSelectionsNoFT.py
+++ b/Phys/StrippingSelections/tests/coordinators/TestFromSelectionsNoFT.py
@@ -26,7 +26,7 @@ from Configurables import AuditorSvc, ChronoAuditor
 from Configurables import TimingAuditor, SequencerTimerTool
 from DSTWriters.microdstelements import *
 from Configurables import ProcStatusCheck
-from StrippingSelections.Utils import lineBuilder, buildStreams
+from StrippingSelections.Utils import buildStreams
 from StrippingSelections import buildersConf
 from Configurables import DecodeRawEvent
 from Gaudi.Configuration import *
diff --git a/Phys/StrippingSelections/tests/coordinators/TestFromSelectionsNoRelInfo.py b/Phys/StrippingSelections/tests/coordinators/TestFromSelectionsNoRelInfo.py
old mode 100755
new mode 100644
index e09a840ccda968ee1c80eed063925e106f1cf54f..f2c40ff2e5c65fbae05db6490c43ca1df8dd37ed
--- a/Phys/StrippingSelections/tests/coordinators/TestFromSelectionsNoRelInfo.py
+++ b/Phys/StrippingSelections/tests/coordinators/TestFromSelectionsNoRelInfo.py
@@ -26,7 +26,7 @@ from Configurables import AuditorSvc, ChronoAuditor
 from Configurables import TimingAuditor, SequencerTimerTool
 from DSTWriters.microdstelements import *
 from Configurables import ProcStatusCheck
-from StrippingSelections.Utils import lineBuilder, buildStreams
+from StrippingSelections.Utils import buildStreams
 from StrippingSelections import buildersConf
 from Configurables import DecodeRawEvent
 from Gaudi.Configuration import *
diff --git a/Phys/StrippingSelections/tests/coordinators/TestFromSettings.py b/Phys/StrippingSelections/tests/coordinators/TestFromSettings.py
old mode 100755
new mode 100644
index daf439c274777563a1e909cec2532da2f056c49c..636f6847709d077b08079bdf45baf0504be69a5f
--- a/Phys/StrippingSelections/tests/coordinators/TestFromSettings.py
+++ b/Phys/StrippingSelections/tests/coordinators/TestFromSettings.py
@@ -29,8 +29,7 @@ from Configurables import AuditorSvc, ChronoAuditor
 from Configurables import TimingAuditor, SequencerTimerTool
 from DSTWriters.microdstelements import *
 from Configurables import ProcStatusCheck
-from StrippingSelections.Utils import lineBuilder, buildStreams
-from StrippingSelections import buildersConf
+from StrippingSelections.Utils import buildStreams
 from StrippingSettings.Utils import strippingConfiguration
 from Configurables import DecodeRawEvent
 from Gaudi.Configuration import *
diff --git a/Phys/StrippingSelections/tests/coordinators/documentation/DaVinci-Nevents.py b/Phys/StrippingSelections/tests/coordinators/documentation/DaVinci-Nevents.py
index 0716da5c65bacc93befc101be22c4e993c0ca811..31a5057d58823a73f4d4cac89f877925319dc05c 100644
--- a/Phys/StrippingSelections/tests/coordinators/documentation/DaVinci-Nevents.py
+++ b/Phys/StrippingSelections/tests/coordinators/documentation/DaVinci-Nevents.py
@@ -8,7 +8,6 @@
 # granted to it by virtue of its status as an Intergovernmental Organization  #
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
-from Gaudi.Configuration import *
 from Configurables import DaVinci
 
 # Number of events etc.
diff --git a/Phys/StrippingSelections/tests/coordinators/get_correlations.py b/Phys/StrippingSelections/tests/coordinators/get_correlations.py
index 44d4f4bd5667ad78e965699ff6797f57084b3416..82323f326cf91cbe7f83994f9bfa80b833b456d6 100644
--- a/Phys/StrippingSelections/tests/coordinators/get_correlations.py
+++ b/Phys/StrippingSelections/tests/coordinators/get_correlations.py
@@ -12,9 +12,6 @@
 ################################################################################################
 
 from ROOT import *
-import os
-from copy import copy
-from math import sqrt
 
 corr = {}
 listAlgs = []
diff --git a/Phys/StrippingSelections/tests/coordinators/retentions/CVS_Stoomboot_tests/TestFromSettings_B2CC.py b/Phys/StrippingSelections/tests/coordinators/retentions/CVS_Stoomboot_tests/TestFromSettings_B2CC.py
old mode 100755
new mode 100644
index cd487941ef6bf4d0acd10258acf184dbd99bd6ed..0ba34490306f5d5f4402d8f000b2a86453699e5e
--- a/Phys/StrippingSelections/tests/coordinators/retentions/CVS_Stoomboot_tests/TestFromSettings_B2CC.py
+++ b/Phys/StrippingSelections/tests/coordinators/retentions/CVS_Stoomboot_tests/TestFromSettings_B2CC.py
@@ -15,8 +15,6 @@ from DSTWriters.Configuration import (SelDSTWriter,
                                       stripMicroDSTStreamConf,
                                       stripMicroDSTElements,
                                       stripCalibMicroDSTStreamConf)
-from Configurables import TupleToolStripping
-from Configurables import EventTuple
 from Configurables import AlgorithmCorrelationsAlg
 from Configurables import StrippingReport
 from Configurables import AuditorSvc, ChronoAuditor
@@ -25,8 +23,8 @@ from DSTWriters.microdstelements import *
 from StrippingArchive import strippingArchive
 from StrippingArchive.Utils import buildStreams
 from StrippingSettings.Utils import strippingConfiguration
-from StrippingConf.Configuration import StrippingConf, StrippingStream
-from Configurables import DaVinci, Stripping, DecodeRawEvent, ProcStatusCheck
+from StrippingConf.Configuration import StrippingConf
+from Configurables import DaVinci, DecodeRawEvent, ProcStatusCheck
 from Gaudi.Configuration import *
 from CommonParticlesArchive import CommonParticlesArchiveConf
 stripping = 'Stripping34r0p1'
diff --git a/Phys/StrippingSelections/tests/coordinators/retentions/CVS_Stoomboot_tests/TestFromSettings_B2OC.py b/Phys/StrippingSelections/tests/coordinators/retentions/CVS_Stoomboot_tests/TestFromSettings_B2OC.py
old mode 100755
new mode 100644
index a58e2ad790a7ce555c8bbcc0654ccd79646b2c69..879ab124b3c58aa35ef49327450dccfc31786f08
--- a/Phys/StrippingSelections/tests/coordinators/retentions/CVS_Stoomboot_tests/TestFromSettings_B2OC.py
+++ b/Phys/StrippingSelections/tests/coordinators/retentions/CVS_Stoomboot_tests/TestFromSettings_B2OC.py
@@ -15,8 +15,6 @@ from DSTWriters.Configuration import (SelDSTWriter,
                                       stripMicroDSTStreamConf,
                                       stripMicroDSTElements,
                                       stripCalibMicroDSTStreamConf)
-from Configurables import TupleToolStripping
-from Configurables import EventTuple
 from Configurables import AlgorithmCorrelationsAlg
 from Configurables import StrippingReport
 from Configurables import AuditorSvc, ChronoAuditor
@@ -25,8 +23,8 @@ from DSTWriters.microdstelements import *
 from StrippingArchive import strippingArchive
 from StrippingArchive.Utils import buildStreams
 from StrippingSettings.Utils import strippingConfiguration
-from StrippingConf.Configuration import StrippingConf, StrippingStream
-from Configurables import DaVinci, Stripping, DecodeRawEvent, ProcStatusCheck
+from StrippingConf.Configuration import StrippingConf
+from Configurables import DaVinci, DecodeRawEvent, ProcStatusCheck
 from Gaudi.Configuration import *
 from CommonParticlesArchive import CommonParticlesArchiveConf
 stripping = 'Stripping34r0p1'
diff --git a/Phys/StrippingSelections/tests/coordinators/retentions/CVS_Stoomboot_tests/TestFromSettings_BandQ.py b/Phys/StrippingSelections/tests/coordinators/retentions/CVS_Stoomboot_tests/TestFromSettings_BandQ.py
old mode 100755
new mode 100644
index f5f5a2b9b8e35a3244921ec5016e3e106e336d35..35e0f49ab1cdba7d5802787dfb8a9cc830bbb8a0
--- a/Phys/StrippingSelections/tests/coordinators/retentions/CVS_Stoomboot_tests/TestFromSettings_BandQ.py
+++ b/Phys/StrippingSelections/tests/coordinators/retentions/CVS_Stoomboot_tests/TestFromSettings_BandQ.py
@@ -15,8 +15,6 @@ from DSTWriters.Configuration import (SelDSTWriter,
                                       stripMicroDSTStreamConf,
                                       stripMicroDSTElements,
                                       stripCalibMicroDSTStreamConf)
-from Configurables import TupleToolStripping
-from Configurables import EventTuple
 from Configurables import AlgorithmCorrelationsAlg
 from Configurables import StrippingReport
 from Configurables import AuditorSvc, ChronoAuditor
@@ -25,8 +23,8 @@ from DSTWriters.microdstelements import *
 from StrippingArchive import strippingArchive
 from StrippingArchive.Utils import buildStreams
 from StrippingSettings.Utils import strippingConfiguration
-from StrippingConf.Configuration import StrippingConf, StrippingStream
-from Configurables import DaVinci, Stripping, DecodeRawEvent, ProcStatusCheck
+from StrippingConf.Configuration import StrippingConf
+from Configurables import DaVinci, DecodeRawEvent, ProcStatusCheck
 from Gaudi.Configuration import *
 from CommonParticlesArchive import CommonParticlesArchiveConf
 stripping = 'Stripping34r0p1'
diff --git a/Phys/StrippingSelections/tests/coordinators/retentions/CVS_Stoomboot_tests/TestFromSettings_BnoC.py b/Phys/StrippingSelections/tests/coordinators/retentions/CVS_Stoomboot_tests/TestFromSettings_BnoC.py
old mode 100755
new mode 100644
index 52892d780dbf6a754e7aaf3ded2cb69a7f5cd204..f92bfeb8612d9264a5f0a01a074af88cc1090c72
--- a/Phys/StrippingSelections/tests/coordinators/retentions/CVS_Stoomboot_tests/TestFromSettings_BnoC.py
+++ b/Phys/StrippingSelections/tests/coordinators/retentions/CVS_Stoomboot_tests/TestFromSettings_BnoC.py
@@ -15,8 +15,6 @@ from DSTWriters.Configuration import (SelDSTWriter,
                                       stripMicroDSTStreamConf,
                                       stripMicroDSTElements,
                                       stripCalibMicroDSTStreamConf)
-from Configurables import TupleToolStripping
-from Configurables import EventTuple
 from Configurables import AlgorithmCorrelationsAlg
 from Configurables import StrippingReport
 from Configurables import AuditorSvc, ChronoAuditor
@@ -25,8 +23,8 @@ from DSTWriters.microdstelements import *
 from StrippingArchive import strippingArchive
 from StrippingArchive.Utils import buildStreams
 from StrippingSettings.Utils import strippingConfiguration
-from StrippingConf.Configuration import StrippingConf, StrippingStream
-from Configurables import DaVinci, Stripping, DecodeRawEvent, ProcStatusCheck
+from StrippingConf.Configuration import StrippingConf
+from Configurables import DaVinci, DecodeRawEvent, ProcStatusCheck
 from Gaudi.Configuration import *
 from CommonParticlesArchive import CommonParticlesArchiveConf
 stripping = 'Stripping34r0p1'
diff --git a/Phys/StrippingSelections/tests/coordinators/retentions/CVS_Stoomboot_tests/TestFromSettings_Calib.py b/Phys/StrippingSelections/tests/coordinators/retentions/CVS_Stoomboot_tests/TestFromSettings_Calib.py
old mode 100755
new mode 100644
index c9558ca66c2b9ad78b3ecaca908659bb90362c83..fd3df0b58b72cb69da9b87eb2f690bdea672c133
--- a/Phys/StrippingSelections/tests/coordinators/retentions/CVS_Stoomboot_tests/TestFromSettings_Calib.py
+++ b/Phys/StrippingSelections/tests/coordinators/retentions/CVS_Stoomboot_tests/TestFromSettings_Calib.py
@@ -15,8 +15,6 @@ from DSTWriters.Configuration import (SelDSTWriter,
                                       stripMicroDSTStreamConf,
                                       stripMicroDSTElements,
                                       stripCalibMicroDSTStreamConf)
-from Configurables import TupleToolStripping
-from Configurables import EventTuple
 from Configurables import AlgorithmCorrelationsAlg
 from Configurables import StrippingReport
 from Configurables import AuditorSvc, ChronoAuditor
@@ -25,8 +23,8 @@ from DSTWriters.microdstelements import *
 from StrippingArchive import strippingArchive
 from StrippingArchive.Utils import buildStreams
 from StrippingSettings.Utils import strippingConfiguration
-from StrippingConf.Configuration import StrippingConf, StrippingStream
-from Configurables import DaVinci, Stripping, DecodeRawEvent, ProcStatusCheck
+from StrippingConf.Configuration import StrippingConf
+from Configurables import DaVinci, DecodeRawEvent, ProcStatusCheck
 from Gaudi.Configuration import *
 from CommonParticlesArchive import CommonParticlesArchiveConf
 stripping = 'Stripping34r0p1'
diff --git a/Phys/StrippingSelections/tests/coordinators/retentions/CVS_Stoomboot_tests/TestFromSettings_Charm.py b/Phys/StrippingSelections/tests/coordinators/retentions/CVS_Stoomboot_tests/TestFromSettings_Charm.py
old mode 100755
new mode 100644
index e57f7cc8ad5a12073a789eca16e98768ee8deda0..454fe0a4705bf98615941a897cf5ddc9cc550623
--- a/Phys/StrippingSelections/tests/coordinators/retentions/CVS_Stoomboot_tests/TestFromSettings_Charm.py
+++ b/Phys/StrippingSelections/tests/coordinators/retentions/CVS_Stoomboot_tests/TestFromSettings_Charm.py
@@ -15,8 +15,6 @@ from DSTWriters.Configuration import (SelDSTWriter,
                                       stripMicroDSTStreamConf,
                                       stripMicroDSTElements,
                                       stripCalibMicroDSTStreamConf)
-from Configurables import TupleToolStripping
-from Configurables import EventTuple
 from Configurables import AlgorithmCorrelationsAlg
 from Configurables import StrippingReport
 from Configurables import AuditorSvc, ChronoAuditor
@@ -25,8 +23,8 @@ from DSTWriters.microdstelements import *
 from StrippingArchive import strippingArchive
 from StrippingArchive.Utils import buildStreams
 from StrippingSettings.Utils import strippingConfiguration
-from StrippingConf.Configuration import StrippingConf, StrippingStream
-from Configurables import DaVinci, Stripping, DecodeRawEvent, ProcStatusCheck
+from StrippingConf.Configuration import StrippingConf
+from Configurables import DaVinci, DecodeRawEvent, ProcStatusCheck
 from Gaudi.Configuration import *
 from CommonParticlesArchive import CommonParticlesArchiveConf
 stripping = 'Stripping34r0p1'
diff --git a/Phys/StrippingSelections/tests/coordinators/retentions/CVS_Stoomboot_tests/TestFromSettings_QEE.py b/Phys/StrippingSelections/tests/coordinators/retentions/CVS_Stoomboot_tests/TestFromSettings_QEE.py
old mode 100755
new mode 100644
index f4cf24f0d5846ec4b13683f31126b0be6f5572e3..a22b793b07023a81df5e7417d73df55f54d2fb0a
--- a/Phys/StrippingSelections/tests/coordinators/retentions/CVS_Stoomboot_tests/TestFromSettings_QEE.py
+++ b/Phys/StrippingSelections/tests/coordinators/retentions/CVS_Stoomboot_tests/TestFromSettings_QEE.py
@@ -15,8 +15,6 @@ from DSTWriters.Configuration import (SelDSTWriter,
                                       stripMicroDSTStreamConf,
                                       stripMicroDSTElements,
                                       stripCalibMicroDSTStreamConf)
-from Configurables import TupleToolStripping
-from Configurables import EventTuple
 from Configurables import AlgorithmCorrelationsAlg
 from Configurables import StrippingReport
 from Configurables import AuditorSvc, ChronoAuditor
@@ -25,8 +23,8 @@ from DSTWriters.microdstelements import *
 from StrippingArchive import strippingArchive
 from StrippingArchive.Utils import buildStreams
 from StrippingSettings.Utils import strippingConfiguration
-from StrippingConf.Configuration import StrippingConf, StrippingStream
-from Configurables import DaVinci, Stripping, DecodeRawEvent, ProcStatusCheck
+from StrippingConf.Configuration import StrippingConf
+from Configurables import DaVinci, DecodeRawEvent, ProcStatusCheck
 from Gaudi.Configuration import *
 from CommonParticlesArchive import CommonParticlesArchiveConf
 stripping = 'Stripping34r0p1'
diff --git a/Phys/StrippingSelections/tests/coordinators/retentions/CVS_Stoomboot_tests/TestFromSettings_RD.py b/Phys/StrippingSelections/tests/coordinators/retentions/CVS_Stoomboot_tests/TestFromSettings_RD.py
old mode 100755
new mode 100644
index d71b84f053042fcf7db7d968aab71fed99324dba..d5e7110eb17ad4cf143af1267a39439c58d237b7
--- a/Phys/StrippingSelections/tests/coordinators/retentions/CVS_Stoomboot_tests/TestFromSettings_RD.py
+++ b/Phys/StrippingSelections/tests/coordinators/retentions/CVS_Stoomboot_tests/TestFromSettings_RD.py
@@ -15,8 +15,6 @@ from DSTWriters.Configuration import (SelDSTWriter,
                                       stripMicroDSTStreamConf,
                                       stripMicroDSTElements,
                                       stripCalibMicroDSTStreamConf)
-from Configurables import TupleToolStripping
-from Configurables import EventTuple
 from Configurables import AlgorithmCorrelationsAlg
 from Configurables import StrippingReport
 from Configurables import AuditorSvc, ChronoAuditor
@@ -25,8 +23,8 @@ from DSTWriters.microdstelements import *
 from StrippingArchive import strippingArchive
 from StrippingArchive.Utils import buildStreams
 from StrippingSettings.Utils import strippingConfiguration
-from StrippingConf.Configuration import StrippingConf, StrippingStream
-from Configurables import DaVinci, Stripping, DecodeRawEvent, ProcStatusCheck
+from StrippingConf.Configuration import StrippingConf
+from Configurables import DaVinci, DecodeRawEvent, ProcStatusCheck
 from Gaudi.Configuration import *
 from CommonParticlesArchive import CommonParticlesArchiveConf
 stripping = 'Stripping34r0p1'
diff --git a/Phys/StrippingSelections/tests/coordinators/retentions/CVS_Stoomboot_tests/TestFromSettings_Semileptonic.py b/Phys/StrippingSelections/tests/coordinators/retentions/CVS_Stoomboot_tests/TestFromSettings_Semileptonic.py
old mode 100755
new mode 100644
index b3bd32d29cd40ba371e858e8801c76ece2a87a0a..fff71e792fe580ed870a02bc1d39435b24bb9414
--- a/Phys/StrippingSelections/tests/coordinators/retentions/CVS_Stoomboot_tests/TestFromSettings_Semileptonic.py
+++ b/Phys/StrippingSelections/tests/coordinators/retentions/CVS_Stoomboot_tests/TestFromSettings_Semileptonic.py
@@ -15,8 +15,6 @@ from DSTWriters.Configuration import (SelDSTWriter,
                                       stripMicroDSTStreamConf,
                                       stripMicroDSTElements,
                                       stripCalibMicroDSTStreamConf)
-from Configurables import TupleToolStripping
-from Configurables import EventTuple
 from Configurables import AlgorithmCorrelationsAlg
 from Configurables import StrippingReport
 from Configurables import AuditorSvc, ChronoAuditor
@@ -25,8 +23,8 @@ from DSTWriters.microdstelements import *
 from StrippingArchive import strippingArchive
 from StrippingArchive.Utils import buildStreams
 from StrippingSettings.Utils import strippingConfiguration
-from StrippingConf.Configuration import StrippingConf, StrippingStream
-from Configurables import DaVinci, Stripping, DecodeRawEvent, ProcStatusCheck
+from StrippingConf.Configuration import StrippingConf
+from Configurables import DaVinci, DecodeRawEvent, ProcStatusCheck
 from Gaudi.Configuration import *
 from CommonParticlesArchive import CommonParticlesArchiveConf
 stripping = 'Stripping34r0p1'
diff --git a/Phys/StrippingSelections/tests/coordinators/retentions/CVS_Stoomboot_tests/TestFromSettings_all.py b/Phys/StrippingSelections/tests/coordinators/retentions/CVS_Stoomboot_tests/TestFromSettings_all.py
old mode 100755
new mode 100644
index 78714285ee1679b5bcceb27c389f0d6565bacbb9..4398fdae7601306c4d86f45c7be6af5e8b9b143b
--- a/Phys/StrippingSelections/tests/coordinators/retentions/CVS_Stoomboot_tests/TestFromSettings_all.py
+++ b/Phys/StrippingSelections/tests/coordinators/retentions/CVS_Stoomboot_tests/TestFromSettings_all.py
@@ -15,8 +15,6 @@ from DSTWriters.Configuration import (SelDSTWriter,
                                       stripMicroDSTStreamConf,
                                       stripMicroDSTElements,
                                       stripCalibMicroDSTStreamConf)
-from Configurables import TupleToolStripping
-from Configurables import EventTuple
 from Configurables import AlgorithmCorrelationsAlg
 from Configurables import StrippingReport
 from Configurables import AuditorSvc, ChronoAuditor
@@ -25,8 +23,8 @@ from DSTWriters.microdstelements import *
 from StrippingArchive import strippingArchive
 from StrippingArchive.Utils import buildStreams
 from StrippingSettings.Utils import strippingConfiguration
-from StrippingConf.Configuration import StrippingConf, StrippingStream
-from Configurables import DaVinci, Stripping, DecodeRawEvent, ProcStatusCheck
+from StrippingConf.Configuration import StrippingConf
+from Configurables import DaVinci, DecodeRawEvent, ProcStatusCheck
 from Gaudi.Configuration import *
 from CommonParticlesArchive import CommonParticlesArchiveConf
 stripping = 'Stripping34r0p1'
diff --git a/Phys/StrippingSelections/tests/coordinators/retentions/TestFromSettings_all.py b/Phys/StrippingSelections/tests/coordinators/retentions/TestFromSettings_all.py
old mode 100755
new mode 100644
index 03e39d22265fde3f206ba5f44190cfc4a519eb1e..2d4789a74d22ec0e659f5f2713c75b9cc167e9b9
--- a/Phys/StrippingSelections/tests/coordinators/retentions/TestFromSettings_all.py
+++ b/Phys/StrippingSelections/tests/coordinators/retentions/TestFromSettings_all.py
@@ -15,7 +15,6 @@ from DSTWriters.Configuration import (SelDSTWriter,
                                       stripMicroDSTElements,
                                       stripCalibMicroDSTStreamConf)
 from Configurables import EventTuple, TupleToolEventInfo
-from Configurables import TupleToolStripping
 from Configurables import EventTuple
 from Configurables import AlgorithmCorrelationsAlg
 from Configurables import StrippingReport
@@ -27,7 +26,7 @@ from Configurables import ProcStatusCheck
 from StrippingArchive import strippingArchive
 from StrippingArchive.Utils import buildStreams
 from StrippingSettings.Utils import strippingConfiguration
-from StrippingConf.Configuration import StrippingConf, StrippingStream
+from StrippingConf.Configuration import StrippingConf
 from Configurables import DecodeRawEvent
 from Configurables import RawEventJuggler
 from StrippingConf.Configuration import StrippingConf
diff --git a/Phys/StrippingSelections/tests/data/Reco14_2013pp_Run137246.py b/Phys/StrippingSelections/tests/data/Reco14_2013pp_Run137246.py
index 83e4ae076b02d2c93de0335bdfa13639c1cfb5b4..b93f546aa907eed8261f0ff9a8512a87858efaa7 100644
--- a/Phys/StrippingSelections/tests/data/Reco14_2013pp_Run137246.py
+++ b/Phys/StrippingSelections/tests/data/Reco14_2013pp_Run137246.py
@@ -11,7 +11,6 @@
 
 
 from Gaudi.Configuration import FileCatalog
-from Gaudi.Configuration import *
 from GaudiConf import IOHelper
 IOHelper('ROOT').inputFiles([
     'LFN:/lhcb/LHCb/Collision13/FULL.DST/00023836/0000/00023836_00000538_1.full.dst',
diff --git a/Phys/StrippingSelections/tests/data/Reco14_DataType2011_Run89335.py b/Phys/StrippingSelections/tests/data/Reco14_DataType2011_Run89335.py
index 8d30cb209e0c7136490c83943fc76199eb0dc919..b5115d2577ee21ade35c433ebb02b61bc75da943 100644
--- a/Phys/StrippingSelections/tests/data/Reco14_DataType2011_Run89335.py
+++ b/Phys/StrippingSelections/tests/data/Reco14_DataType2011_Run89335.py
@@ -9,7 +9,6 @@
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
 from Gaudi.Configuration import FileCatalog
-from Gaudi.Configuration import *
 from Configurables import DaVinci
 from PRConfig import TestFileDB
 TestFileDB.test_file_db["TestData_restripping_collision11_reco14"].run(
diff --git a/Phys/StrippingSelections/tests/data/Reco14_DataType2012_Run133399.py b/Phys/StrippingSelections/tests/data/Reco14_DataType2012_Run133399.py
index 0c831466db3150c31b5a13d57bb5714d4fc17787..f2e56a7a8ff55a824339fc570730afe67f456014 100644
--- a/Phys/StrippingSelections/tests/data/Reco14_DataType2012_Run133399.py
+++ b/Phys/StrippingSelections/tests/data/Reco14_DataType2012_Run133399.py
@@ -9,7 +9,6 @@
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
 from Gaudi.Configuration import FileCatalog
-from Gaudi.Configuration import *
 from Configurables import DaVinci
 from PRConfig import TestFileDB
 TestFileDB.test_file_db["TestData_restripping_collision12_reco14"].run(
diff --git a/Phys/StrippingSelections/tests/data/Reco14_pA_MagDown.py b/Phys/StrippingSelections/tests/data/Reco14_pA_MagDown.py
index 24e4ebdcf2d2d164360e5250c69ab33ba0cd17c1..833a718035c2f65ee54240bbbee1b688d726fe62 100644
--- a/Phys/StrippingSelections/tests/data/Reco14_pA_MagDown.py
+++ b/Phys/StrippingSelections/tests/data/Reco14_pA_MagDown.py
@@ -41,7 +41,6 @@
 # --  ExtraPackages : AppConfig.v3r172;SQLDDDB.v7r9
 # --  Visible : Y
 
-from Gaudi.Configuration import *
 from GaudiConf import IOHelper
 IOHelper('ROOT').inputFiles([
     'PFN:/castor/cern.ch/grid/lhcb/LHCb/Protonion13/FULL.DST/00024845/0000/00024845_00009990_1.full.dst'
diff --git a/Phys/StrippingSelections/tests/data/Reco14r1_Protonion13_Run135710.py b/Phys/StrippingSelections/tests/data/Reco14r1_Protonion13_Run135710.py
index d36dc2f7b706f44e1cec1bf19bfaa0f1d9920847..49aaf46280be21f15ab4dfd104a2a092d6bd3f59 100644
--- a/Phys/StrippingSelections/tests/data/Reco14r1_Protonion13_Run135710.py
+++ b/Phys/StrippingSelections/tests/data/Reco14r1_Protonion13_Run135710.py
@@ -11,7 +11,6 @@
 
 
 from Gaudi.Configuration import FileCatalog
-from Gaudi.Configuration import *
 from GaudiConf import IOHelper
 IOHelper('ROOT').inputFiles([
     'LFN:/lhcb/LHCb/Protonion13/FULL.DST/00032860/0000/00032860_00005453_1.full.dst',
diff --git a/Phys/StrippingSelections/tests/data/Reco15_NoBias.py b/Phys/StrippingSelections/tests/data/Reco15_NoBias.py
index f392b9992dbf8caafdb38c21cf8e506da245b5a1..b337f2db687eeb2bfff6a34a323ed5646a16957a 100644
--- a/Phys/StrippingSelections/tests/data/Reco15_NoBias.py
+++ b/Phys/StrippingSelections/tests/data/Reco15_NoBias.py
@@ -8,7 +8,6 @@
 # granted to it by virtue of its status as an Intergovernmental Organization  #
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
-from Gaudi.Configuration import *
 from GaudiConf import IOHelper
 IOHelper('ROOT').inputFiles([
     'root://eoslhcb.cern.ch//eos/lhcb/user/r/rvazquez/DSTsForS23/114088641_NoBias_2015_0xEE63_Hlt.dst', 'root://eoslhcb.cern.ch//eos/lhcb/user/r/rvazquez/DSTsForS23/114088646_NoBias_2015_0xEE63_Hlt.dst', 'root://eoslhcb.cern.ch//eos/lhcb/user/r/rvazquez/DSTsForS23/114088652_NoBias_2015_0xEE63_Hlt.dst', 'root://eoslhcb.cern.ch//eos/lhcb/user/r/rvazquez/DSTsForS23/114088655_NoBias_2015_0xEE63_Hlt.dst', 'root://eoslhcb.cern.ch//eos/lhcb/user/r/rvazquez/DSTsForS23/114088665_NoBias_2015_0xEE63_Hlt.dst', 'root://eoslhcb.cern.ch//eos/lhcb/user/r/rvazquez/DSTsForS23/114088685_NoBias_2015_0xEE63_Hlt.dst', 'root://eoslhcb.cern.ch//eos/lhcb/user/r/rvazquez/DSTsForS23/114088689_NoBias_2015_0xEE63_Hlt.dst', 'root://eoslhcb.cern.ch//eos/lhcb/user/r/rvazquez/DSTsForS23/114088693_NoBias_2015_0xEE63_Hlt.dst', 'root://eoslhcb.cern.ch//eos/lhcb/user/r/rvazquez/DSTsForS23/114088696_NoBias_2015_0xEE63_Hlt.dst', 'root://eoslhcb.cern.ch//eos/lhcb/user/r/rvazquez/DSTsForS23/114088704_NoBias_2015_0xEE63_Hlt.dst', 'root://eoslhcb.cern.ch//eos/lhcb/user/r/rvazquez/DSTsForS23/114088711_NoBias_2015_0xEE63_Hlt.dst', 'root://eoslhcb.cern.ch//eos/lhcb/user/r/rvazquez/DSTsForS23/114088717_NoBias_2015_0xEE63_Hlt.dst', 'root://eoslhcb.cern.ch//eos/lhcb/user/r/rvazquez/DSTsForS23/114088723_NoBias_2015_0xEE63_Hlt.dst', 'root://eoslhcb.cern.ch//eos/lhcb/user/r/rvazquez/DSTsForS23/114088728_NoBias_2015_0xEE63_Hlt.dst', 'root://eoslhcb.cern.ch//eos/lhcb/user/r/rvazquez/DSTsForS23/114088735_NoBias_2015_0xEE63_Hlt.dst', 'root://eoslhcb.cern.ch//eos/lhcb/user/r/rvazquez/DSTsForS23/114088739_NoBias_2015_0xEE63_Hlt.dst', 'root://eoslhcb.cern.ch//eos/lhcb/user/r/rvazquez/DSTsForS23/114088743_NoBias_2015_0xEE63_Hlt.dst', 'root://eoslhcb.cern.ch//eos/lhcb/user/r/rvazquez/DSTsForS23/114088751_NoBias_2015_0xEE63_Hlt.dst', 'root://eoslhcb.cern.ch//eos/lhcb/user/r/rvazquez/DSTsForS23/114088756_NoBias_2015_0xEE63_Hlt.dst', 'root://eoslhcb.cern.ch//eos/lhcb/user/r/rvazquez/DSTsForS23/114088760_NoBias_2015_0xEE63_Hlt.dst', 'root://eoslhcb.cern.ch//eos/lhcb/user/r/rvazquez/DSTsForS23/114088764_NoBias_2015_0xEE63_Hlt.dst', 'root://eoslhcb.cern.ch//eos/lhcb/user/r/rvazquez/DSTsForS23/114088767_NoBias_2015_0xEE63_Hlt.dst', 'root://eoslhcb.cern.ch//eos/lhcb/user/r/rvazquez/DSTsForS23/114088773_NoBias_2015_0xEE63_Hlt.dst', 'root://eoslhcb.cern.ch//eos/lhcb/user/r/rvazquez/DSTsForS23/114088777_NoBias_2015_0xEE63_Hlt.dst', 'root://eoslhcb.cern.ch//eos/lhcb/user/r/rvazquez/DSTsForS23/114088781_NoBias_2015_0xEE63_Hlt.dst', 'root://eoslhcb.cern.ch//eos/lhcb/user/r/rvazquez/DSTsForS23/114088785_NoBias_2015_0xEE63_Hlt.dst', 'root://eoslhcb.cern.ch//eos/lhcb/user/r/rvazquez/DSTsForS23/114088789_NoBias_2015_0xEE63_Hlt.dst', 'root://eoslhcb.cern.ch//eos/lhcb/user/r/rvazquez/DSTsForS23/114088794_NoBias_2015_0xEE63_Hlt.dst', 'root://eoslhcb.cern.ch//eos/lhcb/user/r/rvazquez/DSTsForS23/114088800_NoBias_2015_0xEE63_Hlt.dst', 'root://eoslhcb.cern.ch//eos/lhcb/user/r/rvazquez/DSTsForS23/114088805_NoBias_2015_0xEE63_Hlt.dst', 'root://eoslhcb.cern.ch//eos/lhcb/user/r/rvazquez/DSTsForS23/114088809_NoBias_2015_0xEE63_Hlt.dst', 'root://eoslhcb.cern.ch//eos/lhcb/user/r/rvazquez/DSTsForS23/114088813_NoBias_2015_0xEE63_Hlt.dst', 'root://eoslhcb.cern.ch//eos/lhcb/user/r/rvazquez/DSTsForS23/114088819_NoBias_2015_0xEE63_Hlt.dst', 'root://eoslhcb.cern.ch//eos/lhcb/user/r/rvazquez/DSTsForS23/114088823_NoBias_2015_0xEE63_Hlt.dst', 'root://eoslhcb.cern.ch//eos/lhcb/user/r/rvazquez/DSTsForS23/114088827_NoBias_2015_0xEE63_Hlt.dst', 'root://eoslhcb.cern.ch//eos/lhcb/user/r/rvazquez/DSTsForS23/114088833_NoBias_2015_0xEE63_Hlt.dst', 'root://eoslhcb.cern.ch//eos/lhcb/user/r/rvazquez/DSTsForS23/114088838_NoBias_2015_0xEE63_Hlt.dst', 'root://eoslhcb.cern.ch//eos/lhcb/user/r/rvazquez/DSTsForS23/114088842_NoBias_2015_0xEE63_Hlt.dst', 'root://eoslhcb.cern.ch//eos/lhcb/user/r/rvazquez/DSTsForS23/114088846_NoBias_2015_0xEE63_Hlt.dst', 'root://eoslhcb.cern.ch//eos/lhcb/user/r/rvazquez/DSTsForS23/114088850_NoBias_2015_0xEE63_Hlt.dst', 'root://eoslhcb.cern.ch//eos/lhcb/user/r/rvazquez/DSTsForS23/114088866_NoBias_2015_0xEE63_Hlt.dst', 'root://eoslhcb.cern.ch//eos/lhcb/user/r/rvazquez/DSTsForS23/114088872_NoBias_2015_0xEE63_Hlt.dst', 'root://eoslhcb.cern.ch//eos/lhcb/user/r/rvazquez/DSTsForS23/114088878_NoBias_2015_0xEE63_Hlt.dst', 'root://eoslhcb.cern.ch//eos/lhcb/user/r/rvazquez/DSTsForS23/114088883_NoBias_2015_0xEE63_Hlt.dst', 'root://eoslhcb.cern.ch//eos/lhcb/user/r/rvazquez/DSTsForS23/114088889_NoBias_2015_0xEE63_Hlt.dst', 'root://eoslhcb.cern.ch//eos/lhcb/user/r/rvazquez/DSTsForS23/114088893_NoBias_2015_0xEE63_Hlt.dst', 'root://eoslhcb.cern.ch//eos/lhcb/user/r/rvazquez/DSTsForS23/114088898_NoBias_2015_0xEE63_Hlt.dst', 'root://eoslhcb.cern.ch//eos/lhcb/user/r/rvazquez/DSTsForS23/114088903_NoBias_2015_0xEE63_Hlt.dst', 'root://eoslhcb.cern.ch//eos/lhcb/user/r/rvazquez/DSTsForS23/114088924_NoBias_2015_0xEE63_Hlt.dst', 'root://eoslhcb.cern.ch//eos/lhcb/user/r/rvazquez/DSTsForS23/114088949_NoBias_2015_0xEE63_Hlt.dst', 'root://eoslhcb.cern.ch//eos/lhcb/user/r/rvazquez/DSTsForS23/114088970_NoBias_2015_0xEE63_Hlt.dst', 'root://eoslhcb.cern.ch//eos/lhcb/user/r/rvazquez/DSTsForS23/114088992_NoBias_2015_0xEE63_Hlt.dst', 'root://eoslhcb.cern.ch//eos/lhcb/user/r/rvazquez/DSTsForS23/114089016_NoBias_2015_0xEE63_Hlt.dst', 'root://eoslhcb.cern.ch//eos/lhcb/user/r/rvazquez/DSTsForS23/114089031_NoBias_2015_0xEE63_Hlt.dst', 'root://eoslhcb.cern.ch//eos/lhcb/user/r/rvazquez/DSTsForS23/114089036_NoBias_2015_0xEE63_Hlt.dst', 'root://eoslhcb.cern.ch//eos/lhcb/user/r/rvazquez/DSTsForS23/114089046_NoBias_2015_0xEE63_Hlt.dst', 'root://eoslhcb.cern.ch//eos/lhcb/user/r/rvazquez/DSTsForS23/114089050_NoBias_2015_0xEE63_Hlt.dst', 'root://eoslhcb.cern.ch//eos/lhcb/user/r/rvazquez/DSTsForS23/114089055_NoBias_2015_0xEE63_Hlt.dst', 'root://eoslhcb.cern.ch//eos/lhcb/user/r/rvazquez/DSTsForS23/114089060_NoBias_2015_0xEE63_Hlt.dst', 'root://eoslhcb.cern.ch//eos/lhcb/user/r/rvazquez/DSTsForS23/114089064_NoBias_2015_0xEE63_Hlt.dst', 'root://eoslhcb.cern.ch//eos/lhcb/user/r/rvazquez/DSTsForS23/114089068_NoBias_2015_0xEE63_Hlt.dst', 'root://eoslhcb.cern.ch//eos/lhcb/user/r/rvazquez/DSTsForS23/114089073_NoBias_2015_0xEE63_Hlt.dst', 'root://eoslhcb.cern.ch//eos/lhcb/user/r/rvazquez/DSTsForS23/114089078_NoBias_2015_0xEE63_Hlt.dst', 'root://eoslhcb.cern.ch//eos/lhcb/user/r/rvazquez/DSTsForS23/114089081_NoBias_2015_0xEE63_Hlt.dst', 'root://eoslhcb.cern.ch//eos/lhcb/user/r/rvazquez/DSTsForS23/114089086_NoBias_2015_0xEE63_Hlt.dst', 'root://eoslhcb.cern.ch//eos/lhcb/user/r/rvazquez/DSTsForS23/114089090_NoBias_2015_0xEE63_Hlt.dst', 'root://eoslhcb.cern.ch//eos/lhcb/user/r/rvazquez/DSTsForS23/114089095_NoBias_2015_0xEE63_Hlt.dst', 'root://eoslhcb.cern.ch//eos/lhcb/user/r/rvazquez/DSTsForS23/114089101_NoBias_2015_0xEE63_Hlt.dst', 'root://eoslhcb.cern.ch//eos/lhcb/user/r/rvazquez/DSTsForS23/114089105_NoBias_2015_0xEE63_Hlt.dst', 'root://eoslhcb.cern.ch//eos/lhcb/user/r/rvazquez/DSTsForS23/114089119_NoBias_2015_0xEE63_Hlt.dst', 'root://eoslhcb.cern.ch//eos/lhcb/user/r/rvazquez/DSTsForS23/114089123_NoBias_2015_0xEE63_Hlt.dst', 'root://eoslhcb.cern.ch//eos/lhcb/user/r/rvazquez/DSTsForS23/114089130_NoBias_2015_0xEE63_Hlt.dst', 'root://eoslhcb.cern.ch//eos/lhcb/user/r/rvazquez/DSTsForS23/114089136_NoBias_2015_0xEE63_Hlt.dst', 'root://eoslhcb.cern.ch//eos/lhcb/user/r/rvazquez/DSTsForS23/114089139_NoBias_2015_0xEE63_Hlt.dst', 'root://eoslhcb.cern.ch//eos/lhcb/user/r/rvazquez/DSTsForS23/114089153_NoBias_2015_0xEE63_Hlt.dst', 'root://eoslhcb.cern.ch//eos/lhcb/user/r/rvazquez/DSTsForS23/114089164_NoBias_2015_0xEE63_Hlt.dst', 'root://eoslhcb.cern.ch//eos/lhcb/user/r/rvazquez/DSTsForS23/114089168_NoBias_2015_0xEE63_Hlt.dst', 'root://eoslhcb.cern.ch//eos/lhcb/user/r/rvazquez/DSTsForS23/114089173_NoBias_2015_0xEE63_Hlt.dst', 'root://eoslhcb.cern.ch//eos/lhcb/user/r/rvazquez/DSTsForS23/114089183_NoBias_2015_0xEE63_Hlt.dst', 'root://eoslhcb.cern.ch//eos/lhcb/user/r/rvazquez/DSTsForS23/114089203_NoBias_2015_0xEE63_Hlt.dst', 'root://eoslhcb.cern.ch//eos/lhcb/user/r/rvazquez/DSTsForS23/114089226_NoBias_2015_0xEE63_Hlt.dst', 'root://eoslhcb.cern.ch//eos/lhcb/user/r/rvazquez/DSTsForS23/114089249_NoBias_2015_0xEE63_Hlt.dst', 'root://eoslhcb.cern.ch//eos/lhcb/user/r/rvazquez/DSTsForS23/114089280_NoBias_2015_0xEE63_Hlt.dst', 'root://eoslhcb.cern.ch//eos/lhcb/user/r/rvazquez/DSTsForS23/114089294_NoBias_2015_0xEE63_Hlt.dst', 'root://eoslhcb.cern.ch//eos/lhcb/user/r/rvazquez/DSTsForS23/114089309_NoBias_2015_0xEE63_Hlt.dst', 'root://eoslhcb.cern.ch//eos/lhcb/user/r/rvazquez/DSTsForS23/114089315_NoBias_2015_0xEE63_Hlt.dst', 'root://eoslhcb.cern.ch//eos/lhcb/user/r/rvazquez/DSTsForS23/114089321_NoBias_2015_0xEE63_Hlt.dst', 'root://eoslhcb.cern.ch//eos/lhcb/user/r/rvazquez/DSTsForS23/114089328_NoBias_2015_0xEE63_Hlt.dst', 'root://eoslhcb.cern.ch//eos/lhcb/user/r/rvazquez/DSTsForS23/114089332_NoBias_2015_0xEE63_Hlt.dst', 'root://eoslhcb.cern.ch//eos/lhcb/user/r/rvazquez/DSTsForS23/114089346_NoBias_2015_0xEE63_Hlt.dst', 'root://eoslhcb.cern.ch//eos/lhcb/user/r/rvazquez/DSTsForS23/114089368_NoBias_2015_0xEE63_Hlt.dst', 'root://eoslhcb.cern.ch//eos/lhcb/user/r/rvazquez/DSTsForS23/114089384_NoBias_2015_0xEE63_Hlt.dst', 'root://eoslhcb.cern.ch//eos/lhcb/user/r/rvazquez/DSTsForS23/114089388_NoBias_2015_0xEE63_Hlt.dst', 'root://eoslhcb.cern.ch//eos/lhcb/user/r/rvazquez/DSTsForS23/114089393_NoBias_2015_0xEE63_Hlt.dst', 'root://eoslhcb.cern.ch//eos/lhcb/user/r/rvazquez/DSTsForS23/114089398_NoBias_2015_0xEE63_Hlt.dst', 'root://eoslhcb.cern.ch//eos/lhcb/user/r/rvazquez/DSTsForS23/114089402_NoBias_2015_0xEE63_Hlt.dst', 'root://eoslhcb.cern.ch//eos/lhcb/user/r/rvazquez/DSTsForS23/114089407_NoBias_2015_0xEE63_Hlt.dst', 'root://eoslhcb.cern.ch//eos/lhcb/user/r/rvazquez/DSTsForS23/114089412_NoBias_2015_0xEE63_Hlt.dst', 'root://eoslhcb.cern.ch//eos/lhcb/user/r/rvazquez/DSTsForS23/114089416_NoBias_2015_0xEE63_Hlt.dst', 'root://eoslhcb.cern.ch//eos/lhcb/user/r/rvazquez/DSTsForS23/114089420_NoBias_2015_0xEE63_Hlt.dst', 'root://eoslhcb.cern.ch//eos/lhcb/user/r/rvazquez/DSTsForS23/114089425_NoBias_2015_0xEE63_Hlt.dst', 'root://eoslhcb.cern.ch//eos/lhcb/user/r/rvazquez/DSTsForS23/114089430_NoBias_2015_0xEE63_Hlt.dst', 'root://eoslhcb.cern.ch//eos/lhcb/user/r/rvazquez/DSTsForS23/114089434_NoBias_2015_0xEE63_Hlt.dst', 'root://eoslhcb.cern.ch//eos/lhcb/user/r/rvazquez/DSTsForS23/114089439_NoBias_2015_0xEE63_Hlt.dst', 'root://eoslhcb.cern.ch//eos/lhcb/user/r/rvazquez/DSTsForS23/114089442_NoBias_2015_0xEE63_Hlt.dst', 'root://eoslhcb.cern.ch//eos/lhcb/user/r/rvazquez/DSTsForS23/114089450_NoBias_2015_0xEE63_Hlt.dst', 'root://eoslhcb.cern.ch//eos/lhcb/user/r/rvazquez/DSTsForS23/114089457_NoBias_2015_0xEE63_Hlt.dst', 'root://eoslhcb.cern.ch//eos/lhcb/user/r/rvazquez/DSTsForS23/114089522_NoBias_2015_0xEE63_Hlt.dst', 'root://eoslhcb.cern.ch//eos/lhcb/user/r/rvazquez/DSTsForS23/114089545_NoBias_2015_0xEE63_Hlt.dst', 'root://eoslhcb.cern.ch//eos/lhcb/user/r/rvazquez/DSTsForS23/114089556_NoBias_2015_0xEE63_Hlt.dst', 'root://eoslhcb.cern.ch//eos/lhcb/user/r/rvazquez/DSTsForS23/114089573_NoBias_2015_0xEE63_Hlt.dst', 'root://eoslhcb.cern.ch//eos/lhcb/user/r/rvazquez/DSTsForS23/114089593_NoBias_2015_0xEE63_Hlt.dst', 'root://eoslhcb.cern.ch//eos/lhcb/user/r/rvazquez/DSTsForS23/114089598_NoBias_2015_0xEE63_Hlt.dst', 'root://eoslhcb.cern.ch//eos/lhcb/user/r/rvazquez/DSTsForS23/114089602_NoBias_2015_0xEE63_Hlt.dst', 'root://eoslhcb.cern.ch//eos/lhcb/user/r/rvazquez/DSTsForS23/114089607_NoBias_2015_0xEE63_Hlt.dst', 'root://eoslhcb.cern.ch//eos/lhcb/user/r/rvazquez/DSTsForS23/114089614_NoBias_2015_0xEE63_Hlt.dst', 'root://eoslhcb.cern.ch//eos/lhcb/user/r/rvazquez/DSTsForS23/114089618_NoBias_2015_0xEE63_Hlt.dst', 'root://eoslhcb.cern.ch//eos/lhcb/user/r/rvazquez/DSTsForS23/114089621_NoBias_2015_0xEE63_Hlt.dst', 'root://eoslhcb.cern.ch//eos/lhcb/user/r/rvazquez/DSTsForS23/114089626_NoBias_2015_0xEE63_Hlt.dst', 'root://eoslhcb.cern.ch//eos/lhcb/user/r/rvazquez/DSTsForS23/114089635_NoBias_2015_0xEE63_Hlt.dst', 'root://eoslhcb.cern.ch//eos/lhcb/user/r/rvazquez/DSTsForS23/114089640_NoBias_2015_0xEE63_Hlt.dst', 'root://eoslhcb.cern.ch//eos/lhcb/user/r/rvazquez/DSTsForS23/114089644_NoBias_2015_0xEE63_Hlt.dst', 'root://eoslhcb.cern.ch//eos/lhcb/user/r/rvazquez/DSTsForS23/114089653_NoBias_2015_0xEE63_Hlt.dst', 'root://eoslhcb.cern.ch//eos/lhcb/user/r/rvazquez/DSTsForS23/114089676_NoBias_2015_0xEE63_Hlt.dst', 'root://eoslhcb.cern.ch//eos/lhcb/user/r/rvazquez/DSTsForS23/114089701_NoBias_2015_0xEE63_Hlt.dst', 'root://eoslhcb.cern.ch//eos/lhcb/user/r/rvazquez/DSTsForS23/114089722_NoBias_2015_0xEE63_Hlt.dst', 'root://eoslhcb.cern.ch//eos/lhcb/user/r/rvazquez/DSTsForS23/114089754_NoBias_2015_0xEE63_Hlt.dst', 'root://eoslhcb.cern.ch//eos/lhcb/user/r/rvazquez/DSTsForS23/114089777_NoBias_2015_0xEE63_Hlt.dst', 'root://eoslhcb.cern.ch//eos/lhcb/user/r/rvazquez/DSTsForS23/114089781_NoBias_2015_0xEE63_Hlt.dst', 'root://eoslhcb.cern.ch//eos/lhcb/user/r/rvazquez/DSTsForS23/114089786_NoBias_2015_0xEE63_Hlt.dst', 'root://eoslhcb.cern.ch//eos/lhcb/user/r/rvazquez/DSTsForS23/114089790_NoBias_2015_0xEE63_Hlt.dst', 'root://eoslhcb.cern.ch//eos/lhcb/user/r/rvazquez/DSTsForS23/114089795_NoBias_2015_0xEE63_Hlt.dst', 'root://eoslhcb.cern.ch//eos/lhcb/user/r/rvazquez/DSTsForS23/114089802_NoBias_2015_0xEE63_Hlt.dst', 'root://eoslhcb.cern.ch//eos/lhcb/user/r/rvazquez/DSTsForS23/114089807_NoBias_2015_0xEE63_Hlt.dst', 'root://eoslhcb.cern.ch//eos/lhcb/user/r/rvazquez/DSTsForS23/114089811_NoBias_2015_0xEE63_Hlt.dst', 'root://eoslhcb.cern.ch//eos/lhcb/user/r/rvazquez/DSTsForS23/114089814_NoBias_2015_0xEE63_Hlt.dst'
diff --git a/Phys/StrippingSelections/tests/data/Reco15aLead15_Run168665_PbAr.py b/Phys/StrippingSelections/tests/data/Reco15aLead15_Run168665_PbAr.py
index f3ed992e6732133f410c6a091e2ce763191e3744..9e469a5ebe7a7cab2fcdeb6a585de0c8bd0c4b8c 100644
--- a/Phys/StrippingSelections/tests/data/Reco15aLead15_Run168665_PbAr.py
+++ b/Phys/StrippingSelections/tests/data/Reco15aLead15_Run168665_PbAr.py
@@ -16,7 +16,6 @@
 # --  Extra information about the data processing phases:
 
 from Gaudi.Configuration import FileCatalog
-from Gaudi.Configuration import *
 from GaudiConf import IOHelper
 IOHelper('ROOT').inputFiles([
     'LFN:/lhcb/LHCb/Lead15/RDST/00050695/0000/00050695_00000433_1.rdst',
diff --git a/Phys/StrippingSelections/tests/data/Reco15aLead15_Run168665_PbAr_DV.py b/Phys/StrippingSelections/tests/data/Reco15aLead15_Run168665_PbAr_DV.py
index c8fb7ab5d1f6985934da1292bbca5d503aa1d216..0d9eadb80d30be11f7a2fc9d7472610a1391a609 100644
--- a/Phys/StrippingSelections/tests/data/Reco15aLead15_Run168665_PbAr_DV.py
+++ b/Phys/StrippingSelections/tests/data/Reco15aLead15_Run168665_PbAr_DV.py
@@ -8,7 +8,7 @@
 # granted to it by virtue of its status as an Intergovernmental Organization  #
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
-from Configurables import DaVinci, Stripping
+from Configurables import DaVinci
 from Gaudi.Configuration import importOptions
 
 DaVinci().DataType = '2015'
diff --git a/Phys/StrippingSelections/tests/data/Reco15aLead15_Run169106_PbPb.py b/Phys/StrippingSelections/tests/data/Reco15aLead15_Run169106_PbPb.py
index b28b1c5bf3a5a584fbb62a5fd62275c63bbb364f..c2c34c0a2f7acf16935bd39d0e93b2279d20d8cb 100644
--- a/Phys/StrippingSelections/tests/data/Reco15aLead15_Run169106_PbPb.py
+++ b/Phys/StrippingSelections/tests/data/Reco15aLead15_Run169106_PbPb.py
@@ -16,7 +16,6 @@
 # --  Extra information about the data processing phases:
 
 from Gaudi.Configuration import FileCatalog
-from Gaudi.Configuration import *
 from GaudiConf import IOHelper
 IOHelper('ROOT').inputFiles([
     'LFN:/lhcb/LHCb/Lead15/RDST/00050695/0001/00050695_00013415_1.rdst',
diff --git a/Phys/StrippingSelections/tests/data/Reco15aLead15_Run169106_PbPb_DV.py b/Phys/StrippingSelections/tests/data/Reco15aLead15_Run169106_PbPb_DV.py
index c8fb7ab5d1f6985934da1292bbca5d503aa1d216..0d9eadb80d30be11f7a2fc9d7472610a1391a609 100644
--- a/Phys/StrippingSelections/tests/data/Reco15aLead15_Run169106_PbPb_DV.py
+++ b/Phys/StrippingSelections/tests/data/Reco15aLead15_Run169106_PbPb_DV.py
@@ -8,7 +8,7 @@
 # granted to it by virtue of its status as an Intergovernmental Organization  #
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
-from Configurables import DaVinci, Stripping
+from Configurables import DaVinci
 from Gaudi.Configuration import importOptions
 
 DaVinci().DataType = '2015'
diff --git a/Phys/StrippingSelections/tests/data/Reco15a_DataType2015_Run164524.py b/Phys/StrippingSelections/tests/data/Reco15a_DataType2015_Run164524.py
index 63025ab49d746a39f5749f4e99cd062b53a871a8..3107623043f02de1252c5a5e5cd2df1dee45b9d3 100644
--- a/Phys/StrippingSelections/tests/data/Reco15a_DataType2015_Run164524.py
+++ b/Phys/StrippingSelections/tests/data/Reco15a_DataType2015_Run164524.py
@@ -9,7 +9,6 @@
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
 from Gaudi.Configuration import FileCatalog
-from Gaudi.Configuration import *
 from Configurables import DaVinci
 from PRConfig import TestFileDB
 TestFileDB.test_file_db["TestData_restripping_collision15_reco15a"].run(
diff --git a/Phys/StrippingSelections/tests/data/Reco15a_DataType2015_Run164524_DV.py b/Phys/StrippingSelections/tests/data/Reco15a_DataType2015_Run164524_DV.py
index 6caabebf05336bcffb8bf901c881b7ba3f91dd7a..c5c90751a63063c9a2cc5ddd09ddec1c8891cb8b 100644
--- a/Phys/StrippingSelections/tests/data/Reco15a_DataType2015_Run164524_DV.py
+++ b/Phys/StrippingSelections/tests/data/Reco15a_DataType2015_Run164524_DV.py
@@ -8,7 +8,7 @@
 # granted to it by virtue of its status as an Intergovernmental Organization  #
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
-from Configurables import DaVinci, Stripping
+from Configurables import DaVinci
 from Gaudi.Configuration import importOptions
 
 DaVinci().DataType = '2015'
diff --git a/Phys/StrippingSelections/tests/data/Reco16LeadSmog_Run168665_PbAr.py b/Phys/StrippingSelections/tests/data/Reco16LeadSmog_Run168665_PbAr.py
index 596977907bf2f3a3d9b5e2ce305bb1e0e37894cc..890915a9bcdf7ee0ac73f15f1a9560e3ace6093c 100644
--- a/Phys/StrippingSelections/tests/data/Reco16LeadSmog_Run168665_PbAr.py
+++ b/Phys/StrippingSelections/tests/data/Reco16LeadSmog_Run168665_PbAr.py
@@ -11,7 +11,6 @@
 # lb-run LHCbDirac/prod dirac-bookkeeping-get-files -B /LHCb/Lead15/Beam6370GeV-VeloClosed-MagDown/RealData/Reco16LeadSmog/90300000/RDST --Runs 168665
 
 from Gaudi.Configuration import FileCatalog
-from Gaudi.Configuration import *
 from GaudiConf import IOHelper
 IOHelper('ROOT').inputFiles([
     'LFN:/lhcb/LHCb/Lead15/RDST/00058255/0002/00058255_00029696_1.rdst',
diff --git a/Phys/StrippingSelections/tests/data/Reco16_DataType2016_Run174858.py b/Phys/StrippingSelections/tests/data/Reco16_DataType2016_Run174858.py
index c10bed737109617310ec10a529583b400970bfdf..51244624e6967c3653c9afd9817e0fc012d6c659 100644
--- a/Phys/StrippingSelections/tests/data/Reco16_DataType2016_Run174858.py
+++ b/Phys/StrippingSelections/tests/data/Reco16_DataType2016_Run174858.py
@@ -9,7 +9,6 @@
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
 from Gaudi.Configuration import FileCatalog
-from Gaudi.Configuration import *
 from Configurables import DaVinci
 from PRConfig import TestFileDB
 TestFileDB.test_file_db["TestData_restripping_collision16_reco16"].run(
diff --git a/Phys/StrippingSelections/tests/data/Reco16_DataType2016_Run174858_DV.py b/Phys/StrippingSelections/tests/data/Reco16_DataType2016_Run174858_DV.py
index 0d5c699c6e41404bd1febfe425c34cd32249ce16..cbd00ca827ebaff92a0c8f887f6d683ebec540a3 100644
--- a/Phys/StrippingSelections/tests/data/Reco16_DataType2016_Run174858_DV.py
+++ b/Phys/StrippingSelections/tests/data/Reco16_DataType2016_Run174858_DV.py
@@ -8,7 +8,7 @@
 # granted to it by virtue of its status as an Intergovernmental Organization  #
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
-from Configurables import DaVinci, Stripping
+from Configurables import DaVinci
 from Gaudi.Configuration import importOptions
 
 DaVinci().DataType = '2016'
diff --git a/Phys/StrippingSelections/tests/data/Reco16_Run179101.py b/Phys/StrippingSelections/tests/data/Reco16_Run179101.py
index 6bf1346f6f302d3548b31658baef300482af033b..f0052cbbfa7282372fd43814a1c59ee6a0e34620 100644
--- a/Phys/StrippingSelections/tests/data/Reco16_Run179101.py
+++ b/Phys/StrippingSelections/tests/data/Reco16_Run179101.py
@@ -26,7 +26,6 @@
 # Trigger per bunch: 3.69 events/s/bunch
 
 from Gaudi.Configuration import FileCatalog
-from Gaudi.Configuration import *
 from GaudiConf import IOHelper
 IOHelper('ROOT').inputFiles([
     'LFN:/lhcb/LHCb/Collision16/RDST/00051872/0018/00051872_00189670_1.rdst',
diff --git a/Phys/StrippingSelections/tests/data/Reco16_pAr2015.py b/Phys/StrippingSelections/tests/data/Reco16_pAr2015.py
index 2638154d5ea29ff2b7c2f6f5a6d6b175a3eafdae..518c493d22286465513d35d31372046bf68464a1 100644
--- a/Phys/StrippingSelections/tests/data/Reco16_pAr2015.py
+++ b/Phys/StrippingSelections/tests/data/Reco16_pAr2015.py
@@ -15,7 +15,6 @@
 # --  Extra information about the data processing phases:
 
 from Gaudi.Configuration import FileCatalog
-from Gaudi.Configuration import *
 from GaudiConf import IOHelper
 IOHelper('ROOT').inputFiles([
     'LFN:/lhcb/LHCb/Protonargon15/FULL.DST/00051869/0000/00051869_00000400_1.full.dst',
diff --git a/Phys/StrippingSelections/tests/data/Reco16_pHe.py b/Phys/StrippingSelections/tests/data/Reco16_pHe.py
index a30cf84589368cf4503623a27cdf0cc76f3a4b54..22b22b5464e4567ec71309d547ddc9cb98e06ada 100644
--- a/Phys/StrippingSelections/tests/data/Reco16_pHe.py
+++ b/Phys/StrippingSelections/tests/data/Reco16_pHe.py
@@ -16,7 +16,6 @@
 # --  Extra information about the data processing phases:
 
 from Gaudi.Configuration import FileCatalog
-from Gaudi.Configuration import *
 from GaudiConf import IOHelper
 IOHelper('ROOT').inputFiles([
     'LFN:/lhcb/LHCb/Protonhelium16/RDST/00055503/0000/00055503_00000489_1.rdst',
diff --git a/Phys/StrippingSelections/tests/data/Reco16pLead_Run186558_pPb.py b/Phys/StrippingSelections/tests/data/Reco16pLead_Run186558_pPb.py
index d6e2eab976bc055d8e12690c9761d2cd4ceaa28b..824419396638c6a3ee0b4c55e32864fa83093c8d 100644
--- a/Phys/StrippingSelections/tests/data/Reco16pLead_Run186558_pPb.py
+++ b/Phys/StrippingSelections/tests/data/Reco16pLead_Run186558_pPb.py
@@ -16,7 +16,6 @@
 # --  Extra information about the data processing phases:
 
 from Gaudi.Configuration import FileCatalog
-from Gaudi.Configuration import *
 from GaudiConf import IOHelper
 IOHelper('ROOT').inputFiles(['LFN:/lhcb/LHCb/Protonion16/FULL.DST/00055643/0000/00055643_00000165_1.full.dst',
                              'LFN:/lhcb/LHCb/Protonion16/FULL.DST/00055643/0000/00055643_00000166_1.full.dst',
diff --git a/Phys/StrippingSelections/tests/data/Reco16pLead_Run187018_Pbp.py b/Phys/StrippingSelections/tests/data/Reco16pLead_Run187018_Pbp.py
index dd3f415c6e56c885a79cdd2943c3f06cede036ef..edf8b7506dd556719952c0905166188da91077ac 100644
--- a/Phys/StrippingSelections/tests/data/Reco16pLead_Run187018_Pbp.py
+++ b/Phys/StrippingSelections/tests/data/Reco16pLead_Run187018_Pbp.py
@@ -16,7 +16,6 @@
 # --  Extra information about the data processing phases:
 
 from Gaudi.Configuration import FileCatalog
-from Gaudi.Configuration import *
 from GaudiConf import IOHelper
 IOHelper('ROOT').inputFiles(['LFN:/lhcb/LHCb/Ionproton16/FULL.DST/00055929/0000/00055929_00001117_1.full.dst',
                              'LFN:/lhcb/LHCb/Ionproton16/FULL.DST/00055929/0000/00055929_00001118_1.full.dst',
diff --git a/Phys/StrippingSelections/tests/data/Reco17_DataType2017_Run195969.py b/Phys/StrippingSelections/tests/data/Reco17_DataType2017_Run195969.py
index c5a62095cb6af6775c708959d92bf0e2c8538023..bb88d6e2c74de50ef8e520ada3066c3630944a85 100644
--- a/Phys/StrippingSelections/tests/data/Reco17_DataType2017_Run195969.py
+++ b/Phys/StrippingSelections/tests/data/Reco17_DataType2017_Run195969.py
@@ -9,7 +9,6 @@
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
 from Gaudi.Configuration import FileCatalog
-from Gaudi.Configuration import *
 from Configurables import DaVinci
 from PRConfig import TestFileDB
 TestFileDB.test_file_db["TestData_restripping_collision17_reco17"].run(
diff --git a/Phys/StrippingSelections/tests/data/Reco17_DataType2017_Run195969_DV.py b/Phys/StrippingSelections/tests/data/Reco17_DataType2017_Run195969_DV.py
index dd34c421c7253b9ee2ebc0942be5377109a0fff5..2c36112ba2ea58d3430ddc8740bd47eb5025c73c 100644
--- a/Phys/StrippingSelections/tests/data/Reco17_DataType2017_Run195969_DV.py
+++ b/Phys/StrippingSelections/tests/data/Reco17_DataType2017_Run195969_DV.py
@@ -8,7 +8,7 @@
 # granted to it by virtue of its status as an Intergovernmental Organization  #
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
-from Configurables import DaVinci, Stripping
+from Configurables import DaVinci
 from Gaudi.Configuration import importOptions
 
 DaVinci().DataType = '2017'
diff --git a/Phys/StrippingSelections/tests/data/Reco17_Run198660_DV.py b/Phys/StrippingSelections/tests/data/Reco17_Run198660_DV.py
index 77c4f1998e81079dacc7b9967731b20a7c413fc0..7244a139c2aa2bebab89142df104e549965eae4f 100644
--- a/Phys/StrippingSelections/tests/data/Reco17_Run198660_DV.py
+++ b/Phys/StrippingSelections/tests/data/Reco17_Run198660_DV.py
@@ -8,7 +8,7 @@
 # granted to it by virtue of its status as an Intergovernmental Organization  #
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
-from Configurables import DaVinci, Stripping
+from Configurables import DaVinci
 from Gaudi.Configuration import importOptions
 
 DaVinci().DataType = '2017'
diff --git a/Phys/StrippingSelections/tests/data/Reco17aSmog_Run202253.py b/Phys/StrippingSelections/tests/data/Reco17aSmog_Run202253.py
index 9d212cdd7bd0e77790a8738416b03ccbc568a023..5fee6fd6d3c30655ed697c98c35005ff78789e64 100644
--- a/Phys/StrippingSelections/tests/data/Reco17aSmog_Run202253.py
+++ b/Phys/StrippingSelections/tests/data/Reco17aSmog_Run202253.py
@@ -9,7 +9,6 @@
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
 from Gaudi.Configuration import FileCatalog
-from Gaudi.Configuration import *
 from GaudiConf import IOHelper
 IOHelper('ROOT').inputFiles([
     "LFN:/lhcb/LHCb/Collision17/RDST/00073870/0000/00073870_00005160_1.rdst",
diff --git a/Phys/StrippingSelections/tests/data/Reco17aSmog_Run202253_DV.py b/Phys/StrippingSelections/tests/data/Reco17aSmog_Run202253_DV.py
index 77c4f1998e81079dacc7b9967731b20a7c413fc0..7244a139c2aa2bebab89142df104e549965eae4f 100644
--- a/Phys/StrippingSelections/tests/data/Reco17aSmog_Run202253_DV.py
+++ b/Phys/StrippingSelections/tests/data/Reco17aSmog_Run202253_DV.py
@@ -8,7 +8,7 @@
 # granted to it by virtue of its status as an Intergovernmental Organization  #
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
-from Configurables import DaVinci, Stripping
+from Configurables import DaVinci
 from Gaudi.Configuration import importOptions
 
 DaVinci().DataType = '2017'
diff --git a/Phys/StrippingSelections/tests/data/Reco18Lead18_217952_PbNe.py b/Phys/StrippingSelections/tests/data/Reco18Lead18_217952_PbNe.py
index 792718e70e8b45c3d14900ff2560a6a188fe9be4..6a091822c140320be976a49f327cbeb16ea200bf 100644
--- a/Phys/StrippingSelections/tests/data/Reco18Lead18_217952_PbNe.py
+++ b/Phys/StrippingSelections/tests/data/Reco18Lead18_217952_PbNe.py
@@ -10,7 +10,6 @@
 ###############################################################################
 
 from Gaudi.Configuration import FileCatalog
-from Gaudi.Configuration import *
 from GaudiConf import IOHelper
 IOHelper('ROOT').inputFiles(["LFN:/lhcb/LHCb/Lead18/RDST/00083198/0000/00083198_00003427_1.rdst",
                              "LFN:/lhcb/LHCb/Lead18/RDST/00083198/0001/00083198_00010614_1.rdst",
diff --git a/Phys/StrippingSelections/tests/data/Reco18Lead18_217952_PbNe_DV.py b/Phys/StrippingSelections/tests/data/Reco18Lead18_217952_PbNe_DV.py
index 935b3d0d0f142a9825ffb8910f170ecca0da42fa..281644c95a70568ac35ec40166c7ddcb6e74a510 100644
--- a/Phys/StrippingSelections/tests/data/Reco18Lead18_217952_PbNe_DV.py
+++ b/Phys/StrippingSelections/tests/data/Reco18Lead18_217952_PbNe_DV.py
@@ -8,7 +8,7 @@
 # granted to it by virtue of its status as an Intergovernmental Organization  #
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
-from Configurables import DaVinci, Stripping
+from Configurables import DaVinci
 from Gaudi.Configuration import importOptions
 
 DaVinci().DataType = '2018'
diff --git a/Phys/StrippingSelections/tests/data/Reco18Lead18_218177_PbPb.py b/Phys/StrippingSelections/tests/data/Reco18Lead18_218177_PbPb.py
index a80498b139f9c4e8fecb04db7fc8609470c5502a..bcfb71d32b9d42171ca9ef743801a3746a7359ea 100644
--- a/Phys/StrippingSelections/tests/data/Reco18Lead18_218177_PbPb.py
+++ b/Phys/StrippingSelections/tests/data/Reco18Lead18_218177_PbPb.py
@@ -10,7 +10,6 @@
 ###############################################################################
 
 from Gaudi.Configuration import FileCatalog
-from Gaudi.Configuration import *
 from Configurables import DaVinci
 from PRConfig import TestFileDB
 TestFileDB.test_file_db["TestData_stripping_PbPbcollision18_reco18"].run(
diff --git a/Phys/StrippingSelections/tests/data/Reco18Lead18_218177_PbPb_DV.py b/Phys/StrippingSelections/tests/data/Reco18Lead18_218177_PbPb_DV.py
index 06df978e6143b0da794fb3e6364d66fdd1aa1459..319a94e1eb51e428a4b31cc596b30c511626ca16 100644
--- a/Phys/StrippingSelections/tests/data/Reco18Lead18_218177_PbPb_DV.py
+++ b/Phys/StrippingSelections/tests/data/Reco18Lead18_218177_PbPb_DV.py
@@ -8,7 +8,7 @@
 # granted to it by virtue of its status as an Intergovernmental Organization  #
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
-from Configurables import DaVinci, Stripping
+from Configurables import DaVinci
 from Gaudi.Configuration import importOptions
 
 DaVinci().DataType = '2018'
diff --git a/Phys/StrippingSelections/tests/data/Reco18_DataType2018_Run214741.py b/Phys/StrippingSelections/tests/data/Reco18_DataType2018_Run214741.py
index 6f74e1ef901eba2a6898f7f12619475b4d473379..2b8029e84b2658a6a1728d140dd544244272d682 100644
--- a/Phys/StrippingSelections/tests/data/Reco18_DataType2018_Run214741.py
+++ b/Phys/StrippingSelections/tests/data/Reco18_DataType2018_Run214741.py
@@ -9,7 +9,6 @@
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
 from Gaudi.Configuration import FileCatalog
-from Gaudi.Configuration import *
 from Configurables import DaVinci
 from PRConfig import TestFileDB
 TestFileDB.test_file_db["TestData_restripping_collision18_reco18"].run(
diff --git a/Phys/StrippingSelections/tests/data/Reco18_DataType2018_Run214741_DV.py b/Phys/StrippingSelections/tests/data/Reco18_DataType2018_Run214741_DV.py
index 5304e36fe27a05b086693c645b0bd454d81f698d..4d68a2ef236dff5c3a9dcad5b659c9fc14654cf9 100644
--- a/Phys/StrippingSelections/tests/data/Reco18_DataType2018_Run214741_DV.py
+++ b/Phys/StrippingSelections/tests/data/Reco18_DataType2018_Run214741_DV.py
@@ -8,7 +8,7 @@
 # granted to it by virtue of its status as an Intergovernmental Organization  #
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
-from Configurables import DaVinci, Stripping
+from Configurables import DaVinci
 from Gaudi.Configuration import importOptions
 
 DaVinci().DataType = '2018'
diff --git a/Phys/StrippingSelections/tests/data/Reco18_Run206538.py b/Phys/StrippingSelections/tests/data/Reco18_Run206538.py
index b4ca826bc00ab1c24ce572aa58e06d527e00ebf1..a120e80fa585acc7d42ad0cf0be64ca16b6dabd2 100644
--- a/Phys/StrippingSelections/tests/data/Reco18_Run206538.py
+++ b/Phys/StrippingSelections/tests/data/Reco18_Run206538.py
@@ -16,7 +16,6 @@
 # --  Extra information about the data processing phases:
 
 from Gaudi.Configuration import FileCatalog
-from Gaudi.Configuration import *
 from GaudiConf import IOHelper
 IOHelper('ROOT').inputFiles(['LFN:/lhcb/LHCb/Collision18/RDST/00074101/0000/00074101_00000005_1.rdst',
                              'LFN:/lhcb/LHCb/Collision18/RDST/00074101/0000/00074101_00000006_1.rdst',
diff --git a/Phys/StrippingSelections/tests/data/Reco18_Run206538_DV.py b/Phys/StrippingSelections/tests/data/Reco18_Run206538_DV.py
index 465b37a0afb787b088e814470bbcc3ef56939651..f7ae5e93f37bf895d28854f13319375b7a900302 100644
--- a/Phys/StrippingSelections/tests/data/Reco18_Run206538_DV.py
+++ b/Phys/StrippingSelections/tests/data/Reco18_Run206538_DV.py
@@ -8,7 +8,7 @@
 # granted to it by virtue of its status as an Intergovernmental Organization  #
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
-from Configurables import DaVinci, Stripping
+from Configurables import DaVinci
 from Gaudi.Configuration import importOptions
 
 DaVinci().DataType = '2018'
diff --git a/Phys/StrippingSelections/tests/data/Reco18_Run206574_validation.py b/Phys/StrippingSelections/tests/data/Reco18_Run206574_validation.py
index 52738267aa7dcfd617ef5a7fe1bf5f3a291409a2..de0d84436a0163081aef03117cf9a176fe00f6fa 100644
--- a/Phys/StrippingSelections/tests/data/Reco18_Run206574_validation.py
+++ b/Phys/StrippingSelections/tests/data/Reco18_Run206574_validation.py
@@ -15,7 +15,6 @@
 # lb-run LHCbDirac/prod dirac-bookkeeping-get-files -B /validation/Collision18/Beam6500GeV-VeloClosed-MagUp/RealData/Reco18/90000000/RDST
 
 from Gaudi.Configuration import FileCatalog
-from Gaudi.Configuration import *
 from GaudiConf import IOHelper
 IOHelper('ROOT').inputFiles(['LFN:/lhcb/validation/Collision18/RDST/00073878/0000/00073878_00000014_1.rdst',
                              'LFN:/lhcb/validation/Collision18/RDST/00073878/0000/00073878_00000015_1.rdst'
diff --git a/Phys/StrippingSelections/tests/data/Reco18_Run206574_validation_DV.py b/Phys/StrippingSelections/tests/data/Reco18_Run206574_validation_DV.py
index 465b37a0afb787b088e814470bbcc3ef56939651..f7ae5e93f37bf895d28854f13319375b7a900302 100644
--- a/Phys/StrippingSelections/tests/data/Reco18_Run206574_validation_DV.py
+++ b/Phys/StrippingSelections/tests/data/Reco18_Run206574_validation_DV.py
@@ -8,7 +8,7 @@
 # granted to it by virtue of its status as an Intergovernmental Organization  #
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
-from Configurables import DaVinci, Stripping
+from Configurables import DaVinci
 from Gaudi.Configuration import importOptions
 
 DaVinci().DataType = '2018'
diff --git a/Phys/StrippingSelections/tests/data/Reco18_Run209291.py b/Phys/StrippingSelections/tests/data/Reco18_Run209291.py
index df409951a22c2e1a61822678a56d4bc9c03ab492..291ea87a97d556342c60ef5bdb4999e0445b87d8 100644
--- a/Phys/StrippingSelections/tests/data/Reco18_Run209291.py
+++ b/Phys/StrippingSelections/tests/data/Reco18_Run209291.py
@@ -16,7 +16,6 @@
 # --  Extra information about the data processing phases:
 
 from Gaudi.Configuration import FileCatalog
-from Gaudi.Configuration import *
 from GaudiConf import IOHelper
 IOHelper('ROOT').inputFiles(['LFN:/lhcb/LHCb/Collision18/RDST/00074708/0003/00074708_00030781_1.rdst',
                              'LFN:/lhcb/LHCb/Collision18/RDST/00074708/0003/00074708_00030844_1.rdst',
diff --git a/Phys/StrippingSelections/tests/data/Reco18_Run209291_DV.py b/Phys/StrippingSelections/tests/data/Reco18_Run209291_DV.py
index 465b37a0afb787b088e814470bbcc3ef56939651..f7ae5e93f37bf895d28854f13319375b7a900302 100644
--- a/Phys/StrippingSelections/tests/data/Reco18_Run209291_DV.py
+++ b/Phys/StrippingSelections/tests/data/Reco18_Run209291_DV.py
@@ -8,7 +8,7 @@
 # granted to it by virtue of its status as an Intergovernmental Organization  #
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
-from Configurables import DaVinci, Stripping
+from Configurables import DaVinci
 from Gaudi.Configuration import importOptions
 
 DaVinci().DataType = '2018'
diff --git a/Phys/StrippingSelections/tests/data/Reco18_Run214741.py b/Phys/StrippingSelections/tests/data/Reco18_Run214741.py
index c04fc0f99b85cda0f2fa6c453b8aef1bc108af43..ccf01af6d904056c991eaa503f45fb51b968c247 100644
--- a/Phys/StrippingSelections/tests/data/Reco18_Run214741.py
+++ b/Phys/StrippingSelections/tests/data/Reco18_Run214741.py
@@ -9,7 +9,6 @@
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
 from Gaudi.Configuration import FileCatalog
-from Gaudi.Configuration import *
 from GaudiConf import IOHelper
 IOHelper('ROOT').inputFiles(['LFN:/lhcb/LHCb/Collision18/RDST/00077427/0011/00077427_00119592_1.rdst',
                              'LFN:/lhcb/LHCb/Collision18/RDST/00077427/0011/00077427_00119590_1.rdst',
diff --git a/Phys/StrippingSelections/tests/data/Reco18_Run214741_DV.py b/Phys/StrippingSelections/tests/data/Reco18_Run214741_DV.py
index 465b37a0afb787b088e814470bbcc3ef56939651..f7ae5e93f37bf895d28854f13319375b7a900302 100644
--- a/Phys/StrippingSelections/tests/data/Reco18_Run214741_DV.py
+++ b/Phys/StrippingSelections/tests/data/Reco18_Run214741_DV.py
@@ -8,7 +8,7 @@
 # granted to it by virtue of its status as an Intergovernmental Organization  #
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
-from Configurables import DaVinci, Stripping
+from Configurables import DaVinci
 from Gaudi.Configuration import importOptions
 
 DaVinci().DataType = '2018'
diff --git a/Phys/StrippingSelections/tests/data/Reco18_Run217951_validation_DV.py b/Phys/StrippingSelections/tests/data/Reco18_Run217951_validation_DV.py
index 43018231700eb844dafc63a000d8fe03c4875868..3ff1c02e00024b976d747b2fd6aa03e336697bc7 100644
--- a/Phys/StrippingSelections/tests/data/Reco18_Run217951_validation_DV.py
+++ b/Phys/StrippingSelections/tests/data/Reco18_Run217951_validation_DV.py
@@ -8,7 +8,7 @@
 # granted to it by virtue of its status as an Intergovernmental Organization  #
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
-from Configurables import DaVinci, Stripping
+from Configurables import DaVinci
 from Gaudi.Configuration import importOptions
 
 DaVinci().DataType = '2018'
diff --git a/Phys/StrippingSelections/tests/data/Reco18_Run218177_validation_DV.py b/Phys/StrippingSelections/tests/data/Reco18_Run218177_validation_DV.py
index 43018231700eb844dafc63a000d8fe03c4875868..3ff1c02e00024b976d747b2fd6aa03e336697bc7 100644
--- a/Phys/StrippingSelections/tests/data/Reco18_Run218177_validation_DV.py
+++ b/Phys/StrippingSelections/tests/data/Reco18_Run218177_validation_DV.py
@@ -8,7 +8,7 @@
 # granted to it by virtue of its status as an Intergovernmental Organization  #
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
-from Configurables import DaVinci, Stripping
+from Configurables import DaVinci
 from Gaudi.Configuration import importOptions
 
 DaVinci().DataType = '2018'
diff --git a/Phys/StrippingSelections/tests/data/Reco18_problemValidation_Feb2019.py b/Phys/StrippingSelections/tests/data/Reco18_problemValidation_Feb2019.py
index 9d597e0a9b75bca75d1847c0bf13cdfff3d9ed75..6c3fb6578a41260883308fe06da0fde67cafe366 100644
--- a/Phys/StrippingSelections/tests/data/Reco18_problemValidation_Feb2019.py
+++ b/Phys/StrippingSelections/tests/data/Reco18_problemValidation_Feb2019.py
@@ -9,8 +9,6 @@
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
 from Gaudi.Configuration import FileCatalog
-from Gaudi.Configuration import *
-from Configurables import DaVinci
 from GaudiConf import IOHelper
 
 IOHelper('ROOT').inputFiles(
diff --git a/Phys/StrippingSelections/tests/data/fulldst154030_trigfilt.py b/Phys/StrippingSelections/tests/data/fulldst154030_trigfilt.py
index 5f11554d6e7606e7460f32eb703db688a1ec10bb..fff981778a366abd784d3c0b15711c25ef7d0c01 100644
--- a/Phys/StrippingSelections/tests/data/fulldst154030_trigfilt.py
+++ b/Phys/StrippingSelections/tests/data/fulldst154030_trigfilt.py
@@ -41,7 +41,6 @@
 # --  ExtraPackages : AppConfig.v3r214;SQLDDDB.v7r10
 # --  Visible : N
 
-from Gaudi.Configuration import *
 from GaudiConf import IOHelper
 IOHelper('ROOT').inputFiles(['root://eoslhcb.cern.ch//eos/lhcb/user/a/acontu/FULLDST_TrifFiltEM.dst',
                              # 'LFN:/lhcb/validation/Collision15em/FULL.DST/00045500/0000/00045500_00000367_1.full.dst',
diff --git a/Phys/StrippingSelections/tests/data/validationReco2015a.py b/Phys/StrippingSelections/tests/data/validationReco2015a.py
index 82309b837305f834f33f13b5679e3d3b88fe02c9..ce69c3ae7c79650cf623b4f29e3cc9676c5161c9 100644
--- a/Phys/StrippingSelections/tests/data/validationReco2015a.py
+++ b/Phys/StrippingSelections/tests/data/validationReco2015a.py
@@ -41,7 +41,6 @@
 # --  ExtraPackages : AppConfig.v3r214;SQLDDDB.v7r10
 # --  Visible : N
 
-from Gaudi.Configuration import *
 from GaudiConf import IOHelper
 IOHelper('ROOT').inputFiles([
     'root://by32-4.grid.sara.nl:1094/pnfs/grid.sara.nl/data/lhcb/buffer/lhcb/validation/Collision15em/FULL.DST/00045500/0000/00045500_00000204_1.full.dst'
diff --git a/Phys/StrippingSelections/tests/data/validationReco2016.py b/Phys/StrippingSelections/tests/data/validationReco2016.py
index 4877291ecd2743d47ff6aff920ca76ebb48e6b7f..c20e2944a9ea0c90f48c24f55d73f950639323c5 100644
--- a/Phys/StrippingSelections/tests/data/validationReco2016.py
+++ b/Phys/StrippingSelections/tests/data/validationReco2016.py
@@ -41,7 +41,6 @@
 # --  ExtraPackages : AppConfig.v3r264;SQLDDDB.v7r10
 # --  Visible : Y
 
-from Gaudi.Configuration import *
 from GaudiConf import IOHelper
 IOHelper('ROOT').inputFiles([
     "root://fly7.grid.sara.nl:1094/pnfs/grid.sara.nl/data/lhcb/buffer/lhcb/validation/Collision16/FULL.DST/00051034/0000/00051034_00000916_1.full.dst",
diff --git a/Phys/StrippingSelections/tests/liaisons/B2CC/S21_tests/TestB2CC.py b/Phys/StrippingSelections/tests/liaisons/B2CC/S21_tests/TestB2CC.py
old mode 100755
new mode 100644
index d76594f845b05826339e132f41bd98d6293768de..527e747229927f0f4f6548a1182e583e54dc2096
--- a/Phys/StrippingSelections/tests/liaisons/B2CC/S21_tests/TestB2CC.py
+++ b/Phys/StrippingSelections/tests/liaisons/B2CC/S21_tests/TestB2CC.py
@@ -26,7 +26,7 @@ from Configurables import AuditorSvc, ChronoAuditor
 from Configurables import TimingAuditor, SequencerTimerTool
 from DSTWriters.microdstelements import *
 from Configurables import ProcStatusCheck
-from StrippingSelections.Utils import lineBuilder, buildStreams
+from StrippingSelections.Utils import buildStreams
 from StrippingSelections import buildersConf
 from Configurables import RawEventJuggler
 from Gaudi.Configuration import *
diff --git a/Phys/StrippingSelections/tests/liaisons/B2CC/S21p1_tests/TestMyWGfromSelections_Run1.py b/Phys/StrippingSelections/tests/liaisons/B2CC/S21p1_tests/TestMyWGfromSelections_Run1.py
old mode 100755
new mode 100644
index e4b00cc02b8a92e880f57973b868db00fdcf253d..91ad491e29b1c4bc68afeec04d9c8f1fe2f5064c
--- a/Phys/StrippingSelections/tests/liaisons/B2CC/S21p1_tests/TestMyWGfromSelections_Run1.py
+++ b/Phys/StrippingSelections/tests/liaisons/B2CC/S21p1_tests/TestMyWGfromSelections_Run1.py
@@ -28,7 +28,7 @@ from Configurables import TimingAuditor, SequencerTimerTool
 from DSTWriters.microdstelements import *
 from PhysConf.Filters import LoKi_Filters
 from Configurables import ProcStatusCheck
-from StrippingSelections.Utils import lineBuilder, buildStreams
+from StrippingSelections.Utils import buildStreams
 from StrippingSelections import buildersConf
 from Configurables import DecodeRawEvent
 from Configurables import RawEventJuggler
diff --git a/Phys/StrippingSelections/tests/liaisons/B2CC/S21p1_tests/TestMyWGfromSettings_Run1.py b/Phys/StrippingSelections/tests/liaisons/B2CC/S21p1_tests/TestMyWGfromSettings_Run1.py
old mode 100755
new mode 100644
index 0c6b9fe601ee49fb8f1d2e159e315da8bc6551f9..629f4c0a958eb917094c3a4527f4684790ab8525
--- a/Phys/StrippingSelections/tests/liaisons/B2CC/S21p1_tests/TestMyWGfromSettings_Run1.py
+++ b/Phys/StrippingSelections/tests/liaisons/B2CC/S21p1_tests/TestMyWGfromSettings_Run1.py
@@ -28,8 +28,7 @@ from Configurables import TimingAuditor, SequencerTimerTool
 from DSTWriters.microdstelements import *
 from PhysConf.Filters import LoKi_Filters
 from Configurables import ProcStatusCheck
-from StrippingSelections.Utils import lineBuilder, buildStreams
-from StrippingSelections import buildersConf
+from StrippingSelections.Utils import buildStreams
 from StrippingSettings.Utils import strippingConfiguration
 from Configurables import DecodeRawEvent
 from Configurables import RawEventJuggler
diff --git a/Phys/StrippingSelections/tests/liaisons/B2CC/S21p1_tests/r1p1_tests/TestMyWGfromSettings_Run1.py b/Phys/StrippingSelections/tests/liaisons/B2CC/S21p1_tests/r1p1_tests/TestMyWGfromSettings_Run1.py
old mode 100755
new mode 100644
index 8e827780ef627b1841cce5d6903cc7b590a6a49e..e5dfb806744bd6f7de357ac201e1cff33925db03
--- a/Phys/StrippingSelections/tests/liaisons/B2CC/S21p1_tests/r1p1_tests/TestMyWGfromSettings_Run1.py
+++ b/Phys/StrippingSelections/tests/liaisons/B2CC/S21p1_tests/r1p1_tests/TestMyWGfromSettings_Run1.py
@@ -28,8 +28,7 @@ from Configurables import TimingAuditor, SequencerTimerTool
 from DSTWriters.microdstelements import *
 from PhysConf.Filters import LoKi_Filters
 from Configurables import ProcStatusCheck
-from StrippingSelections.Utils import lineBuilder, buildStreams
-from StrippingSelections import buildersConf
+from StrippingSelections.Utils import buildStreams
 from StrippingSettings.Utils import strippingConfiguration
 from Configurables import DecodeRawEvent
 from Configurables import RawEventJuggler
diff --git a/Phys/StrippingSelections/tests/liaisons/B2CC/S23_tests/TestB2CC_sels.py b/Phys/StrippingSelections/tests/liaisons/B2CC/S23_tests/TestB2CC_sels.py
old mode 100755
new mode 100644
index 1746867ed08cc008f041903d572d3425bd4e0db1..bad1ad602bc4fe352b04c2f4584169d98b962177
--- a/Phys/StrippingSelections/tests/liaisons/B2CC/S23_tests/TestB2CC_sels.py
+++ b/Phys/StrippingSelections/tests/liaisons/B2CC/S23_tests/TestB2CC_sels.py
@@ -29,7 +29,7 @@ from Configurables import AuditorSvc, ChronoAuditor
 from Configurables import TimingAuditor, SequencerTimerTool
 from DSTWriters.microdstelements import *
 from Configurables import ProcStatusCheck
-from StrippingSelections.Utils import lineBuilder, buildStreams
+from StrippingSelections.Utils import buildStreams
 from StrippingSelections import buildersConf
 from Configurables import ConfigCDBAccessSvc
 from Configurables import DecodeRawEvent
diff --git a/Phys/StrippingSelections/tests/liaisons/B2CC/S23_tests/TestB2CC_settings.py b/Phys/StrippingSelections/tests/liaisons/B2CC/S23_tests/TestB2CC_settings.py
old mode 100755
new mode 100644
index 790c17aa8b193fc75a307d79148ed9ca7c566bd9..e5a3303004f8e12b785b9fc572c5c51c4e283108
--- a/Phys/StrippingSelections/tests/liaisons/B2CC/S23_tests/TestB2CC_settings.py
+++ b/Phys/StrippingSelections/tests/liaisons/B2CC/S23_tests/TestB2CC_settings.py
@@ -29,8 +29,7 @@ from Configurables import AuditorSvc, ChronoAuditor
 from Configurables import TimingAuditor, SequencerTimerTool
 from DSTWriters.microdstelements import *
 from Configurables import ProcStatusCheck
-from StrippingSelections.Utils import lineBuilder, buildStreams
-from StrippingSelections import buildersConf
+from StrippingSelections.Utils import buildStreams
 from StrippingSettings.Utils import strippingConfiguration
 from Configurables import ConfigCDBAccessSvc
 from Configurables import DecodeRawEvent
diff --git a/Phys/StrippingSelections/tests/liaisons/B2CC/S24_tests/TestB2CC_sels.py b/Phys/StrippingSelections/tests/liaisons/B2CC/S24_tests/TestB2CC_sels.py
old mode 100755
new mode 100644
index c625f963808a33462329f47ce4fd36ca8a4fd710..dfa89c385f96c1373539dc311a3132821d682cd9
--- a/Phys/StrippingSelections/tests/liaisons/B2CC/S24_tests/TestB2CC_sels.py
+++ b/Phys/StrippingSelections/tests/liaisons/B2CC/S24_tests/TestB2CC_sels.py
@@ -26,7 +26,7 @@ from Configurables import AuditorSvc, ChronoAuditor
 from Configurables import TimingAuditor, SequencerTimerTool
 from DSTWriters.microdstelements import *
 from Configurables import ProcStatusCheck
-from StrippingSelections.Utils import lineBuilder, buildStreams
+from StrippingSelections.Utils import buildStreams
 from StrippingSelections import buildersConf
 from Configurables import DecodeRawEvent
 from Gaudi.Configuration import *
diff --git a/Phys/StrippingSelections/tests/liaisons/B2CC/S24_tests/TestB2CC_settings.py b/Phys/StrippingSelections/tests/liaisons/B2CC/S24_tests/TestB2CC_settings.py
old mode 100755
new mode 100644
index f3cd1e3313f5594685222c37990858755fe2bf85..a64eb7c4c64182f8945f16048cb6549c91a284db
--- a/Phys/StrippingSelections/tests/liaisons/B2CC/S24_tests/TestB2CC_settings.py
+++ b/Phys/StrippingSelections/tests/liaisons/B2CC/S24_tests/TestB2CC_settings.py
@@ -26,8 +26,7 @@ from Configurables import AuditorSvc, ChronoAuditor
 from Configurables import TimingAuditor, SequencerTimerTool
 from DSTWriters.microdstelements import *
 from Configurables import ProcStatusCheck
-from StrippingSelections.Utils import lineBuilder, buildStreams
-from StrippingSelections import buildersConf
+from StrippingSelections.Utils import buildStreams
 from StrippingSettings.Utils import strippingConfiguration
 from Configurables import DecodeRawEvent
 from Gaudi.Configuration import *
diff --git a/Phys/StrippingSelections/tests/liaisons/B2CC/S24r1_tests/TestMyWGfromSelections.py b/Phys/StrippingSelections/tests/liaisons/B2CC/S24r1_tests/TestMyWGfromSelections.py
old mode 100755
new mode 100644
index e67450c125ef50bc78f89a5deb9760156dca8082..a08a129ec33e65cc80f39062082e76b69ed9b372
--- a/Phys/StrippingSelections/tests/liaisons/B2CC/S24r1_tests/TestMyWGfromSelections.py
+++ b/Phys/StrippingSelections/tests/liaisons/B2CC/S24r1_tests/TestMyWGfromSelections.py
@@ -29,7 +29,7 @@ from Configurables import AuditorSvc, ChronoAuditor
 from Configurables import TimingAuditor, SequencerTimerTool
 from DSTWriters.microdstelements import *
 from Configurables import ProcStatusCheck
-from StrippingSelections.Utils import lineBuilder, buildStreams
+from StrippingSelections.Utils import buildStreams
 from StrippingSelections import buildersConf
 from Gaudi.Configuration import *
 from Configurables import DaVinci
diff --git a/Phys/StrippingSelections/tests/liaisons/B2CC/S24r1_tests/TestMyWGfromSettings.py b/Phys/StrippingSelections/tests/liaisons/B2CC/S24r1_tests/TestMyWGfromSettings.py
old mode 100755
new mode 100644
index 472e737aa7f35cf5dda5e29b545f6cf8fa43ac1b..f57d14bdf1862b3b0a780de2ebc45f6448d0b153
--- a/Phys/StrippingSelections/tests/liaisons/B2CC/S24r1_tests/TestMyWGfromSettings.py
+++ b/Phys/StrippingSelections/tests/liaisons/B2CC/S24r1_tests/TestMyWGfromSettings.py
@@ -29,8 +29,7 @@ from Configurables import AuditorSvc, ChronoAuditor
 from Configurables import TimingAuditor, SequencerTimerTool
 from DSTWriters.microdstelements import *
 from Configurables import ProcStatusCheck
-from StrippingSelections.Utils import lineBuilder, buildStreams
-from StrippingSelections import buildersConf
+from StrippingSelections.Utils import buildStreams
 from StrippingSettings.Utils import strippingConfiguration
 from Gaudi.Configuration import *
 from Configurables import DaVinci
diff --git a/Phys/StrippingSelections/tests/liaisons/B2CC/S26_tests/TestMyWGfromSelections.py b/Phys/StrippingSelections/tests/liaisons/B2CC/S26_tests/TestMyWGfromSelections.py
old mode 100755
new mode 100644
index 723ae803f58ee854347b6c408f4a682faaf768e2..6473e04c60512db3cdda9497e4a0d455c1d01725
--- a/Phys/StrippingSelections/tests/liaisons/B2CC/S26_tests/TestMyWGfromSelections.py
+++ b/Phys/StrippingSelections/tests/liaisons/B2CC/S26_tests/TestMyWGfromSelections.py
@@ -29,7 +29,7 @@ from Configurables import AuditorSvc, ChronoAuditor
 from Configurables import TimingAuditor, SequencerTimerTool
 from DSTWriters.microdstelements import *
 from Configurables import ProcStatusCheck
-from StrippingSelections.Utils import lineBuilder, buildStreams
+from StrippingSelections.Utils import buildStreams
 from StrippingSelections import buildersConf
 from Gaudi.Configuration import *
 from Configurables import DaVinci
diff --git a/Phys/StrippingSelections/tests/liaisons/B2CC/S26_tests/TestMyWGfromSettings.py b/Phys/StrippingSelections/tests/liaisons/B2CC/S26_tests/TestMyWGfromSettings.py
old mode 100755
new mode 100644
index a472261ffec33bcc08bb349909ac842d219fbae8..6ec2c569f04a1a93db80815ea984fcb4929726b9
--- a/Phys/StrippingSelections/tests/liaisons/B2CC/S26_tests/TestMyWGfromSettings.py
+++ b/Phys/StrippingSelections/tests/liaisons/B2CC/S26_tests/TestMyWGfromSettings.py
@@ -29,8 +29,7 @@ from Configurables import AuditorSvc, ChronoAuditor
 from Configurables import TimingAuditor, SequencerTimerTool
 from DSTWriters.microdstelements import *
 from Configurables import ProcStatusCheck
-from StrippingSelections.Utils import lineBuilder, buildStreams
-from StrippingSelections import buildersConf
+from StrippingSelections.Utils import buildStreams
 from StrippingSettings.Utils import strippingConfiguration
 from Gaudi.Configuration import *
 from Configurables import DaVinci
diff --git a/Phys/StrippingSelections/tests/liaisons/B2CC/S26r1_tests/TestMyWGfromSelections.py b/Phys/StrippingSelections/tests/liaisons/B2CC/S26r1_tests/TestMyWGfromSelections.py
old mode 100755
new mode 100644
index 1dad1f73bd9fc26abea565c1d0d2cedb5c03053e..8125ec64ea7706b967b99dffe61f6b43973ca50d
--- a/Phys/StrippingSelections/tests/liaisons/B2CC/S26r1_tests/TestMyWGfromSelections.py
+++ b/Phys/StrippingSelections/tests/liaisons/B2CC/S26r1_tests/TestMyWGfromSelections.py
@@ -29,7 +29,7 @@ from Configurables import AuditorSvc, ChronoAuditor
 from Configurables import TimingAuditor, SequencerTimerTool
 from DSTWriters.microdstelements import *
 from Configurables import ProcStatusCheck
-from StrippingSelections.Utils import lineBuilder, buildStreams
+from StrippingSelections.Utils import buildStreams
 from StrippingSelections import buildersConf
 from Gaudi.Configuration import *
 from Configurables import DaVinci
diff --git a/Phys/StrippingSelections/tests/liaisons/B2CC/S26r1_tests/TestMyWGfromSettings.py b/Phys/StrippingSelections/tests/liaisons/B2CC/S26r1_tests/TestMyWGfromSettings.py
old mode 100755
new mode 100644
index e4aca880a692adb11dad3df1cd00473e611b5004..f280356ad52b19dd2c3f9a61ab86b44d50fb1216
--- a/Phys/StrippingSelections/tests/liaisons/B2CC/S26r1_tests/TestMyWGfromSettings.py
+++ b/Phys/StrippingSelections/tests/liaisons/B2CC/S26r1_tests/TestMyWGfromSettings.py
@@ -29,8 +29,7 @@ from Configurables import AuditorSvc, ChronoAuditor
 from Configurables import TimingAuditor, SequencerTimerTool
 from DSTWriters.microdstelements import *
 from Configurables import ProcStatusCheck
-from StrippingSelections.Utils import lineBuilder, buildStreams
-from StrippingSelections import buildersConf
+from StrippingSelections.Utils import buildStreams
 from StrippingSettings.Utils import strippingConfiguration
 from Gaudi.Configuration import *
 from Configurables import DaVinci
diff --git a/Phys/StrippingSelections/tests/liaisons/B2CC/S28_tests/TestMyWGfromSelections.py b/Phys/StrippingSelections/tests/liaisons/B2CC/S28_tests/TestMyWGfromSelections.py
old mode 100755
new mode 100644
index 1dad1f73bd9fc26abea565c1d0d2cedb5c03053e..8125ec64ea7706b967b99dffe61f6b43973ca50d
--- a/Phys/StrippingSelections/tests/liaisons/B2CC/S28_tests/TestMyWGfromSelections.py
+++ b/Phys/StrippingSelections/tests/liaisons/B2CC/S28_tests/TestMyWGfromSelections.py
@@ -29,7 +29,7 @@ from Configurables import AuditorSvc, ChronoAuditor
 from Configurables import TimingAuditor, SequencerTimerTool
 from DSTWriters.microdstelements import *
 from Configurables import ProcStatusCheck
-from StrippingSelections.Utils import lineBuilder, buildStreams
+from StrippingSelections.Utils import buildStreams
 from StrippingSelections import buildersConf
 from Gaudi.Configuration import *
 from Configurables import DaVinci
diff --git a/Phys/StrippingSelections/tests/liaisons/B2CC/S28_tests/TestMyWGfromSettings.py b/Phys/StrippingSelections/tests/liaisons/B2CC/S28_tests/TestMyWGfromSettings.py
old mode 100755
new mode 100644
index 12e09b6ad1140382c603e6f398f44b5133664687..dd54fc063b1280ca43abcf11e3b851936c656de8
--- a/Phys/StrippingSelections/tests/liaisons/B2CC/S28_tests/TestMyWGfromSettings.py
+++ b/Phys/StrippingSelections/tests/liaisons/B2CC/S28_tests/TestMyWGfromSettings.py
@@ -29,8 +29,7 @@ from Configurables import AuditorSvc, ChronoAuditor
 from Configurables import TimingAuditor, SequencerTimerTool
 from DSTWriters.microdstelements import *
 from Configurables import ProcStatusCheck
-from StrippingSelections.Utils import lineBuilder, buildStreams
-from StrippingSelections import buildersConf
+from StrippingSelections.Utils import buildStreams
 from StrippingSettings.Utils import strippingConfiguration
 from Gaudi.Configuration import *
 from Configurables import DaVinci
diff --git a/Phys/StrippingSelections/tests/liaisons/B2CC/S29_tests/TestMyWGfromSelections.py b/Phys/StrippingSelections/tests/liaisons/B2CC/S29_tests/TestMyWGfromSelections.py
old mode 100755
new mode 100644
index 2b83e6b5f8ba67d664a8092931356a4b37b5e4b5..5a4915aafea29c02481cf05be880688c25736d45
--- a/Phys/StrippingSelections/tests/liaisons/B2CC/S29_tests/TestMyWGfromSelections.py
+++ b/Phys/StrippingSelections/tests/liaisons/B2CC/S29_tests/TestMyWGfromSelections.py
@@ -29,7 +29,7 @@ from Configurables import AuditorSvc, ChronoAuditor
 from Configurables import TimingAuditor, SequencerTimerTool
 from DSTWriters.microdstelements import *
 from Configurables import ProcStatusCheck
-from StrippingSelections.Utils import lineBuilder, buildStreams
+from StrippingSelections.Utils import buildStreams
 from StrippingSelections import buildersConf
 from Gaudi.Configuration import *
 from Configurables import DaVinci
diff --git a/Phys/StrippingSelections/tests/liaisons/B2CC/S29_tests/TestMyWGfromSettings.py b/Phys/StrippingSelections/tests/liaisons/B2CC/S29_tests/TestMyWGfromSettings.py
old mode 100755
new mode 100644
index 543cadf01ccc32591fc5195b0c3ad75b5643eb94..7024a94d00f2dceec113152cb02678a441d4f587
--- a/Phys/StrippingSelections/tests/liaisons/B2CC/S29_tests/TestMyWGfromSettings.py
+++ b/Phys/StrippingSelections/tests/liaisons/B2CC/S29_tests/TestMyWGfromSettings.py
@@ -29,8 +29,7 @@ from Configurables import AuditorSvc, ChronoAuditor
 from Configurables import TimingAuditor, SequencerTimerTool
 from DSTWriters.microdstelements import *
 from Configurables import ProcStatusCheck
-from StrippingSelections.Utils import lineBuilder, buildStreams
-from StrippingSelections import buildersConf
+from StrippingSelections.Utils import buildStreams
 from StrippingSettings.Utils import strippingConfiguration
 from Gaudi.Configuration import *
 from Configurables import DaVinci
diff --git a/Phys/StrippingSelections/tests/liaisons/B2CC/S34_tests/TestMyWGfromSelections.py b/Phys/StrippingSelections/tests/liaisons/B2CC/S34_tests/TestMyWGfromSelections.py
old mode 100755
new mode 100644
index 4eb12af9675582991dcd7a73540f2e3e83496c74..cd0f23bfe47cf8554f499f0a6f57d3f7c0f74e52
--- a/Phys/StrippingSelections/tests/liaisons/B2CC/S34_tests/TestMyWGfromSelections.py
+++ b/Phys/StrippingSelections/tests/liaisons/B2CC/S34_tests/TestMyWGfromSelections.py
@@ -26,7 +26,7 @@ from Configurables import AuditorSvc, ChronoAuditor
 from Configurables import TimingAuditor, SequencerTimerTool
 from DSTWriters.microdstelements import *
 from Configurables import ProcStatusCheck
-from StrippingSelections.Utils import lineBuilder, buildStreams
+from StrippingSelections.Utils import buildStreams
 from StrippingSelections import buildersConf
 from Gaudi.Configuration import *
 from Configurables import DaVinci
diff --git a/Phys/StrippingSelections/tests/liaisons/B2CC/S34_tests/TestMyWGfromSettings.py b/Phys/StrippingSelections/tests/liaisons/B2CC/S34_tests/TestMyWGfromSettings.py
old mode 100755
new mode 100644
index 86d432e7937f9e16c27ffa1131badbe85b9d3012..675ec81651bb9c006d815cea2c3945708ade6016
--- a/Phys/StrippingSelections/tests/liaisons/B2CC/S34_tests/TestMyWGfromSettings.py
+++ b/Phys/StrippingSelections/tests/liaisons/B2CC/S34_tests/TestMyWGfromSettings.py
@@ -26,7 +26,7 @@ from Configurables import AuditorSvc, ChronoAuditor
 from Configurables import TimingAuditor, SequencerTimerTool
 from DSTWriters.microdstelements import *
 from Configurables import ProcStatusCheck
-from StrippingSelections.Utils import lineBuilder, buildStreams
+from StrippingSelections.Utils import buildStreams
 from StrippingSettings.Utils import config_from_modules
 from Gaudi.Configuration import *
 from Configurables import DaVinci
diff --git a/Phys/StrippingSelections/tests/liaisons/B2CC/S34r0p1_tests/TestMyWGfromSelections.py b/Phys/StrippingSelections/tests/liaisons/B2CC/S34r0p1_tests/TestMyWGfromSelections.py
old mode 100755
new mode 100644
index f58b1662424a91e653582682070842c7f34423ba..1b6d8579e076d9b5cc945d1d18696d14dd13c82b
--- a/Phys/StrippingSelections/tests/liaisons/B2CC/S34r0p1_tests/TestMyWGfromSelections.py
+++ b/Phys/StrippingSelections/tests/liaisons/B2CC/S34r0p1_tests/TestMyWGfromSelections.py
@@ -26,7 +26,7 @@ from Configurables import AuditorSvc, ChronoAuditor
 from Configurables import TimingAuditor, SequencerTimerTool
 from DSTWriters.microdstelements import *
 from Configurables import ProcStatusCheck
-from StrippingSelections.Utils import lineBuilder, buildStreams
+from StrippingSelections.Utils import buildStreams
 from StrippingSelections import buildersConf
 from Gaudi.Configuration import *
 from Configurables import DaVinci
diff --git a/Phys/StrippingSelections/tests/liaisons/B2CC/S34r0p1_tests/TestMyWGfromSettings.py b/Phys/StrippingSelections/tests/liaisons/B2CC/S34r0p1_tests/TestMyWGfromSettings.py
old mode 100755
new mode 100644
index ccc03121a23d55b5d8c39d75170ee3ba6a686931..2c7a52c23e4ece1a8137484addf3213a13c8a08d
--- a/Phys/StrippingSelections/tests/liaisons/B2CC/S34r0p1_tests/TestMyWGfromSettings.py
+++ b/Phys/StrippingSelections/tests/liaisons/B2CC/S34r0p1_tests/TestMyWGfromSettings.py
@@ -26,7 +26,7 @@ from Configurables import AuditorSvc, ChronoAuditor
 from Configurables import TimingAuditor, SequencerTimerTool
 from DSTWriters.microdstelements import *
 from Configurables import ProcStatusCheck
-from StrippingSelections.Utils import lineBuilder, buildStreams
+from StrippingSelections.Utils import buildStreams
 from StrippingSettings.Utils import config_from_modules
 from Gaudi.Configuration import *
 from Configurables import DaVinci
diff --git a/Phys/StrippingSelections/tests/liaisons/B2CC/old_builders/StrippingB2CharmoniumX_6H.py b/Phys/StrippingSelections/tests/liaisons/B2CC/old_builders/StrippingB2CharmoniumX_6H.py
index 80047825a460bc67958eb8f33ae5b51fd7f8bce7..5b94b030ef4693d10a72cf11b8851bf72930ece5 100644
--- a/Phys/StrippingSelections/tests/liaisons/B2CC/old_builders/StrippingB2CharmoniumX_6H.py
+++ b/Phys/StrippingSelections/tests/liaisons/B2CC/old_builders/StrippingB2CharmoniumX_6H.py
@@ -29,7 +29,6 @@ from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = ['Adam Morris']
 __date__ = '26/08/2014'
 __version__ = '$Revision: 2.0$'
diff --git a/Phys/StrippingSelections/tests/liaisons/B2CC/old_builders/StrippingB2Psi2SX.py b/Phys/StrippingSelections/tests/liaisons/B2CC/old_builders/StrippingB2Psi2SX.py
index f1e3fd653d41401c7ac5ab51c1f3f71e5a78caa7..5f8634e172df5897a99b68d4d48fac5bd6fcee24 100644
--- a/Phys/StrippingSelections/tests/liaisons/B2CC/old_builders/StrippingB2Psi2SX.py
+++ b/Phys/StrippingSelections/tests/liaisons/B2CC/old_builders/StrippingB2Psi2SX.py
@@ -25,11 +25,7 @@ Exported symbols (use python help!):
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
-from StandardParticles import StdAllLooseKaons
-from StandardParticles import StdAllLooseMuons
-from StandardParticles import StdAllLoosePions
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = ['Fred Blanc - Neus Lopez March']
 __date__ = '16/2/2011'
 __version__ = '$Revision: 1.0 $'
@@ -160,7 +156,7 @@ class B2Psi2SXConf(LineBuilder):
         LineBuilder.__init__(self, name, config)
 
         incl = self.name + '_InclPsi2SToJpsiPiPi'
-        incl_detached_name = incl + 'Detached'
+        incl + 'Detached'
         sig = self.name + '_Bs2Psi2SPhiJpsiPiPi'
         K = self.name + '_Bu2Psi2SKJpsiPiPi'
         Kstar = self.name + '_Bd2Psi2SKstarJpsiPiPi'
diff --git a/Phys/StrippingSelections/tests/liaisons/B2CC/old_builders/StrippingB2Psi2SXMuMu.py b/Phys/StrippingSelections/tests/liaisons/B2CC/old_builders/StrippingB2Psi2SXMuMu.py
index 14129daebbe473c6ec15e1101e530252718caf25..10a332681be6f457f99776aa4aa771f1a9f8bc7a 100644
--- a/Phys/StrippingSelections/tests/liaisons/B2CC/old_builders/StrippingB2Psi2SXMuMu.py
+++ b/Phys/StrippingSelections/tests/liaisons/B2CC/old_builders/StrippingB2Psi2SXMuMu.py
@@ -26,11 +26,7 @@ Exported symbols (use python help!):
 from StrippingUtils.Utils import LineBuilder
 from StrippingConf.StrippingLine import StrippingLine
 from PhysSelPython.Wrappers import Selection, DataOnDemand, MergedSelection
-from StandardParticles import StdAllLooseKaons
-from StandardParticles import StdAllLooseMuons
-from StandardParticles import StdAllLoosePions
 from GaudiConfUtils.ConfigurableGenerators import FilterDesktop, CombineParticles
-from Gaudi.Configuration import *
 __author__ = ['Neus Lopez March']
 __date__ = '16/2/2011'
 __version__ = '$Revision: 1.0 $'
diff --git a/Phys/StrippingSelections/tests/liaisons/B2OC/TestBeauty2Charm-MC.py b/Phys/StrippingSelections/tests/liaisons/B2OC/TestBeauty2Charm-MC.py
index 365ac9982a0613fd984912075d943d605e96a420..c5a13a38bc82c5dee81543c5b9c95869b02234f7 100644
--- a/Phys/StrippingSelections/tests/liaisons/B2OC/TestBeauty2Charm-MC.py
+++ b/Phys/StrippingSelections/tests/liaisons/B2OC/TestBeauty2Charm-MC.py
@@ -16,17 +16,14 @@
 
 from DSTWriters.Configuration import (SelDSTWriter,
                                       stripDSTStreamConf,
-                                      stripDSTElements,
-                                      stripMicroDSTStreamConf,
-                                      stripMicroDSTElements,
-                                      stripCalibMicroDSTStreamConf)
+                                      stripDSTElements)
 from Configurables import AlgorithmCorrelationsAlg
 from Configurables import StrippingReport
 from Configurables import AuditorSvc, ChronoAuditor
 from Configurables import TimingAuditor, SequencerTimerTool
 from DSTWriters.microdstelements import *
 from Configurables import ProcStatusCheck
-from StrippingSelections.Utils import lineBuilder, buildStreamsFromBuilder
+from StrippingSelections.Utils import buildStreamsFromBuilder
 from StrippingSelections import buildersConf
 from Gaudi.Configuration import *
 from Configurables import DaVinci
diff --git a/Phys/StrippingSelections/tests/liaisons/B2OC/TestBeauty2Charm.py b/Phys/StrippingSelections/tests/liaisons/B2OC/TestBeauty2Charm.py
index 1eebd8af8d44c8c1f27ac6f98f6b25f6cd57b417..4db70bd4f63d55d1d5323e5d441cb24319f02b0e 100644
--- a/Phys/StrippingSelections/tests/liaisons/B2OC/TestBeauty2Charm.py
+++ b/Phys/StrippingSelections/tests/liaisons/B2OC/TestBeauty2Charm.py
@@ -26,7 +26,7 @@ from Configurables import AuditorSvc, ChronoAuditor
 from Configurables import TimingAuditor, SequencerTimerTool
 from DSTWriters.microdstelements import *
 from Configurables import ProcStatusCheck
-from StrippingSelections.Utils import lineBuilder, buildStreamsFromBuilder
+from StrippingSelections.Utils import buildStreamsFromBuilder
 from StrippingSelections import buildersConf
 from Gaudi.Configuration import *
 from Configurables import DaVinci
diff --git a/Phys/StrippingSelections/tests/liaisons/BandQ/TestMyWGfromSelections.py b/Phys/StrippingSelections/tests/liaisons/BandQ/TestMyWGfromSelections.py
old mode 100755
new mode 100644
index 081efc20a9ca33c37b4e8cc692a6d7a4cafd6c36..c5a43896287caaeeda8764f94e8bde07c263fea8
--- a/Phys/StrippingSelections/tests/liaisons/BandQ/TestMyWGfromSelections.py
+++ b/Phys/StrippingSelections/tests/liaisons/BandQ/TestMyWGfromSelections.py
@@ -27,7 +27,7 @@ from Configurables import AuditorSvc, ChronoAuditor
 from Configurables import TimingAuditor, SequencerTimerTool
 from DSTWriters.microdstelements import *
 from Configurables import ProcStatusCheck
-from StrippingSelections.Utils import lineBuilder, buildStreams
+from StrippingSelections.Utils import buildStreams
 from StrippingSelections import buildersConf
 from Configurables import RootCnvSvc
 from Gaudi.Configuration import *
diff --git a/Phys/StrippingSelections/tests/liaisons/BandQ/TestMyWGfromSettings.py b/Phys/StrippingSelections/tests/liaisons/BandQ/TestMyWGfromSettings.py
old mode 100755
new mode 100644
index fd12d313dad4eb311fb9671a17d8ac9610e63083..078145f9282b2dffabf3a6b448fa1cdab13b4622
--- a/Phys/StrippingSelections/tests/liaisons/BandQ/TestMyWGfromSettings.py
+++ b/Phys/StrippingSelections/tests/liaisons/BandQ/TestMyWGfromSettings.py
@@ -27,7 +27,7 @@ from Configurables import AuditorSvc, ChronoAuditor
 from Configurables import TimingAuditor, SequencerTimerTool
 from DSTWriters.microdstelements import *
 from Configurables import ProcStatusCheck
-from StrippingSelections.Utils import lineBuilder, buildStreams
+from StrippingSelections.Utils import buildStreams
 from StrippingSettings.Utils import config_from_modules
 from Configurables import TrackStateProvider
 from Configurables import RootCnvSvc
diff --git a/Phys/StrippingSelections/tests/liaisons/BnoC/TestBnoCfromSelections.py b/Phys/StrippingSelections/tests/liaisons/BnoC/TestBnoCfromSelections.py
old mode 100755
new mode 100644
index edb87074a5d908bd7c36edf3cf41978523b89556..098ef7d56f4cf13dacc98c4f3bdce53ca46738bb
--- a/Phys/StrippingSelections/tests/liaisons/BnoC/TestBnoCfromSelections.py
+++ b/Phys/StrippingSelections/tests/liaisons/BnoC/TestBnoCfromSelections.py
@@ -29,7 +29,7 @@ from Configurables import AuditorSvc, ChronoAuditor
 from Configurables import TimingAuditor, SequencerTimerTool
 from DSTWriters.microdstelements import *
 from Configurables import ProcStatusCheck
-from StrippingSelections.Utils import lineBuilder, buildStreams
+from StrippingSelections.Utils import buildStreams
 from StrippingSelections import buildersConf
 from Configurables import DecodeRawEvent
 from Configurables import RawEventJuggler
diff --git a/Phys/StrippingSelections/tests/liaisons/BnoC/TestBnoCfromSettings.py b/Phys/StrippingSelections/tests/liaisons/BnoC/TestBnoCfromSettings.py
old mode 100755
new mode 100644
index ac8bfef4329d7430f32ef16587fde44685d13190..2ff6990cba5c374a5a18eca438465430be116ffc
--- a/Phys/StrippingSelections/tests/liaisons/BnoC/TestBnoCfromSettings.py
+++ b/Phys/StrippingSelections/tests/liaisons/BnoC/TestBnoCfromSettings.py
@@ -29,8 +29,7 @@ from Configurables import AuditorSvc, ChronoAuditor
 from Configurables import TimingAuditor, SequencerTimerTool
 from DSTWriters.microdstelements import *
 from Configurables import ProcStatusCheck
-from StrippingSelections.Utils import lineBuilder, buildStreams
-from StrippingSelections import buildersConf
+from StrippingSelections.Utils import buildStreams
 from StrippingSettings.Utils import strippingConfiguration
 from Configurables import DecodeRawEvent
 from Configurables import RawEventJuggler
diff --git a/Phys/StrippingSelections/tests/liaisons/Calibrations/TestCalibLines.py b/Phys/StrippingSelections/tests/liaisons/Calibrations/TestCalibLines.py
old mode 100755
new mode 100644
index ec5ca39d32cd9a65daa5d6dbaef9e5ccb2728842..36efb7a6d328d06962627acb62c14c90a2da88b0
--- a/Phys/StrippingSelections/tests/liaisons/Calibrations/TestCalibLines.py
+++ b/Phys/StrippingSelections/tests/liaisons/Calibrations/TestCalibLines.py
@@ -29,7 +29,7 @@ from Configurables import AuditorSvc, ChronoAuditor
 from Configurables import TimingAuditor, SequencerTimerTool
 from DSTWriters.microdstelements import *
 from Configurables import ProcStatusCheck
-from StrippingSelections.Utils import lineBuilder, buildStreams
+from StrippingSelections.Utils import buildStreams
 from StrippingSelections import buildersConf
 from Gaudi.Configuration import *
 from Configurables import DaVinci
diff --git a/Phys/StrippingSelections/tests/liaisons/Calibrations/TestMyWGfromSelections.py b/Phys/StrippingSelections/tests/liaisons/Calibrations/TestMyWGfromSelections.py
old mode 100755
new mode 100644
index 744182bd63f97eb1d11ef42474cfe798f0e14591..93e3484eb24c38085cc2a680255d75dc330f0a5e
--- a/Phys/StrippingSelections/tests/liaisons/Calibrations/TestMyWGfromSelections.py
+++ b/Phys/StrippingSelections/tests/liaisons/Calibrations/TestMyWGfromSelections.py
@@ -26,7 +26,7 @@ from Configurables import AuditorSvc, ChronoAuditor
 from Configurables import TimingAuditor, SequencerTimerTool
 from DSTWriters.microdstelements import *
 from Configurables import ProcStatusCheck
-from StrippingSelections.Utils import lineBuilder, buildStreams
+from StrippingSelections.Utils import buildStreams
 from StrippingSelections import buildersConf
 from Gaudi.Configuration import *
 from Configurables import DaVinci
diff --git a/Phys/StrippingSelections/tests/liaisons/Calibrations/TestMyWGfromSettings.py b/Phys/StrippingSelections/tests/liaisons/Calibrations/TestMyWGfromSettings.py
old mode 100755
new mode 100644
index b751b157b9a54991f7b458c5018eb6ab67650a22..6650ebff342c98c8a586adb8f73b3a952564945d
--- a/Phys/StrippingSelections/tests/liaisons/Calibrations/TestMyWGfromSettings.py
+++ b/Phys/StrippingSelections/tests/liaisons/Calibrations/TestMyWGfromSettings.py
@@ -26,7 +26,7 @@ from Configurables import AuditorSvc, ChronoAuditor
 from Configurables import TimingAuditor, SequencerTimerTool
 from DSTWriters.microdstelements import *
 from Configurables import ProcStatusCheck
-from StrippingSelections.Utils import lineBuilder, buildStreams
+from StrippingSelections.Utils import buildStreams
 from StrippingSettings.Utils import config_from_modules
 from Gaudi.Configuration import *
 from Configurables import DaVinci
diff --git a/Phys/StrippingSelections/tests/liaisons/Calibrations/TestPIDLines.py b/Phys/StrippingSelections/tests/liaisons/Calibrations/TestPIDLines.py
old mode 100755
new mode 100644
index 23f92a6582b28a8d2453580428a91847a716bae0..100dff3bec84f1a31ff9273763cbad5a4d108fed
--- a/Phys/StrippingSelections/tests/liaisons/Calibrations/TestPIDLines.py
+++ b/Phys/StrippingSelections/tests/liaisons/Calibrations/TestPIDLines.py
@@ -32,7 +32,7 @@ from Configurables import GaudiSequencer
 import os
 from DSTWriters.microdstelements import *
 from Configurables import ProcStatusCheck
-from StrippingSelections.Utils import lineBuilder, buildStreamsFromBuilder
+from StrippingSelections.Utils import buildStreamsFromBuilder
 from StrippingSelections import buildersConf
 from Configurables import RawEventJuggler
 from Gaudi.Configuration import *
diff --git a/Phys/StrippingSelections/tests/liaisons/Charm/S34r0p1_tests/TestMyWGfromSelections.py b/Phys/StrippingSelections/tests/liaisons/Charm/S34r0p1_tests/TestMyWGfromSelections.py
old mode 100755
new mode 100644
index 24bb05e4a111357dd74e7e76252582dd031c8a5a..dd4144004b6b30aa7471b4d97f956250aa8e3b2a
--- a/Phys/StrippingSelections/tests/liaisons/Charm/S34r0p1_tests/TestMyWGfromSelections.py
+++ b/Phys/StrippingSelections/tests/liaisons/Charm/S34r0p1_tests/TestMyWGfromSelections.py
@@ -26,7 +26,7 @@ from Configurables import AuditorSvc, ChronoAuditor
 from Configurables import TimingAuditor, SequencerTimerTool
 from DSTWriters.microdstelements import *
 from Configurables import ProcStatusCheck
-from StrippingSelections.Utils import lineBuilder, buildStreams
+from StrippingSelections.Utils import buildStreams
 from StrippingSelections import buildersConf
 from Gaudi.Configuration import *
 from Configurables import DaVinci
diff --git a/Phys/StrippingSelections/tests/liaisons/Charm/S34r0p1_tests/TestMyWGfromSettings.py b/Phys/StrippingSelections/tests/liaisons/Charm/S34r0p1_tests/TestMyWGfromSettings.py
old mode 100755
new mode 100644
index 55e7e4a3a99a365f28981ef5551b8580fcdfe7de..c33fcce6ac5375f0a2a68f8c989063037ef61bf4
--- a/Phys/StrippingSelections/tests/liaisons/Charm/S34r0p1_tests/TestMyWGfromSettings.py
+++ b/Phys/StrippingSelections/tests/liaisons/Charm/S34r0p1_tests/TestMyWGfromSettings.py
@@ -26,7 +26,7 @@ from Configurables import AuditorSvc, ChronoAuditor
 from Configurables import TimingAuditor, SequencerTimerTool
 from DSTWriters.microdstelements import *
 from Configurables import ProcStatusCheck
-from StrippingSelections.Utils import lineBuilder, buildStreams
+from StrippingSelections.Utils import buildStreams
 from StrippingSettings.Utils import config_from_modules
 from Gaudi.Configuration import *
 from Configurables import DaVinci
diff --git a/Phys/StrippingSelections/tests/liaisons/QEE/TestS22.py b/Phys/StrippingSelections/tests/liaisons/QEE/TestS22.py
old mode 100755
new mode 100644
index d5390ed39747908a7389b67c9899994877d65a29..2454250c239e45cfc0d651bdba2036d1217cd6be
--- a/Phys/StrippingSelections/tests/liaisons/QEE/TestS22.py
+++ b/Phys/StrippingSelections/tests/liaisons/QEE/TestS22.py
@@ -26,7 +26,7 @@ from Configurables import AuditorSvc, ChronoAuditor
 from Configurables import TimingAuditor, SequencerTimerTool
 from DSTWriters.microdstelements import *
 from Configurables import ProcStatusCheck
-from StrippingSelections.Utils import lineBuilder, buildStreams
+from StrippingSelections.Utils import buildStreams
 from StrippingSelections import buildersConf
 from Configurables import RawEventJuggler
 from Gaudi.Configuration import *
diff --git a/Phys/StrippingSelections/tests/liaisons/QEE/TestS26_Selections.py b/Phys/StrippingSelections/tests/liaisons/QEE/TestS26_Selections.py
old mode 100755
new mode 100644
index 6fa0f5beeda38275dc21382fbe6e059bbceb85c9..0e800f1e3f1fce4967f937540c4e4b20c56dfb37
--- a/Phys/StrippingSelections/tests/liaisons/QEE/TestS26_Selections.py
+++ b/Phys/StrippingSelections/tests/liaisons/QEE/TestS26_Selections.py
@@ -31,7 +31,7 @@ from Configurables import AuditorSvc, ChronoAuditor
 from Configurables import TimingAuditor, SequencerTimerTool
 from DSTWriters.microdstelements import *
 from Configurables import ProcStatusCheck
-from StrippingSelections.Utils import lineBuilder, buildStreams, buildStreamsFromBuilder
+from StrippingSelections.Utils import buildStreamsFromBuilder
 from StrippingSelections import buildersConf
 from Configurables import DecodeRawEvent
 from StrippingConf.Configuration import StrippingConf
diff --git a/Phys/StrippingSelections/tests/liaisons/SL/TestB2DMuNuX.py b/Phys/StrippingSelections/tests/liaisons/SL/TestB2DMuNuX.py
old mode 100755
new mode 100644
index 3699b6e38d224902bd9662c64be8faf151b6aea0..751679b644a5907d8291159843e73ff662d11181
--- a/Phys/StrippingSelections/tests/liaisons/SL/TestB2DMuNuX.py
+++ b/Phys/StrippingSelections/tests/liaisons/SL/TestB2DMuNuX.py
@@ -32,7 +32,7 @@ from Configurables import AddressKillerAlg
 from Configurables import GaudiSequencer
 from DSTWriters.microdstelements import *
 from Configurables import ProcStatusCheck
-from StrippingSelections.Utils import lineBuilder, buildStreamsFromBuilder
+from StrippingSelections.Utils import buildStreamsFromBuilder
 from StrippingSelections import buildersConf
 from Configurables import RawEventJuggler
 from Gaudi.Configuration import *
diff --git a/Phys/StrippingSelections/tests/liaisons/SL/TestB2DstMuNuIncl.py b/Phys/StrippingSelections/tests/liaisons/SL/TestB2DstMuNuIncl.py
old mode 100755
new mode 100644
index b3229f9d3ea75b34f41aacac6019288bc799a0e5..a6a5dcb377f6ec4773ffb371a707bc72a637cfd0
--- a/Phys/StrippingSelections/tests/liaisons/SL/TestB2DstMuNuIncl.py
+++ b/Phys/StrippingSelections/tests/liaisons/SL/TestB2DstMuNuIncl.py
@@ -32,7 +32,7 @@ from Configurables import AddressKillerAlg
 from Configurables import GaudiSequencer
 from DSTWriters.microdstelements import *
 from Configurables import ProcStatusCheck
-from StrippingSelections.Utils import lineBuilder, buildStreamsFromBuilder
+from StrippingSelections.Utils import buildStreamsFromBuilder
 from StrippingSelections import buildersConf
 from Configurables import RawEventJuggler
 from Gaudi.Configuration import *
diff --git a/Phys/StrippingSelections/tests/liaisons/SL/TestSLfromSelections.py b/Phys/StrippingSelections/tests/liaisons/SL/TestSLfromSelections.py
old mode 100755
new mode 100644
index 9c472e22dd430ac105948927795fbae438477ea0..0dd3e1e4ac200efdf2b5fbe42843c32a0bf2f098
--- a/Phys/StrippingSelections/tests/liaisons/SL/TestSLfromSelections.py
+++ b/Phys/StrippingSelections/tests/liaisons/SL/TestSLfromSelections.py
@@ -29,7 +29,7 @@ from Configurables import AuditorSvc, ChronoAuditor
 from Configurables import TimingAuditor, SequencerTimerTool
 from DSTWriters.microdstelements import *
 from Configurables import ProcStatusCheck
-from StrippingSelections.Utils import lineBuilder, buildStreams
+from StrippingSelections.Utils import buildStreams
 from StrippingSelections import buildersConf
 from Gaudi.Configuration import *
 from Configurables import DaVinci
diff --git a/Phys/StrippingSelections/tests/liaisons/TestMyWGfromSelections.py b/Phys/StrippingSelections/tests/liaisons/TestMyWGfromSelections.py
old mode 100755
new mode 100644
index 7cd1e1b0ed4263e2c4d747c810d9baeb41539f09..48e3dcbf28f1045848f9f5a8549bd93064700ecc
--- a/Phys/StrippingSelections/tests/liaisons/TestMyWGfromSelections.py
+++ b/Phys/StrippingSelections/tests/liaisons/TestMyWGfromSelections.py
@@ -26,7 +26,7 @@ from Configurables import AuditorSvc, ChronoAuditor
 from Configurables import TimingAuditor, SequencerTimerTool
 from DSTWriters.microdstelements import *
 from Configurables import ProcStatusCheck
-from StrippingSelections.Utils import lineBuilder, buildStreams
+from StrippingSelections.Utils import buildStreams
 from StrippingSelections import buildersConf
 from Configurables import RootCnvSvc
 from Gaudi.Configuration import *
diff --git a/Phys/StrippingSelections/tests/liaisons/TestMyWGfromSelections_Run1.py b/Phys/StrippingSelections/tests/liaisons/TestMyWGfromSelections_Run1.py
old mode 100755
new mode 100644
index 89a064ab490a78f42e3b22a56be5b91e1e3f6281..d1c155cd18e1a7450f95a9bed86fd113a4e3c591
--- a/Phys/StrippingSelections/tests/liaisons/TestMyWGfromSelections_Run1.py
+++ b/Phys/StrippingSelections/tests/liaisons/TestMyWGfromSelections_Run1.py
@@ -28,7 +28,7 @@ from Configurables import TimingAuditor, SequencerTimerTool
 from DSTWriters.microdstelements import *
 from PhysConf.Filters import LoKi_Filters
 from Configurables import ProcStatusCheck
-from StrippingSelections.Utils import lineBuilder, buildStreams
+from StrippingSelections.Utils import buildStreams
 from StrippingSelections import buildersConf
 from Configurables import DecodeRawEvent
 from Configurables import RawEventJuggler
diff --git a/Phys/StrippingSelections/tests/liaisons/TestMyWGfromSettings.py b/Phys/StrippingSelections/tests/liaisons/TestMyWGfromSettings.py
old mode 100755
new mode 100644
index a8f2c29458a7632da5ee23f127fe478eb47b04ac..8a8dc454200df9b3324bc38c3da1be37201523c1
--- a/Phys/StrippingSelections/tests/liaisons/TestMyWGfromSettings.py
+++ b/Phys/StrippingSelections/tests/liaisons/TestMyWGfromSettings.py
@@ -26,7 +26,7 @@ from Configurables import AuditorSvc, ChronoAuditor
 from Configurables import TimingAuditor, SequencerTimerTool
 from DSTWriters.microdstelements import *
 from Configurables import ProcStatusCheck
-from StrippingSelections.Utils import lineBuilder, buildStreams
+from StrippingSelections.Utils import buildStreams
 from StrippingSettings.Utils import config_from_modules
 from Configurables import TrackStateProvider
 from Configurables import RootCnvSvc
diff --git a/Phys/StrippingSelections/tests/liaisons/TestMyWGfromSettings_Run1.py b/Phys/StrippingSelections/tests/liaisons/TestMyWGfromSettings_Run1.py
old mode 100755
new mode 100644
index a74525048d8e723076d2007e923b43d7f7efcd23..f64a2bc87ec2d95b5066bcda96a79ac53fc3dc75
--- a/Phys/StrippingSelections/tests/liaisons/TestMyWGfromSettings_Run1.py
+++ b/Phys/StrippingSelections/tests/liaisons/TestMyWGfromSettings_Run1.py
@@ -28,8 +28,7 @@ from Configurables import TimingAuditor, SequencerTimerTool
 from DSTWriters.microdstelements import *
 from PhysConf.Filters import LoKi_Filters
 from Configurables import ProcStatusCheck
-from StrippingSelections.Utils import lineBuilder, buildStreams
-from StrippingSelections import buildersConf
+from StrippingSelections.Utils import buildStreams
 from StrippingSettings.Utils import strippingConfiguration
 from Configurables import DecodeRawEvent
 from Configurables import RawEventJuggler
diff --git a/Phys/StrippingSelections/tests/users/DV-RedoCaloPID-Stripping21.py b/Phys/StrippingSelections/tests/users/DV-RedoCaloPID-Stripping21.py
index ab234fdfdcf0b4668bd9076a6086aea5fb82c18f..1540477d91587214831a22aaae4c5e0526b861ad 100644
--- a/Phys/StrippingSelections/tests/users/DV-RedoCaloPID-Stripping21.py
+++ b/Phys/StrippingSelections/tests/users/DV-RedoCaloPID-Stripping21.py
@@ -70,7 +70,7 @@ init.Members += palgs
 
 
 def removeUnpacking():
-    from Configurables import DataOnDemandSvc, CaloProcessor
+    from Configurables import DataOnDemandSvc
     DataOnDemandSvc().AlgMap.pop("/Event/Rec/ProtoP/Neutrals", None)
     DataOnDemandSvc().AlgMap.pop("/Event/Rec/ProtoP/Charged", None)
     DataOnDemandSvc().AlgMap.pop("/Event/Rec/Calo/Electrons", None)
diff --git a/Phys/StrippingSelections/tests/users/StrippingTupleExample.py b/Phys/StrippingSelections/tests/users/StrippingTupleExample.py
index 7977ff2858f4fe79d9a1315ac12984c77e86d64c..cf71dbdd261a181442642268218c2f59e946dd33 100644
--- a/Phys/StrippingSelections/tests/users/StrippingTupleExample.py
+++ b/Phys/StrippingSelections/tests/users/StrippingTupleExample.py
@@ -8,7 +8,6 @@
 # granted to it by virtue of its status as an Intergovernmental Organization  #
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
-from Configurables import DaVinci
 from StrippingTuple import add_stripping_tuple_sequence
 import sys
 import os
diff --git a/Phys/StrippingSelections/tests/users/TestMyStrippingLine_EM.py b/Phys/StrippingSelections/tests/users/TestMyStrippingLine_EM.py
old mode 100755
new mode 100644
index 48a131f37547cc716f191691cb4a438cb3e7362f..71bc23b2194ad46524f5729c48f37736815bdb6d
--- a/Phys/StrippingSelections/tests/users/TestMyStrippingLine_EM.py
+++ b/Phys/StrippingSelections/tests/users/TestMyStrippingLine_EM.py
@@ -28,7 +28,7 @@ from Configurables import AuditorSvc, ChronoAuditor
 from Configurables import TimingAuditor, SequencerTimerTool
 from DSTWriters.microdstelements import *
 from Configurables import ProcStatusCheck
-from StrippingSelections.Utils import lineBuilder, buildStreamsFromBuilder
+from StrippingSelections.Utils import buildStreamsFromBuilder
 from StrippingSelections import buildersConf
 from Configurables import DecodeRawEvent
 from Gaudi.Configuration import *
diff --git a/Phys/StrippingSettings/python/StrippingSettings/Stripping24r2/LineConfigDictionaries_B2CC.py b/Phys/StrippingSettings/python/StrippingSettings/Stripping24r2/LineConfigDictionaries_B2CC.py
index eae3b92d71871326a70815e44c86b0b1bd4ac798..eb6d3890c5121cdf56598a7c851e7da4a1e71dee 100644
--- a/Phys/StrippingSettings/python/StrippingSettings/Stripping24r2/LineConfigDictionaries_B2CC.py
+++ b/Phys/StrippingSettings/python/StrippingSettings/Stripping24r2/LineConfigDictionaries_B2CC.py
@@ -15,7 +15,6 @@
 ##  Contact person: Piera Muzzetto      (piera.muzzetto@cern.ch)              ##
 ################################################################################
 
-from GaudiKernel.SystemOfUnits import *
 
 ######################################################################
 # StrippingBetaSBd2JpsieeKstarDetachedLine (MicroDST)
diff --git a/Phys/StrippingSettings/python/StrippingSettings/Stripping24r2/LineConfigDictionaries_B2OC.py b/Phys/StrippingSettings/python/StrippingSettings/Stripping24r2/LineConfigDictionaries_B2OC.py
index f44352310b365a05c9e06d9f6f8d0f01a88c7fc5..9ebd6e641403a3b01e71caeb48e68eef9ab22180 100644
--- a/Phys/StrippingSettings/python/StrippingSettings/Stripping24r2/LineConfigDictionaries_B2OC.py
+++ b/Phys/StrippingSettings/python/StrippingSettings/Stripping24r2/LineConfigDictionaries_B2OC.py
@@ -15,7 +15,6 @@
 ##  Contact person: Shunan Zhang (shunan.zhang@cern.ch)                                                ##
 #########################################################################################################
 
-from GaudiKernel.SystemOfUnits import *
 
 Beauty2Charm = {
     'BUILDERTYPE': 'Beauty2CharmConf',
diff --git a/Phys/StrippingSettings/python/StrippingSettings/Stripping28r2/LineConfigDictionaries_B2CC.py b/Phys/StrippingSettings/python/StrippingSettings/Stripping28r2/LineConfigDictionaries_B2CC.py
index 39dba8ea0ec43ed6af7882c0ca7c5e286651e4c2..b03b1620767169ac95bedb05e1e2fe60224b7786 100644
--- a/Phys/StrippingSettings/python/StrippingSettings/Stripping28r2/LineConfigDictionaries_B2CC.py
+++ b/Phys/StrippingSettings/python/StrippingSettings/Stripping28r2/LineConfigDictionaries_B2CC.py
@@ -15,7 +15,6 @@
 ##  Contact person: Piera Muzzetto      (piera.muzzetto@cern.ch)              ##
 ################################################################################
 
-from GaudiKernel.SystemOfUnits import *
 
 ######################################################################
 # StrippingBetaSBd2JpsieeKstarDetachedLine (MicroDST)
diff --git a/Phys/StrippingSettings/python/StrippingSettings/Stripping28r2/LineConfigDictionaries_B2OC.py b/Phys/StrippingSettings/python/StrippingSettings/Stripping28r2/LineConfigDictionaries_B2OC.py
index 922168f7c53fe8e239fd93c5f2491dd084faf70b..ef453ed399c47a2005aa59936ada8baae4318bad 100644
--- a/Phys/StrippingSettings/python/StrippingSettings/Stripping28r2/LineConfigDictionaries_B2OC.py
+++ b/Phys/StrippingSettings/python/StrippingSettings/Stripping28r2/LineConfigDictionaries_B2OC.py
@@ -15,7 +15,6 @@
 ##  Contact person: Shunan Zhang (shunan.zhang@cern.ch)                                                ##
 #########################################################################################################
 
-from GaudiKernel.SystemOfUnits import *
 
 Beauty2Charm = {
     'BUILDERTYPE': 'Beauty2CharmConf',
diff --git a/Phys/StrippingSettings/python/StrippingSettings/Stripping28r2p1/LineConfigDictionaries_B2CC.py b/Phys/StrippingSettings/python/StrippingSettings/Stripping28r2p1/LineConfigDictionaries_B2CC.py
index 9b732f4d7580c3c0dd84cbf688f7c486cd7a71a7..6a02abb11d2440dfdd83fa2fe4ec47f2d955a642 100644
--- a/Phys/StrippingSettings/python/StrippingSettings/Stripping28r2p1/LineConfigDictionaries_B2CC.py
+++ b/Phys/StrippingSettings/python/StrippingSettings/Stripping28r2p1/LineConfigDictionaries_B2CC.py
@@ -15,7 +15,6 @@
 ##  Contact person: Jie Wu               (j.wu@cern.ch)                       ##
 ################################################################################
 
-from GaudiKernel.SystemOfUnits import *
 
 ######################################################################
 # StrippingB2JpsiHHBs2Jpsif0PrescaledLine (MicroDST)
diff --git a/Phys/StrippingSettings/python/StrippingSettings/Stripping28r2p1/LineConfigDictionaries_B2OC.py b/Phys/StrippingSettings/python/StrippingSettings/Stripping28r2p1/LineConfigDictionaries_B2OC.py
index b04d4deb0a7922d49a6d96408eb90e5451c63bef..e7628be5701c4f4962ebf59d1fe54fe63c4b9d31 100644
--- a/Phys/StrippingSettings/python/StrippingSettings/Stripping28r2p1/LineConfigDictionaries_B2OC.py
+++ b/Phys/StrippingSettings/python/StrippingSettings/Stripping28r2p1/LineConfigDictionaries_B2OC.py
@@ -15,7 +15,6 @@
 ##  Contact person: Shunan Zhang (shunan.zhang@cern.ch)                                                ##
 #########################################################################################################
 
-from GaudiKernel.SystemOfUnits import *
 
 Beauty2Charm = {
     'BUILDERTYPE': 'Beauty2CharmConf',
diff --git a/Phys/StrippingSettings/python/StrippingSettings/Stripping34/LineConfigDictionaries_B2CC.py b/Phys/StrippingSettings/python/StrippingSettings/Stripping34/LineConfigDictionaries_B2CC.py
index ef63e1ae444ed3035b5a8ea682d972c9bcb4fd70..247dd99b1ac7ce344247534afc5376149f917366 100644
--- a/Phys/StrippingSettings/python/StrippingSettings/Stripping34/LineConfigDictionaries_B2CC.py
+++ b/Phys/StrippingSettings/python/StrippingSettings/Stripping34/LineConfigDictionaries_B2CC.py
@@ -15,7 +15,6 @@
 ##  Contact person: Xuesong Liu           (xuesong.liu@cern.ch)               ##
 ################################################################################
 
-from GaudiKernel.SystemOfUnits import *
 
 ######################################################################
 # StrippingB2JpsiHHBs2Jpsif0PrescaledLine (MicroDST)
diff --git a/Phys/StrippingSettings/python/StrippingSettings/Stripping34/LineConfigDictionaries_B2OC.py b/Phys/StrippingSettings/python/StrippingSettings/Stripping34/LineConfigDictionaries_B2OC.py
index 3f89c191f95ed2f68e667221fe1be4d68307babc..6d1ed9f04a969ea1c57347da01d4e9593f98c5ed 100644
--- a/Phys/StrippingSettings/python/StrippingSettings/Stripping34/LineConfigDictionaries_B2OC.py
+++ b/Phys/StrippingSettings/python/StrippingSettings/Stripping34/LineConfigDictionaries_B2OC.py
@@ -15,7 +15,6 @@
 ##  Contact person: Alison Tully (alison.tully@cern.ch)                                                ##
 #########################################################################################################
 
-from GaudiKernel.SystemOfUnits import *
 
 Beauty2Charm = {
     'BUILDERTYPE': 'Beauty2CharmConf',
diff --git a/Phys/StrippingSettings/python/StrippingSettings/Stripping34r0p1/LineConfigDictionaries_B2CC.py b/Phys/StrippingSettings/python/StrippingSettings/Stripping34r0p1/LineConfigDictionaries_B2CC.py
index 29b4aeea821c13c8583c47d1a85d0716fd461401..f246ebc34d2710eb99d4f9c6726e2c081f92c683 100644
--- a/Phys/StrippingSettings/python/StrippingSettings/Stripping34r0p1/LineConfigDictionaries_B2CC.py
+++ b/Phys/StrippingSettings/python/StrippingSettings/Stripping34r0p1/LineConfigDictionaries_B2CC.py
@@ -15,7 +15,6 @@
 ##  Contact person: Xuesong Liu           (xuesong.liu@cern.ch)               ##
 ################################################################################
 
-from GaudiKernel.SystemOfUnits import *
 
 ######################################################################
 # StrippingBetaSBd2JpsieeKstarDetachedLine (MicroDST)
diff --git a/Phys/StrippingSettings/python/StrippingSettings/Stripping34r0p1/LineConfigDictionaries_B2OC.py b/Phys/StrippingSettings/python/StrippingSettings/Stripping34r0p1/LineConfigDictionaries_B2OC.py
index 25c425dbae55c7a48b8555fe188d2f4a7713edfc..50fcfcd0a1d70a1a23e22137870390e84132bfcf 100644
--- a/Phys/StrippingSettings/python/StrippingSettings/Stripping34r0p1/LineConfigDictionaries_B2OC.py
+++ b/Phys/StrippingSettings/python/StrippingSettings/Stripping34r0p1/LineConfigDictionaries_B2OC.py
@@ -15,7 +15,6 @@
 ##  Contact person: Alison Tully (alison.tully@cern.ch)                                                ##
 #########################################################################################################
 
-from GaudiKernel.SystemOfUnits import *
 
 Beauty2Charm = {
     'BUILDERTYPE': 'Beauty2CharmConf',
diff --git a/Phys/StrippingSettings/python/StrippingSettings/Stripping34r0p1/LineConfigDictionaries_BandQ.py b/Phys/StrippingSettings/python/StrippingSettings/Stripping34r0p1/LineConfigDictionaries_BandQ.py
index f35ccf51b3b071b6ccb7d796c49a787ff934b786..01dbc83235a164b71ab6fe742af53c15a9126fe9 100644
--- a/Phys/StrippingSettings/python/StrippingSettings/Stripping34r0p1/LineConfigDictionaries_BandQ.py
+++ b/Phys/StrippingSettings/python/StrippingSettings/Stripping34r0p1/LineConfigDictionaries_BandQ.py
@@ -15,7 +15,6 @@
 ##  Contact person: andrii.usachov@cern.ch                                    ##
 ################################################################################
 
-from GaudiKernel.SystemOfUnits import *
 
 ######################################################################
 #
diff --git a/Phys/StrippingSettings/python/StrippingSettings/Stripping34r0p2/LineConfigDictionaries_B2CC.py b/Phys/StrippingSettings/python/StrippingSettings/Stripping34r0p2/LineConfigDictionaries_B2CC.py
index 54006cc0529c604481a5ec87aec0a0dcf5edb384..ec1abc7145ab114b085c976737447331d77179e7 100644
--- a/Phys/StrippingSettings/python/StrippingSettings/Stripping34r0p2/LineConfigDictionaries_B2CC.py
+++ b/Phys/StrippingSettings/python/StrippingSettings/Stripping34r0p2/LineConfigDictionaries_B2CC.py
@@ -15,7 +15,6 @@
 ##  Contact person: Jie Wu               (j.wu@cern.ch)                       ##
 ################################################################################
 
-from GaudiKernel.SystemOfUnits import *
 
 ######################################################################
 # StrippingB2JpsiHHBs2Jpsif0PrescaledLine (MicroDST)
diff --git a/Phys/StrippingSettings/python/StrippingSettings/Stripping34r0p2/LineConfigDictionaries_B2OC.py b/Phys/StrippingSettings/python/StrippingSettings/Stripping34r0p2/LineConfigDictionaries_B2OC.py
index 9870225a4b4d65e0bbe44303d5ab6684b03d914d..7904982daf573af375422ad5bfa600d5d5d99803 100644
--- a/Phys/StrippingSettings/python/StrippingSettings/Stripping34r0p2/LineConfigDictionaries_B2OC.py
+++ b/Phys/StrippingSettings/python/StrippingSettings/Stripping34r0p2/LineConfigDictionaries_B2OC.py
@@ -15,7 +15,6 @@
 ##  Contact person: Shunan Zhang (shunan.zhang@cern.ch)                                                ##
 #########################################################################################################
 
-from GaudiKernel.SystemOfUnits import *
 
 Beauty2Charm = {
     'BUILDERTYPE': 'Beauty2CharmConf',