diff --git a/Grid/qcd/representations/Representations.h b/Grid/qcd/representations/Representations.h
index 85dc6596..22311be0 100644
--- a/Grid/qcd/representations/Representations.h
+++ b/Grid/qcd/representations/Representations.h
@@ -4,7 +4,6 @@
 #include <Grid/qcd/representations/adjoint.h>
 #include <Grid/qcd/representations/two_index.h>
 #include <Grid/qcd/representations/fundamental.h>
-#include <Grid/qcd/representations/sp_two_index.h>
 #include <Grid/qcd/representations/hmc_types.h>
 
 #endif
diff --git a/Grid/qcd/representations/hmc_types.h b/Grid/qcd/representations/hmc_types.h
index 7ad67079..5e4ab020 100644
--- a/Grid/qcd/representations/hmc_types.h
+++ b/Grid/qcd/representations/hmc_types.h
@@ -4,7 +4,6 @@
 #include <Grid/qcd/representations/adjoint.h>
 #include <Grid/qcd/representations/two_index.h>
 #include <Grid/qcd/representations/fundamental.h>
-#include <Grid/qcd/representations/sp_two_index.h>
 #include <Grid/qcd/action/scalar/ScalarImpl.h>
 
 #include <tuple>
diff --git a/Grid/qcd/representations/sp_two_index.h b/Grid/qcd/representations/sp_two_index.h
deleted file mode 100644
index 7fe097b9..00000000
--- a/Grid/qcd/representations/sp_two_index.h
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- *  Policy classes for the HMC
- *  Authors: Guido Cossu, David Preti
- */
-
-#ifndef SP2N2INDEX_H_H
-#define SP2N2INDEX_H_H
-
-NAMESPACE_BEGIN(Grid);
-
-/*
- * This is an helper class for the HMC
- * Should contain only the data for the two index representations
- * and the facility to convert from the fundamental -> two index
- * The templated parameter TwoIndexSymmetry choses between the 
- * symmetric and antisymmetric representations
- * 
- * There is an 
- * enum TwoIndexSymmetry { Symmetric = 1, AntiSymmetric = -1 };
- * in the SUnTwoIndex.h file
- */
-
-template <int ncolour, TwoIndexSymmetry S>
-class SpTwoIndexRep {
-public:
-  // typdef to be used by the Representations class in HMC to get the
-  // types for the higher representation fields
-  typedef typename Sp_TwoIndex<ncolour, S>::LatticeTwoIndexMatrix LatticeMatrix;
-  typedef typename Sp_TwoIndex<ncolour, S>::LatticeTwoIndexField LatticeField;
-  static const int Dimension = (ncolour * (ncolour + S) / 2) + S;
-  static const bool isFundamental = false;
-  //static const int nsp = Nc / 2;
-  LatticeField U;
-
-  explicit SpTwoIndexRep(GridBase *grid) : U(grid) {}
-
-  void update_representation(const LatticeGaugeField &Uin) {
-    std::cout << GridLogDebug << "Updating TwoIndex representation\n";
-    // Uin is in the fundamental representation
-    // get the U in TwoIndexRep
-    // (U)_{(ij)(lk)} = tr [ adj(e^(ij)) U e^(lk) transpose(U) ]
-    conformable(U, Uin);
-    U = Zero();
-    LatticeColourMatrix tmp(Uin.Grid());
-
-    Vector<typename Sp<ncolour>::Matrix> eij(Dimension);
-
-    for (int a = 0; a < Dimension; a++)
-      Sp_TwoIndex<ncolour, S>::base(a, eij[a]);
-
-    for (int mu = 0; mu < Nd; mu++) {
-      auto Uin_mu = peekLorentz(Uin, mu);
-      auto U_mu = peekLorentz(U, mu);
-      for (int a = 0; a < Dimension; a++) {
-        tmp = transpose(Uin_mu) * adj(eij[a]) * Uin_mu;
-        for (int b = 0; b < Dimension; b++)
-          pokeColour(U_mu, trace(tmp * eij[b]), a, b);
-      }
-      pokeLorentz(U, U_mu, mu);
-    }
-  }
-
-  LatticeGaugeField RtoFundamentalProject(const LatticeField &in,
-                                          Real scale = 1.0) const {
-    LatticeGaugeField out(in.Grid());
-    out = Zero();
-
-    for (int mu = 0; mu < Nd; mu++) {
-      LatticeColourMatrix out_mu(in.Grid());  // fundamental representation
-      LatticeMatrix in_mu = peekLorentz(in, mu);
-
-      out_mu = Zero();
-
-      typename Sp<ncolour>::LatticeAlgebraVector h(in.Grid());
-      projectOnAlgebra(h, in_mu, double(Nc + 2 * S));  // factor T(r)/T(fund)
-      FundamentalLieAlgebraMatrix(h, out_mu);          // apply scale only once
-      pokeLorentz(out, out_mu, mu);                     // should be 2 for sp4 as. ok
-    }
-    return out;
-  }
-
-private:
-  void projectOnAlgebra(typename Sp<ncolour>::LatticeAlgebraVector &h_out,
-                        const LatticeMatrix &in, Real scale = 1.0) const {
-    Sp_TwoIndex<ncolour, S>::projectOnAlgebra(h_out, in, scale);
-  }
-
-  void FundamentalLieAlgebraMatrix(
-				   typename Sp<ncolour>::LatticeAlgebraVector &h,
-				   typename Sp<ncolour>::LatticeMatrix &out, Real scale = 1.0) const {
-    Sp<ncolour>::FundamentalLieAlgebraMatrix(h, out, scale);
-  }
-};
-
-typedef SpTwoIndexRep<Nc, Symmetric> SpTwoIndexSymmetricRepresentation;
-typedef SpTwoIndexRep<Nc, AntiSymmetric> SpTwoIndexAntiSymmetricRepresentation;
-
-NAMESPACE_END(Grid);
-
-#endif
diff --git a/Grid/qcd/representations/two_index.h b/Grid/qcd/representations/two_index.h
index 8dfb5561..9fa6a203 100644
--- a/Grid/qcd/representations/two_index.h
+++ b/Grid/qcd/representations/two_index.h
@@ -20,14 +20,14 @@ NAMESPACE_BEGIN(Grid);
  * in the SUnTwoIndex.h file
  */
 
-template <int ncolour, TwoIndexSymmetry S>
+template <int ncolour, TwoIndexSymmetry S, class group_name>
 class TwoIndexRep {
 public:
   // typdef to be used by the Representations class in HMC to get the
   // types for the higher representation fields
-  typedef typename SU_TwoIndex<ncolour, S>::LatticeTwoIndexMatrix LatticeMatrix;
-  typedef typename SU_TwoIndex<ncolour, S>::LatticeTwoIndexField LatticeField;
-  static const int Dimension = ncolour * (ncolour + S) / 2;
+  typedef typename GaugeGroupTwoIndex<ncolour, S, group_name>::LatticeTwoIndexMatrix LatticeMatrix;
+  typedef typename GaugeGroupTwoIndex<ncolour, S, group_name>::LatticeTwoIndexField LatticeField;
+  static const int Dimension = GaugeGroupTwoIndex<ncolour,S,group_name>::Dimension;
   static const bool isFundamental = false;
 
   LatticeField U;
@@ -43,10 +43,10 @@ public:
     U = Zero();
     LatticeColourMatrix tmp(Uin.Grid());
 
-    Vector<typename SU<ncolour>::Matrix> eij(Dimension);
+    Vector<typename GaugeGroup<ncolour,group_name>::Matrix> eij(Dimension);
 
     for (int a = 0; a < Dimension; a++)
-      SU_TwoIndex<ncolour, S>::base(a, eij[a]);
+      GaugeGroupTwoIndex<ncolour, S, group_name>::base(a, eij[a]);
 
     for (int mu = 0; mu < Nd; mu++) {
       auto Uin_mu = peekLorentz(Uin, mu);
@@ -71,7 +71,7 @@ public:
 
       out_mu = Zero();
 
-      typename SU<ncolour>::LatticeAlgebraVector h(in.Grid());
+      typename GaugeGroup<ncolour, group_name>::LatticeAlgebraVector h(in.Grid());
       projectOnAlgebra(h, in_mu, double(Nc + 2 * S));  // factor T(r)/T(fund)
       FundamentalLieAlgebraMatrix(h, out_mu);          // apply scale only once
       pokeLorentz(out, out_mu, mu);
@@ -82,18 +82,21 @@ public:
 private:
   void projectOnAlgebra(typename SU<ncolour>::LatticeAlgebraVector &h_out,
                         const LatticeMatrix &in, Real scale = 1.0) const {
-    SU_TwoIndex<ncolour, S>::projectOnAlgebra(h_out, in, scale);
+    GaugeGroupTwoIndex<ncolour, S,group_name>::projectOnAlgebra(h_out, in, scale);
   }
 
   void FundamentalLieAlgebraMatrix(
 				   typename SU<ncolour>::LatticeAlgebraVector &h,
 				   typename SU<ncolour>::LatticeMatrix &out, Real scale = 1.0) const {
-    SU<ncolour>::FundamentalLieAlgebraMatrix(h, out, scale);
+    GaugeGroup<ncolour,group_name>::FundamentalLieAlgebraMatrix(h, out, scale);
   }
 };
 
-typedef TwoIndexRep<Nc, Symmetric> TwoIndexSymmetricRepresentation;
-typedef TwoIndexRep<Nc, AntiSymmetric> TwoIndexAntiSymmetricRepresentation;
+typedef TwoIndexRep<Nc, Symmetric, GroupName::SU> TwoIndexSymmetricRepresentation;
+typedef TwoIndexRep<Nc, AntiSymmetric, GroupName::SU> TwoIndexAntiSymmetricRepresentation;
+
+typedef TwoIndexRep<Nc, Symmetric, GroupName::Sp> SpTwoIndexSymmetricRepresentation;
+typedef TwoIndexRep<Nc, AntiSymmetric, GroupName::Sp> SpTwoIndexAntiSymmetricRepresentation;
 
 NAMESPACE_END(Grid);