diff --git a/benchmarks/Benchmark_ITT.cc b/benchmarks/Benchmark_ITT.cc
index 666e4830..b637679a 100644
--- a/benchmarks/Benchmark_ITT.cc
+++ b/benchmarks/Benchmark_ITT.cc
@@ -30,7 +30,7 @@ Author: paboyle <paboyle@ph.ed.ac.uk>
 
 using namespace std;
 using namespace Grid;
-using namespace Grid::QCD;
+ ;
 
 typedef WilsonFermion5D<DomainWallVec5dImplR> WilsonFermion5DR;
 typedef WilsonFermion5D<DomainWallVec5dImplF> WilsonFermion5DF;
@@ -369,19 +369,19 @@ public:
 #endif
       controls Cases [] = {
 #ifdef AVX512
-	{ QCD::WilsonKernelsStatic::OptInlineAsm , QCD::WilsonKernelsStatic::CommsThenCompute ,CartesianCommunicator::CommunicatorPolicySequential  },
-	{ QCD::WilsonKernelsStatic::OptInlineAsm , QCD::WilsonKernelsStatic::CommsAndCompute  ,CartesianCommunicator::CommunicatorPolicySequential  },
+	{  WilsonKernelsStatic::OptInlineAsm ,  WilsonKernelsStatic::CommsThenCompute ,CartesianCommunicator::CommunicatorPolicySequential  },
+	{  WilsonKernelsStatic::OptInlineAsm ,  WilsonKernelsStatic::CommsAndCompute  ,CartesianCommunicator::CommunicatorPolicySequential  },
 #endif
-	{ QCD::WilsonKernelsStatic::OptHandUnroll, QCD::WilsonKernelsStatic::CommsThenCompute ,CartesianCommunicator::CommunicatorPolicySequential  },
-	{ QCD::WilsonKernelsStatic::OptHandUnroll, QCD::WilsonKernelsStatic::CommsAndCompute  ,CartesianCommunicator::CommunicatorPolicySequential  },
-	{ QCD::WilsonKernelsStatic::OptGeneric   , QCD::WilsonKernelsStatic::CommsThenCompute ,CartesianCommunicator::CommunicatorPolicySequential  },
-	{ QCD::WilsonKernelsStatic::OptGeneric   , QCD::WilsonKernelsStatic::CommsAndCompute  ,CartesianCommunicator::CommunicatorPolicySequential  }
+	{  WilsonKernelsStatic::OptHandUnroll,  WilsonKernelsStatic::CommsThenCompute ,CartesianCommunicator::CommunicatorPolicySequential  },
+	{  WilsonKernelsStatic::OptHandUnroll,  WilsonKernelsStatic::CommsAndCompute  ,CartesianCommunicator::CommunicatorPolicySequential  },
+	{  WilsonKernelsStatic::OptGeneric   ,  WilsonKernelsStatic::CommsThenCompute ,CartesianCommunicator::CommunicatorPolicySequential  },
+	{  WilsonKernelsStatic::OptGeneric   ,  WilsonKernelsStatic::CommsAndCompute  ,CartesianCommunicator::CommunicatorPolicySequential  }
       }; 
 
       for(int c=0;c<num_cases;c++) {
 
-	QCD::WilsonKernelsStatic::Comms = Cases[c].CommsOverlap;
-	QCD::WilsonKernelsStatic::Opt   = Cases[c].Opt;
+	 WilsonKernelsStatic::Comms = Cases[c].CommsOverlap;
+	 WilsonKernelsStatic::Opt   = Cases[c].Opt;
 	CartesianCommunicator::SetCommunicatorPolicy(Cases[c].CommsAsynch);
 
 	std::cout<<GridLogMessage << "=================================================================================="<<std::endl;
@@ -577,19 +577,19 @@ public:
 #endif
       controls Cases [] = {
 #ifdef AVX512
-	{ QCD::WilsonKernelsStatic::OptInlineAsm , QCD::WilsonKernelsStatic::CommsThenCompute ,CartesianCommunicator::CommunicatorPolicySequential  },
-	{ QCD::WilsonKernelsStatic::OptInlineAsm , QCD::WilsonKernelsStatic::CommsAndCompute  ,CartesianCommunicator::CommunicatorPolicySequential  },
+	{  WilsonKernelsStatic::OptInlineAsm ,  WilsonKernelsStatic::CommsThenCompute ,CartesianCommunicator::CommunicatorPolicySequential  },
+	{  WilsonKernelsStatic::OptInlineAsm ,  WilsonKernelsStatic::CommsAndCompute  ,CartesianCommunicator::CommunicatorPolicySequential  },
 #endif
-	{ QCD::WilsonKernelsStatic::OptHandUnroll, QCD::WilsonKernelsStatic::CommsThenCompute ,CartesianCommunicator::CommunicatorPolicySequential  },
-	{ QCD::WilsonKernelsStatic::OptHandUnroll, QCD::WilsonKernelsStatic::CommsAndCompute  ,CartesianCommunicator::CommunicatorPolicySequential  },
-	{ QCD::WilsonKernelsStatic::OptGeneric   , QCD::WilsonKernelsStatic::CommsThenCompute ,CartesianCommunicator::CommunicatorPolicySequential  },
-	{ QCD::WilsonKernelsStatic::OptGeneric   , QCD::WilsonKernelsStatic::CommsAndCompute  ,CartesianCommunicator::CommunicatorPolicySequential  }
+	{  WilsonKernelsStatic::OptHandUnroll,  WilsonKernelsStatic::CommsThenCompute ,CartesianCommunicator::CommunicatorPolicySequential  },
+	{  WilsonKernelsStatic::OptHandUnroll,  WilsonKernelsStatic::CommsAndCompute  ,CartesianCommunicator::CommunicatorPolicySequential  },
+	{  WilsonKernelsStatic::OptGeneric   ,  WilsonKernelsStatic::CommsThenCompute ,CartesianCommunicator::CommunicatorPolicySequential  },
+	{  WilsonKernelsStatic::OptGeneric   ,  WilsonKernelsStatic::CommsAndCompute  ,CartesianCommunicator::CommunicatorPolicySequential  }
       }; 
 
       for(int c=0;c<num_cases;c++) {
 
-	QCD::WilsonKernelsStatic::Comms = Cases[c].CommsOverlap;
-	QCD::WilsonKernelsStatic::Opt   = Cases[c].Opt;
+	 WilsonKernelsStatic::Comms = Cases[c].CommsOverlap;
+	 WilsonKernelsStatic::Opt   = Cases[c].Opt;
 	CartesianCommunicator::SetCommunicatorPolicy(Cases[c].CommsAsynch);
 
 	std::cout<<GridLogMessage << "=================================================================================="<<std::endl;
diff --git a/benchmarks/Benchmark_comms.cc b/benchmarks/Benchmark_comms.cc
index 29ccf96c..b8abcc87 100644
--- a/benchmarks/Benchmark_comms.cc
+++ b/benchmarks/Benchmark_comms.cc
@@ -29,7 +29,7 @@ Author: Peter Boyle <paboyle@ph.ed.ac.uk>
 
 using namespace std;
 using namespace Grid;
-using namespace Grid::QCD;
+ ;
 
 struct time_statistics{
   double mean;
diff --git a/benchmarks/Benchmark_dwf.cc b/benchmarks/Benchmark_dwf.cc
index 73621bbe..24339e5c 100644
--- a/benchmarks/Benchmark_dwf.cc
+++ b/benchmarks/Benchmark_dwf.cc
@@ -24,7 +24,7 @@
 
 using namespace std;
 using namespace Grid;
-using namespace Grid::QCD;
+ ;
 
 template<class d>
 struct scal {
diff --git a/benchmarks/Benchmark_dwf_sweep.cc b/benchmarks/Benchmark_dwf_sweep.cc
index 37e47062..e1eab85a 100644
--- a/benchmarks/Benchmark_dwf_sweep.cc
+++ b/benchmarks/Benchmark_dwf_sweep.cc
@@ -30,7 +30,7 @@ Author: paboyle <paboyle@ph.ed.ac.uk>
 
 using namespace std;
 using namespace Grid;
-using namespace Grid::QCD;
+ ;
 
 template<class d>
 struct scal {
diff --git a/benchmarks/Benchmark_gparity.cc b/benchmarks/Benchmark_gparity.cc
index f6036aa8..be0c8b54 100644
--- a/benchmarks/Benchmark_gparity.cc
+++ b/benchmarks/Benchmark_gparity.cc
@@ -2,7 +2,7 @@
 #include <sstream>
 using namespace std;
 using namespace Grid;
-using namespace Grid::QCD;
+ ;
 
 template<class d>
 struct scal {
diff --git a/benchmarks/Benchmark_memory_asynch.cc b/benchmarks/Benchmark_memory_asynch.cc
index 2124b137..20a32e3e 100644
--- a/benchmarks/Benchmark_memory_asynch.cc
+++ b/benchmarks/Benchmark_memory_asynch.cc
@@ -30,7 +30,7 @@ Author: paboyle <paboyle@ph.ed.ac.uk>
 
 using namespace std;
 using namespace Grid;
-using namespace Grid::QCD;
+ ;
 
 int main (int argc, char ** argv)
 {
diff --git a/benchmarks/Benchmark_memory_bandwidth.cc b/benchmarks/Benchmark_memory_bandwidth.cc
index 848f271d..61ce2300 100644
--- a/benchmarks/Benchmark_memory_bandwidth.cc
+++ b/benchmarks/Benchmark_memory_bandwidth.cc
@@ -30,7 +30,7 @@ Author: paboyle <paboyle@ph.ed.ac.uk>
 
 using namespace std;
 using namespace Grid;
-using namespace Grid::QCD;
+ ;
 
 int main (int argc, char ** argv)
 {
diff --git a/benchmarks/Benchmark_mooee.cc b/benchmarks/Benchmark_mooee.cc
index 1e51c9d2..037e6dc6 100644
--- a/benchmarks/Benchmark_mooee.cc
+++ b/benchmarks/Benchmark_mooee.cc
@@ -30,7 +30,7 @@ Author: paboyle <paboyle@ph.ed.ac.uk>
 
 using namespace std;
 using namespace Grid;
-using namespace Grid::QCD;
+ ;
 
 
 int main (int argc, char ** argv)
diff --git a/benchmarks/Benchmark_staggered.cc b/benchmarks/Benchmark_staggered.cc
index f5325b28..f3cfef75 100644
--- a/benchmarks/Benchmark_staggered.cc
+++ b/benchmarks/Benchmark_staggered.cc
@@ -30,7 +30,7 @@ Author: paboyle <paboyle@ph.ed.ac.uk>
 
 using namespace std;
 using namespace Grid;
-using namespace Grid::QCD;
+ ;
 
 int main (int argc, char ** argv)
 {
diff --git a/benchmarks/Benchmark_su3.cc b/benchmarks/Benchmark_su3.cc
index 035af2d9..49e34136 100644
--- a/benchmarks/Benchmark_su3.cc
+++ b/benchmarks/Benchmark_su3.cc
@@ -30,7 +30,7 @@ Author: Peter Boyle <peterboyle@Peters-MacBook-Pro-2.local>
 
 using namespace std;
 using namespace Grid;
-using namespace Grid::QCD;
+ ;
 
 int main (int argc, char ** argv)
 {
diff --git a/benchmarks/Benchmark_wilson.cc b/benchmarks/Benchmark_wilson.cc
index 55042d6a..9585558b 100644
--- a/benchmarks/Benchmark_wilson.cc
+++ b/benchmarks/Benchmark_wilson.cc
@@ -30,7 +30,7 @@ Author: paboyle <paboyle@ph.ed.ac.uk>
 
 using namespace std;
 using namespace Grid;
-using namespace Grid::QCD;
+ ;
 
 template<class d>
 struct scal {
diff --git a/benchmarks/Benchmark_wilson_sweep.cc b/benchmarks/Benchmark_wilson_sweep.cc
index a189ac58..01befa76 100644
--- a/benchmarks/Benchmark_wilson_sweep.cc
+++ b/benchmarks/Benchmark_wilson_sweep.cc
@@ -23,7 +23,7 @@ Author: Richard Rollins <rprollins@users.noreply.github.com>
 
 using namespace std;
 using namespace Grid;
-using namespace Grid::QCD;
+ ;
 
 template<class d>
 struct scal {
diff --git a/benchmarks/simple_su3_expr.cc b/benchmarks/simple_su3_expr.cc
index 0c6092f6..7e53cce0 100644
--- a/benchmarks/simple_su3_expr.cc
+++ b/benchmarks/simple_su3_expr.cc
@@ -29,7 +29,7 @@ Author: Peter Boyle <paboyle@ph.ed.ac.uk>
 
 using namespace std;
 using namespace Grid;
-using namespace Grid::QCD;
+ ;
 
 void su3_test_mult_expression(LatticeColourMatrix &z, LatticeColourMatrix &x,LatticeColourMatrix &y)
 {
diff --git a/benchmarks/simple_su3_test.cc b/benchmarks/simple_su3_test.cc
index 79437c23..41ef3184 100644
--- a/benchmarks/simple_su3_test.cc
+++ b/benchmarks/simple_su3_test.cc
@@ -29,7 +29,7 @@ Author: Peter Boyle <paboyle@ph.ed.ac.uk>
 
 using namespace std;
 using namespace Grid;
-using namespace Grid::QCD;
+ ;
 
 
 void su3_test_mult_routine(LatticeColourMatrix &z, LatticeColourMatrix &x,LatticeColourMatrix &y)
diff --git a/configure.ac b/configure.ac
index 468d9d5f..57dd458a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -46,6 +46,7 @@ if test "${OPENMP_CXXFLAGS}X" != "X"; then
   AM_CXXFLAGS="$OPENMP_CXXFLAGS $AM_CXXFLAGS"
   AM_LDFLAGS="$OPENMP_CXXFLAGS $AM_LDFLAGS"
 fi
+ac_openmp=yes
 
 ############### Checks for header files
 AC_CHECK_HEADERS(stdint.h)
diff --git a/extras/Hadrons/Application.cc b/extras/Hadrons/Application.cc
index 9a3366d4..649cae9b 100644
--- a/extras/Hadrons/Application.cc
+++ b/extras/Hadrons/Application.cc
@@ -31,7 +31,7 @@ See the full license in the file "LICENSE" in the top level distribution directo
 #include <Grid/Hadrons/GeneticScheduler.hpp>
 
 using namespace Grid;
-using namespace QCD;
+ 
 using namespace Hadrons;
 
 #define BIG_SEP "==============="
diff --git a/extras/Hadrons/Environment.cc b/extras/Hadrons/Environment.cc
index 6de13e86..83d20d3c 100644
--- a/extras/Hadrons/Environment.cc
+++ b/extras/Hadrons/Environment.cc
@@ -32,7 +32,7 @@ See the full license in the file "LICENSE" in the top level distribution directo
 #include <Grid/Hadrons/ModuleFactory.hpp>
 
 using namespace Grid;
-using namespace QCD;
+ 
 using namespace Hadrons;
 
 #define ERROR_NO_ADDRESS(address)\
diff --git a/extras/Hadrons/Exceptions.cc b/extras/Hadrons/Exceptions.cc
index bf532c21..b251939f 100644
--- a/extras/Hadrons/Exceptions.cc
+++ b/extras/Hadrons/Exceptions.cc
@@ -54,4 +54,4 @@ CONST_EXC(Io, Runtime("IO error: " + msg, loc))
 CONST_EXC(Memory, Runtime("memory error: " + msg, loc))
 CONST_EXC(Parsing, Runtime("parsing error: " + msg, loc))
 CONST_EXC(Program, Runtime("program error: " + msg, loc))
-CONST_EXC(System, Runtime("system error: " + msg, loc))
\ No newline at end of file
+CONST_EXC(System, Runtime("system error: " + msg, loc))
diff --git a/extras/Hadrons/Global.cc b/extras/Hadrons/Global.cc
index 130ede96..54507bdf 100644
--- a/extras/Hadrons/Global.cc
+++ b/extras/Hadrons/Global.cc
@@ -30,7 +30,7 @@ See the full license in the file "LICENSE" in the top level distribution directo
 #include <Grid/Hadrons/Global.hpp>
 
 using namespace Grid;
-using namespace QCD;
+ 
 using namespace Hadrons;
 
 HadronsLogger Hadrons::HadronsLogError(1,"Error");
diff --git a/extras/Hadrons/Global.hpp b/extras/Hadrons/Global.hpp
index ebfe94dc..ebca2aad 100644
--- a/extras/Hadrons/Global.hpp
+++ b/extras/Hadrons/Global.hpp
@@ -41,7 +41,7 @@ See the full license in the file "LICENSE" in the top level distribution directo
 
 #define BEGIN_HADRONS_NAMESPACE \
 namespace Grid {\
-using namespace QCD;\
+ \
 namespace Hadrons {\
 using Grid::operator<<;
 #define END_HADRONS_NAMESPACE }}
diff --git a/extras/Hadrons/HadronsXmlRun.cc b/extras/Hadrons/HadronsXmlRun.cc
index 0dff8f9a..ab858844 100644
--- a/extras/Hadrons/HadronsXmlRun.cc
+++ b/extras/Hadrons/HadronsXmlRun.cc
@@ -30,7 +30,7 @@ See the full license in the file "LICENSE" in the top level distribution directo
 #include <Grid/Hadrons/Application.hpp>
 
 using namespace Grid;
-using namespace QCD;
+ 
 using namespace Hadrons;
 
 int main(int argc, char *argv[])
diff --git a/extras/Hadrons/HadronsXmlSchedule.cc b/extras/Hadrons/HadronsXmlSchedule.cc
index a8ca9a63..2ac84817 100644
--- a/extras/Hadrons/HadronsXmlSchedule.cc
+++ b/extras/Hadrons/HadronsXmlSchedule.cc
@@ -30,7 +30,7 @@ See the full license in the file "LICENSE" in the top level distribution directo
 #include <Grid/Hadrons/Application.hpp>
 
 using namespace Grid;
-using namespace QCD;
+ 
 using namespace Hadrons;
 
 int main(int argc, char *argv[])
diff --git a/extras/Hadrons/Module.cc b/extras/Hadrons/Module.cc
index e5ef0fe4..93e9316f 100644
--- a/extras/Hadrons/Module.cc
+++ b/extras/Hadrons/Module.cc
@@ -30,7 +30,7 @@ See the full license in the file "LICENSE" in the top level distribution directo
 #include <Grid/Hadrons/Module.hpp>
 
 using namespace Grid;
-using namespace QCD;
+ 
 using namespace Hadrons;
 
 /******************************************************************************
diff --git a/extras/Hadrons/VirtualMachine.cc b/extras/Hadrons/VirtualMachine.cc
index e0035bc1..30de8a43 100644
--- a/extras/Hadrons/VirtualMachine.cc
+++ b/extras/Hadrons/VirtualMachine.cc
@@ -31,7 +31,7 @@ See the full license in the file "LICENSE" in the top level distribution directo
 #include <Grid/Hadrons/ModuleFactory.hpp>
 
 using namespace Grid;
-using namespace QCD;
+ 
 using namespace Hadrons;
 
 /******************************************************************************
diff --git a/lib/algorithms/approx/Zolotarev.cc b/lib/algorithms/approx/Zolotarev.cc
index bf57105d..c2efd41c 100644
--- a/lib/algorithms/approx/Zolotarev.cc
+++ b/lib/algorithms/approx/Zolotarev.cc
@@ -516,7 +516,9 @@ zolotarev_data* higham(PRECISION epsilon, int n) {
   free(d);
   return zd;
 }
-}}
+
+NAMESPACE_END(Approx);
+NAMESPACE_END(Grid);
 
 #ifdef TEST
 
@@ -585,6 +587,7 @@ static PRECISION zolotarev_cayley_eval(PRECISION x, zolotarev_data* rdata) {
   return (ONE - T) / (ONE + T);
 }
 
+
 /* Test program. Apart from printing out the parameters for R(x) it produces
  * the following data files for plotting (unless NPLOT is defined):
  *
@@ -724,5 +727,4 @@ int main(int argc, char** argv) {
 }
 
 #endif /* TEST */
-NAMESPACE_END(Approx);
-NAMESPACE_END(Grid);
+
diff --git a/lib/parallelIO/MetaData.h b/lib/parallelIO/MetaData.h
index a6abcf43..8c350402 100644
--- a/lib/parallelIO/MetaData.h
+++ b/lib/parallelIO/MetaData.h
@@ -177,14 +177,14 @@ template<class vobj> inline void PrepareMetaData(Lattice<vobj> & field, FieldMet
 inline void GaugeStatistics(Lattice<vLorentzColourMatrixF> & data,FieldMetaData &header)
 {
   // How to convert data precision etc...
-  header.link_trace=Grid::QCD::WilsonLoops<PeriodicGimplF>::linkTrace(data);
-  header.plaquette =Grid::QCD::WilsonLoops<PeriodicGimplF>::avgPlaquette(data);
+  header.link_trace=WilsonLoops<PeriodicGimplF>::linkTrace(data);
+  header.plaquette =WilsonLoops<PeriodicGimplF>::avgPlaquette(data);
 }
 inline void GaugeStatistics(Lattice<vLorentzColourMatrixD> & data,FieldMetaData &header)
 {
   // How to convert data precision etc...
-  header.link_trace=Grid::QCD::WilsonLoops<PeriodicGimplD>::linkTrace(data);
-  header.plaquette =Grid::QCD::WilsonLoops<PeriodicGimplD>::avgPlaquette(data);
+  header.link_trace=WilsonLoops<PeriodicGimplD>::linkTrace(data);
+  header.plaquette =WilsonLoops<PeriodicGimplD>::avgPlaquette(data);
 }
 template<> inline void PrepareMetaData<vLorentzColourMatrixF>(Lattice<vLorentzColourMatrixF> & field, FieldMetaData &header)
 {
diff --git a/lib/qcd/action/pseudofermion/TwoFlavourRatio.h b/lib/qcd/action/pseudofermion/TwoFlavourRatio.h
index 7897bb12..21f30000 100644
--- a/lib/qcd/action/pseudofermion/TwoFlavourRatio.h
+++ b/lib/qcd/action/pseudofermion/TwoFlavourRatio.h
@@ -168,6 +168,6 @@ public:
   };
 };
 
-NAMESPACE_END(Grid):
+NAMESPACE_END(Grid);
 
 #endif
diff --git a/lib/qcd/action/scalar/ScalarAction.h b/lib/qcd/action/scalar/ScalarAction.h
index 421cb91a..8480b4b7 100644
--- a/lib/qcd/action/scalar/ScalarAction.h
+++ b/lib/qcd/action/scalar/ScalarAction.h
@@ -36,7 +36,7 @@ directory
 NAMESPACE_BEGIN(Grid);
 
 template <class Impl>
-class ScalarAction : public QCD::Action<typename Impl::Field> {
+class ScalarAction : public Action<typename Impl::Field> {
 public:
   INHERIT_FIELD_TYPES(Impl);
 
@@ -58,7 +58,7 @@ public:
   virtual void refresh(const Field &U, GridParallelRNG &pRNG) {}  // noop as no pseudoferms
 
   virtual RealD S(const Field &p) {
-    return (mass_square * 0.5 + QCD::Nd) * ScalarObs<Impl>::sumphisquared(p) +
+    return (mass_square * 0.5 + Nd) * ScalarObs<Impl>::sumphisquared(p) +
       (lambda / 24.) * ScalarObs<Impl>::sumphifourth(p) +
       ScalarObs<Impl>::sumphider(p);
   };
@@ -69,9 +69,9 @@ public:
     Field p2(p._grid);
     ScalarObs<Impl>::phisquared(p2, p);
     tmp = -(Cshift(p, 0, -1) + Cshift(p, 0, 1));
-    for (int mu = 1; mu < QCD::Nd; mu++) tmp -= Cshift(p, mu, -1) + Cshift(p, mu, 1);
+    for (int mu = 1; mu < Nd; mu++) tmp -= Cshift(p, mu, -1) + Cshift(p, mu, 1);
 
-    force =+(mass_square + 2. * QCD::Nd) * p + (lambda / 6.) * p2 * p + tmp;
+    force =+(mass_square + 2. * Nd) * p + (lambda / 6.) * p2 * p + tmp;
   }
 };
 
diff --git a/lib/qcd/action/scalar/ScalarImpl.h b/lib/qcd/action/scalar/ScalarImpl.h
index 7efd88fe..84fb9923 100644
--- a/lib/qcd/action/scalar/ScalarImpl.h
+++ b/lib/qcd/action/scalar/ScalarImpl.h
@@ -91,7 +91,7 @@ template <class S, unsigned int N>
 class ScalarAdjMatrixImplTypes {
 public:
   typedef S Simd;
-  typedef QCD::SU<N> Group;
+  typedef SU<N> Group;
     
   template <typename vtype>
   using iImplField   = iScalar<iScalar<iMatrix<vtype, N>>>;
@@ -146,9 +146,9 @@ typedef ScalarImplTypes<vComplexF> ScalarImplCF;
 typedef ScalarImplTypes<vComplexD> ScalarImplCD;
     
 // Hardcoding here the size of the matrices
-typedef ScalarAdjMatrixImplTypes<vComplex,  QCD::Nc> ScalarAdjImplR;
-typedef ScalarAdjMatrixImplTypes<vComplexF, QCD::Nc> ScalarAdjImplF;
-typedef ScalarAdjMatrixImplTypes<vComplexD, QCD::Nc> ScalarAdjImplD;
+typedef ScalarAdjMatrixImplTypes<vComplex,  Nc> ScalarAdjImplR;
+typedef ScalarAdjMatrixImplTypes<vComplexF, Nc> ScalarAdjImplF;
+typedef ScalarAdjMatrixImplTypes<vComplexD, Nc> ScalarAdjImplD;
 
 template <int Colours > using ScalarNxNAdjImplR = ScalarAdjMatrixImplTypes<vComplex,   Colours >;
 template <int Colours > using ScalarNxNAdjImplF = ScalarAdjMatrixImplTypes<vComplexF,  Colours >;
diff --git a/lib/qcd/action/scalar/ScalarInteractionAction.h b/lib/qcd/action/scalar/ScalarInteractionAction.h
index eeca6e98..97547655 100644
--- a/lib/qcd/action/scalar/ScalarInteractionAction.h
+++ b/lib/qcd/action/scalar/ScalarInteractionAction.h
@@ -36,7 +36,7 @@ directory
 NAMESPACE_BEGIN(Grid);
 
 template <class Impl, int Ndim >
-class ScalarInteractionAction : public QCD::Action<typename Impl::Field> {
+class ScalarInteractionAction : public Action<typename Impl::Field> {
 public:
   INHERIT_FIELD_TYPES(Impl);
 private:
@@ -116,7 +116,7 @@ public:
     static Stencil phiStencil(p._grid, npoint, 0, directions, displacements);
     phiStencil.HaloExchange(p, compressor);
       
-    //for (int mu = 0; mu < QCD::Nd; mu++) force -= Cshift(p, mu, -1) + Cshift(p, mu, 1);
+    //for (int mu = 0; mu < Nd; mu++) force -= Cshift(p, mu, -1) + Cshift(p, mu, 1);
     for (int point = 0; point < npoint; point++) {
       parallel_for (int i = 0; i < p._grid->oSites(); i++) {
 	const vobj *temp;
diff --git a/lib/qcd/hmc/HMCResourceManager.h b/lib/qcd/hmc/HMCResourceManager.h
index aeff5b8e..f4f5f8a1 100644
--- a/lib/qcd/hmc/HMCResourceManager.h
+++ b/lib/qcd/hmc/HMCResourceManager.h
@@ -53,9 +53,9 @@ NAMESPACE_BEGIN(Grid);
 // HMC Resource manager
 template <class ImplementationPolicy>
 class HMCResourceManager {
-  typedef HMCModuleBase< QCD::BaseHmcCheckpointer<ImplementationPolicy> > CheckpointerBaseModule;
-  typedef HMCModuleBase< QCD::HmcObservable<typename ImplementationPolicy::Field> > ObservableBaseModule;
-  typedef ActionModuleBase< QCD::Action<typename ImplementationPolicy::Field>, GridModule > ActionBaseModule;
+  typedef HMCModuleBase< BaseHmcCheckpointer<ImplementationPolicy> > CheckpointerBaseModule;
+  typedef HMCModuleBase< HmcObservable<typename ImplementationPolicy::Field> > ObservableBaseModule;
+  typedef ActionModuleBase< Action<typename ImplementationPolicy::Field>, GridModule > ActionBaseModule;
 
   // Named storage for grid pairs (std + red-black)
   std::unordered_map<std::string, GridModule> Grids;
diff --git a/lib/qcd/hmc/HMCRunnerModule.h b/lib/qcd/hmc/HMCRunnerModule.h
index a750cde0..fa714a1c 100644
--- a/lib/qcd/hmc/HMCRunnerModule.h
+++ b/lib/qcd/hmc/HMCRunnerModule.h
@@ -36,18 +36,18 @@ NAMESPACE_BEGIN(Grid);
 // if we had a virtual reader would have been unecessary
 template <class HMCType, class ReaderClass >
 class HMCModule
-  : public Parametrized< QCD::HMCparameters >,
-    public HMCModuleBase< QCD::HMCRunnerBase<ReaderClass> > {
+  : public Parametrized< HMCparameters >,
+    public HMCModuleBase< HMCRunnerBase<ReaderClass> > {
 public:
-  typedef HMCModuleBase< QCD::HMCRunnerBase<ReaderClass> > Base;
+  typedef HMCModuleBase< HMCRunnerBase<ReaderClass> > Base;
   typedef typename Base::Product Product;
 
   std::unique_ptr<HMCType> HMCPtr;
 
-  HMCModule(QCD::HMCparameters Par) : Parametrized<QCD::HMCparameters>(Par) {}
+  HMCModule(HMCparameters Par) : Parametrized<HMCparameters>(Par) {}
 
   template <class ReaderCl>
-  HMCModule(Reader<ReaderCl>& R) : Parametrized<QCD::HMCparameters>(R, "HMC"){};
+  HMCModule(Reader<ReaderCl>& R) : Parametrized<HMCparameters>(R, "HMC"){};
 
   Product* getPtr() {
     if (!HMCPtr) initialize();
@@ -62,7 +62,7 @@ private:
 // Factory
 template <char const *str, class ReaderClass >
 class HMCRunnerModuleFactory
-  : public Factory < HMCModuleBase< QCD::HMCRunnerBase<ReaderClass> > ,	Reader<ReaderClass> > {
+  : public Factory < HMCModuleBase< HMCRunnerBase<ReaderClass> > ,	Reader<ReaderClass> > {
 public:
   typedef Reader<ReaderClass> TheReader; 
   // use SINGLETON FUNCTOR MACRO HERE
@@ -88,36 +88,36 @@ private:
 // macro for these
 
 template < class ImplementationPolicy, class RepresentationPolicy, class ReaderClass >
-class HMCLeapFrog: public HMCModule< QCD::GenericHMCRunnerTemplate<ImplementationPolicy, RepresentationPolicy, QCD::LeapFrog>, ReaderClass >{
-  typedef HMCModule< QCD::GenericHMCRunnerTemplate<ImplementationPolicy, RepresentationPolicy, QCD::LeapFrog>, ReaderClass  > HMCBaseMod;
+class HMCLeapFrog: public HMCModule< GenericHMCRunnerTemplate<ImplementationPolicy, RepresentationPolicy, LeapFrog>, ReaderClass >{
+  typedef HMCModule< GenericHMCRunnerTemplate<ImplementationPolicy, RepresentationPolicy, LeapFrog>, ReaderClass  > HMCBaseMod;
   using HMCBaseMod::HMCBaseMod;
 
   // aquire resource
   virtual void initialize(){
-    this->HMCPtr.reset(new QCD::GenericHMCRunnerTemplate<ImplementationPolicy, RepresentationPolicy, QCD::LeapFrog>(this->Par_) );
+    this->HMCPtr.reset(new GenericHMCRunnerTemplate<ImplementationPolicy, RepresentationPolicy, LeapFrog>(this->Par_) );
   }
 };
 
 template < class ImplementationPolicy, class RepresentationPolicy, class ReaderClass >
-class HMCMinimumNorm2: public HMCModule< QCD::GenericHMCRunnerTemplate<ImplementationPolicy, RepresentationPolicy, QCD::MinimumNorm2>, ReaderClass  >{
-  typedef HMCModule< QCD::GenericHMCRunnerTemplate<ImplementationPolicy, RepresentationPolicy, QCD::MinimumNorm2>, ReaderClass  > HMCBaseMod;
+class HMCMinimumNorm2: public HMCModule< GenericHMCRunnerTemplate<ImplementationPolicy, RepresentationPolicy, MinimumNorm2>, ReaderClass  >{
+  typedef HMCModule< GenericHMCRunnerTemplate<ImplementationPolicy, RepresentationPolicy, MinimumNorm2>, ReaderClass  > HMCBaseMod;
   using HMCBaseMod::HMCBaseMod;
 
   // aquire resource
   virtual void initialize(){
-    this->HMCPtr.reset(new QCD::GenericHMCRunnerTemplate<ImplementationPolicy, RepresentationPolicy, QCD::MinimumNorm2>(this->Par_));
+    this->HMCPtr.reset(new GenericHMCRunnerTemplate<ImplementationPolicy, RepresentationPolicy, MinimumNorm2>(this->Par_));
   }
 };
 
 
 template < class ImplementationPolicy, class RepresentationPolicy, class ReaderClass >
-class HMCForceGradient: public HMCModule< QCD::GenericHMCRunnerTemplate<ImplementationPolicy, RepresentationPolicy, QCD::ForceGradient>, ReaderClass  >{
-  typedef HMCModule< QCD::GenericHMCRunnerTemplate<ImplementationPolicy, RepresentationPolicy, QCD::ForceGradient>, ReaderClass   > HMCBaseMod;
+class HMCForceGradient: public HMCModule< GenericHMCRunnerTemplate<ImplementationPolicy, RepresentationPolicy, ForceGradient>, ReaderClass  >{
+  typedef HMCModule< GenericHMCRunnerTemplate<ImplementationPolicy, RepresentationPolicy, ForceGradient>, ReaderClass   > HMCBaseMod;
   using HMCBaseMod::HMCBaseMod;
 
   // aquire resource
   virtual void initialize(){
-    this->HMCPtr.reset(new QCD::GenericHMCRunnerTemplate<ImplementationPolicy, RepresentationPolicy, QCD::ForceGradient>(this->Par_) );
+    this->HMCPtr.reset(new GenericHMCRunnerTemplate<ImplementationPolicy, RepresentationPolicy, ForceGradient>(this->Par_) );
   }
 };
 
diff --git a/lib/qcd/hmc/HMC_GridModules.h b/lib/qcd/hmc/HMC_GridModules.h
index 9967bf53..4236063c 100644
--- a/lib/qcd/hmc/HMC_GridModules.h
+++ b/lib/qcd/hmc/HMC_GridModules.h
@@ -104,7 +104,6 @@ class GridFourDimModule : public GridModule
 public:
   GridFourDimModule()
   {
-    using namespace QCD;
     set_full(SpaceTimeGrid::makeFourDimGrid(
 					    GridDefaultLatt(), 
 					    GridDefaultSimd(4, vector_type::Nsimd()),
@@ -114,7 +113,6 @@ public:
 
   GridFourDimModule(const std::vector<int> tweak_simd)
   {
-    using namespace QCD;
     if (tweak_simd.size() != 4)
       {
 	std::cout << GridLogError
@@ -148,7 +146,6 @@ public:
 
   GridFourDimModule(const GridModuleParameters Params)
   {
-    using namespace QCD;
     std::vector<int> lattice_v = Params.getLattice();
     std::vector<int> mpi_v = Params.getMpi();
     if (lattice_v.size() == 4)
diff --git a/lib/qcd/modules/ActionModules.h b/lib/qcd/modules/ActionModules.h
index 8006bd5c..cef4c036 100644
--- a/lib/qcd/modules/ActionModules.h
+++ b/lib/qcd/modules/ActionModules.h
@@ -52,9 +52,9 @@ public:
 template <class ActionType, class APar>
 class ActionModule
   : public Parametrized<APar>,
-    public ActionModuleBase< QCD::Action<typename ActionType::GaugeField> , QCD::GridModule > {
+    public ActionModuleBase< Action<typename ActionType::GaugeField> , GridModule > {
 public:
-  typedef ActionModuleBase< QCD::Action<typename ActionType::GaugeField>, QCD::GridModule > Base;
+  typedef ActionModuleBase< Action<typename ActionType::GaugeField>, GridModule > Base;
   typedef typename Base::Product Product;
   typedef APar Parameters;
 
@@ -467,31 +467,19 @@ public:
 
 };
 
-}// QCD temporarily here
-
-
-
-
-
-
-
 ////////////////////////////////////////
 // Factories specialisations
 ////////////////////////////////////////
-
-
-
 // use the same classed defined by Antonin, does not make sense to rewrite
 // Factory is perfectly fine
 // Registar must be changed because I do not want to use the ModuleFactory
-
 // explicit ref to LatticeGaugeField must be changed or put in the factory
-//typedef ActionModuleBase< QCD::Action< QCD::LatticeGaugeField >, QCD::GridModule > HMC_LGTActionModBase;
-//typedef ActionModuleBase< QCD::Action< QCD::LatticeReal >, QCD::GridModule > HMC_ScalarActionModBase;
+//typedef ActionModuleBase< Action< LatticeGaugeField >, GridModule > HMC_LGTActionModBase;
+//typedef ActionModuleBase< Action< LatticeReal >, GridModule > HMC_ScalarActionModBase;
 
 template <char const *str, class Field, class ReaderClass >
 class HMC_ActionModuleFactory
-  : public Factory < ActionModuleBase< QCD::Action< Field >, QCD::GridModule > , Reader<ReaderClass> > {
+  : public Factory < ActionModuleBase< Action< Field >, GridModule > , Reader<ReaderClass> > {
 public:
   typedef Reader<ReaderClass> TheReader; 
   // use SINGLETON FUNCTOR MACRO HERE
diff --git a/lib/qcd/modules/FermionOperatorModules.h b/lib/qcd/modules/FermionOperatorModules.h
index b1a3ad04..5af1378e 100644
--- a/lib/qcd/modules/FermionOperatorModules.h
+++ b/lib/qcd/modules/FermionOperatorModules.h
@@ -37,19 +37,19 @@ NAMESPACE_BEGIN(Grid);
 template < class Product>
 class FermionOperatorModuleBase : public HMCModuleBase<Product>{
 public:
-  virtual void AddGridPair(QCD::GridModule&) = 0;
+  virtual void AddGridPair(GridModule&) = 0;
 };
 
 template <template <typename> class FOType, class FermionImpl, class FOPar>
 class FermionOperatorModule
   : public Parametrized<FOPar>,
-    public FermionOperatorModuleBase<QCD::FermionOperator<FermionImpl> > {
+    public FermionOperatorModuleBase<FermionOperator<FermionImpl> > {
 
 protected:
   std::unique_ptr< FOType<FermionImpl> > FOPtr;
-  std::vector< QCD::GridModule* >    GridRefs;
+  std::vector< GridModule* >    GridRefs;
 public:
-  typedef HMCModuleBase< QCD::FermionOperator<FermionImpl> > Base;
+  typedef HMCModuleBase< FermionOperator<FermionImpl> > Base;
   typedef typename Base::Product Product;
 
   FermionOperatorModule(FOPar Par) : Parametrized<FOPar>(Par) {}
@@ -57,7 +57,7 @@ public:
   template <class ReaderClass>
   FermionOperatorModule(Reader<ReaderClass>& Reader) : Parametrized<FOPar>(Reader){};
 
-  void AddGridPair(QCD::GridModule &Mod){
+  void AddGridPair(GridModule &Mod){
     if (GridRefs.size()>1){
       std::cout << GridLogError << "Adding too many Grids to the FermionOperatorModule" << std::endl;
       exit(1);
@@ -65,9 +65,9 @@ public:
     GridRefs.push_back(&Mod);
 
     if (Ls()){
-      GridRefs.push_back(new QCD::GridModule());
-      GridRefs[1]->set_full(QCD::SpaceTimeGrid::makeFiveDimGrid(Ls(),GridRefs[0]->get_full()));
-      GridRefs[1]->set_rb(QCD::SpaceTimeGrid::makeFiveDimRedBlackGrid(Ls(),GridRefs[0]->get_full()));
+      GridRefs.push_back(new GridModule());
+      GridRefs[1]->set_full(SpaceTimeGrid::makeFiveDimGrid(Ls(),GridRefs[0]->get_full()));
+      GridRefs[1]->set_rb(SpaceTimeGrid::makeFiveDimRedBlackGrid(Ls(),GridRefs[0]->get_full()));
     }
   }
 
@@ -94,7 +94,7 @@ private:
 // Factory
 template <char const *str, class FermionImpl, class ReaderClass >
 class HMC_FermionOperatorModuleFactory
-  : public Factory < FermionOperatorModuleBase<QCD::FermionOperator<FermionImpl> > ,  Reader<ReaderClass> > {
+  : public Factory < FermionOperatorModuleBase<FermionOperator<FermionImpl> > ,  Reader<ReaderClass> > {
 public:
   // use SINGLETON FUNCTOR MACRO HERE
   typedef Reader<ReaderClass> TheReader;
diff --git a/lib/qcd/modules/ObservableModules.h b/lib/qcd/modules/ObservableModules.h
index cb9844a5..7ec2bb71 100644
--- a/lib/qcd/modules/ObservableModules.h
+++ b/lib/qcd/modules/ObservableModules.h
@@ -37,9 +37,9 @@ NAMESPACE_BEGIN(Grid);
 template <class ObservableType, class OPar>
 class ObservableModule
   : public Parametrized<OPar>,
-    public HMCModuleBase< QCD::HmcObservable<typename ObservableType::Field> > {
+    public HMCModuleBase< HmcObservable<typename ObservableType::Field> > {
 public:
-  typedef HMCModuleBase< QCD::HmcObservable< typename ObservableType::Field> > Base;
+  typedef HMCModuleBase< HmcObservable< typename ObservableType::Field> > Base;
   typedef typename Base::Product Product;
   typedef OPar Parameters;
 
@@ -105,19 +105,15 @@ public:
   TopologicalChargeMod(): ObsBase(){}
 };
 
-
-}// QCD temporarily here
-
-
 ////////////////////////////////////////
 // Factories specialisations
 ////////////////////////////////////////
 // explicit ref to LatticeGaugeField must be changed or put in the factory
-//typedef HMCModuleBase< QCD::HmcObservable<QCD::LatticeGaugeField> > HMC_ObsModBase;
+//typedef HMCModuleBase< HmcObservable<LatticeGaugeField> > HMC_ObsModBase;
 
 template <char const *str, class Field, class ReaderClass >
 class HMC_ObservablesModuleFactory
-  : public Factory < HMCModuleBase< QCD::HmcObservable<Field> >, Reader<ReaderClass> > {
+  : public Factory < HMCModuleBase< HmcObservable<Field> >, Reader<ReaderClass> > {
 public:
   typedef Reader<ReaderClass> TheReader; 
   // use SINGLETON FUNCTOR MACRO HERE
diff --git a/lib/qcd/spin/Dirac.h b/lib/qcd/spin/Dirac.h
index bedd6a40..b36ba67c 100644
--- a/lib/qcd/spin/Dirac.h
+++ b/lib/qcd/spin/Dirac.h
@@ -39,10 +39,10 @@ See the full license in the file "LICENSE" in the top level distribution directo
 
 NAMESPACE_BEGIN(Grid);
 
-// Dirac algebra adjoint operator (not in QCD:: to overload other adj)
-inline QCD::Gamma adj(const QCD::Gamma &g)
+// Dirac algebra adjoint operator (not in  to overload other adj)
+inline Gamma adj(const Gamma &g)
 {
-  return QCD::Gamma (QCD::Gamma::adj[g.g]);
+  return Gamma (Gamma::adj[g.g]);
 }
 
 
diff --git a/lib/util/Init.cc b/lib/util/Init.cc
index 5182e80f..922c08a3 100644
--- a/lib/util/Init.cc
+++ b/lib/util/Init.cc
@@ -352,21 +352,21 @@ void Grid_init(int *argc,char ***argv)
   ////////////////////////////////////
 
   if( GridCmdOptionExists(*argv,*argv+*argc,"--dslash-unroll") ){
-    QCD::WilsonKernelsStatic::Opt=QCD::WilsonKernelsStatic::OptHandUnroll;
-    QCD::StaggeredKernelsStatic::Opt=QCD::StaggeredKernelsStatic::OptHandUnroll;
+    WilsonKernelsStatic::Opt=WilsonKernelsStatic::OptHandUnroll;
+    StaggeredKernelsStatic::Opt=StaggeredKernelsStatic::OptHandUnroll;
   }
   if( GridCmdOptionExists(*argv,*argv+*argc,"--dslash-asm") ){
-    QCD::WilsonKernelsStatic::Opt=QCD::WilsonKernelsStatic::OptInlineAsm;
-    QCD::StaggeredKernelsStatic::Opt=QCD::StaggeredKernelsStatic::OptInlineAsm;
+    WilsonKernelsStatic::Opt=WilsonKernelsStatic::OptInlineAsm;
+    StaggeredKernelsStatic::Opt=StaggeredKernelsStatic::OptInlineAsm;
   }
   if( GridCmdOptionExists(*argv,*argv+*argc,"--dslash-generic") ){
-    QCD::WilsonKernelsStatic::Opt=QCD::WilsonKernelsStatic::OptGeneric;
-    QCD::StaggeredKernelsStatic::Opt=QCD::StaggeredKernelsStatic::OptGeneric;
+    WilsonKernelsStatic::Opt=WilsonKernelsStatic::OptGeneric;
+    StaggeredKernelsStatic::Opt=StaggeredKernelsStatic::OptGeneric;
   }
   if( GridCmdOptionExists(*argv,*argv+*argc,"--comms-overlap") ){
-    QCD::WilsonKernelsStatic::Comms = QCD::WilsonKernelsStatic::CommsAndCompute;
+    WilsonKernelsStatic::Comms = WilsonKernelsStatic::CommsAndCompute;
   } else {
-    QCD::WilsonKernelsStatic::Comms = QCD::WilsonKernelsStatic::CommsThenCompute;
+    WilsonKernelsStatic::Comms = WilsonKernelsStatic::CommsThenCompute;
   }
   if( GridCmdOptionExists(*argv,*argv+*argc,"--comms-concurrent") ){
     CartesianCommunicator::SetCommunicatorPolicy(CartesianCommunicator::CommunicatorPolicyConcurrent);
diff --git a/tests/IO/Test_ildg_io.cc b/tests/IO/Test_ildg_io.cc
index 6aac2e38..4fcff21d 100644
--- a/tests/IO/Test_ildg_io.cc
+++ b/tests/IO/Test_ildg_io.cc
@@ -31,7 +31,7 @@ Author: paboyle <paboyle@ph.ed.ac.uk>
 
 using namespace std;
 using namespace Grid;
-using namespace Grid::QCD;
+ ;
 
 
 int main (int argc, char ** argv)
diff --git a/tests/IO/Test_ildg_read.cc b/tests/IO/Test_ildg_read.cc
index 958fbe4e..0c841019 100644
--- a/tests/IO/Test_ildg_read.cc
+++ b/tests/IO/Test_ildg_read.cc
@@ -31,7 +31,7 @@ Author: paboyle <paboyle@ph.ed.ac.uk>
 
 using namespace std;
 using namespace Grid;
-using namespace Grid::QCD;
+ ;
 
 
 int main (int argc, char ** argv)
diff --git a/tests/IO/Test_nersc_io.cc b/tests/IO/Test_nersc_io.cc
index ca04e623..82d44000 100644
--- a/tests/IO/Test_nersc_io.cc
+++ b/tests/IO/Test_nersc_io.cc
@@ -31,7 +31,7 @@ Author: paboyle <paboyle@ph.ed.ac.uk>
 
 using namespace std;
 using namespace Grid;
-using namespace Grid::QCD;
+ ;
 
 
 int main (int argc, char ** argv)
diff --git a/tests/IO/Test_nersc_read.cc b/tests/IO/Test_nersc_read.cc
index 66b2d62e..81f8734b 100644
--- a/tests/IO/Test_nersc_read.cc
+++ b/tests/IO/Test_nersc_read.cc
@@ -31,7 +31,7 @@ Author: paboyle <paboyle@ph.ed.ac.uk>
 
 using namespace std;
 using namespace Grid;
-using namespace Grid::QCD;
+ ;
 
 
 int main (int argc, char ** argv)
diff --git a/tests/IO/Test_serialisation.cc b/tests/IO/Test_serialisation.cc
index 82638ad9..ade91808 100644
--- a/tests/IO/Test_serialisation.cc
+++ b/tests/IO/Test_serialisation.cc
@@ -30,7 +30,7 @@ Author: Peter Boyle <paboyle@ph.ed.ac.uk>
 #include <Grid/Grid.h>
 
 using namespace Grid;
-using namespace Grid::QCD;
+ ;
 
 GRID_SERIALIZABLE_ENUM(myenum, undef, red, 1, blue, 2, green, 3);
 
diff --git a/tests/Test_cayley_even_odd_vec.cc b/tests/Test_cayley_even_odd_vec.cc
index fc271001..371cdd03 100644
--- a/tests/Test_cayley_even_odd_vec.cc
+++ b/tests/Test_cayley_even_odd_vec.cc
@@ -29,7 +29,7 @@ Author: Peter Boyle <paboyle@ph.ed.ac.uk>
 
 using namespace std;
 using namespace Grid;
-using namespace Grid::QCD;
+ ;
 
 template<class d>
 struct scal {
diff --git a/tests/Test_cshift.cc b/tests/Test_cshift.cc
index f9559a83..a5f4eb03 100644
--- a/tests/Test_cshift.cc
+++ b/tests/Test_cshift.cc
@@ -29,7 +29,7 @@ Author: Peter Boyle <paboyle@ph.ed.ac.uk>
 #include <Grid/Grid.h>
 
 using namespace Grid;
-using namespace Grid::QCD;
+ ;
 
 int main (int argc, char ** argv)
 {
diff --git a/tests/Test_dwf_mixedcg_prec.cc b/tests/Test_dwf_mixedcg_prec.cc
index 2601b76c..ba07124b 100644
--- a/tests/Test_dwf_mixedcg_prec.cc
+++ b/tests/Test_dwf_mixedcg_prec.cc
@@ -29,7 +29,7 @@ Author: Peter Boyle <paboyle@ph.ed.ac.uk>
 
 using namespace std;
 using namespace Grid;
-using namespace Grid::QCD;
+ ;
 
 template<class d>
 struct scal {
diff --git a/tests/Test_dwf_mixedcg_prec_halfcomms.cc b/tests/Test_dwf_mixedcg_prec_halfcomms.cc
index d6aaa21e..b10561f6 100644
--- a/tests/Test_dwf_mixedcg_prec_halfcomms.cc
+++ b/tests/Test_dwf_mixedcg_prec_halfcomms.cc
@@ -29,7 +29,7 @@ Author: Peter Boyle <paboyle@ph.ed.ac.uk>
 
 using namespace std;
 using namespace Grid;
-using namespace Grid::QCD;
+ ;
 
 template<class d>
 struct scal {
diff --git a/tests/Test_simd.cc b/tests/Test_simd.cc
index b2e8d68e..a3dc200f 100644
--- a/tests/Test_simd.cc
+++ b/tests/Test_simd.cc
@@ -30,7 +30,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 
 using namespace std;
 using namespace Grid;
-using namespace Grid::QCD;
+ ;
 
 class funcPlus {
 public:
diff --git a/tests/Test_stencil.cc b/tests/Test_stencil.cc
index e9517446..2f8444b6 100644
--- a/tests/Test_stencil.cc
+++ b/tests/Test_stencil.cc
@@ -31,7 +31,7 @@ Author: paboyle <paboyle@ph.ed.ac.uk>
 
 using namespace std;
 using namespace Grid;
-using namespace Grid::QCD;
+ ;
 
 int main(int argc, char ** argv) {
   Grid_init(&argc, &argv);
diff --git a/tests/core/Test_GaugeAction.cc b/tests/core/Test_GaugeAction.cc
index 572f19fb..a8a18522 100644
--- a/tests/core/Test_GaugeAction.cc
+++ b/tests/core/Test_GaugeAction.cc
@@ -31,7 +31,7 @@ Author: paboyle <paboyle@ph.ed.ac.uk>
 
 using namespace std;
 using namespace Grid;
-using namespace Grid::QCD;
+ ;
 
 
 /* For Metropolis */
diff --git a/tests/core/Test_RectPlaq.cc b/tests/core/Test_RectPlaq.cc
index 2e9cc832..67310f3b 100644
--- a/tests/core/Test_RectPlaq.cc
+++ b/tests/core/Test_RectPlaq.cc
@@ -30,7 +30,7 @@ Author: paboyle <paboyle@ph.ed.ac.uk>
 
 using namespace std;
 using namespace Grid;
-using namespace Grid::QCD;
+ ;
 
 
 /* For Metropolis */
diff --git a/tests/core/Test_cf_coarsen_support.cc b/tests/core/Test_cf_coarsen_support.cc
index 35a8a764..e0a9e5f6 100644
--- a/tests/core/Test_cf_coarsen_support.cc
+++ b/tests/core/Test_cf_coarsen_support.cc
@@ -29,7 +29,7 @@ Author: Peter Boyle <paboyle@ph.ed.ac.uk>
 
 using namespace std;
 using namespace Grid;
-using namespace Grid::QCD;
+ ;
 
 template<class d>
 struct scal {
diff --git a/tests/core/Test_checker.cc b/tests/core/Test_checker.cc
index 56b0eb60..146ae13f 100644
--- a/tests/core/Test_checker.cc
+++ b/tests/core/Test_checker.cc
@@ -30,7 +30,7 @@ Author: Peter Boyle <paboyle@ph.ed.ac.uk>
 
 using namespace std;
 using namespace Grid;
-using namespace Grid::QCD;
+ ;
 
 template<class d>
 struct scal {
diff --git a/tests/core/Test_contfrac_even_odd.cc b/tests/core/Test_contfrac_even_odd.cc
index 9ad0be5a..1bfae07d 100644
--- a/tests/core/Test_contfrac_even_odd.cc
+++ b/tests/core/Test_contfrac_even_odd.cc
@@ -29,7 +29,7 @@ Author: Peter Boyle <paboyle@ph.ed.ac.uk>
 
 using namespace std;
 using namespace Grid;
-using namespace Grid::QCD;
+ ;
 
 template<class d>
 struct scal {
diff --git a/tests/core/Test_cshift_red_black.cc b/tests/core/Test_cshift_red_black.cc
index c7b0c2f1..5b925350 100644
--- a/tests/core/Test_cshift_red_black.cc
+++ b/tests/core/Test_cshift_red_black.cc
@@ -30,7 +30,7 @@ Author: paboyle <paboyle@ph.ed.ac.uk>
 #include <Grid/Grid.h>
 
 using namespace Grid;
-using namespace Grid::QCD;
+ ;
 
 #define POWER10
 
diff --git a/tests/core/Test_cshift_red_black_rotate.cc b/tests/core/Test_cshift_red_black_rotate.cc
index aa9e6104..43a92d85 100644
--- a/tests/core/Test_cshift_red_black_rotate.cc
+++ b/tests/core/Test_cshift_red_black_rotate.cc
@@ -30,7 +30,7 @@ Author: paboyle <paboyle@ph.ed.ac.uk>
 #include <Grid/Grid.h>
 
 using namespace Grid;
-using namespace Grid::QCD;
+ ;
 
 #define POWER10
 
diff --git a/tests/core/Test_cshift_rotate.cc b/tests/core/Test_cshift_rotate.cc
index 64c08892..466f32a6 100644
--- a/tests/core/Test_cshift_rotate.cc
+++ b/tests/core/Test_cshift_rotate.cc
@@ -29,7 +29,7 @@ Author: Peter Boyle <paboyle@ph.ed.ac.uk>
 #include <Grid/Grid.h>
 
 using namespace Grid;
-using namespace Grid::QCD;
+ ;
 
 int main (int argc, char ** argv)
 {
diff --git a/tests/core/Test_dwf_eofa_even_odd.cc b/tests/core/Test_dwf_eofa_even_odd.cc
index 5fe0f653..85e3b239 100644
--- a/tests/core/Test_dwf_eofa_even_odd.cc
+++ b/tests/core/Test_dwf_eofa_even_odd.cc
@@ -32,7 +32,7 @@ See the full license in the file "LICENSE" in the top level distribution directo
 
 using namespace std;
 using namespace Grid;
-using namespace Grid::QCD;
+ ;
 
 template<class d>
 struct scal {
diff --git a/tests/core/Test_dwf_even_odd.cc b/tests/core/Test_dwf_even_odd.cc
index 0424301c..ade428ec 100644
--- a/tests/core/Test_dwf_even_odd.cc
+++ b/tests/core/Test_dwf_even_odd.cc
@@ -30,7 +30,7 @@ Author: paboyle <paboyle@ph.ed.ac.uk>
 
 using namespace std;
 using namespace Grid;
-using namespace Grid::QCD;
+ ;
 
 template<class d>
 struct scal {
diff --git a/tests/core/Test_dwf_rb5d.cc b/tests/core/Test_dwf_rb5d.cc
index 68c1755e..e606f588 100644
--- a/tests/core/Test_dwf_rb5d.cc
+++ b/tests/core/Test_dwf_rb5d.cc
@@ -30,7 +30,7 @@ Author: paboyle <paboyle@ph.ed.ac.uk>
 
 using namespace std;
 using namespace Grid;
-using namespace Grid::QCD;
+ ;
 
 template<class d>
 struct scal {
diff --git a/tests/core/Test_fft.cc b/tests/core/Test_fft.cc
index b2336cfa..f9821151 100644
--- a/tests/core/Test_fft.cc
+++ b/tests/core/Test_fft.cc
@@ -29,7 +29,7 @@ Author: Peter Boyle <paboyle@ph.ed.ac.uk>
 #include <Grid/Grid.h>
 
 using namespace Grid;
-using namespace Grid::QCD;
+ ;
 
 int main (int argc, char ** argv)
 {
diff --git a/tests/core/Test_fft_gfix.cc b/tests/core/Test_fft_gfix.cc
index 916c4b0b..4a26647e 100644
--- a/tests/core/Test_fft_gfix.cc
+++ b/tests/core/Test_fft_gfix.cc
@@ -29,7 +29,7 @@ Author: Peter Boyle <paboyle@ph.ed.ac.uk>
 #include <Grid/Grid.h>
 
 using namespace Grid;
-using namespace Grid::QCD;
+ ;
 
 int main (int argc, char ** argv)
 {
diff --git a/tests/core/Test_fftf.cc b/tests/core/Test_fftf.cc
index 22838f7b..11076cf4 100644
--- a/tests/core/Test_fftf.cc
+++ b/tests/core/Test_fftf.cc
@@ -29,7 +29,7 @@ Author: Peter Boyle <paboyle@ph.ed.ac.uk>
 #include <Grid/Grid.h>
 
 using namespace Grid;
-using namespace Grid::QCD;
+ ;
 
 int main (int argc, char ** argv)
 {
diff --git a/tests/core/Test_gparity.cc b/tests/core/Test_gparity.cc
index 81091e9e..02bb6d17 100644
--- a/tests/core/Test_gparity.cc
+++ b/tests/core/Test_gparity.cc
@@ -31,7 +31,7 @@ Author: paboyle <paboyle@ph.ed.ac.uk>
 
 using namespace std;
 using namespace Grid;
-using namespace Grid::QCD;
+ ;
 
 //typedef GparityDomainWallFermionD GparityDiracOp;
 //typedef DomainWallFermionD StandardDiracOp;
diff --git a/tests/core/Test_gpwilson_even_odd.cc b/tests/core/Test_gpwilson_even_odd.cc
index 2069eb40..c3a343e2 100644
--- a/tests/core/Test_gpwilson_even_odd.cc
+++ b/tests/core/Test_gpwilson_even_odd.cc
@@ -30,7 +30,7 @@ Author: paboyle <paboyle@ph.ed.ac.uk>
 
 using namespace std;
 using namespace Grid;
-using namespace Grid::QCD;
+ ;
 
 int main (int argc, char ** argv)
 {
diff --git a/tests/core/Test_lie_generators.cc b/tests/core/Test_lie_generators.cc
index 114b49f7..2213d7f7 100644
--- a/tests/core/Test_lie_generators.cc
+++ b/tests/core/Test_lie_generators.cc
@@ -42,7 +42,7 @@ directory
 
 using namespace std;
 using namespace Grid;
-using namespace Grid::QCD;
+ ;
 
 int main(int argc, char** argv) {
   Grid_init(&argc, &argv);
diff --git a/tests/core/Test_main.cc b/tests/core/Test_main.cc
index a5f1bcd5..e5f675f1 100644
--- a/tests/core/Test_main.cc
+++ b/tests/core/Test_main.cc
@@ -32,7 +32,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 
 using namespace std;
 using namespace Grid;
-using namespace Grid::QCD;
+ ;
 
 /*
  Grid_main.cc(232): error: no suitable user-defined conversion from
diff --git a/tests/core/Test_mobius_eofa_even_odd.cc b/tests/core/Test_mobius_eofa_even_odd.cc
index fceb58f6..00e46355 100644
--- a/tests/core/Test_mobius_eofa_even_odd.cc
+++ b/tests/core/Test_mobius_eofa_even_odd.cc
@@ -32,7 +32,7 @@ See the full license in the file "LICENSE" in the top level distribution directo
 
 using namespace std;
 using namespace Grid;
-using namespace Grid::QCD;
+ ;
 
 template<class d>
 struct scal {
diff --git a/tests/core/Test_mobius_even_odd.cc b/tests/core/Test_mobius_even_odd.cc
index 3c9ac520..e83a1f77 100644
--- a/tests/core/Test_mobius_even_odd.cc
+++ b/tests/core/Test_mobius_even_odd.cc
@@ -30,7 +30,7 @@ Author: paboyle <paboyle@ph.ed.ac.uk>
 
 using namespace std;
 using namespace Grid;
-using namespace Grid::QCD;
+ ;
 
 template<class d>
 struct scal {
diff --git a/tests/core/Test_poisson_fft.cc b/tests/core/Test_poisson_fft.cc
index 2252ec7a..f7e3a333 100644
--- a/tests/core/Test_poisson_fft.cc
+++ b/tests/core/Test_poisson_fft.cc
@@ -29,7 +29,7 @@ Author: Peter Boyle <paboyle@ph.ed.ac.uk>
 #include <Grid/Grid.h>
 
 using namespace Grid;
-using namespace Grid::QCD;
+ ;
 
 int main (int argc, char ** argv)
 {
diff --git a/tests/core/Test_quenched_update.cc b/tests/core/Test_quenched_update.cc
index 66d65309..760718c5 100644
--- a/tests/core/Test_quenched_update.cc
+++ b/tests/core/Test_quenched_update.cc
@@ -30,7 +30,7 @@ Author: Peter Boyle <paboyle@ph.ed.ac.uk>
 
 using namespace std;
 using namespace Grid;
-using namespace Grid::QCD;
+ ;
 
 int main (int argc, char ** argv)
 {
diff --git a/tests/core/Test_rng.cc b/tests/core/Test_rng.cc
index b5d27c29..8ff9554a 100644
--- a/tests/core/Test_rng.cc
+++ b/tests/core/Test_rng.cc
@@ -29,7 +29,7 @@ Author: Peter Boyle <paboyle@ph.ed.ac.uk>
 
 using namespace std;
 using namespace Grid;
-using namespace Grid::QCD;
+ ;
 
 int main (int argc, char ** argv)
 {
diff --git a/tests/core/Test_rng_fixed.cc b/tests/core/Test_rng_fixed.cc
index 3c4a27e1..83ed1a4b 100644
--- a/tests/core/Test_rng_fixed.cc
+++ b/tests/core/Test_rng_fixed.cc
@@ -29,7 +29,7 @@ Author: Peter Boyle <paboyle@ph.ed.ac.uk>
 
 using namespace std;
 using namespace Grid;
-using namespace Grid::QCD;
+ ;
 
 int main (int argc, char ** argv)
 {
diff --git a/tests/core/Test_staggered.cc b/tests/core/Test_staggered.cc
index f8f7035a..96b709d3 100644
--- a/tests/core/Test_staggered.cc
+++ b/tests/core/Test_staggered.cc
@@ -30,7 +30,7 @@ Author: paboyle <paboyle@ph.ed.ac.uk>
 
 using namespace std;
 using namespace Grid;
-using namespace Grid::QCD;
+ ;
 
 int main (int argc, char ** argv)
 {
diff --git a/tests/core/Test_staggered5D.cc b/tests/core/Test_staggered5D.cc
index be31c438..f13415a2 100644
--- a/tests/core/Test_staggered5D.cc
+++ b/tests/core/Test_staggered5D.cc
@@ -30,7 +30,7 @@ Author: paboyle <paboyle@ph.ed.ac.uk>
 
 using namespace std;
 using namespace Grid;
-using namespace Grid::QCD;
+ ;
 
 int main (int argc, char ** argv)
 {
diff --git a/tests/core/Test_staggered5Dvec.cc b/tests/core/Test_staggered5Dvec.cc
index db76f792..f2e73cd1 100644
--- a/tests/core/Test_staggered5Dvec.cc
+++ b/tests/core/Test_staggered5Dvec.cc
@@ -30,7 +30,7 @@ Author: paboyle <paboyle@ph.ed.ac.uk>
 
 using namespace std;
 using namespace Grid;
-using namespace Grid::QCD;
+ ;
 
 int main (int argc, char ** argv)
 {
diff --git a/tests/core/Test_wilson_even_odd.cc b/tests/core/Test_wilson_even_odd.cc
index 909a2509..20d271de 100644
--- a/tests/core/Test_wilson_even_odd.cc
+++ b/tests/core/Test_wilson_even_odd.cc
@@ -29,7 +29,7 @@ Author: paboyle <paboyle@ph.ed.ac.uk>
 
 using namespace std;
 using namespace Grid;
-using namespace Grid::QCD;
+ ;
 
 template<class d>
 struct scal {
diff --git a/tests/core/Test_wilson_twisted_mass_even_odd.cc b/tests/core/Test_wilson_twisted_mass_even_odd.cc
index adc5c9c9..04e18615 100644
--- a/tests/core/Test_wilson_twisted_mass_even_odd.cc
+++ b/tests/core/Test_wilson_twisted_mass_even_odd.cc
@@ -30,7 +30,7 @@ Author: paboyle <paboyle@ph.ed.ac.uk>
 
 using namespace std;
 using namespace Grid;
-using namespace Grid::QCD;
+ ;
 
 template<class d>
 struct scal {
diff --git a/tests/core/Test_zmobius_even_odd.cc b/tests/core/Test_zmobius_even_odd.cc
index 867c3359..473e9c08 100644
--- a/tests/core/Test_zmobius_even_odd.cc
+++ b/tests/core/Test_zmobius_even_odd.cc
@@ -30,7 +30,7 @@ Author: paboyle <paboyle@ph.ed.ac.uk>
 
 using namespace std;
 using namespace Grid;
-using namespace Grid::QCD;
+ ;
 
 template<class d>
 struct scal {
diff --git a/tests/debug/Test_cayley_cg.cc b/tests/debug/Test_cayley_cg.cc
index 57fe7717..226b7bc6 100644
--- a/tests/debug/Test_cayley_cg.cc
+++ b/tests/debug/Test_cayley_cg.cc
@@ -30,7 +30,7 @@ Author: paboyle <paboyle@ph.ed.ac.uk>
 
 using namespace std;
 using namespace Grid;
-using namespace Grid::QCD;
+ ;
 
 template<class d>
 struct scal {
diff --git a/tests/debug/Test_cayley_coarsen_support.cc b/tests/debug/Test_cayley_coarsen_support.cc
index c6532a0d..3958b71b 100644
--- a/tests/debug/Test_cayley_coarsen_support.cc
+++ b/tests/debug/Test_cayley_coarsen_support.cc
@@ -30,7 +30,7 @@ Author: Peter Boyle <paboyle@ph.ed.ac.uk>
 
 using namespace std;
 using namespace Grid;
-using namespace Grid::QCD;
+ ;
 
 
 template<class d>
diff --git a/tests/debug/Test_cayley_even_odd.cc b/tests/debug/Test_cayley_even_odd.cc
index e226ac4a..a97e28a8 100644
--- a/tests/debug/Test_cayley_even_odd.cc
+++ b/tests/debug/Test_cayley_even_odd.cc
@@ -29,7 +29,7 @@ Author: Peter Boyle <paboyle@ph.ed.ac.uk>
 
 using namespace std;
 using namespace Grid;
-using namespace Grid::QCD;
+ ;
 
 template<class d>
 struct scal {
diff --git a/tests/debug/Test_cayley_ldop_cr.cc b/tests/debug/Test_cayley_ldop_cr.cc
index cbefdd46..7080d9e4 100644
--- a/tests/debug/Test_cayley_ldop_cr.cc
+++ b/tests/debug/Test_cayley_ldop_cr.cc
@@ -29,7 +29,7 @@ Author: Peter Boyle <paboyle@ph.ed.ac.uk>
 
 using namespace std;
 using namespace Grid;
-using namespace Grid::QCD;
+ ;
 
 int main (int argc, char ** argv)
 {
diff --git a/tests/debug/Test_cheby.cc b/tests/debug/Test_cheby.cc
index 72d07885..ad5022ec 100644
--- a/tests/debug/Test_cheby.cc
+++ b/tests/debug/Test_cheby.cc
@@ -29,7 +29,7 @@ Author: Peter Boyle <paboyle@ph.ed.ac.uk>
 
 using namespace std;
 using namespace Grid;
-using namespace Grid::QCD;
+ ;
 
 RealD InverseApproximation(RealD x){
   return 1.0/x;
diff --git a/tests/debug/Test_heatbath_dwf_eofa.cc b/tests/debug/Test_heatbath_dwf_eofa.cc
index b77bc982..1e64a568 100644
--- a/tests/debug/Test_heatbath_dwf_eofa.cc
+++ b/tests/debug/Test_heatbath_dwf_eofa.cc
@@ -38,7 +38,7 @@ Author: David Murphy <dmurphy@phys.columbia.edu>
 
 using namespace std;
 using namespace Grid;
-using namespace Grid::QCD;
+ ;
 
 // Parameters for test
 const std::vector<int> grid_dim = { 8, 8, 8, 8 };
diff --git a/tests/debug/Test_heatbath_dwf_eofa_gparity.cc b/tests/debug/Test_heatbath_dwf_eofa_gparity.cc
index 5c9d4923..cc118d1d 100644
--- a/tests/debug/Test_heatbath_dwf_eofa_gparity.cc
+++ b/tests/debug/Test_heatbath_dwf_eofa_gparity.cc
@@ -38,7 +38,7 @@ Author: David Murphy <dmurphy@phys.columbia.edu>
 
 using namespace std;
 using namespace Grid;
-using namespace Grid::QCD;
+ ;
 
 typedef GparityWilsonImplR FermionImplPolicy;
 typedef GparityDomainWallEOFAFermionR FermionAction;
diff --git a/tests/debug/Test_heatbath_mobius_eofa.cc b/tests/debug/Test_heatbath_mobius_eofa.cc
index a952873d..95ab935e 100644
--- a/tests/debug/Test_heatbath_mobius_eofa.cc
+++ b/tests/debug/Test_heatbath_mobius_eofa.cc
@@ -38,7 +38,7 @@ See the full license in the file "LICENSE" in the top level distribution directo
 
 using namespace std;
 using namespace Grid;
-using namespace Grid::QCD;
+ ;
 
 // Parameters for test
 const std::vector<int> grid_dim = { 8, 8, 8, 8 };
diff --git a/tests/debug/Test_heatbath_mobius_eofa_gparity.cc b/tests/debug/Test_heatbath_mobius_eofa_gparity.cc
index 08c6d566..7ed3a308 100644
--- a/tests/debug/Test_heatbath_mobius_eofa_gparity.cc
+++ b/tests/debug/Test_heatbath_mobius_eofa_gparity.cc
@@ -38,7 +38,7 @@ See the full license in the file "LICENSE" in the top level distribution directo
 
 using namespace std;
 using namespace Grid;
-using namespace Grid::QCD;
+ ;
 
 typedef GparityWilsonImplR FermionImplPolicy;
 typedef GparityMobiusEOFAFermionR FermionAction;
diff --git a/tests/debug/Test_reweight_dwf_eofa.cc b/tests/debug/Test_reweight_dwf_eofa.cc
index 98a17e2f..24fa6445 100644
--- a/tests/debug/Test_reweight_dwf_eofa.cc
+++ b/tests/debug/Test_reweight_dwf_eofa.cc
@@ -31,7 +31,7 @@ See the full license in the file "LICENSE" in the top level distribution directo
 
 using namespace std;
 using namespace Grid;
-using namespace Grid::QCD;
+ ;
 
 // parameters for test
 const std::vector<int> grid_dim = { 8, 8, 8, 8 };
diff --git a/tests/debug/Test_reweight_dwf_eofa_gparity.cc b/tests/debug/Test_reweight_dwf_eofa_gparity.cc
index bb0fd98e..9f58061c 100644
--- a/tests/debug/Test_reweight_dwf_eofa_gparity.cc
+++ b/tests/debug/Test_reweight_dwf_eofa_gparity.cc
@@ -31,7 +31,7 @@ See the full license in the file "LICENSE" in the top level distribution directo
 
 using namespace std;
 using namespace Grid;
-using namespace Grid::QCD;
+ ;
 
 typedef typename GparityDomainWallFermionR::FermionField FermionField;
 
diff --git a/tests/debug/Test_reweight_mobius_eofa.cc b/tests/debug/Test_reweight_mobius_eofa.cc
index c4fa78d0..e885b538 100644
--- a/tests/debug/Test_reweight_mobius_eofa.cc
+++ b/tests/debug/Test_reweight_mobius_eofa.cc
@@ -31,7 +31,7 @@ See the full license in the file "LICENSE" in the top level distribution directo
 
 using namespace std;
 using namespace Grid;
-using namespace Grid::QCD;
+ ;
 
 // parameters for test
 const std::vector<int> grid_dim = { 8, 8, 8, 8 };
diff --git a/tests/debug/Test_reweight_mobius_eofa_gparity.cc b/tests/debug/Test_reweight_mobius_eofa_gparity.cc
index 11a242d2..3a8b6d82 100644
--- a/tests/debug/Test_reweight_mobius_eofa_gparity.cc
+++ b/tests/debug/Test_reweight_mobius_eofa_gparity.cc
@@ -31,7 +31,7 @@ See the full license in the file "LICENSE" in the top level distribution directo
 
 using namespace std;
 using namespace Grid;
-using namespace Grid::QCD;
+ ;
 
 typedef typename GparityDomainWallFermionR::FermionField FermionField;
 
diff --git a/tests/debug/Test_zmm.cc b/tests/debug/Test_zmm.cc
index 92bae882..ed4c8a40 100644
--- a/tests/debug/Test_zmm.cc
+++ b/tests/debug/Test_zmm.cc
@@ -37,7 +37,7 @@ int main(int argc,char **argv)
 #if 0
 #include <simd/Intel512wilson.h>
 using namespace Grid;
-using namespace Grid::QCD;
+ ;
 
 void ZmulF(void *ptr1,void *ptr2,void *ptr3);
 void Zmul(void *ptr1,void *ptr2,void *ptr3);
diff --git a/tests/debug/test_Grid_jacobi.cc b/tests/debug/test_Grid_jacobi.cc
index 8561f686..c6209fe7 100644
--- a/tests/debug/test_Grid_jacobi.cc
+++ b/tests/debug/test_Grid_jacobi.cc
@@ -29,7 +29,7 @@ Author: Peter Boyle <paboyle@ph.ed.ac.uk>
 
 using namespace std;
 using namespace Grid;
-using namespace Grid::QCD;
+ ;
 
 template<class vobj>
 class LinearOperator {
diff --git a/tests/forces/Test_contfrac_force.cc b/tests/forces/Test_contfrac_force.cc
index 2afb4dde..09290d42 100644
--- a/tests/forces/Test_contfrac_force.cc
+++ b/tests/forces/Test_contfrac_force.cc
@@ -29,7 +29,7 @@ Author: Peter Boyle <paboyle@ph.ed.ac.uk>
 
 using namespace std;
 using namespace Grid;
-using namespace Grid::QCD;
+ ;
 
 int main (int argc, char ** argv)
 {
diff --git a/tests/forces/Test_dwf_force.cc b/tests/forces/Test_dwf_force.cc
index 59aee7b7..5cd49578 100644
--- a/tests/forces/Test_dwf_force.cc
+++ b/tests/forces/Test_dwf_force.cc
@@ -29,7 +29,7 @@ Author: Peter Boyle <paboyle@ph.ed.ac.uk>
 
 using namespace std;
 using namespace Grid;
-using namespace Grid::QCD;
+ ;
 
 int main (int argc, char ** argv)
 {
diff --git a/tests/forces/Test_dwf_force_eofa.cc b/tests/forces/Test_dwf_force_eofa.cc
index f17579ae..50ad5237 100644
--- a/tests/forces/Test_dwf_force_eofa.cc
+++ b/tests/forces/Test_dwf_force_eofa.cc
@@ -31,7 +31,7 @@ See the full license in the file "LICENSE" in the top level distribution directo
 
 using namespace std;
 using namespace Grid;
-using namespace Grid::QCD;
+ ;
 
 int main (int argc, char** argv)
 {
diff --git a/tests/forces/Test_dwf_gpforce.cc b/tests/forces/Test_dwf_gpforce.cc
index 98453aab..f9a6ff82 100644
--- a/tests/forces/Test_dwf_gpforce.cc
+++ b/tests/forces/Test_dwf_gpforce.cc
@@ -29,7 +29,7 @@ Author: paboyle <paboyle@ph.ed.ac.uk>
 
 using namespace std;
 using namespace Grid;
-using namespace Grid::QCD;
+ ;
 
  
 
diff --git a/tests/forces/Test_dwf_gpforce_eofa.cc b/tests/forces/Test_dwf_gpforce_eofa.cc
index 3afeaa43..781f053f 100644
--- a/tests/forces/Test_dwf_gpforce_eofa.cc
+++ b/tests/forces/Test_dwf_gpforce_eofa.cc
@@ -31,7 +31,7 @@ See the full license in the file "LICENSE" in the top level distribution directo
 
 using namespace std;
 using namespace Grid;
-using namespace Grid::QCD;
+ ;
 
 typedef GparityWilsonImplR FermionImplPolicy;
 typedef GparityDomainWallEOFAFermionR FermionAction;
diff --git a/tests/forces/Test_gp_rect_force.cc b/tests/forces/Test_gp_rect_force.cc
index bb35c77a..a72116e6 100644
--- a/tests/forces/Test_gp_rect_force.cc
+++ b/tests/forces/Test_gp_rect_force.cc
@@ -29,7 +29,7 @@ Author: paboyle <paboyle@ph.ed.ac.uk>
 
 using namespace std;
 using namespace Grid;
-using namespace Grid::QCD;
+ ;
 
  
 
diff --git a/tests/forces/Test_gpdwf_force.cc b/tests/forces/Test_gpdwf_force.cc
index ca9b0a2c..c868be22 100644
--- a/tests/forces/Test_gpdwf_force.cc
+++ b/tests/forces/Test_gpdwf_force.cc
@@ -29,7 +29,7 @@ Author: paboyle <paboyle@ph.ed.ac.uk>
 
 using namespace std;
 using namespace Grid;
-using namespace Grid::QCD;
+ ;
 
  
 
diff --git a/tests/forces/Test_gpwilson_force.cc b/tests/forces/Test_gpwilson_force.cc
index ebde61a5..6847c212 100644
--- a/tests/forces/Test_gpwilson_force.cc
+++ b/tests/forces/Test_gpwilson_force.cc
@@ -29,7 +29,7 @@ Author: paboyle <paboyle@ph.ed.ac.uk>
 
 using namespace std;
 using namespace Grid;
-using namespace Grid::QCD;
+ ;
 
  
 
diff --git a/tests/forces/Test_laplacian_force.cc b/tests/forces/Test_laplacian_force.cc
index bae80c0b..a4780683 100644
--- a/tests/forces/Test_laplacian_force.cc
+++ b/tests/forces/Test_laplacian_force.cc
@@ -29,7 +29,7 @@ Author: Azusa Yamaguchi <ayamaguc@staffmail.ed.ac.uk>
 
 using namespace std;
 using namespace Grid;
-using namespace Grid::QCD;
+ ;
 
 #define parallel_for PARALLEL_FOR_LOOP for
 
diff --git a/tests/forces/Test_mobius_force.cc b/tests/forces/Test_mobius_force.cc
index 06a17ffe..58ef3613 100644
--- a/tests/forces/Test_mobius_force.cc
+++ b/tests/forces/Test_mobius_force.cc
@@ -29,7 +29,7 @@ Author: Peter Boyle <paboyle@ph.ed.ac.uk>
 
 using namespace std;
 using namespace Grid;
-using namespace Grid::QCD;
+ ;
 
 int main (int argc, char ** argv)
 {
diff --git a/tests/forces/Test_mobius_force_eofa.cc b/tests/forces/Test_mobius_force_eofa.cc
index 2a5a7d04..8fa10b73 100644
--- a/tests/forces/Test_mobius_force_eofa.cc
+++ b/tests/forces/Test_mobius_force_eofa.cc
@@ -31,7 +31,7 @@ See the full license in the file "LICENSE" in the top level distribution directo
 
 using namespace std;
 using namespace Grid;
-using namespace Grid::QCD;
+ ;
 
 int main (int argc, char** argv)
 {
diff --git a/tests/forces/Test_mobius_gpforce_eofa.cc b/tests/forces/Test_mobius_gpforce_eofa.cc
index 72f1dee2..b464ac90 100644
--- a/tests/forces/Test_mobius_gpforce_eofa.cc
+++ b/tests/forces/Test_mobius_gpforce_eofa.cc
@@ -31,7 +31,7 @@ See the full license in the file "LICENSE" in the top level distribution directo
 
 using namespace std;
 using namespace Grid;
-using namespace Grid::QCD;
+ ;
 
 typedef GparityWilsonImplR FermionImplPolicy;
 typedef GparityMobiusEOFAFermionR FermionAction;
diff --git a/tests/forces/Test_partfrac_force.cc b/tests/forces/Test_partfrac_force.cc
index 81f9aaa5..a6bbede2 100644
--- a/tests/forces/Test_partfrac_force.cc
+++ b/tests/forces/Test_partfrac_force.cc
@@ -29,7 +29,7 @@ Author: Peter Boyle <paboyle@ph.ed.ac.uk>
 
 using namespace std;
 using namespace Grid;
-using namespace Grid::QCD;
+ ;
 
  
 
diff --git a/tests/forces/Test_rect_force.cc b/tests/forces/Test_rect_force.cc
index a846af30..3019ca4d 100644
--- a/tests/forces/Test_rect_force.cc
+++ b/tests/forces/Test_rect_force.cc
@@ -29,7 +29,7 @@ Author: Azusa Yamaguchi <ayamaguc@staffmail.ed.ac.uk>
 
 using namespace std;
 using namespace Grid;
-using namespace Grid::QCD;
+ ;
 
  
 
diff --git a/tests/forces/Test_wilson_force.cc b/tests/forces/Test_wilson_force.cc
index 1f34a48a..6fb0ca14 100644
--- a/tests/forces/Test_wilson_force.cc
+++ b/tests/forces/Test_wilson_force.cc
@@ -29,7 +29,7 @@ Author: Peter Boyle <paboyle@ph.ed.ac.uk>
 
 using namespace std;
 using namespace Grid;
-using namespace Grid::QCD;
+ ;
 
  
 
diff --git a/tests/forces/Test_zmobius_force.cc b/tests/forces/Test_zmobius_force.cc
index 329d77e2..725a46c0 100644
--- a/tests/forces/Test_zmobius_force.cc
+++ b/tests/forces/Test_zmobius_force.cc
@@ -29,7 +29,7 @@ Author: Peter Boyle <paboyle@ph.ed.ac.uk>
 
 using namespace std;
 using namespace Grid;
-using namespace Grid::QCD;
+ ;
 
 int main (int argc, char ** argv)
 {
diff --git a/tests/hadrons/Test_hadrons_3pt_contractions.cc b/tests/hadrons/Test_hadrons_3pt_contractions.cc
index 452fc34d..1d38b4f8 100644
--- a/tests/hadrons/Test_hadrons_3pt_contractions.cc
+++ b/tests/hadrons/Test_hadrons_3pt_contractions.cc
@@ -119,4 +119,4 @@ int main(int argc, char *argv[])
     Grid_finalize();
 
     return EXIT_SUCCESS;
-}
\ No newline at end of file
+}
diff --git a/tests/hadrons/Test_hadrons_conserved_current.cc b/tests/hadrons/Test_hadrons_conserved_current.cc
index 37ef30d9..e91d8245 100644
--- a/tests/hadrons/Test_hadrons_conserved_current.cc
+++ b/tests/hadrons/Test_hadrons_conserved_current.cc
@@ -147,4 +147,4 @@ int main(int argc, char *argv[])
     Grid_finalize();
 
     return EXIT_SUCCESS;
-}
\ No newline at end of file
+}
diff --git a/tests/hadrons/Test_hadrons_meson_conserved_3pt.cc b/tests/hadrons/Test_hadrons_meson_conserved_3pt.cc
index c9aeb2cc..3a887cc2 100644
--- a/tests/hadrons/Test_hadrons_meson_conserved_3pt.cc
+++ b/tests/hadrons/Test_hadrons_meson_conserved_3pt.cc
@@ -112,4 +112,4 @@ int main(int argc, char *argv[])
     return EXIT_SUCCESS;
 }
     
-    
\ No newline at end of file
+    
diff --git a/tests/hadrons/Test_hadrons_seq_gamma.cc b/tests/hadrons/Test_hadrons_seq_gamma.cc
index 22c35ecb..ba711f88 100644
--- a/tests/hadrons/Test_hadrons_seq_gamma.cc
+++ b/tests/hadrons/Test_hadrons_seq_gamma.cc
@@ -86,4 +86,4 @@ int main(int argc, char *argv[])
     Grid_finalize();
 
     return EXIT_SUCCESS;
-}
\ No newline at end of file
+}
diff --git a/tests/hmc/Test_hmc_EODWFRatio.cc b/tests/hmc/Test_hmc_EODWFRatio.cc
index dc903f4d..402c46b9 100644
--- a/tests/hmc/Test_hmc_EODWFRatio.cc
+++ b/tests/hmc/Test_hmc_EODWFRatio.cc
@@ -33,7 +33,7 @@ directory
 
 int main(int argc, char **argv) {
   using namespace Grid;
-  using namespace Grid::QCD;
+   ;
 
   Grid_init(&argc, &argv);
   int threads = GridThread::GetThreads();
diff --git a/tests/hmc/Test_hmc_EODWFRatioLsVectorised.cc b/tests/hmc/Test_hmc_EODWFRatioLsVectorised.cc
index fb2621a8..340d800a 100644
--- a/tests/hmc/Test_hmc_EODWFRatioLsVectorised.cc
+++ b/tests/hmc/Test_hmc_EODWFRatioLsVectorised.cc
@@ -34,7 +34,7 @@ directory
 
 int main(int argc, char **argv) {
   using namespace Grid;
-  using namespace Grid::QCD;
+   ;
 
   Grid_init(&argc, &argv);
   int threads = GridThread::GetThreads();
diff --git a/tests/hmc/Test_hmc_EODWFRatio_Gparity.cc b/tests/hmc/Test_hmc_EODWFRatio_Gparity.cc
index 16d225be..3434fccc 100644
--- a/tests/hmc/Test_hmc_EODWFRatio_Gparity.cc
+++ b/tests/hmc/Test_hmc_EODWFRatio_Gparity.cc
@@ -31,7 +31,7 @@ Author: paboyle <paboyle@ph.ed.ac.uk>
 
 int main(int argc, char **argv) {
   using namespace Grid;
-  using namespace Grid::QCD;
+   ;
 
   Grid_init(&argc, &argv);
   int threads = GridThread::GetThreads();
diff --git a/tests/hmc/Test_hmc_EOMobiusRatio.cc b/tests/hmc/Test_hmc_EOMobiusRatio.cc
index d6ca96db..4c4ce46a 100644
--- a/tests/hmc/Test_hmc_EOMobiusRatio.cc
+++ b/tests/hmc/Test_hmc_EOMobiusRatio.cc
@@ -73,7 +73,7 @@ namespace Grid{
 
 int main(int argc, char **argv) {
   using namespace Grid;
-  using namespace Grid::QCD;
+   ;
 
   Grid_init(&argc, &argv);
   int threads = GridThread::GetThreads();
diff --git a/tests/hmc/Test_hmc_EOMobiusRatioManyFlavour.cc b/tests/hmc/Test_hmc_EOMobiusRatioManyFlavour.cc
index d4eac654..135bcec6 100644
--- a/tests/hmc/Test_hmc_EOMobiusRatioManyFlavour.cc
+++ b/tests/hmc/Test_hmc_EOMobiusRatioManyFlavour.cc
@@ -79,7 +79,7 @@ namespace Grid{
 
 int main(int argc, char **argv) {
   using namespace Grid;
-  using namespace Grid::QCD;
+   ;
 
   Grid_init(&argc, &argv);
   int threads = GridThread::GetThreads();
diff --git a/tests/hmc/Test_hmc_EOWilsonFermionGauge.cc b/tests/hmc/Test_hmc_EOWilsonFermionGauge.cc
index eccb10b7..3643c0ad 100644
--- a/tests/hmc/Test_hmc_EOWilsonFermionGauge.cc
+++ b/tests/hmc/Test_hmc_EOWilsonFermionGauge.cc
@@ -30,7 +30,7 @@ directory
 
 int main(int argc, char **argv) {
   using namespace Grid;
-  using namespace Grid::QCD;
+   ;
 
   Grid_init(&argc, &argv);
   int threads = GridThread::GetThreads();
diff --git a/tests/hmc/Test_hmc_EOWilsonRatio.cc b/tests/hmc/Test_hmc_EOWilsonRatio.cc
index 0344a534..675bc605 100644
--- a/tests/hmc/Test_hmc_EOWilsonRatio.cc
+++ b/tests/hmc/Test_hmc_EOWilsonRatio.cc
@@ -32,7 +32,7 @@
 
 int main(int argc, char **argv) {
   using namespace Grid;
-  using namespace Grid::QCD;
+   ;
 
   Grid_init(&argc, &argv);
   int threads = GridThread::GetThreads();
diff --git a/tests/hmc/Test_hmc_Factories.cc b/tests/hmc/Test_hmc_Factories.cc
index 07174c7b..094e214b 100644
--- a/tests/hmc/Test_hmc_Factories.cc
+++ b/tests/hmc/Test_hmc_Factories.cc
@@ -44,7 +44,7 @@ typedef Grid::XmlReader       Serialiser;
 
 int main(int argc, char **argv) {
   using namespace Grid;
-  using namespace Grid::QCD;
+   ;
 
   Grid_init(&argc, &argv);
 
diff --git a/tests/hmc/Test_hmc_GparityIwasakiGauge.cc b/tests/hmc/Test_hmc_GparityIwasakiGauge.cc
index 6fbb389f..bc47b6c2 100644
--- a/tests/hmc/Test_hmc_GparityIwasakiGauge.cc
+++ b/tests/hmc/Test_hmc_GparityIwasakiGauge.cc
@@ -30,7 +30,7 @@ Author: paboyle <paboyle@ph.ed.ac.uk>
 
 int main(int argc, char **argv) {
   using namespace Grid;
-  using namespace Grid::QCD;
+   ;
 
   Grid_init(&argc, &argv);
   int threads = GridThread::GetThreads();
diff --git a/tests/hmc/Test_hmc_GparityWilsonGauge.cc b/tests/hmc/Test_hmc_GparityWilsonGauge.cc
index 4fbb63d0..eb057181 100644
--- a/tests/hmc/Test_hmc_GparityWilsonGauge.cc
+++ b/tests/hmc/Test_hmc_GparityWilsonGauge.cc
@@ -31,7 +31,7 @@ Author: paboyle <paboyle@ph.ed.ac.uk>
 
 int main(int argc, char **argv) {
   using namespace Grid;
-  using namespace Grid::QCD;
+   ;
 
   Grid_init(&argc, &argv);
   int threads = GridThread::GetThreads();
diff --git a/tests/hmc/Test_hmc_IwasakiGauge.cc b/tests/hmc/Test_hmc_IwasakiGauge.cc
index c4d96d83..66345bc0 100644
--- a/tests/hmc/Test_hmc_IwasakiGauge.cc
+++ b/tests/hmc/Test_hmc_IwasakiGauge.cc
@@ -30,7 +30,7 @@ Author: Azusa Yamaguchi <ayamaguc@staffmail.ed.ac.uk>
 
 int main(int argc, char **argv) {
   using namespace Grid;
-  using namespace Grid::QCD;
+   ;
 
   Grid_init(&argc, &argv);
   int threads = GridThread::GetThreads();
diff --git a/tests/hmc/Test_hmc_RectGauge.cc b/tests/hmc/Test_hmc_RectGauge.cc
index c0601d2b..9352a35b 100644
--- a/tests/hmc/Test_hmc_RectGauge.cc
+++ b/tests/hmc/Test_hmc_RectGauge.cc
@@ -31,7 +31,7 @@ directory
 
 int main(int argc, char **argv) {
   using namespace Grid;
-  using namespace Grid::QCD;
+   ;
 
   Grid_init(&argc, &argv);
   int threads = GridThread::GetThreads();
diff --git a/tests/hmc/Test_hmc_ScalarAction.cc b/tests/hmc/Test_hmc_ScalarAction.cc
index 65d3b399..5cf8ab35 100644
--- a/tests/hmc/Test_hmc_ScalarAction.cc
+++ b/tests/hmc/Test_hmc_ScalarAction.cc
@@ -29,7 +29,7 @@ See the full license in the file "LICENSE" in the top level distribution directo
 
 int main(int argc, char **argv) {
   using namespace Grid;
-  using namespace Grid::QCD;
+   ;
 
   Grid_init(&argc, &argv);
   int threads = GridThread::GetThreads();
diff --git a/tests/hmc/Test_hmc_ScalarActionNxN.cc b/tests/hmc/Test_hmc_ScalarActionNxN.cc
index a4dad1a3..b105efb3 100644
--- a/tests/hmc/Test_hmc_ScalarActionNxN.cc
+++ b/tests/hmc/Test_hmc_ScalarActionNxN.cc
@@ -42,7 +42,7 @@ class ScalarActionParameters : Serializable {
 }
 
 using namespace Grid;
-using namespace Grid::QCD;
+ ;
 
 template <class Impl>
 class MagMeas : public HmcObservable<typename Impl::Field> {
diff --git a/tests/hmc/Test_hmc_WilsonAdjointFermionGauge.cc b/tests/hmc/Test_hmc_WilsonAdjointFermionGauge.cc
index af4fdae1..cc56cae3 100644
--- a/tests/hmc/Test_hmc_WilsonAdjointFermionGauge.cc
+++ b/tests/hmc/Test_hmc_WilsonAdjointFermionGauge.cc
@@ -33,7 +33,7 @@ directory
 
 int main(int argc, char **argv) {
   using namespace Grid;
-  using namespace Grid::QCD;
+   ;
 
   // Here change the allowed (higher) representations
   typedef Representations< FundamentalRepresentation, AdjointRepresentation > TheRepresentations;
diff --git a/tests/hmc/Test_hmc_WilsonFermionGauge.cc b/tests/hmc/Test_hmc_WilsonFermionGauge.cc
index 9b709a1a..cc1f2474 100644
--- a/tests/hmc/Test_hmc_WilsonFermionGauge.cc
+++ b/tests/hmc/Test_hmc_WilsonFermionGauge.cc
@@ -32,7 +32,7 @@ directory
 
 int main(int argc, char **argv) {
   using namespace Grid;
-  using namespace Grid::QCD;
+   ;
 
   Grid_init(&argc, &argv);
   int threads = GridThread::GetThreads();
diff --git a/tests/hmc/Test_hmc_WilsonGauge.cc b/tests/hmc/Test_hmc_WilsonGauge.cc
index 05bf81a2..91c1f3a4 100644
--- a/tests/hmc/Test_hmc_WilsonGauge.cc
+++ b/tests/hmc/Test_hmc_WilsonGauge.cc
@@ -32,7 +32,7 @@ directory
 
 int main(int argc, char **argv) {
   using namespace Grid;
-  using namespace Grid::QCD;
+   ;
 
   Grid_init(&argc, &argv);
   GridLogLayout();
diff --git a/tests/hmc/Test_hmc_WilsonMixedRepresentationsFermionGauge.cc b/tests/hmc/Test_hmc_WilsonMixedRepresentationsFermionGauge.cc
index b54345cf..93dc9c5d 100644
--- a/tests/hmc/Test_hmc_WilsonMixedRepresentationsFermionGauge.cc
+++ b/tests/hmc/Test_hmc_WilsonMixedRepresentationsFermionGauge.cc
@@ -36,7 +36,7 @@ directory
 
 int main(int argc, char **argv) {
   using namespace Grid;
-  using namespace Grid::QCD;
+   ;
 
   // Here change the allowed (higher) representations
   typedef Representations< FundamentalRepresentation, AdjointRepresentation , TwoIndexSymmetricRepresentation> TheRepresentations;
diff --git a/tests/hmc/Test_hmc_WilsonRatio.cc b/tests/hmc/Test_hmc_WilsonRatio.cc
index 4e6426ca..3e3cac7e 100644
--- a/tests/hmc/Test_hmc_WilsonRatio.cc
+++ b/tests/hmc/Test_hmc_WilsonRatio.cc
@@ -31,7 +31,7 @@ Author: paboyle <paboyle@ph.ed.ac.uk>
 
 int main(int argc, char **argv) {
   using namespace Grid;
-  using namespace Grid::QCD;
+   ;
 
   Grid_init(&argc, &argv);
   int threads = GridThread::GetThreads();
diff --git a/tests/hmc/Test_hmc_WilsonTMFermionGauge.cc b/tests/hmc/Test_hmc_WilsonTMFermionGauge.cc
index fbb9bd6f..5928efbe 100644
--- a/tests/hmc/Test_hmc_WilsonTMFermionGauge.cc
+++ b/tests/hmc/Test_hmc_WilsonTMFermionGauge.cc
@@ -32,7 +32,7 @@ directory
 
 int main(int argc, char **argv) {
   using namespace Grid;
-  using namespace Grid::QCD;
+   ;
 
   Grid_init(&argc, &argv);
   int threads = GridThread::GetThreads();
diff --git a/tests/hmc/Test_hmc_WilsonTwoIndexSymmetricFermionGauge.cc b/tests/hmc/Test_hmc_WilsonTwoIndexSymmetricFermionGauge.cc
index 853d8a92..387842f7 100644
--- a/tests/hmc/Test_hmc_WilsonTwoIndexSymmetricFermionGauge.cc
+++ b/tests/hmc/Test_hmc_WilsonTwoIndexSymmetricFermionGauge.cc
@@ -31,7 +31,7 @@ directory
 
 int main(int argc, char **argv) {
   using namespace Grid;
-  using namespace Grid::QCD;
+   ;
 
   // Here change the allowed (higher) representations
   typedef Representations< FundamentalRepresentation, TwoIndexSymmetricRepresentation > TheRepresentations;
diff --git a/tests/hmc/Test_multishift_sqrt.cc b/tests/hmc/Test_multishift_sqrt.cc
index 8f12b3bd..834e6fc8 100644
--- a/tests/hmc/Test_multishift_sqrt.cc
+++ b/tests/hmc/Test_multishift_sqrt.cc
@@ -31,7 +31,7 @@ Author: paboyle <paboyle@ph.ed.ac.uk>
 
 using namespace std;
 using namespace Grid;
-using namespace Grid::QCD;
+ ;
 
 template<class Field> class DumbOperator  : public LinearOperatorBase<Field> {
 public:
diff --git a/tests/hmc/Test_remez.cc b/tests/hmc/Test_remez.cc
index 5f4b0a25..ff20e7f4 100644
--- a/tests/hmc/Test_remez.cc
+++ b/tests/hmc/Test_remez.cc
@@ -30,7 +30,7 @@ Author: Peter Boyle <paboyle@ph.ed.ac.uk>
 
 using namespace std;
 using namespace Grid;
-using namespace Grid::QCD;
+ ;
 
 int main (int argc, char ** argv)
 {
diff --git a/tests/hmc/Test_rhmc_EOWilson1p1.cc b/tests/hmc/Test_rhmc_EOWilson1p1.cc
index 37713766..51a966b1 100644
--- a/tests/hmc/Test_rhmc_EOWilson1p1.cc
+++ b/tests/hmc/Test_rhmc_EOWilson1p1.cc
@@ -31,7 +31,7 @@ See the full license in the file "LICENSE" in the top level distribution directo
 
 int main(int argc, char **argv) {
   using namespace Grid;
-  using namespace Grid::QCD;
+   ;
 
   Grid_init(&argc, &argv);
   int threads = GridThread::GetThreads();
diff --git a/tests/hmc/Test_rhmc_EOWilsonRatio.cc b/tests/hmc/Test_rhmc_EOWilsonRatio.cc
index d7d6f35e..44fb6d47 100644
--- a/tests/hmc/Test_rhmc_EOWilsonRatio.cc
+++ b/tests/hmc/Test_rhmc_EOWilsonRatio.cc
@@ -32,7 +32,7 @@ Author: paboyle <paboyle@ph.ed.ac.uk>
 
 int main(int argc, char **argv) {
   using namespace Grid;
-  using namespace Grid::QCD;
+   ;
 
   Grid_init(&argc, &argv);
   int threads = GridThread::GetThreads();
diff --git a/tests/hmc/Test_rhmc_Wilson1p1.cc b/tests/hmc/Test_rhmc_Wilson1p1.cc
index bab86ab9..93b748d2 100644
--- a/tests/hmc/Test_rhmc_Wilson1p1.cc
+++ b/tests/hmc/Test_rhmc_Wilson1p1.cc
@@ -32,7 +32,7 @@ Author: paboyle <paboyle@ph.ed.ac.uk>
 
 int main(int argc, char **argv) {
   using namespace Grid;
-  using namespace Grid::QCD;
+   ;
 
   Grid_init(&argc, &argv);
   int threads = GridThread::GetThreads();
diff --git a/tests/hmc/Test_rhmc_WilsonRatio.cc b/tests/hmc/Test_rhmc_WilsonRatio.cc
index 40bea28e..4896d329 100644
--- a/tests/hmc/Test_rhmc_WilsonRatio.cc
+++ b/tests/hmc/Test_rhmc_WilsonRatio.cc
@@ -31,7 +31,7 @@ Author: paboyle <paboyle@ph.ed.ac.uk>
 
 int main(int argc, char **argv) {
   using namespace Grid;
-  using namespace Grid::QCD;
+   ;
 
   Grid_init(&argc, &argv);
   int threads = GridThread::GetThreads();
diff --git a/tests/lanczos/Test_dwf_compressed_lanczos.cc b/tests/lanczos/Test_dwf_compressed_lanczos.cc
index 45690f05..d11c73ab 100644
--- a/tests/lanczos/Test_dwf_compressed_lanczos.cc
+++ b/tests/lanczos/Test_dwf_compressed_lanczos.cc
@@ -34,7 +34,7 @@
 
 using namespace std;
 using namespace Grid;
-using namespace Grid::QCD;
+ ;
 
 bool read_evals(GridBase* _grid, char* fn, std::vector<RealD>& evals) {
 
diff --git a/tests/lanczos/Test_dwf_compressed_lanczos_reorg.cc b/tests/lanczos/Test_dwf_compressed_lanczos_reorg.cc
index 4c702a33..cbd93730 100644
--- a/tests/lanczos/Test_dwf_compressed_lanczos_reorg.cc
+++ b/tests/lanczos/Test_dwf_compressed_lanczos_reorg.cc
@@ -36,7 +36,7 @@ Author: Peter Boyle <paboyle@ph.ed.ac.uk>
 
 using namespace std;
 using namespace Grid;
-using namespace Grid::QCD;
+ ;
 
 template<class Fobj,class CComplex,int nbasis>
 class LocalCoherenceLanczosScidac : public LocalCoherenceLanczos<Fobj,CComplex,nbasis>
diff --git a/tests/lanczos/Test_dwf_compressed_lanczos_reorg_synthetic.cc b/tests/lanczos/Test_dwf_compressed_lanczos_reorg_synthetic.cc
index 132dff4e..b7a424cc 100644
--- a/tests/lanczos/Test_dwf_compressed_lanczos_reorg_synthetic.cc
+++ b/tests/lanczos/Test_dwf_compressed_lanczos_reorg_synthetic.cc
@@ -35,7 +35,7 @@ Author: Peter Boyle <paboyle@ph.ed.ac.uk>
 
 using namespace std;
 using namespace Grid;
-using namespace Grid::QCD;
+ ;
 
 template<class Fobj,class CComplex,int nbasis>
 class ProjectedHermOp : public LinearFunction<Lattice<iVector<CComplex,nbasis > > > {
diff --git a/tests/lanczos/Test_dwf_lanczos.cc b/tests/lanczos/Test_dwf_lanczos.cc
index b1e205cf..d4910178 100644
--- a/tests/lanczos/Test_dwf_lanczos.cc
+++ b/tests/lanczos/Test_dwf_lanczos.cc
@@ -29,7 +29,7 @@ Author: Peter Boyle <paboyle@ph.ed.ac.uk>
 
 using namespace std;
 using namespace Grid;
-using namespace Grid::QCD;
+ ;
 
 typedef typename GparityDomainWallFermionR::FermionField FermionField;
 
diff --git a/tests/lanczos/Test_synthetic_lanczos.cc b/tests/lanczos/Test_synthetic_lanczos.cc
index 4be9ca31..3cd78241 100644
--- a/tests/lanczos/Test_synthetic_lanczos.cc
+++ b/tests/lanczos/Test_synthetic_lanczos.cc
@@ -31,7 +31,7 @@ Author: paboyle <paboyle@ph.ed.ac.uk>
 
 using namespace std;
 using namespace Grid;
-using namespace Grid::QCD;
+ ;
 
 static int
 FEenableexcept (unsigned int excepts)
diff --git a/tests/lanczos/Test_wilson_lanczos.cc b/tests/lanczos/Test_wilson_lanczos.cc
index eabc86d7..14afdbbd 100644
--- a/tests/lanczos/Test_wilson_lanczos.cc
+++ b/tests/lanczos/Test_wilson_lanczos.cc
@@ -30,7 +30,7 @@ directory
 
 using namespace std;
 using namespace Grid;
-using namespace Grid::QCD;
+ ;
 
 typedef WilsonFermionR FermionOp;
 typedef typename WilsonFermionR::FermionField FermionField;
diff --git a/tests/qdpxx/Test_qdpxx_munprec.cc b/tests/qdpxx/Test_qdpxx_munprec.cc
index fd60566d..da0cf1ba 100644
--- a/tests/qdpxx/Test_qdpxx_munprec.cc
+++ b/tests/qdpxx/Test_qdpxx_munprec.cc
@@ -486,7 +486,7 @@ void calc_chroma(ChromaAction action,Grid::QCD::LatticeGaugeField & lat, Grid::Q
 void calc_grid(ChromaAction action,Grid::QCD::LatticeGaugeField & Umu, Grid::QCD::LatticeFermion &src, Grid::QCD::LatticeFermion &res,int dag)
 {
   using namespace Grid;
-  using namespace Grid::QCD;
+   ;
 
   std::vector<int> seeds4({1,2,3,4});
   std::vector<int> seeds5({5,6,7,8});
diff --git a/tests/qdpxx/Test_qdpxx_stag.cc b/tests/qdpxx/Test_qdpxx_stag.cc
index a7563924..93a10698 100644
--- a/tests/qdpxx/Test_qdpxx_stag.cc
+++ b/tests/qdpxx/Test_qdpxx_stag.cc
@@ -327,7 +327,7 @@ void calc_chroma(GaugeField & lat, GaugeField &uthin, GaugeField &ufat, FermionF
 void make_gauge(GaugeField & Umu,FermionField &src)
 {
   using namespace Grid;
-  using namespace Grid::QCD;
+   ;
 
   std::vector<int> seeds4({1,2,3,4});
 
@@ -340,7 +340,7 @@ void make_gauge(GaugeField & Umu,FermionField &src)
 void calc_grid(GaugeField & Uthin, GaugeField & Utriple, GaugeField & Ufat, FermionField &src, FermionField &res,int dag)
 {
   using namespace Grid;
-  using namespace Grid::QCD;
+   ;
 
   Grid::GridCartesian         * UGrid   = (Grid::GridCartesian *) Uthin._grid;
   Grid::GridRedBlackCartesian * UrbGrid = Grid::QCD::SpaceTimeGrid::makeFourDimRedBlackGrid(UGrid);
diff --git a/tests/smearing/Test_WilsonFlow.cc b/tests/smearing/Test_WilsonFlow.cc
index 9d706af0..dbdac890 100644
--- a/tests/smearing/Test_WilsonFlow.cc
+++ b/tests/smearing/Test_WilsonFlow.cc
@@ -62,7 +62,7 @@ namespace Grid{
 
 int main(int argc, char **argv) {
   using namespace Grid;
-  using namespace Grid::QCD;
+   ;
 
   Grid_init(&argc, &argv);
   GridLogLayout();
diff --git a/tests/solver/Test_cf_cr_unprec.cc b/tests/solver/Test_cf_cr_unprec.cc
index 05f31ae6..3bf718a8 100644
--- a/tests/solver/Test_cf_cr_unprec.cc
+++ b/tests/solver/Test_cf_cr_unprec.cc
@@ -29,7 +29,7 @@ Author: Peter Boyle <paboyle@ph.ed.ac.uk>
 
 using namespace std;
 using namespace Grid;
-using namespace Grid::QCD;
+ ;
 
 template<class d>
 struct scal {
diff --git a/tests/solver/Test_contfrac_cg.cc b/tests/solver/Test_contfrac_cg.cc
index 1d7c121f..3a74996d 100644
--- a/tests/solver/Test_contfrac_cg.cc
+++ b/tests/solver/Test_contfrac_cg.cc
@@ -29,7 +29,7 @@ Author: Peter Boyle <paboyle@ph.ed.ac.uk>
 
 using namespace std;
 using namespace Grid;
-using namespace Grid::QCD;
+ ;
 
 template<class d>
 struct scal {
diff --git a/tests/solver/Test_dwf_cg_prec.cc b/tests/solver/Test_dwf_cg_prec.cc
index 0ede352e..ab6b5cf7 100644
--- a/tests/solver/Test_dwf_cg_prec.cc
+++ b/tests/solver/Test_dwf_cg_prec.cc
@@ -30,7 +30,7 @@ directory
 
 using namespace std;
 using namespace Grid;
-using namespace Grid::QCD;
+ ;
 
 template <class d>
 struct scal {
diff --git a/tests/solver/Test_dwf_cg_prec_LsVec.cc b/tests/solver/Test_dwf_cg_prec_LsVec.cc
index 27799739..556cfcd3 100644
--- a/tests/solver/Test_dwf_cg_prec_LsVec.cc
+++ b/tests/solver/Test_dwf_cg_prec_LsVec.cc
@@ -30,7 +30,7 @@ directory
 
 using namespace std;
 using namespace Grid;
-using namespace Grid::QCD;
+ ;
 
 template <class d>
 struct scal {
diff --git a/tests/solver/Test_dwf_cg_schur.cc b/tests/solver/Test_dwf_cg_schur.cc
index 0f75eb3c..6d71e041 100644
--- a/tests/solver/Test_dwf_cg_schur.cc
+++ b/tests/solver/Test_dwf_cg_schur.cc
@@ -29,7 +29,7 @@ Author: Peter Boyle <paboyle@ph.ed.ac.uk>
 
 using namespace std;
 using namespace Grid;
-using namespace Grid::QCD;
+ ;
 
 template<class d>
 struct scal {
diff --git a/tests/solver/Test_dwf_cg_unprec.cc b/tests/solver/Test_dwf_cg_unprec.cc
index 38f632ef..8e53896e 100644
--- a/tests/solver/Test_dwf_cg_unprec.cc
+++ b/tests/solver/Test_dwf_cg_unprec.cc
@@ -29,7 +29,7 @@ Author: Peter Boyle <paboyle@ph.ed.ac.uk>
 
 using namespace std;
 using namespace Grid;
-using namespace Grid::QCD;
+ ;
 
 template<class d>
 struct scal {
diff --git a/tests/solver/Test_dwf_cr_unprec.cc b/tests/solver/Test_dwf_cr_unprec.cc
index fbfa2965..601692ce 100644
--- a/tests/solver/Test_dwf_cr_unprec.cc
+++ b/tests/solver/Test_dwf_cr_unprec.cc
@@ -29,7 +29,7 @@ Author: Peter Boyle <paboyle@ph.ed.ac.uk>
 
 using namespace std;
 using namespace Grid;
-using namespace Grid::QCD;
+ ;
 
 
 template<class d>
diff --git a/tests/solver/Test_dwf_fpgcr.cc b/tests/solver/Test_dwf_fpgcr.cc
index aaf622b9..17a3c17f 100644
--- a/tests/solver/Test_dwf_fpgcr.cc
+++ b/tests/solver/Test_dwf_fpgcr.cc
@@ -30,7 +30,7 @@ Author: Peter Boyle <paboyle@ph.ed.ac.uk>
 #include <Grid/algorithms/iterative/PrecGeneralisedConjugateResidual.h>
 using namespace std;
 using namespace Grid;
-using namespace Grid::QCD;
+ ;
 
 
 template<class d>
diff --git a/tests/solver/Test_dwf_hdcr.cc b/tests/solver/Test_dwf_hdcr.cc
index b3373238..344d7e56 100644
--- a/tests/solver/Test_dwf_hdcr.cc
+++ b/tests/solver/Test_dwf_hdcr.cc
@@ -33,7 +33,7 @@ Author: paboyle <paboyle@ph.ed.ac.uk>
 
 using namespace std;
 using namespace Grid;
-using namespace Grid::QCD;
+ ;
 
 class myclass: Serializable {
 public:
diff --git a/tests/solver/Test_dwf_mrhs_cg.cc b/tests/solver/Test_dwf_mrhs_cg.cc
index 207e1331..ba757d1a 100644
--- a/tests/solver/Test_dwf_mrhs_cg.cc
+++ b/tests/solver/Test_dwf_mrhs_cg.cc
@@ -30,7 +30,7 @@ Author: Peter Boyle <paboyle@ph.ed.ac.uk>
 
 using namespace std;
 using namespace Grid;
-using namespace Grid::QCD;
+ ;
 
 int main (int argc, char ** argv)
 {
diff --git a/tests/solver/Test_dwf_mrhs_cg_mpi.cc b/tests/solver/Test_dwf_mrhs_cg_mpi.cc
index aa36ebbc..50f5aa80 100644
--- a/tests/solver/Test_dwf_mrhs_cg_mpi.cc
+++ b/tests/solver/Test_dwf_mrhs_cg_mpi.cc
@@ -30,7 +30,7 @@ Author: Peter Boyle <paboyle@ph.ed.ac.uk>
 
 using namespace std;
 using namespace Grid;
-using namespace Grid::QCD;
+ ;
 
 int main (int argc, char ** argv)
 {
diff --git a/tests/solver/Test_dwf_mrhs_cg_mpieo.cc b/tests/solver/Test_dwf_mrhs_cg_mpieo.cc
index a6dfcd57..6a6bd2d8 100644
--- a/tests/solver/Test_dwf_mrhs_cg_mpieo.cc
+++ b/tests/solver/Test_dwf_mrhs_cg_mpieo.cc
@@ -30,7 +30,7 @@ Author: Peter Boyle <paboyle@ph.ed.ac.uk>
 
 using namespace std;
 using namespace Grid;
-using namespace Grid::QCD;
+ ;
 
 int main (int argc, char ** argv)
 {
diff --git a/tests/solver/Test_laplacian.cc b/tests/solver/Test_laplacian.cc
index f163fe54..6b84f6c6 100644
--- a/tests/solver/Test_laplacian.cc
+++ b/tests/solver/Test_laplacian.cc
@@ -29,7 +29,7 @@ Author: Peter Boyle <paboyle@ph.ed.ac.uk>
 
 using namespace std;
 using namespace Grid;
-using namespace Grid::QCD;
+ ;
 
 int main (int argc, char ** argv)
 {
diff --git a/tests/solver/Test_split_grid.cc b/tests/solver/Test_split_grid.cc
index 2b6a4bf7..54b58739 100644
--- a/tests/solver/Test_split_grid.cc
+++ b/tests/solver/Test_split_grid.cc
@@ -30,7 +30,7 @@ Author: Peter Boyle <paboyle@ph.ed.ac.uk>
 
 using namespace std;
 using namespace Grid;
-using namespace Grid::QCD;
+ ;
 
 int main (int argc, char ** argv)
 {
diff --git a/tests/solver/Test_staggered_block_cg_prec.cc b/tests/solver/Test_staggered_block_cg_prec.cc
index 0076e5a0..22e0a683 100644
--- a/tests/solver/Test_staggered_block_cg_prec.cc
+++ b/tests/solver/Test_staggered_block_cg_prec.cc
@@ -30,7 +30,7 @@ Author: Peter Boyle <paboyle@ph.ed.ac.uk>
 
 using namespace std;
 using namespace Grid;
-using namespace Grid::QCD;
+ ;
 
 template<class d>
 struct scal {
diff --git a/tests/solver/Test_staggered_block_cg_unprec.cc b/tests/solver/Test_staggered_block_cg_unprec.cc
index 22051ef6..52369ff9 100644
--- a/tests/solver/Test_staggered_block_cg_unprec.cc
+++ b/tests/solver/Test_staggered_block_cg_unprec.cc
@@ -30,7 +30,7 @@ Author: Peter Boyle <paboyle@ph.ed.ac.uk>
 
 using namespace std;
 using namespace Grid;
-using namespace Grid::QCD;
+ ;
 
 template<class d>
 struct scal {
diff --git a/tests/solver/Test_staggered_cg_prec.cc b/tests/solver/Test_staggered_cg_prec.cc
index 6bea97c2..494c76dc 100644
--- a/tests/solver/Test_staggered_cg_prec.cc
+++ b/tests/solver/Test_staggered_cg_prec.cc
@@ -31,7 +31,7 @@ Author: Peter Boyle <paboyle@ph.ed.ac.uk>
 
 using namespace std;
 using namespace Grid;
-using namespace Grid::QCD;
+ ;
 
 template<class d>
 struct scal {
diff --git a/tests/solver/Test_staggered_cg_schur.cc b/tests/solver/Test_staggered_cg_schur.cc
index a5c25b85..16ff794d 100644
--- a/tests/solver/Test_staggered_cg_schur.cc
+++ b/tests/solver/Test_staggered_cg_schur.cc
@@ -29,7 +29,7 @@ Author: Peter Boyle <paboyle@ph.ed.ac.uk>
 
 using namespace std;
 using namespace Grid;
-using namespace Grid::QCD;
+ ;
 
 template<class d>
 struct scal {
diff --git a/tests/solver/Test_staggered_cg_unprec.cc b/tests/solver/Test_staggered_cg_unprec.cc
index eb33c004..42d98154 100644
--- a/tests/solver/Test_staggered_cg_unprec.cc
+++ b/tests/solver/Test_staggered_cg_unprec.cc
@@ -31,7 +31,7 @@ Author: Peter Boyle <paboyle@ph.ed.ac.uk>
 
 using namespace std;
 using namespace Grid;
-using namespace Grid::QCD;
+ ;
 
 template<class d>
 struct scal {
diff --git a/tests/solver/Test_wilson_cg_prec.cc b/tests/solver/Test_wilson_cg_prec.cc
index 99ddfceb..5b546353 100644
--- a/tests/solver/Test_wilson_cg_prec.cc
+++ b/tests/solver/Test_wilson_cg_prec.cc
@@ -29,7 +29,7 @@ Author: Peter Boyle <paboyle@ph.ed.ac.uk>
 
 using namespace std;
 using namespace Grid;
-using namespace Grid::QCD;
+ ;
 
 template<class d>
 struct scal {
diff --git a/tests/solver/Test_wilson_cg_schur.cc b/tests/solver/Test_wilson_cg_schur.cc
index 13ac0090..7ec6d6c2 100644
--- a/tests/solver/Test_wilson_cg_schur.cc
+++ b/tests/solver/Test_wilson_cg_schur.cc
@@ -29,7 +29,7 @@ Author: Peter Boyle <paboyle@ph.ed.ac.uk>
 
 using namespace std;
 using namespace Grid;
-using namespace Grid::QCD;
+ ;
 
 template<class d>
 struct scal {
diff --git a/tests/solver/Test_wilson_cg_unprec.cc b/tests/solver/Test_wilson_cg_unprec.cc
index db227ec8..a920b117 100644
--- a/tests/solver/Test_wilson_cg_unprec.cc
+++ b/tests/solver/Test_wilson_cg_unprec.cc
@@ -30,7 +30,7 @@ Author: Peter Boyle <paboyle@ph.ed.ac.uk>
 
 using namespace std;
 using namespace Grid;
-using namespace Grid::QCD;
+ ;
 
 template<class d>
 struct scal {
diff --git a/tests/solver/Test_wilson_cr_unprec.cc b/tests/solver/Test_wilson_cr_unprec.cc
index eccd7e74..1d0e65bf 100644
--- a/tests/solver/Test_wilson_cr_unprec.cc
+++ b/tests/solver/Test_wilson_cr_unprec.cc
@@ -29,7 +29,7 @@ Author: Peter Boyle <paboyle@ph.ed.ac.uk>
 
 using namespace std;
 using namespace Grid;
-using namespace Grid::QCD;
+ ;
 
 template<class d>
 struct scal {
diff --git a/tests/solver/Test_zmobius_cg_prec.cc b/tests/solver/Test_zmobius_cg_prec.cc
index 922ca8ae..2bdf837a 100644
--- a/tests/solver/Test_zmobius_cg_prec.cc
+++ b/tests/solver/Test_zmobius_cg_prec.cc
@@ -30,7 +30,7 @@ directory
 
 using namespace std;
 using namespace Grid;
-using namespace Grid::QCD;
+ ;
 
 template <class d>
 struct scal {
diff --git a/tests/testu01/Test_smallcrush.cc b/tests/testu01/Test_smallcrush.cc
index d09cd577..ca3a9464 100644
--- a/tests/testu01/Test_smallcrush.cc
+++ b/tests/testu01/Test_smallcrush.cc
@@ -29,7 +29,7 @@ Author: Peter Boyle <paboyle@ph.ed.ac.uk>
 
 using namespace std;
 using namespace Grid;
-using namespace Grid::QCD;
+ ;
 
 // Wrap Grid's parallel RNG for testU01
 #undef BIG_CRUSH             // Big crush enable (long running)