Use Ian's version of Kranc, which is found at

<git@github.com:ianhinder/Kranc.git>.

7 files changed, 565 insertions, 714 deletions

diff --git a/ML_ADM/src/ML_ADM_Minkowski.c b/ML_ADM/src/ML_ADM_Minkowski.c
index ace3b38..7f8bf6f 100644
--- a/ML_ADM/src/ML_ADM_Minkowski.c
+++ b/ML_ADM/src/ML_ADM_Minkowski.c
@@ -28,17 +28,6 @@ void ML_ADM_Minkowski_Body(cGH const * restrict const cctkGH, int const dir, int
   
   /* Declare finite differencing variables */
   
-  /* Declare predefined quantities */
-  // CCTK_REAL p1o12dx = INITVALUE;
-  // CCTK_REAL p1o12dy = INITVALUE;
-  // CCTK_REAL p1o12dz = INITVALUE;
-  // CCTK_REAL p1o144dxdy = INITVALUE;
-  // CCTK_REAL p1o144dxdz = INITVALUE;
-  // CCTK_REAL p1o144dydz = INITVALUE;
-  // CCTK_REAL pm1o12dx2 = INITVALUE;
-  // CCTK_REAL pm1o12dy2 = INITVALUE;
-  // CCTK_REAL pm1o12dz2 = INITVALUE;
-  
   if (verbose > 1)
   {
     CCTK_VInfo(CCTK_THORNSTRING,"Entering ML_ADM_Minkowski_Body");
@@ -88,63 +77,47 @@ void ML_ADM_Minkowski_Body(cGH const * restrict const cctkGH, int const dir, int
             cctk_lsh[0],cctk_lsh[1],cctk_lsh[2])
   {
     // int index = INITVALUE;
-    // int subblock_index = INITVALUE;
     int const index = CCTK_GFINDEX3D(cctkGH,i,j,k);
-    int const subblock_index = i - min[0] + (max[0] - min[0]) * (j - min[1] + (max[1]-min[1]) * (k - min[2]));
-    
-    /* Declare shorthands */
-    
-    /* Declare local copies of grid functions */
-    // CCTK_REAL alphaL = INITVALUE;
-    // CCTK_REAL beta1L = INITVALUE, beta2L = INITVALUE, beta3L = INITVALUE;
-    // CCTK_REAL g11L = INITVALUE, g12L = INITVALUE, g13L = INITVALUE, g22L = INITVALUE, g23L = INITVALUE, g33L = INITVALUE;
-    // CCTK_REAL K11L = INITVALUE, K12L = INITVALUE, K13L = INITVALUE, K22L = INITVALUE, K23L = INITVALUE, K33L = INITVALUE;
-    /* Declare precomputed derivatives*/
-    
     /* Declare derivatives */
     
     /* Assign local copies of grid functions */
     
-    /* Assign local copies of subblock grid functions */
-    
     /* Include user supplied include files */
     
-    /* Precompute derivatives (new style) */
-    
-    /* Precompute derivatives (old style) */
+    /* Precompute derivatives */
     
     /* Calculate temporaries and grid functions */
-    CCTK_REAL const g11L  =  1;
+    CCTK_REAL g11L = 1;
     
-    CCTK_REAL const g12L  =  0;
+    CCTK_REAL g12L = 0;
     
-    CCTK_REAL const g13L  =  0;
+    CCTK_REAL g13L = 0;
     
-    CCTK_REAL const g22L  =  1;
+    CCTK_REAL g22L = 1;
     
-    CCTK_REAL const g23L  =  0;
+    CCTK_REAL g23L = 0;
     
-    CCTK_REAL const g33L  =  1;
+    CCTK_REAL g33L = 1;
     
-    CCTK_REAL const K11L  =  0;
+    CCTK_REAL K11L = 0;
     
-    CCTK_REAL const K12L  =  0;
+    CCTK_REAL K12L = 0;
     
-    CCTK_REAL const K13L  =  0;
+    CCTK_REAL K13L = 0;
     
-    CCTK_REAL const K22L  =  0;
+    CCTK_REAL K22L = 0;
     
-    CCTK_REAL const K23L  =  0;
+    CCTK_REAL K23L = 0;
     
-    CCTK_REAL const K33L  =  0;
+    CCTK_REAL K33L = 0;
     
-    CCTK_REAL const alphaL  =  1;
+    CCTK_REAL alphaL = 1;
     
-    CCTK_REAL const beta1L  =  0;
+    CCTK_REAL beta1L = 0;
     
-    CCTK_REAL const beta2L  =  0;
+    CCTK_REAL beta2L = 0;
     
-    CCTK_REAL const beta3L  =  0;
+    CCTK_REAL beta3L = 0;
     
     
     /* Copy local copies back to grid functions */
@@ -164,8 +137,6 @@ void ML_ADM_Minkowski_Body(cGH const * restrict const cctkGH, int const dir, int
     K22[index] = K22L;
     K23[index] = K23L;
     K33[index] = K33L;
-    
-    /* Copy local copies back to subblock grid functions */
   }
   LC_ENDLOOP3 (ML_ADM_Minkowski);
 }
diff --git a/ML_ADM/src/ML_ADM_RHS.c b/ML_ADM/src/ML_ADM_RHS.c
index 4170199..7bf7801 100644
--- a/ML_ADM/src/ML_ADM_RHS.c
+++ b/ML_ADM/src/ML_ADM_RHS.c
@@ -28,17 +28,6 @@ void ML_ADM_RHS_Body(cGH const * restrict const cctkGH, int const dir, int const
   
   /* Declare finite differencing variables */
   
-  /* Declare predefined quantities */
-  // CCTK_REAL p1o12dx = INITVALUE;
-  // CCTK_REAL p1o12dy = INITVALUE;
-  // CCTK_REAL p1o12dz = INITVALUE;
-  // CCTK_REAL p1o144dxdy = INITVALUE;
-  // CCTK_REAL p1o144dxdz = INITVALUE;
-  // CCTK_REAL p1o144dydz = INITVALUE;
-  // CCTK_REAL pm1o12dx2 = INITVALUE;
-  // CCTK_REAL pm1o12dy2 = INITVALUE;
-  // CCTK_REAL pm1o12dz2 = INITVALUE;
-  
   if (verbose > 1)
   {
     CCTK_VInfo(CCTK_THORNSTRING,"Entering ML_ADM_RHS_Body");
@@ -88,31 +77,7 @@ void ML_ADM_RHS_Body(cGH const * restrict const cctkGH, int const dir, int const
             cctk_lsh[0],cctk_lsh[1],cctk_lsh[2])
   {
     // int index = INITVALUE;
-    // int subblock_index = INITVALUE;
     int const index = CCTK_GFINDEX3D(cctkGH,i,j,k);
-    int const subblock_index = i - min[0] + (max[0] - min[0]) * (j - min[1] + (max[1]-min[1]) * (k - min[2]));
-    
-    /* Declare shorthands */
-    // CCTK_REAL detg = INITVALUE;
-    // CCTK_REAL G111 = INITVALUE, G112 = INITVALUE, G113 = INITVALUE, G122 = INITVALUE, G123 = INITVALUE, G133 = INITVALUE;
-    // CCTK_REAL G211 = INITVALUE, G212 = INITVALUE, G213 = INITVALUE, G222 = INITVALUE, G223 = INITVALUE, G233 = INITVALUE;
-    // CCTK_REAL G311 = INITVALUE, G312 = INITVALUE, G313 = INITVALUE, G322 = INITVALUE, G323 = INITVALUE, G333 = INITVALUE;
-    // CCTK_REAL gu11 = INITVALUE, gu12 = INITVALUE, gu13 = INITVALUE, gu21 = INITVALUE, gu22 = INITVALUE, gu23 = INITVALUE;
-    // CCTK_REAL gu31 = INITVALUE, gu32 = INITVALUE, gu33 = INITVALUE;
-    // CCTK_REAL Km11 = INITVALUE, Km12 = INITVALUE, Km13 = INITVALUE, Km21 = INITVALUE, Km22 = INITVALUE, Km23 = INITVALUE;
-    // CCTK_REAL Km31 = INITVALUE, Km32 = INITVALUE, Km33 = INITVALUE;
-    // CCTK_REAL R11 = INITVALUE, R12 = INITVALUE, R13 = INITVALUE, R22 = INITVALUE, R23 = INITVALUE, R33 = INITVALUE;
-    // CCTK_REAL trK = INITVALUE;
-    
-    /* Declare local copies of grid functions */
-    // CCTK_REAL alphaL = INITVALUE, alpharhsL = INITVALUE;
-    // CCTK_REAL beta1L = INITVALUE, beta1rhsL = INITVALUE, beta2L = INITVALUE, beta2rhsL = INITVALUE, beta3L = INITVALUE, beta3rhsL = INITVALUE;
-    // CCTK_REAL g11L = INITVALUE, g11rhsL = INITVALUE, g12L = INITVALUE, g12rhsL = INITVALUE, g13L = INITVALUE, g13rhsL = INITVALUE;
-    // CCTK_REAL g22L = INITVALUE, g22rhsL = INITVALUE, g23L = INITVALUE, g23rhsL = INITVALUE, g33L = INITVALUE, g33rhsL = INITVALUE;
-    // CCTK_REAL K11L = INITVALUE, K11rhsL = INITVALUE, K12L = INITVALUE, K12rhsL = INITVALUE, K13L = INITVALUE, K13rhsL = INITVALUE;
-    // CCTK_REAL K22L = INITVALUE, K22rhsL = INITVALUE, K23L = INITVALUE, K23rhsL = INITVALUE, K33L = INITVALUE, K33rhsL = INITVALUE;
-    /* Declare precomputed derivatives*/
-    
     /* Declare derivatives */
     // CCTK_REAL PDstandardNth1alpha = INITVALUE;
     // CCTK_REAL PDstandardNth2alpha = INITVALUE;
@@ -191,28 +156,26 @@ void ML_ADM_RHS_Body(cGH const * restrict const cctkGH, int const dir, int const
     // CCTK_REAL PDstandardNth3K33 = INITVALUE;
     
     /* Assign local copies of grid functions */
-    CCTK_REAL const alphaL = alpha[index];
-    CCTK_REAL const beta1L = beta1[index];
-    CCTK_REAL const beta2L = beta2[index];
-    CCTK_REAL const beta3L = beta3[index];
-    CCTK_REAL const g11L = g11[index];
-    CCTK_REAL const g12L = g12[index];
-    CCTK_REAL const g13L = g13[index];
-    CCTK_REAL const g22L = g22[index];
-    CCTK_REAL const g23L = g23[index];
-    CCTK_REAL const g33L = g33[index];
-    CCTK_REAL const K11L = K11[index];
-    CCTK_REAL const K12L = K12[index];
-    CCTK_REAL const K13L = K13[index];
-    CCTK_REAL const K22L = K22[index];
-    CCTK_REAL const K23L = K23[index];
-    CCTK_REAL const K33L = K33[index];
-    
-    /* Assign local copies of subblock grid functions */
+    CCTK_REAL  alphaL = alpha[index];
+    CCTK_REAL  beta1L = beta1[index];
+    CCTK_REAL  beta2L = beta2[index];
+    CCTK_REAL  beta3L = beta3[index];
+    CCTK_REAL  g11L = g11[index];
+    CCTK_REAL  g12L = g12[index];
+    CCTK_REAL  g13L = g13[index];
+    CCTK_REAL  g22L = g22[index];
+    CCTK_REAL  g23L = g23[index];
+    CCTK_REAL  g33L = g33[index];
+    CCTK_REAL  K11L = K11[index];
+    CCTK_REAL  K12L = K12[index];
+    CCTK_REAL  K13L = K13[index];
+    CCTK_REAL  K22L = K22[index];
+    CCTK_REAL  K23L = K23[index];
+    CCTK_REAL  K33L = K33[index];
     
     /* Include user supplied include files */
     
-    /* Precompute derivatives (new style) */
+    /* Precompute derivatives */
     CCTK_REAL const PDstandardNth1alpha = PDstandardNth1(alpha, i, j, k);
     CCTK_REAL const PDstandardNth2alpha = PDstandardNth2(alpha, i, j, k);
     CCTK_REAL const PDstandardNth3alpha = PDstandardNth3(alpha, i, j, k);
@@ -289,202 +252,265 @@ void ML_ADM_RHS_Body(cGH const * restrict const cctkGH, int const dir, int const
     CCTK_REAL const PDstandardNth2K33 = PDstandardNth2(K33, i, j, k);
     CCTK_REAL const PDstandardNth3K33 = PDstandardNth3(K33, i, j, k);
     
-    /* Precompute derivatives (old style) */
-    
     /* Calculate temporaries and grid functions */
-    CCTK_REAL const detg  =  2*g12L*g13L*g23L + g33L*(g11L*g22L - SQR(g12L)) - g22L*SQR(g13L) - g11L*SQR(g23L);
-    
-    CCTK_REAL const gu11  =  INV(detg)*(g22L*g33L - SQR(g23L));
-    
-    CCTK_REAL const gu12  =  (g13L*g23L - g12L*g33L)*INV(detg);
-    
-    CCTK_REAL const gu13  =  (-(g13L*g22L) + g12L*g23L)*INV(detg);
-    
-    CCTK_REAL const gu21  =  (g13L*g23L - g12L*g33L)*INV(detg);
-    
-    CCTK_REAL const gu22  =  INV(detg)*(g11L*g33L - SQR(g13L));
-    
-    CCTK_REAL const gu23  =  (g12L*g13L - g11L*g23L)*INV(detg);
-    
-    CCTK_REAL const gu31  =  (-(g13L*g22L) + g12L*g23L)*INV(detg);
-    
-    CCTK_REAL const gu32  =  (g12L*g13L - g11L*g23L)*INV(detg);
-    
-    CCTK_REAL const gu33  =  INV(detg)*(g11L*g22L - SQR(g12L));
-    
-    CCTK_REAL const G111  =  khalf*(gu11*PDstandardNth1g11 + 2*(gu12*PDstandardNth1g12 + gu13*PDstandardNth1g13) - gu12*PDstandardNth2g11 - 
-          gu13*PDstandardNth3g11);
-    
-    CCTK_REAL const G211  =  khalf*(gu21*PDstandardNth1g11 + 2*(gu22*PDstandardNth1g12 + gu23*PDstandardNth1g13) - gu22*PDstandardNth2g11 - 
-          gu23*PDstandardNth3g11);
-    
-    CCTK_REAL const G311  =  khalf*(gu31*PDstandardNth1g11 + 2*(gu32*PDstandardNth1g12 + gu33*PDstandardNth1g13) - gu32*PDstandardNth2g11 - 
-          gu33*PDstandardNth3g11);
-    
-    CCTK_REAL const G112  =  khalf*(gu12*PDstandardNth1g22 + gu11*PDstandardNth2g11 + 
-          gu13*(PDstandardNth1g23 + PDstandardNth2g13 - PDstandardNth3g12));
-    
-    CCTK_REAL const G212  =  khalf*(gu22*PDstandardNth1g22 + gu21*PDstandardNth2g11 + 
-          gu23*(PDstandardNth1g23 + PDstandardNth2g13 - PDstandardNth3g12));
-    
-    CCTK_REAL const G312  =  khalf*(gu32*PDstandardNth1g22 + gu31*PDstandardNth2g11 + 
-          gu33*(PDstandardNth1g23 + PDstandardNth2g13 - PDstandardNth3g12));
-    
-    CCTK_REAL const G113  =  khalf*(gu13*PDstandardNth1g33 + gu11*PDstandardNth3g11 + 
-          gu12*(PDstandardNth1g23 - PDstandardNth2g13 + PDstandardNth3g12));
-    
-    CCTK_REAL const G213  =  khalf*(gu23*PDstandardNth1g33 + gu21*PDstandardNth3g11 + 
-          gu22*(PDstandardNth1g23 - PDstandardNth2g13 + PDstandardNth3g12));
-    
-    CCTK_REAL const G313  =  khalf*(gu33*PDstandardNth1g33 + gu31*PDstandardNth3g11 + 
-          gu32*(PDstandardNth1g23 - PDstandardNth2g13 + PDstandardNth3g12));
+    CCTK_REAL detg = 2*g12L*g13L*g23L + g33L*(g11L*g22L - SQR(g12L)) - 
+      g22L*SQR(g13L) - g11L*SQR(g23L);
     
-    CCTK_REAL const G122  =  khalf*(gu11*(-PDstandardNth1g22 + 2*PDstandardNth2g12) + gu12*PDstandardNth2g22 + 
-          gu13*(2*PDstandardNth2g23 - PDstandardNth3g22));
+    CCTK_REAL gu11 = INV(detg)*(g22L*g33L - SQR(g23L));
     
-    CCTK_REAL const G222  =  khalf*(gu21*(-PDstandardNth1g22 + 2*PDstandardNth2g12) + gu22*PDstandardNth2g22 + 
-          gu23*(2*PDstandardNth2g23 - PDstandardNth3g22));
+    CCTK_REAL gu12 = (g13L*g23L - g12L*g33L)*INV(detg);
     
-    CCTK_REAL const G322  =  khalf*(gu31*(-PDstandardNth1g22 + 2*PDstandardNth2g12) + gu32*PDstandardNth2g22 + 
-          gu33*(2*PDstandardNth2g23 - PDstandardNth3g22));
+    CCTK_REAL gu13 = (-(g13L*g22L) + g12L*g23L)*INV(detg);
     
-    CCTK_REAL const G123  =  khalf*(gu13*PDstandardNth2g33 + gu11*(-PDstandardNth1g23 + PDstandardNth2g13 + PDstandardNth3g12) + 
-          gu12*PDstandardNth3g22);
+    CCTK_REAL gu21 = (g13L*g23L - g12L*g33L)*INV(detg);
     
-    CCTK_REAL const G223  =  khalf*(gu23*PDstandardNth2g33 + gu21*(-PDstandardNth1g23 + PDstandardNth2g13 + PDstandardNth3g12) + 
-          gu22*PDstandardNth3g22);
+    CCTK_REAL gu22 = INV(detg)*(g11L*g33L - SQR(g13L));
     
-    CCTK_REAL const G323  =  khalf*(gu33*PDstandardNth2g33 + gu31*(-PDstandardNth1g23 + PDstandardNth2g13 + PDstandardNth3g12) + 
-          gu32*PDstandardNth3g22);
+    CCTK_REAL gu23 = (g12L*g13L - g11L*g23L)*INV(detg);
     
-    CCTK_REAL const G133  =  khalf*(-(gu11*PDstandardNth1g33) - gu12*PDstandardNth2g33 + 2*gu11*PDstandardNth3g13 + 
-          2*gu12*PDstandardNth3g23 + gu13*PDstandardNth3g33);
+    CCTK_REAL gu31 = (-(g13L*g22L) + g12L*g23L)*INV(detg);
     
-    CCTK_REAL const G233  =  khalf*(-(gu21*PDstandardNth1g33) - gu22*PDstandardNth2g33 + 2*gu21*PDstandardNth3g13 + 
-          2*gu22*PDstandardNth3g23 + gu23*PDstandardNth3g33);
+    CCTK_REAL gu32 = (g12L*g13L - g11L*g23L)*INV(detg);
     
-    CCTK_REAL const G333  =  khalf*(-(gu31*PDstandardNth1g33) - gu32*PDstandardNth2g33 + 2*gu31*PDstandardNth3g13 + 
-          2*gu32*PDstandardNth3g23 + gu33*PDstandardNth3g33);
+    CCTK_REAL gu33 = INV(detg)*(g11L*g22L - SQR(g12L));
     
-    CCTK_REAL const R11  =  2*(G112*G211 + G113*G311 + G213*G312) - G111*(G111 + G212 + G313) - G211*(G112 + G222 + G323) - 
-        G311*(G113 + G223 + G333) + khalf*(-(gu22*(PDstandardNth11g22 - 2*PDstandardNth12g12 + PDstandardNth22g11)) + 
-           gu23*(-PDstandardNth11g23 + PDstandardNth12g13 + PDstandardNth13g12 - PDstandardNth23g11) + 
-           gu32*(-PDstandardNth11g23 + PDstandardNth12g13 + PDstandardNth13g12 - PDstandardNth23g11) - 
-           gu33*(PDstandardNth11g33 - 2*PDstandardNth13g13 + PDstandardNth33g11)) + SQR(G111) + SQR(G212) + SQR(G313);
+    CCTK_REAL G111 = khalf*(gu11*PDstandardNth1g11 + 
+      2*(gu12*PDstandardNth1g12 + gu13*PDstandardNth1g13) - 
+      gu12*PDstandardNth2g11 - gu13*PDstandardNth3g11);
     
-    CCTK_REAL const R12  =  khalf*(2*(G122*G211 + G123*G311 + G213*G322 + G313*G323) - 
-          2*(G112*G212 + G112*G313 + G212*G323 + G312*G333 + gu12*PDstandardNth12g12) - gu32*PDstandardNth12g23 - 
-          gu33*PDstandardNth12g33 + gu13*(PDstandardNth11g23 - PDstandardNth12g13 - PDstandardNth13g12) + 
-          gu32*PDstandardNth13g22 + gu33*PDstandardNth13g23 + gu12*(PDstandardNth11g22 + PDstandardNth22g11) + 
-          gu32*PDstandardNth22g13 + gu13*PDstandardNth23g11 - gu32*PDstandardNth23g12 + gu33*PDstandardNth23g13 - 
-          gu33*PDstandardNth33g12);
+    CCTK_REAL G211 = khalf*(gu21*PDstandardNth1g11 + 
+      2*(gu22*PDstandardNth1g12 + gu23*PDstandardNth1g13) - 
+      gu22*PDstandardNth2g11 - gu23*PDstandardNth3g11);
+    
+    CCTK_REAL G311 = khalf*(gu31*PDstandardNth1g11 + 
+      2*(gu32*PDstandardNth1g12 + gu33*PDstandardNth1g13) - 
+      gu32*PDstandardNth2g11 - gu33*PDstandardNth3g11);
+    
+    CCTK_REAL G112 = khalf*(gu12*PDstandardNth1g22 + 
+      gu11*PDstandardNth2g11 + gu13*(PDstandardNth1g23 + PDstandardNth2g13 - 
+      PDstandardNth3g12));
+    
+    CCTK_REAL G212 = khalf*(gu22*PDstandardNth1g22 + 
+      gu21*PDstandardNth2g11 + gu23*(PDstandardNth1g23 + PDstandardNth2g13 - 
+      PDstandardNth3g12));
+    
+    CCTK_REAL G312 = khalf*(gu32*PDstandardNth1g22 + 
+      gu31*PDstandardNth2g11 + gu33*(PDstandardNth1g23 + PDstandardNth2g13 - 
+      PDstandardNth3g12));
+    
+    CCTK_REAL G113 = khalf*(gu13*PDstandardNth1g33 + 
+      gu11*PDstandardNth3g11 + gu12*(PDstandardNth1g23 - PDstandardNth2g13 + 
+      PDstandardNth3g12));
+    
+    CCTK_REAL G213 = khalf*(gu23*PDstandardNth1g33 + 
+      gu21*PDstandardNth3g11 + gu22*(PDstandardNth1g23 - PDstandardNth2g13 + 
+      PDstandardNth3g12));
+    
+    CCTK_REAL G313 = khalf*(gu33*PDstandardNth1g33 + 
+      gu31*PDstandardNth3g11 + gu32*(PDstandardNth1g23 - PDstandardNth2g13 + 
+      PDstandardNth3g12));
+    
+    CCTK_REAL G122 = khalf*(gu11*(-PDstandardNth1g22 + 
+      2*PDstandardNth2g12) + gu12*PDstandardNth2g22 + 
+      gu13*(2*PDstandardNth2g23 - PDstandardNth3g22));
     
-    CCTK_REAL const R13  =  khalf*(2*(G123*G211 + G212*G223 + G133*G311 + G233*G312) - 
-          2*(G213*G222 + G223*G313 + G113*(G212 + G313) + gu13*PDstandardNth13g13) + 
-          gu12*(PDstandardNth11g23 - PDstandardNth12g13 - PDstandardNth13g12 + PDstandardNth23g11) + 
-          gu22*(PDstandardNth12g23 - PDstandardNth13g22 - PDstandardNth22g13 + PDstandardNth23g12) + 
-          gu13*(PDstandardNth11g33 + PDstandardNth33g11) + 
-          gu23*(PDstandardNth12g33 - PDstandardNth13g23 - PDstandardNth23g13 + PDstandardNth33g12));
+    CCTK_REAL G222 = khalf*(gu21*(-PDstandardNth1g22 + 
+      2*PDstandardNth2g12) + gu22*PDstandardNth2g22 + 
+      gu23*(2*PDstandardNth2g23 - PDstandardNth3g22));
     
-    CCTK_REAL const R22  =  -(G122*(G111 + G212 + G313)) + 2*(G122*G212 + G123*G312 + G223*G322) - G222*(G112 + G222 + G323) - 
-        G322*(G113 + G223 + G333) + khalf*(-(gu11*(PDstandardNth11g22 - 2*PDstandardNth12g12 + PDstandardNth22g11)) + 
-           gu13*(PDstandardNth12g23 - PDstandardNth13g22 - PDstandardNth22g13 + PDstandardNth23g12) + 
-           gu31*(PDstandardNth12g23 - PDstandardNth13g22 - PDstandardNth22g13 + PDstandardNth23g12) - 
-           gu33*(PDstandardNth22g33 - 2*PDstandardNth23g23 + PDstandardNth33g22)) + SQR(G112) + SQR(G222) + SQR(G323);
+    CCTK_REAL G322 = khalf*(gu31*(-PDstandardNth1g22 + 
+      2*PDstandardNth2g12) + gu32*PDstandardNth2g22 + 
+      gu33*(2*PDstandardNth2g23 - PDstandardNth3g22));
     
-    CCTK_REAL const R23  =  khalf*(2*(G112*G113 + G122*G213 + G133*G312 + G233*G322) + 
-          gu11*(-PDstandardNth11g23 + PDstandardNth12g13 + PDstandardNth13g12 - PDstandardNth23g11) + 
-          gu21*(-PDstandardNth12g23 + PDstandardNth13g22 + PDstandardNth22g13 - PDstandardNth23g12) - 
-          2*(G111*G123 + G113*G323 + G223*(G112 + G323) + gu23*PDstandardNth23g23) + 
-          gu13*(PDstandardNth12g33 - PDstandardNth13g23 - PDstandardNth23g13 + PDstandardNth33g12) + 
-          gu23*(PDstandardNth22g33 + PDstandardNth33g22));
+    CCTK_REAL G123 = khalf*(gu13*PDstandardNth2g33 + 
+      gu11*(-PDstandardNth1g23 + PDstandardNth2g13 + PDstandardNth3g12) + 
+      gu12*PDstandardNth3g22);
     
-    CCTK_REAL const R33  =  -(G133*(G111 + G212 + G313)) + 2*(G123*G213 + G133*G313) + 2*G233*G323 - G233*(G112 + G222 + G323) - 
-        G333*(G113 + G223 + G333) + khalf*(-(gu11*(PDstandardNth11g33 - 2*PDstandardNth13g13 + PDstandardNth33g11)) + 
-           gu12*(-PDstandardNth12g33 + PDstandardNth13g23 + PDstandardNth23g13 - PDstandardNth33g12) + 
-           gu21*(-PDstandardNth12g33 + PDstandardNth13g23 + PDstandardNth23g13 - PDstandardNth33g12) - 
-           gu22*(PDstandardNth22g33 - 2*PDstandardNth23g23 + PDstandardNth33g22)) + SQR(G113) + SQR(G223) + SQR(G333);
+    CCTK_REAL G223 = khalf*(gu23*PDstandardNth2g33 + 
+      gu21*(-PDstandardNth1g23 + PDstandardNth2g13 + PDstandardNth3g12) + 
+      gu22*PDstandardNth3g22);
     
-    CCTK_REAL const Km11  =  gu11*K11L + gu12*K12L + gu13*K13L;
+    CCTK_REAL G323 = khalf*(gu33*PDstandardNth2g33 + 
+      gu31*(-PDstandardNth1g23 + PDstandardNth2g13 + PDstandardNth3g12) + 
+      gu32*PDstandardNth3g22);
     
-    CCTK_REAL const Km21  =  gu21*K11L + gu22*K12L + gu23*K13L;
+    CCTK_REAL G133 = khalf*(-(gu11*PDstandardNth1g33) - 
+      gu12*PDstandardNth2g33 + 2*gu11*PDstandardNth3g13 + 
+      2*gu12*PDstandardNth3g23 + gu13*PDstandardNth3g33);
     
-    CCTK_REAL const Km31  =  gu31*K11L + gu32*K12L + gu33*K13L;
+    CCTK_REAL G233 = khalf*(-(gu21*PDstandardNth1g33) - 
+      gu22*PDstandardNth2g33 + 2*gu21*PDstandardNth3g13 + 
+      2*gu22*PDstandardNth3g23 + gu23*PDstandardNth3g33);
     
-    CCTK_REAL const Km12  =  gu11*K12L + gu12*K22L + gu13*K23L;
+    CCTK_REAL G333 = khalf*(-(gu31*PDstandardNth1g33) - 
+      gu32*PDstandardNth2g33 + 2*gu31*PDstandardNth3g13 + 
+      2*gu32*PDstandardNth3g23 + gu33*PDstandardNth3g33);
     
-    CCTK_REAL const Km22  =  gu21*K12L + gu22*K22L + gu23*K23L;
+    CCTK_REAL R11 = 2*(G112*G211 + G113*G311 + G213*G312) - G111*(G111 + 
+      G212 + G313) - G211*(G112 + G222 + G323) - G311*(G113 + G223 + G333) + 
+      khalf*(-(gu22*(PDstandardNth11g22 - 2*PDstandardNth12g12 + 
+      PDstandardNth22g11)) + gu23*(-PDstandardNth11g23 + PDstandardNth12g13 + 
+      PDstandardNth13g12 - PDstandardNth23g11) + gu32*(-PDstandardNth11g23 + 
+      PDstandardNth12g13 + PDstandardNth13g12 - PDstandardNth23g11) - 
+      gu33*(PDstandardNth11g33 - 2*PDstandardNth13g13 + PDstandardNth33g11)) 
+      + SQR(G111) + SQR(G212) + SQR(G313);
     
-    CCTK_REAL const Km32  =  gu31*K12L + gu32*K22L + gu33*K23L;
-    
-    CCTK_REAL const Km13  =  gu11*K13L + gu12*K23L + gu13*K33L;
-    
-    CCTK_REAL const Km23  =  gu21*K13L + gu22*K23L + gu23*K33L;
-    
-    CCTK_REAL const Km33  =  gu31*K13L + gu32*K23L + gu33*K33L;
-    
-    CCTK_REAL const trK  =  Km11 + Km22 + Km33;
-    
-    CCTK_REAL const g11rhsL  =  -2*alphaL*K11L + 2*(g11L*PDstandardNth1beta1 + g12L*PDstandardNth1beta2 + g13L*PDstandardNth1beta3) + 
-        beta1L*PDstandardNth1g11 + beta2L*PDstandardNth2g11 + beta3L*PDstandardNth3g11;
-    
-    CCTK_REAL const g12rhsL  =  -2*alphaL*K12L + g22L*PDstandardNth1beta2 + g23L*PDstandardNth1beta3 + beta1L*PDstandardNth1g12 + 
-        g11L*PDstandardNth2beta1 + g12L*(PDstandardNth1beta1 + PDstandardNth2beta2) + g13L*PDstandardNth2beta3 + 
-        beta2L*PDstandardNth2g12 + beta3L*PDstandardNth3g12;
-    
-    CCTK_REAL const g13rhsL  =  -2*alphaL*K13L + g23L*PDstandardNth1beta2 + g33L*PDstandardNth1beta3 + beta1L*PDstandardNth1g13 + 
-        beta2L*PDstandardNth2g13 + g11L*PDstandardNth3beta1 + g12L*PDstandardNth3beta2 + 
-        g13L*(PDstandardNth1beta1 + PDstandardNth3beta3) + beta3L*PDstandardNth3g13;
-    
-    CCTK_REAL const g22rhsL  =  -2*alphaL*K22L + beta1L*PDstandardNth1g22 + 
-        2*(g12L*PDstandardNth2beta1 + g22L*PDstandardNth2beta2 + g23L*PDstandardNth2beta3) + beta2L*PDstandardNth2g22 + 
-        beta3L*PDstandardNth3g22;
-    
-    CCTK_REAL const g23rhsL  =  -2*alphaL*K23L + beta1L*PDstandardNth1g23 + g13L*PDstandardNth2beta1 + g33L*PDstandardNth2beta3 + 
-        beta2L*PDstandardNth2g23 + g12L*PDstandardNth3beta1 + g22L*PDstandardNth3beta2 + 
-        g23L*(PDstandardNth2beta2 + PDstandardNth3beta3) + beta3L*PDstandardNth3g23;
-    
-    CCTK_REAL const g33rhsL  =  -2*alphaL*K33L + beta1L*PDstandardNth1g33 + beta2L*PDstandardNth2g33 + 
-        2*(g13L*PDstandardNth3beta1 + g23L*PDstandardNth3beta2 + g33L*PDstandardNth3beta3) + beta3L*PDstandardNth3g33;
-    
-    CCTK_REAL const K11rhsL  =  -PDstandardNth11alpha + G111*PDstandardNth1alpha + 
-        2*(K11L*PDstandardNth1beta1 + K12L*PDstandardNth1beta2 + K13L*PDstandardNth1beta3) + beta1L*PDstandardNth1K11 + 
-        G211*PDstandardNth2alpha + beta2L*PDstandardNth2K11 + G311*PDstandardNth3alpha + beta3L*PDstandardNth3K11 + 
-        alphaL*(-2*(K11L*Km11 + K12L*Km21 + K13L*Km31) + R11 + K11L*trK);
-    
-    CCTK_REAL const K12rhsL  =  -PDstandardNth12alpha + G112*PDstandardNth1alpha + K22L*PDstandardNth1beta2 + K23L*PDstandardNth1beta3 + 
-        beta1L*PDstandardNth1K12 + G212*PDstandardNth2alpha + K11L*PDstandardNth2beta1 + 
-        K12L*(PDstandardNth1beta1 + PDstandardNth2beta2) + K13L*PDstandardNth2beta3 + beta2L*PDstandardNth2K12 + 
-        G312*PDstandardNth3alpha + beta3L*PDstandardNth3K12 + 
-        alphaL*(-2*(K11L*Km12 + K12L*Km22 + K13L*Km32) + R12 + K12L*trK);
-    
-    CCTK_REAL const K13rhsL  =  -PDstandardNth13alpha + G113*PDstandardNth1alpha + K23L*PDstandardNth1beta2 + K33L*PDstandardNth1beta3 + 
-        beta1L*PDstandardNth1K13 + G213*PDstandardNth2alpha + beta2L*PDstandardNth2K13 + G313*PDstandardNth3alpha + 
-        K11L*PDstandardNth3beta1 + K12L*PDstandardNth3beta2 + K13L*(PDstandardNth1beta1 + PDstandardNth3beta3) + 
-        beta3L*PDstandardNth3K13 + alphaL*(-2*(K11L*Km13 + K12L*Km23 + K13L*Km33) + R13 + K13L*trK);
-    
-    CCTK_REAL const K22rhsL  =  G122*PDstandardNth1alpha + beta1L*PDstandardNth1K22 - PDstandardNth22alpha + G222*PDstandardNth2alpha + 
-        2*(K12L*PDstandardNth2beta1 + K22L*PDstandardNth2beta2 + K23L*PDstandardNth2beta3) + beta2L*PDstandardNth2K22 + 
-        G322*PDstandardNth3alpha + beta3L*PDstandardNth3K22 + 
-        alphaL*(-2*(K12L*Km12 + K22L*Km22 + K23L*Km32) + R22 + K22L*trK);
-    
-    CCTK_REAL const K23rhsL  =  G123*PDstandardNth1alpha + beta1L*PDstandardNth1K23 - PDstandardNth23alpha + G223*PDstandardNth2alpha + 
-        K13L*PDstandardNth2beta1 + K33L*PDstandardNth2beta3 + beta2L*PDstandardNth2K23 + G323*PDstandardNth3alpha + 
-        K12L*PDstandardNth3beta1 + K22L*PDstandardNth3beta2 + K23L*(PDstandardNth2beta2 + PDstandardNth3beta3) + 
-        beta3L*PDstandardNth3K23 + alphaL*(-2*(K12L*Km13 + K22L*Km23 + K23L*Km33) + R23 + K23L*trK);
-    
-    CCTK_REAL const K33rhsL  =  G133*PDstandardNth1alpha + beta1L*PDstandardNth1K33 + G233*PDstandardNth2alpha + beta2L*PDstandardNth2K33 - 
-        PDstandardNth33alpha + G333*PDstandardNth3alpha + 
-        2*(K13L*PDstandardNth3beta1 + K23L*PDstandardNth3beta2 + K33L*PDstandardNth3beta3) + beta3L*PDstandardNth3K33 + 
-        alphaL*(-2*(K13L*Km13 + K23L*Km23 + K33L*Km33) + R33 + K33L*trK);
-    
-    CCTK_REAL const alpharhsL  =  0;
-    
-    CCTK_REAL const beta1rhsL  =  0;
-    
-    CCTK_REAL const beta2rhsL  =  0;
-    
-    CCTK_REAL const beta3rhsL  =  0;
+    CCTK_REAL R12 = khalf*(2*(G122*G211 + G123*G311 + G213*G322 + 
+      G313*G323) - 2*(G112*G212 + G112*G313 + G212*G323 + G312*G333 + 
+      gu12*PDstandardNth12g12) - gu32*PDstandardNth12g23 - 
+      gu33*PDstandardNth12g33 + gu13*(PDstandardNth11g23 - PDstandardNth12g13 
+      - PDstandardNth13g12) + gu32*PDstandardNth13g22 + 
+      gu33*PDstandardNth13g23 + gu12*(PDstandardNth11g22 + 
+      PDstandardNth22g11) + gu32*PDstandardNth22g13 + gu13*PDstandardNth23g11 
+      - gu32*PDstandardNth23g12 + gu33*PDstandardNth23g13 - 
+      gu33*PDstandardNth33g12);
+    
+    CCTK_REAL R13 = khalf*(2*(G123*G211 + G212*G223 + G133*G311 + 
+      G233*G312) - 2*(G213*G222 + G223*G313 + G113*(G212 + G313) + 
+      gu13*PDstandardNth13g13) + gu12*(PDstandardNth11g23 - 
+      PDstandardNth12g13 - PDstandardNth13g12 + PDstandardNth23g11) + 
+      gu22*(PDstandardNth12g23 - PDstandardNth13g22 - PDstandardNth22g13 + 
+      PDstandardNth23g12) + gu13*(PDstandardNth11g33 + PDstandardNth33g11) + 
+      gu23*(PDstandardNth12g33 - PDstandardNth13g23 - PDstandardNth23g13 + 
+      PDstandardNth33g12));
+    
+    CCTK_REAL R22 = -(G122*(G111 + G212 + G313)) + 2*(G122*G212 + 
+      G123*G312 + G223*G322) - G222*(G112 + G222 + G323) - G322*(G113 + G223 
+      + G333) + khalf*(-(gu11*(PDstandardNth11g22 - 2*PDstandardNth12g12 + 
+      PDstandardNth22g11)) + gu13*(PDstandardNth12g23 - PDstandardNth13g22 - 
+      PDstandardNth22g13 + PDstandardNth23g12) + gu31*(PDstandardNth12g23 - 
+      PDstandardNth13g22 - PDstandardNth22g13 + PDstandardNth23g12) - 
+      gu33*(PDstandardNth22g33 - 2*PDstandardNth23g23 + PDstandardNth33g22)) 
+      + SQR(G112) + SQR(G222) + SQR(G323);
+    
+    CCTK_REAL R23 = khalf*(2*(G112*G113 + G122*G213 + G133*G312 + 
+      G233*G322) + gu11*(-PDstandardNth11g23 + PDstandardNth12g13 + 
+      PDstandardNth13g12 - PDstandardNth23g11) + gu21*(-PDstandardNth12g23 + 
+      PDstandardNth13g22 + PDstandardNth22g13 - PDstandardNth23g12) - 
+      2*(G111*G123 + G113*G323 + G223*(G112 + G323) + 
+      gu23*PDstandardNth23g23) + gu13*(PDstandardNth12g33 - 
+      PDstandardNth13g23 - PDstandardNth23g13 + PDstandardNth33g12) + 
+      gu23*(PDstandardNth22g33 + PDstandardNth33g22));
+    
+    CCTK_REAL R33 = -(G133*(G111 + G212 + G313)) + 2*(G123*G213 + 
+      G133*G313) + 2*G233*G323 - G233*(G112 + G222 + G323) - G333*(G113 + 
+      G223 + G333) + khalf*(-(gu11*(PDstandardNth11g33 - 2*PDstandardNth13g13 
+      + PDstandardNth33g11)) + gu12*(-PDstandardNth12g33 + PDstandardNth13g23 
+      + PDstandardNth23g13 - PDstandardNth33g12) + gu21*(-PDstandardNth12g33 
+      + PDstandardNth13g23 + PDstandardNth23g13 - PDstandardNth33g12) - 
+      gu22*(PDstandardNth22g33 - 2*PDstandardNth23g23 + PDstandardNth33g22)) 
+      + SQR(G113) + SQR(G223) + SQR(G333);
+    
+    CCTK_REAL Km11 = gu11*K11L + gu12*K12L + gu13*K13L;
+    
+    CCTK_REAL Km21 = gu21*K11L + gu22*K12L + gu23*K13L;
+    
+    CCTK_REAL Km31 = gu31*K11L + gu32*K12L + gu33*K13L;
+    
+    CCTK_REAL Km12 = gu11*K12L + gu12*K22L + gu13*K23L;
+    
+    CCTK_REAL Km22 = gu21*K12L + gu22*K22L + gu23*K23L;
+    
+    CCTK_REAL Km32 = gu31*K12L + gu32*K22L + gu33*K23L;
+    
+    CCTK_REAL Km13 = gu11*K13L + gu12*K23L + gu13*K33L;
+    
+    CCTK_REAL Km23 = gu21*K13L + gu22*K23L + gu23*K33L;
+    
+    CCTK_REAL Km33 = gu31*K13L + gu32*K23L + gu33*K33L;
+    
+    CCTK_REAL trK = Km11 + Km22 + Km33;
+    
+    CCTK_REAL g11rhsL = -2*alphaL*K11L + 2*(g11L*PDstandardNth1beta1 + 
+      g12L*PDstandardNth1beta2 + g13L*PDstandardNth1beta3) + 
+      beta1L*PDstandardNth1g11 + beta2L*PDstandardNth2g11 + 
+      beta3L*PDstandardNth3g11;
+    
+    CCTK_REAL g12rhsL = -2*alphaL*K12L + g22L*PDstandardNth1beta2 + 
+      g23L*PDstandardNth1beta3 + beta1L*PDstandardNth1g12 + 
+      g11L*PDstandardNth2beta1 + g12L*(PDstandardNth1beta1 + 
+      PDstandardNth2beta2) + g13L*PDstandardNth2beta3 + 
+      beta2L*PDstandardNth2g12 + beta3L*PDstandardNth3g12;
+    
+    CCTK_REAL g13rhsL = -2*alphaL*K13L + g23L*PDstandardNth1beta2 + 
+      g33L*PDstandardNth1beta3 + beta1L*PDstandardNth1g13 + 
+      beta2L*PDstandardNth2g13 + g11L*PDstandardNth3beta1 + 
+      g12L*PDstandardNth3beta2 + g13L*(PDstandardNth1beta1 + 
+      PDstandardNth3beta3) + beta3L*PDstandardNth3g13;
+    
+    CCTK_REAL g22rhsL = -2*alphaL*K22L + beta1L*PDstandardNth1g22 + 
+      2*(g12L*PDstandardNth2beta1 + g22L*PDstandardNth2beta2 + 
+      g23L*PDstandardNth2beta3) + beta2L*PDstandardNth2g22 + 
+      beta3L*PDstandardNth3g22;
+    
+    CCTK_REAL g23rhsL = -2*alphaL*K23L + beta1L*PDstandardNth1g23 + 
+      g13L*PDstandardNth2beta1 + g33L*PDstandardNth2beta3 + 
+      beta2L*PDstandardNth2g23 + g12L*PDstandardNth3beta1 + 
+      g22L*PDstandardNth3beta2 + g23L*(PDstandardNth2beta2 + 
+      PDstandardNth3beta3) + beta3L*PDstandardNth3g23;
+    
+    CCTK_REAL g33rhsL = -2*alphaL*K33L + beta1L*PDstandardNth1g33 + 
+      beta2L*PDstandardNth2g33 + 2*(g13L*PDstandardNth3beta1 + 
+      g23L*PDstandardNth3beta2 + g33L*PDstandardNth3beta3) + 
+      beta3L*PDstandardNth3g33;
+    
+    CCTK_REAL K11rhsL = -PDstandardNth11alpha + G111*PDstandardNth1alpha + 
+      2*(K11L*PDstandardNth1beta1 + K12L*PDstandardNth1beta2 + 
+      K13L*PDstandardNth1beta3) + beta1L*PDstandardNth1K11 + 
+      G211*PDstandardNth2alpha + beta2L*PDstandardNth2K11 + 
+      G311*PDstandardNth3alpha + beta3L*PDstandardNth3K11 + 
+      alphaL*(-2*(K11L*Km11 + K12L*Km21 + K13L*Km31) + R11 + K11L*trK);
+    
+    CCTK_REAL K12rhsL = -PDstandardNth12alpha + G112*PDstandardNth1alpha + 
+      K22L*PDstandardNth1beta2 + K23L*PDstandardNth1beta3 + 
+      beta1L*PDstandardNth1K12 + G212*PDstandardNth2alpha + 
+      K11L*PDstandardNth2beta1 + K12L*(PDstandardNth1beta1 + 
+      PDstandardNth2beta2) + K13L*PDstandardNth2beta3 + 
+      beta2L*PDstandardNth2K12 + G312*PDstandardNth3alpha + 
+      beta3L*PDstandardNth3K12 + alphaL*(-2*(K11L*Km12 + K12L*Km22 + 
+      K13L*Km32) + R12 + K12L*trK);
+    
+    CCTK_REAL K13rhsL = -PDstandardNth13alpha + G113*PDstandardNth1alpha + 
+      K23L*PDstandardNth1beta2 + K33L*PDstandardNth1beta3 + 
+      beta1L*PDstandardNth1K13 + G213*PDstandardNth2alpha + 
+      beta2L*PDstandardNth2K13 + G313*PDstandardNth3alpha + 
+      K11L*PDstandardNth3beta1 + K12L*PDstandardNth3beta2 + 
+      K13L*(PDstandardNth1beta1 + PDstandardNth3beta3) + 
+      beta3L*PDstandardNth3K13 + alphaL*(-2*(K11L*Km13 + K12L*Km23 + 
+      K13L*Km33) + R13 + K13L*trK);
+    
+    CCTK_REAL K22rhsL = G122*PDstandardNth1alpha + 
+      beta1L*PDstandardNth1K22 - PDstandardNth22alpha + 
+      G222*PDstandardNth2alpha + 2*(K12L*PDstandardNth2beta1 + 
+      K22L*PDstandardNth2beta2 + K23L*PDstandardNth2beta3) + 
+      beta2L*PDstandardNth2K22 + G322*PDstandardNth3alpha + 
+      beta3L*PDstandardNth3K22 + alphaL*(-2*(K12L*Km12 + K22L*Km22 + 
+      K23L*Km32) + R22 + K22L*trK);
+    
+    CCTK_REAL K23rhsL = G123*PDstandardNth1alpha + 
+      beta1L*PDstandardNth1K23 - PDstandardNth23alpha + 
+      G223*PDstandardNth2alpha + K13L*PDstandardNth2beta1 + 
+      K33L*PDstandardNth2beta3 + beta2L*PDstandardNth2K23 + 
+      G323*PDstandardNth3alpha + K12L*PDstandardNth3beta1 + 
+      K22L*PDstandardNth3beta2 + K23L*(PDstandardNth2beta2 + 
+      PDstandardNth3beta3) + beta3L*PDstandardNth3K23 + alphaL*(-2*(K12L*Km13 
+      + K22L*Km23 + K23L*Km33) + R23 + K23L*trK);
+    
+    CCTK_REAL K33rhsL = G133*PDstandardNth1alpha + 
+      beta1L*PDstandardNth1K33 + G233*PDstandardNth2alpha + 
+      beta2L*PDstandardNth2K33 - PDstandardNth33alpha + 
+      G333*PDstandardNth3alpha + 2*(K13L*PDstandardNth3beta1 + 
+      K23L*PDstandardNth3beta2 + K33L*PDstandardNth3beta3) + 
+      beta3L*PDstandardNth3K33 + alphaL*(-2*(K13L*Km13 + K23L*Km23 + 
+      K33L*Km33) + R33 + K33L*trK);
+    
+    CCTK_REAL alpharhsL = 0;
+    
+    CCTK_REAL beta1rhsL = 0;
+    
+    CCTK_REAL beta2rhsL = 0;
+    
+    CCTK_REAL beta3rhsL = 0;
     
     
     /* Copy local copies back to grid functions */
@@ -504,8 +530,6 @@ void ML_ADM_RHS_Body(cGH const * restrict const cctkGH, int const dir, int const
     K22rhs[index] = K22rhsL;
     K23rhs[index] = K23rhsL;
     K33rhs[index] = K33rhsL;
-    
-    /* Copy local copies back to subblock grid functions */
   }
   LC_ENDLOOP3 (ML_ADM_RHS);
 }
diff --git a/ML_ADM/src/ML_ADM_boundary.c b/ML_ADM/src/ML_ADM_boundary.c
index a177e52..88c13b6 100644
--- a/ML_ADM/src/ML_ADM_boundary.c
+++ b/ML_ADM/src/ML_ADM_boundary.c
@@ -28,17 +28,6 @@ void ML_ADM_boundary_Body(cGH const * restrict const cctkGH, int const dir, int
   
   /* Declare finite differencing variables */
   
-  /* Declare predefined quantities */
-  // CCTK_REAL p1o12dx = INITVALUE;
-  // CCTK_REAL p1o12dy = INITVALUE;
-  // CCTK_REAL p1o12dz = INITVALUE;
-  // CCTK_REAL p1o144dxdy = INITVALUE;
-  // CCTK_REAL p1o144dxdz = INITVALUE;
-  // CCTK_REAL p1o144dydz = INITVALUE;
-  // CCTK_REAL pm1o12dx2 = INITVALUE;
-  // CCTK_REAL pm1o12dy2 = INITVALUE;
-  // CCTK_REAL pm1o12dz2 = INITVALUE;
-  
   if (verbose > 1)
   {
     CCTK_VInfo(CCTK_THORNSTRING,"Entering ML_ADM_boundary_Body");
@@ -88,63 +77,47 @@ void ML_ADM_boundary_Body(cGH const * restrict const cctkGH, int const dir, int
             cctk_lsh[0],cctk_lsh[1],cctk_lsh[2])
   {
     // int index = INITVALUE;
-    // int subblock_index = INITVALUE;
     int const index = CCTK_GFINDEX3D(cctkGH,i,j,k);
-    int const subblock_index = i - min[0] + (max[0] - min[0]) * (j - min[1] + (max[1]-min[1]) * (k - min[2]));
-    
-    /* Declare shorthands */
-    
-    /* Declare local copies of grid functions */
-    // CCTK_REAL alphaL = INITVALUE;
-    // CCTK_REAL beta1L = INITVALUE, beta2L = INITVALUE, beta3L = INITVALUE;
-    // CCTK_REAL g11L = INITVALUE, g12L = INITVALUE, g13L = INITVALUE, g22L = INITVALUE, g23L = INITVALUE, g33L = INITVALUE;
-    // CCTK_REAL K11L = INITVALUE, K12L = INITVALUE, K13L = INITVALUE, K22L = INITVALUE, K23L = INITVALUE, K33L = INITVALUE;
-    /* Declare precomputed derivatives*/
-    
     /* Declare derivatives */
     
     /* Assign local copies of grid functions */
     
-    /* Assign local copies of subblock grid functions */
-    
     /* Include user supplied include files */
     
-    /* Precompute derivatives (new style) */
-    
-    /* Precompute derivatives (old style) */
+    /* Precompute derivatives */
     
     /* Calculate temporaries and grid functions */
-    CCTK_REAL const g11L  =  1;
+    CCTK_REAL g11L = 1;
     
-    CCTK_REAL const g12L  =  0;
+    CCTK_REAL g12L = 0;
     
-    CCTK_REAL const g13L  =  0;
+    CCTK_REAL g13L = 0;
     
-    CCTK_REAL const g22L  =  1;
+    CCTK_REAL g22L = 1;
     
-    CCTK_REAL const g23L  =  0;
+    CCTK_REAL g23L = 0;
     
-    CCTK_REAL const g33L  =  1;
+    CCTK_REAL g33L = 1;
     
-    CCTK_REAL const K11L  =  0;
+    CCTK_REAL K11L = 0;
     
-    CCTK_REAL const K12L  =  0;
+    CCTK_REAL K12L = 0;
     
-    CCTK_REAL const K13L  =  0;
+    CCTK_REAL K13L = 0;
     
-    CCTK_REAL const K22L  =  0;
+    CCTK_REAL K22L = 0;
     
-    CCTK_REAL const K23L  =  0;
+    CCTK_REAL K23L = 0;
     
-    CCTK_REAL const K33L  =  0;
+    CCTK_REAL K33L = 0;
     
-    CCTK_REAL const alphaL  =  1;
+    CCTK_REAL alphaL = 1;
     
-    CCTK_REAL const beta1L  =  0;
+    CCTK_REAL beta1L = 0;
     
-    CCTK_REAL const beta2L  =  0;
+    CCTK_REAL beta2L = 0;
     
-    CCTK_REAL const beta3L  =  0;
+    CCTK_REAL beta3L = 0;
     
     
     /* Copy local copies back to grid functions */
@@ -164,8 +137,6 @@ void ML_ADM_boundary_Body(cGH const * restrict const cctkGH, int const dir, int
     K22[index] = K22L;
     K23[index] = K23L;
     K33[index] = K33L;
-    
-    /* Copy local copies back to subblock grid functions */
   }
   LC_ENDLOOP3 (ML_ADM_boundary);
 }
diff --git a/ML_ADM/src/ML_ADM_constraints.c b/ML_ADM/src/ML_ADM_constraints.c
index 4b9338e..cae9b5e 100644
--- a/ML_ADM/src/ML_ADM_constraints.c
+++ b/ML_ADM/src/ML_ADM_constraints.c
@@ -28,17 +28,6 @@ void ML_ADM_constraints_Body(cGH const * restrict const cctkGH, int const dir, i
   
   /* Declare finite differencing variables */
   
-  /* Declare predefined quantities */
-  // CCTK_REAL p1o12dx = INITVALUE;
-  // CCTK_REAL p1o12dy = INITVALUE;
-  // CCTK_REAL p1o12dz = INITVALUE;
-  // CCTK_REAL p1o144dxdy = INITVALUE;
-  // CCTK_REAL p1o144dxdz = INITVALUE;
-  // CCTK_REAL p1o144dydz = INITVALUE;
-  // CCTK_REAL pm1o12dx2 = INITVALUE;
-  // CCTK_REAL pm1o12dy2 = INITVALUE;
-  // CCTK_REAL pm1o12dz2 = INITVALUE;
-  
   if (verbose > 1)
   {
     CCTK_VInfo(CCTK_THORNSTRING,"Entering ML_ADM_constraints_Body");
@@ -88,30 +77,7 @@ void ML_ADM_constraints_Body(cGH const * restrict const cctkGH, int const dir, i
             cctk_lsh[0],cctk_lsh[1],cctk_lsh[2])
   {
     // int index = INITVALUE;
-    // int subblock_index = INITVALUE;
     int const index = CCTK_GFINDEX3D(cctkGH,i,j,k);
-    int const subblock_index = i - min[0] + (max[0] - min[0]) * (j - min[1] + (max[1]-min[1]) * (k - min[2]));
-    
-    /* Declare shorthands */
-    // CCTK_REAL detg = INITVALUE;
-    // CCTK_REAL G111 = INITVALUE, G112 = INITVALUE, G113 = INITVALUE, G122 = INITVALUE, G123 = INITVALUE, G133 = INITVALUE;
-    // CCTK_REAL G211 = INITVALUE, G212 = INITVALUE, G213 = INITVALUE, G222 = INITVALUE, G223 = INITVALUE, G233 = INITVALUE;
-    // CCTK_REAL G311 = INITVALUE, G312 = INITVALUE, G313 = INITVALUE, G322 = INITVALUE, G323 = INITVALUE, G333 = INITVALUE;
-    // CCTK_REAL gu11 = INITVALUE, gu12 = INITVALUE, gu13 = INITVALUE, gu21 = INITVALUE, gu22 = INITVALUE, gu23 = INITVALUE;
-    // CCTK_REAL gu31 = INITVALUE, gu32 = INITVALUE, gu33 = INITVALUE;
-    // CCTK_REAL Km11 = INITVALUE, Km12 = INITVALUE, Km13 = INITVALUE, Km21 = INITVALUE, Km22 = INITVALUE, Km23 = INITVALUE;
-    // CCTK_REAL Km31 = INITVALUE, Km32 = INITVALUE, Km33 = INITVALUE;
-    // CCTK_REAL R11 = INITVALUE, R12 = INITVALUE, R13 = INITVALUE, R22 = INITVALUE, R23 = INITVALUE, R33 = INITVALUE;
-    // CCTK_REAL trK = INITVALUE;
-    // CCTK_REAL trR = INITVALUE;
-    
-    /* Declare local copies of grid functions */
-    // CCTK_REAL g11L = INITVALUE, g12L = INITVALUE, g13L = INITVALUE, g22L = INITVALUE, g23L = INITVALUE, g33L = INITVALUE;
-    // CCTK_REAL HL = INITVALUE;
-    // CCTK_REAL K11L = INITVALUE, K12L = INITVALUE, K13L = INITVALUE, K22L = INITVALUE, K23L = INITVALUE, K33L = INITVALUE;
-    // CCTK_REAL M1L = INITVALUE, M2L = INITVALUE, M3L = INITVALUE;
-    /* Declare precomputed derivatives*/
-    
     /* Declare derivatives */
     // CCTK_REAL PDstandardNth1g11 = INITVALUE;
     // CCTK_REAL PDstandardNth2g11 = INITVALUE;
@@ -169,24 +135,22 @@ void ML_ADM_constraints_Body(cGH const * restrict const cctkGH, int const dir, i
     // CCTK_REAL PDstandardNth2K33 = INITVALUE;
     
     /* Assign local copies of grid functions */
-    CCTK_REAL const g11L = g11[index];
-    CCTK_REAL const g12L = g12[index];
-    CCTK_REAL const g13L = g13[index];
-    CCTK_REAL const g22L = g22[index];
-    CCTK_REAL const g23L = g23[index];
-    CCTK_REAL const g33L = g33[index];
-    CCTK_REAL const K11L = K11[index];
-    CCTK_REAL const K12L = K12[index];
-    CCTK_REAL const K13L = K13[index];
-    CCTK_REAL const K22L = K22[index];
-    CCTK_REAL const K23L = K23[index];
-    CCTK_REAL const K33L = K33[index];
-    
-    /* Assign local copies of subblock grid functions */
+    CCTK_REAL  g11L = g11[index];
+    CCTK_REAL  g12L = g12[index];
+    CCTK_REAL  g13L = g13[index];
+    CCTK_REAL  g22L = g22[index];
+    CCTK_REAL  g23L = g23[index];
+    CCTK_REAL  g33L = g33[index];
+    CCTK_REAL  K11L = K11[index];
+    CCTK_REAL  K12L = K12[index];
+    CCTK_REAL  K13L = K13[index];
+    CCTK_REAL  K22L = K22[index];
+    CCTK_REAL  K23L = K23[index];
+    CCTK_REAL  K33L = K33[index];
     
     /* Include user supplied include files */
     
-    /* Precompute derivatives (new style) */
+    /* Precompute derivatives */
     CCTK_REAL const PDstandardNth1g11 = PDstandardNth1(g11, i, j, k);
     CCTK_REAL const PDstandardNth2g11 = PDstandardNth2(g11, i, j, k);
     CCTK_REAL const PDstandardNth3g11 = PDstandardNth3(g11, i, j, k);
@@ -242,173 +206,217 @@ void ML_ADM_constraints_Body(cGH const * restrict const cctkGH, int const dir, i
     CCTK_REAL const PDstandardNth1K33 = PDstandardNth1(K33, i, j, k);
     CCTK_REAL const PDstandardNth2K33 = PDstandardNth2(K33, i, j, k);
     
-    /* Precompute derivatives (old style) */
-    
     /* Calculate temporaries and grid functions */
-    CCTK_REAL const detg  =  2*g12L*g13L*g23L + g33L*(g11L*g22L - SQR(g12L)) - g22L*SQR(g13L) - g11L*SQR(g23L);
-    
-    CCTK_REAL const gu11  =  INV(detg)*(g22L*g33L - SQR(g23L));
-    
-    CCTK_REAL const gu12  =  (g13L*g23L - g12L*g33L)*INV(detg);
-    
-    CCTK_REAL const gu13  =  (-(g13L*g22L) + g12L*g23L)*INV(detg);
-    
-    CCTK_REAL const gu21  =  (g13L*g23L - g12L*g33L)*INV(detg);
-    
-    CCTK_REAL const gu22  =  INV(detg)*(g11L*g33L - SQR(g13L));
-    
-    CCTK_REAL const gu23  =  (g12L*g13L - g11L*g23L)*INV(detg);
-    
-    CCTK_REAL const gu31  =  (-(g13L*g22L) + g12L*g23L)*INV(detg);
-    
-    CCTK_REAL const gu32  =  (g12L*g13L - g11L*g23L)*INV(detg);
-    
-    CCTK_REAL const gu33  =  INV(detg)*(g11L*g22L - SQR(g12L));
-    
-    CCTK_REAL const G111  =  khalf*(gu11*PDstandardNth1g11 + 2*(gu12*PDstandardNth1g12 + gu13*PDstandardNth1g13) - gu12*PDstandardNth2g11 - 
-          gu13*PDstandardNth3g11);
-    
-    CCTK_REAL const G211  =  khalf*(gu21*PDstandardNth1g11 + 2*(gu22*PDstandardNth1g12 + gu23*PDstandardNth1g13) - gu22*PDstandardNth2g11 - 
-          gu23*PDstandardNth3g11);
-    
-    CCTK_REAL const G311  =  khalf*(gu31*PDstandardNth1g11 + 2*(gu32*PDstandardNth1g12 + gu33*PDstandardNth1g13) - gu32*PDstandardNth2g11 - 
-          gu33*PDstandardNth3g11);
-    
-    CCTK_REAL const G112  =  khalf*(gu12*PDstandardNth1g22 + gu11*PDstandardNth2g11 + 
-          gu13*(PDstandardNth1g23 + PDstandardNth2g13 - PDstandardNth3g12));
+    CCTK_REAL detg = 2*g12L*g13L*g23L + g33L*(g11L*g22L - SQR(g12L)) - 
+      g22L*SQR(g13L) - g11L*SQR(g23L);
     
-    CCTK_REAL const G212  =  khalf*(gu22*PDstandardNth1g22 + gu21*PDstandardNth2g11 + 
-          gu23*(PDstandardNth1g23 + PDstandardNth2g13 - PDstandardNth3g12));
+    CCTK_REAL gu11 = INV(detg)*(g22L*g33L - SQR(g23L));
     
-    CCTK_REAL const G312  =  khalf*(gu32*PDstandardNth1g22 + gu31*PDstandardNth2g11 + 
-          gu33*(PDstandardNth1g23 + PDstandardNth2g13 - PDstandardNth3g12));
+    CCTK_REAL gu12 = (g13L*g23L - g12L*g33L)*INV(detg);
     
-    CCTK_REAL const G113  =  khalf*(gu13*PDstandardNth1g33 + gu11*PDstandardNth3g11 + 
-          gu12*(PDstandardNth1g23 - PDstandardNth2g13 + PDstandardNth3g12));
+    CCTK_REAL gu13 = (-(g13L*g22L) + g12L*g23L)*INV(detg);
     
-    CCTK_REAL const G213  =  khalf*(gu23*PDstandardNth1g33 + gu21*PDstandardNth3g11 + 
-          gu22*(PDstandardNth1g23 - PDstandardNth2g13 + PDstandardNth3g12));
+    CCTK_REAL gu21 = (g13L*g23L - g12L*g33L)*INV(detg);
     
-    CCTK_REAL const G313  =  khalf*(gu33*PDstandardNth1g33 + gu31*PDstandardNth3g11 + 
-          gu32*(PDstandardNth1g23 - PDstandardNth2g13 + PDstandardNth3g12));
+    CCTK_REAL gu22 = INV(detg)*(g11L*g33L - SQR(g13L));
     
-    CCTK_REAL const G122  =  khalf*(gu11*(-PDstandardNth1g22 + 2*PDstandardNth2g12) + gu12*PDstandardNth2g22 + 
-          gu13*(2*PDstandardNth2g23 - PDstandardNth3g22));
+    CCTK_REAL gu23 = (g12L*g13L - g11L*g23L)*INV(detg);
     
-    CCTK_REAL const G222  =  khalf*(gu21*(-PDstandardNth1g22 + 2*PDstandardNth2g12) + gu22*PDstandardNth2g22 + 
-          gu23*(2*PDstandardNth2g23 - PDstandardNth3g22));
+    CCTK_REAL gu31 = (-(g13L*g22L) + g12L*g23L)*INV(detg);
     
-    CCTK_REAL const G322  =  khalf*(gu31*(-PDstandardNth1g22 + 2*PDstandardNth2g12) + gu32*PDstandardNth2g22 + 
-          gu33*(2*PDstandardNth2g23 - PDstandardNth3g22));
+    CCTK_REAL gu32 = (g12L*g13L - g11L*g23L)*INV(detg);
     
-    CCTK_REAL const G123  =  khalf*(gu13*PDstandardNth2g33 + gu11*(-PDstandardNth1g23 + PDstandardNth2g13 + PDstandardNth3g12) + 
-          gu12*PDstandardNth3g22);
+    CCTK_REAL gu33 = INV(detg)*(g11L*g22L - SQR(g12L));
     
-    CCTK_REAL const G223  =  khalf*(gu23*PDstandardNth2g33 + gu21*(-PDstandardNth1g23 + PDstandardNth2g13 + PDstandardNth3g12) + 
-          gu22*PDstandardNth3g22);
+    CCTK_REAL G111 = khalf*(gu11*PDstandardNth1g11 + 
+      2*(gu12*PDstandardNth1g12 + gu13*PDstandardNth1g13) - 
+      gu12*PDstandardNth2g11 - gu13*PDstandardNth3g11);
     
-    CCTK_REAL const G323  =  khalf*(gu33*PDstandardNth2g33 + gu31*(-PDstandardNth1g23 + PDstandardNth2g13 + PDstandardNth3g12) + 
-          gu32*PDstandardNth3g22);
+    CCTK_REAL G211 = khalf*(gu21*PDstandardNth1g11 + 
+      2*(gu22*PDstandardNth1g12 + gu23*PDstandardNth1g13) - 
+      gu22*PDstandardNth2g11 - gu23*PDstandardNth3g11);
     
-    CCTK_REAL const G133  =  khalf*(-(gu11*PDstandardNth1g33) - gu12*PDstandardNth2g33 + 2*gu11*PDstandardNth3g13 + 
-          2*gu12*PDstandardNth3g23 + gu13*PDstandardNth3g33);
+    CCTK_REAL G311 = khalf*(gu31*PDstandardNth1g11 + 
+      2*(gu32*PDstandardNth1g12 + gu33*PDstandardNth1g13) - 
+      gu32*PDstandardNth2g11 - gu33*PDstandardNth3g11);
+    
+    CCTK_REAL G112 = khalf*(gu12*PDstandardNth1g22 + 
+      gu11*PDstandardNth2g11 + gu13*(PDstandardNth1g23 + PDstandardNth2g13 - 
+      PDstandardNth3g12));
+    
+    CCTK_REAL G212 = khalf*(gu22*PDstandardNth1g22 + 
+      gu21*PDstandardNth2g11 + gu23*(PDstandardNth1g23 + PDstandardNth2g13 - 
+      PDstandardNth3g12));
+    
+    CCTK_REAL G312 = khalf*(gu32*PDstandardNth1g22 + 
+      gu31*PDstandardNth2g11 + gu33*(PDstandardNth1g23 + PDstandardNth2g13 - 
+      PDstandardNth3g12));
+    
+    CCTK_REAL G113 = khalf*(gu13*PDstandardNth1g33 + 
+      gu11*PDstandardNth3g11 + gu12*(PDstandardNth1g23 - PDstandardNth2g13 + 
+      PDstandardNth3g12));
+    
+    CCTK_REAL G213 = khalf*(gu23*PDstandardNth1g33 + 
+      gu21*PDstandardNth3g11 + gu22*(PDstandardNth1g23 - PDstandardNth2g13 + 
+      PDstandardNth3g12));
+    
+    CCTK_REAL G313 = khalf*(gu33*PDstandardNth1g33 + 
+      gu31*PDstandardNth3g11 + gu32*(PDstandardNth1g23 - PDstandardNth2g13 + 
+      PDstandardNth3g12));
     
-    CCTK_REAL const G233  =  khalf*(-(gu21*PDstandardNth1g33) - gu22*PDstandardNth2g33 + 2*gu21*PDstandardNth3g13 + 
-          2*gu22*PDstandardNth3g23 + gu23*PDstandardNth3g33);
+    CCTK_REAL G122 = khalf*(gu11*(-PDstandardNth1g22 + 
+      2*PDstandardNth2g12) + gu12*PDstandardNth2g22 + 
+      gu13*(2*PDstandardNth2g23 - PDstandardNth3g22));
     
-    CCTK_REAL const G333  =  khalf*(-(gu31*PDstandardNth1g33) - gu32*PDstandardNth2g33 + 2*gu31*PDstandardNth3g13 + 
-          2*gu32*PDstandardNth3g23 + gu33*PDstandardNth3g33);
+    CCTK_REAL G222 = khalf*(gu21*(-PDstandardNth1g22 + 
+      2*PDstandardNth2g12) + gu22*PDstandardNth2g22 + 
+      gu23*(2*PDstandardNth2g23 - PDstandardNth3g22));
     
-    CCTK_REAL const R11  =  -(G111*(G111 + G122 + G133)) - G211*(G211 + G222 + G233) - G311*(G311 + G322 + G333) + 
-        khalf*(-(gu22*(PDstandardNth11g22 - 2*PDstandardNth12g12 + PDstandardNth22g11)) + 
-           gu23*(-PDstandardNth11g23 + PDstandardNth12g13 + PDstandardNth13g12 - PDstandardNth23g11) + 
-           gu32*(-PDstandardNth11g23 + PDstandardNth12g13 + PDstandardNth13g12 - PDstandardNth23g11) - 
-           gu33*(PDstandardNth11g33 - 2*PDstandardNth13g13 + PDstandardNth33g11)) + SQR(G111) + SQR(G112) + SQR(G113) + 
-        SQR(G211) + SQR(G212) + SQR(G213) + SQR(G311) + SQR(G312) + SQR(G313);
+    CCTK_REAL G322 = khalf*(gu31*(-PDstandardNth1g22 + 
+      2*PDstandardNth2g12) + gu32*PDstandardNth2g22 + 
+      gu33*(2*PDstandardNth2g23 - PDstandardNth3g22));
     
-    CCTK_REAL const R12  =  khalf*(2*(G113*G123 + G213*G223 + G313*G323) - 2*(G112*G133 + G212*G233 + G312*G333 + gu12*PDstandardNth12g12) - 
-          gu32*PDstandardNth12g23 - gu33*PDstandardNth12g33 + 
-          gu13*(PDstandardNth11g23 - PDstandardNth12g13 - PDstandardNth13g12) + gu32*PDstandardNth13g22 + 
-          gu33*PDstandardNth13g23 + gu12*(PDstandardNth11g22 + PDstandardNth22g11) + gu32*PDstandardNth22g13 + 
-          gu13*PDstandardNth23g11 - gu32*PDstandardNth23g12 + gu33*PDstandardNth23g13 - gu33*PDstandardNth33g12);
+    CCTK_REAL G123 = khalf*(gu13*PDstandardNth2g33 + 
+      gu11*(-PDstandardNth1g23 + PDstandardNth2g13 + PDstandardNth3g12) + 
+      gu12*PDstandardNth3g22);
     
-    CCTK_REAL const R13  =  khalf*(2*(G112*G123 + G212*G223 + G312*G323) - 2*(G113*G122 + G213*G222 + G313*G322 + gu13*PDstandardNth13g13) + 
-          gu12*(PDstandardNth11g23 - PDstandardNth12g13 - PDstandardNth13g12 + PDstandardNth23g11) + 
-          gu22*(PDstandardNth12g23 - PDstandardNth13g22 - PDstandardNth22g13 + PDstandardNth23g12) + 
-          gu13*(PDstandardNth11g33 + PDstandardNth33g11) + 
-          gu23*(PDstandardNth12g33 - PDstandardNth13g23 - PDstandardNth23g13 + PDstandardNth33g12));
+    CCTK_REAL G223 = khalf*(gu23*PDstandardNth2g33 + 
+      gu21*(-PDstandardNth1g23 + PDstandardNth2g13 + PDstandardNth3g12) + 
+      gu22*PDstandardNth3g22);
     
-    CCTK_REAL const R22  =  -(G122*(G111 + G122 + G133)) - G222*(G211 + G222 + G233) - G322*(G311 + G322 + G333) + 
-        khalf*(-(gu11*(PDstandardNth11g22 - 2*PDstandardNth12g12 + PDstandardNth22g11)) + 
-           gu13*(PDstandardNth12g23 - PDstandardNth13g22 - PDstandardNth22g13 + PDstandardNth23g12) + 
-           gu31*(PDstandardNth12g23 - PDstandardNth13g22 - PDstandardNth22g13 + PDstandardNth23g12) - 
-           gu33*(PDstandardNth22g33 - 2*PDstandardNth23g23 + PDstandardNth33g22)) + SQR(G112) + SQR(G122) + SQR(G123) + 
-        SQR(G212) + SQR(G222) + SQR(G223) + SQR(G312) + SQR(G322) + SQR(G323);
+    CCTK_REAL G323 = khalf*(gu33*PDstandardNth2g33 + 
+      gu31*(-PDstandardNth1g23 + PDstandardNth2g13 + PDstandardNth3g12) + 
+      gu32*PDstandardNth3g22);
     
-    CCTK_REAL const R23  =  khalf*(2*(G112*G113 + G212*G213 + G312*G313) + 
-          gu11*(-PDstandardNth11g23 + PDstandardNth12g13 + PDstandardNth13g12 - PDstandardNth23g11) + 
-          gu21*(-PDstandardNth12g23 + PDstandardNth13g22 + PDstandardNth22g13 - PDstandardNth23g12) - 
-          2*(G111*G123 + G211*G223 + G311*G323 + gu23*PDstandardNth23g23) + 
-          gu13*(PDstandardNth12g33 - PDstandardNth13g23 - PDstandardNth23g13 + PDstandardNth33g12) + 
-          gu23*(PDstandardNth22g33 + PDstandardNth33g22));
+    CCTK_REAL G133 = khalf*(-(gu11*PDstandardNth1g33) - 
+      gu12*PDstandardNth2g33 + 2*gu11*PDstandardNth3g13 + 
+      2*gu12*PDstandardNth3g23 + gu13*PDstandardNth3g33);
     
-    CCTK_REAL const R33  =  -(G133*(G111 + G122 + G133)) - G233*(G211 + G222 + G233) - G333*(G311 + G322 + G333) + 
-        khalf*(-(gu11*(PDstandardNth11g33 - 2*PDstandardNth13g13 + PDstandardNth33g11)) + 
-           gu12*(-PDstandardNth12g33 + PDstandardNth13g23 + PDstandardNth23g13 - PDstandardNth33g12) + 
-           gu21*(-PDstandardNth12g33 + PDstandardNth13g23 + PDstandardNth23g13 - PDstandardNth33g12) - 
-           gu22*(PDstandardNth22g33 - 2*PDstandardNth23g23 + PDstandardNth33g22)) + SQR(G113) + SQR(G123) + SQR(G133) + 
-        SQR(G213) + SQR(G223) + SQR(G233) + SQR(G313) + SQR(G323) + SQR(G333);
+    CCTK_REAL G233 = khalf*(-(gu21*PDstandardNth1g33) - 
+      gu22*PDstandardNth2g33 + 2*gu21*PDstandardNth3g13 + 
+      2*gu22*PDstandardNth3g23 + gu23*PDstandardNth3g33);
     
-    CCTK_REAL const trR  =  gu11*R11 + (gu12 + gu21)*R12 + (gu13 + gu31)*R13 + gu22*R22 + (gu23 + gu32)*R23 + gu33*R33;
-    
-    CCTK_REAL const Km11  =  gu11*K11L + gu12*K12L + gu13*K13L;
-    
-    CCTK_REAL const Km21  =  gu21*K11L + gu22*K12L + gu23*K13L;
-    
-    CCTK_REAL const Km31  =  gu31*K11L + gu32*K12L + gu33*K13L;
-    
-    CCTK_REAL const Km12  =  gu11*K12L + gu12*K22L + gu13*K23L;
-    
-    CCTK_REAL const Km22  =  gu21*K12L + gu22*K22L + gu23*K23L;
-    
-    CCTK_REAL const Km32  =  gu31*K12L + gu32*K22L + gu33*K23L;
-    
-    CCTK_REAL const Km13  =  gu11*K13L + gu12*K23L + gu13*K33L;
-    
-    CCTK_REAL const Km23  =  gu21*K13L + gu22*K23L + gu23*K33L;
-    
-    CCTK_REAL const Km33  =  gu31*K13L + gu32*K23L + gu33*K33L;
-    
-    CCTK_REAL const trK  =  Km11 + Km22 + Km33;
-    
-    CCTK_REAL const HL  =  -2*(Km12*Km21 + Km13*Km31 + Km23*Km32) + trR - SQR(Km11) - SQR(Km22) - SQR(Km33) + SQR(trK);
-    
-    CCTK_REAL const M1L  =  gu21*(-(G112*K11L) + G111*K12L - G212*K12L - G312*K13L + G211*K22L + G311*K23L - PDstandardNth1K12 + 
-           PDstandardNth2K11) + gu22*(-(G122*K11L) + G112*K12L - G222*K12L - G322*K13L + G212*K22L + G312*K23L - 
-           PDstandardNth1K22 + PDstandardNth2K12) + gu23*
-         (-(G123*K11L) + G113*K12L - G223*K12L - G323*K13L + G213*K22L + G313*K23L - PDstandardNth1K23 + PDstandardNth2K13)\
-         + gu31*(-(G113*K11L) - G213*K12L + G111*K13L - G313*K13L + G211*K23L + G311*K33L - PDstandardNth1K13 + 
-           PDstandardNth3K11) + gu32*(-(G123*K11L) - G223*K12L + G112*K13L - G323*K13L + G212*K23L + G312*K33L - 
-           PDstandardNth1K23 + PDstandardNth3K12) + gu33*
-         (-(G133*K11L) - G233*K12L + G113*K13L - G333*K13L + G213*K23L + G313*K33L - PDstandardNth1K33 + PDstandardNth3K13);
-    
-    CCTK_REAL const M2L  =  gu11*(G112*K11L + (-G111 + G212)*K12L + G312*K13L - G211*K22L - G311*K23L + PDstandardNth1K12 - 
-           PDstandardNth2K11) + gu12*(G122*K11L + (-G112 + G222)*K12L + G322*K13L - G212*K22L - G312*K23L + 
-           PDstandardNth1K22 - PDstandardNth2K12) + gu13*
-         (G123*K11L + (-G113 + G223)*K12L + G323*K13L - G213*K22L - G313*K23L + PDstandardNth1K23 - PDstandardNth2K13) + 
-        gu31*(-(G113*K12L) + G112*K13L - G213*K22L + G212*K23L - G313*K23L + G312*K33L - PDstandardNth2K13 + 
-           PDstandardNth3K12) + gu32*(-(G123*K12L) + G122*K13L - G223*K22L + G222*K23L - G323*K23L + G322*K33L - 
-           PDstandardNth2K23 + PDstandardNth3K22) + gu33*
-         (-(G133*K12L) + G123*K13L - G233*K22L + G223*K23L - G333*K23L + G323*K33L - PDstandardNth2K33 + PDstandardNth3K23);
-    
-    CCTK_REAL const M3L  =  gu11*(G113*K11L + G213*K12L + (-G111 + G313)*K13L - G211*K23L - G311*K33L + PDstandardNth1K13 - 
-           PDstandardNth3K11) + gu12*(G123*K11L + G223*K12L + (-G112 + G323)*K13L - G212*K23L - G312*K33L + 
-           PDstandardNth1K23 - PDstandardNth3K12) + gu21*
-         (G113*K12L - G112*K13L + G213*K22L - G212*K23L + G313*K23L - G312*K33L + PDstandardNth2K13 - PDstandardNth3K12) + 
-        gu13*(G133*K11L + G233*K12L + (-G113 + G333)*K13L - G213*K23L - G313*K33L + PDstandardNth1K33 - 
-           PDstandardNth3K13) + gu22*(G123*K12L - G122*K13L + G223*K22L - G222*K23L + G323*K23L - G322*K33L + 
-           PDstandardNth2K23 - PDstandardNth3K22) + gu23*
-         (G133*K12L - G123*K13L + G233*K22L - G223*K23L + G333*K23L - G323*K33L + PDstandardNth2K33 - PDstandardNth3K23);
+    CCTK_REAL G333 = khalf*(-(gu31*PDstandardNth1g33) - 
+      gu32*PDstandardNth2g33 + 2*gu31*PDstandardNth3g13 + 
+      2*gu32*PDstandardNth3g23 + gu33*PDstandardNth3g33);
+    
+    CCTK_REAL R11 = -(G111*(G111 + G122 + G133)) - G211*(G211 + G222 + 
+      G233) - G311*(G311 + G322 + G333) + khalf*(-(gu22*(PDstandardNth11g22 - 
+      2*PDstandardNth12g12 + PDstandardNth22g11)) + gu23*(-PDstandardNth11g23 
+      + PDstandardNth12g13 + PDstandardNth13g12 - PDstandardNth23g11) + 
+      gu32*(-PDstandardNth11g23 + PDstandardNth12g13 + PDstandardNth13g12 - 
+      PDstandardNth23g11) - gu33*(PDstandardNth11g33 - 2*PDstandardNth13g13 + 
+      PDstandardNth33g11)) + SQR(G111) + SQR(G112) + SQR(G113) + SQR(G211) + 
+      SQR(G212) + SQR(G213) + SQR(G311) + SQR(G312) + SQR(G313);
+    
+    CCTK_REAL R12 = khalf*(2*(G113*G123 + G213*G223 + G313*G323) - 
+      2*(G112*G133 + G212*G233 + G312*G333 + gu12*PDstandardNth12g12) - 
+      gu32*PDstandardNth12g23 - gu33*PDstandardNth12g33 + 
+      gu13*(PDstandardNth11g23 - PDstandardNth12g13 - PDstandardNth13g12) + 
+      gu32*PDstandardNth13g22 + gu33*PDstandardNth13g23 + 
+      gu12*(PDstandardNth11g22 + PDstandardNth22g11) + 
+      gu32*PDstandardNth22g13 + gu13*PDstandardNth23g11 - 
+      gu32*PDstandardNth23g12 + gu33*PDstandardNth23g13 - 
+      gu33*PDstandardNth33g12);
+    
+    CCTK_REAL R13 = khalf*(2*(G112*G123 + G212*G223 + G312*G323) - 
+      2*(G113*G122 + G213*G222 + G313*G322 + gu13*PDstandardNth13g13) + 
+      gu12*(PDstandardNth11g23 - PDstandardNth12g13 - PDstandardNth13g12 + 
+      PDstandardNth23g11) + gu22*(PDstandardNth12g23 - PDstandardNth13g22 - 
+      PDstandardNth22g13 + PDstandardNth23g12) + gu13*(PDstandardNth11g33 + 
+      PDstandardNth33g11) + gu23*(PDstandardNth12g33 - PDstandardNth13g23 - 
+      PDstandardNth23g13 + PDstandardNth33g12));
+    
+    CCTK_REAL R22 = -(G122*(G111 + G122 + G133)) - G222*(G211 + G222 + 
+      G233) - G322*(G311 + G322 + G333) + khalf*(-(gu11*(PDstandardNth11g22 - 
+      2*PDstandardNth12g12 + PDstandardNth22g11)) + gu13*(PDstandardNth12g23 
+      - PDstandardNth13g22 - PDstandardNth22g13 + PDstandardNth23g12) + 
+      gu31*(PDstandardNth12g23 - PDstandardNth13g22 - PDstandardNth22g13 + 
+      PDstandardNth23g12) - gu33*(PDstandardNth22g33 - 2*PDstandardNth23g23 + 
+      PDstandardNth33g22)) + SQR(G112) + SQR(G122) + SQR(G123) + SQR(G212) + 
+      SQR(G222) + SQR(G223) + SQR(G312) + SQR(G322) + SQR(G323);
+    
+    CCTK_REAL R23 = khalf*(2*(G112*G113 + G212*G213 + G312*G313) + 
+      gu11*(-PDstandardNth11g23 + PDstandardNth12g13 + PDstandardNth13g12 - 
+      PDstandardNth23g11) + gu21*(-PDstandardNth12g23 + PDstandardNth13g22 + 
+      PDstandardNth22g13 - PDstandardNth23g12) - 2*(G111*G123 + G211*G223 + 
+      G311*G323 + gu23*PDstandardNth23g23) + gu13*(PDstandardNth12g33 - 
+      PDstandardNth13g23 - PDstandardNth23g13 + PDstandardNth33g12) + 
+      gu23*(PDstandardNth22g33 + PDstandardNth33g22));
+    
+    CCTK_REAL R33 = -(G133*(G111 + G122 + G133)) - G233*(G211 + G222 + 
+      G233) - G333*(G311 + G322 + G333) + khalf*(-(gu11*(PDstandardNth11g33 - 
+      2*PDstandardNth13g13 + PDstandardNth33g11)) + gu12*(-PDstandardNth12g33 
+      + PDstandardNth13g23 + PDstandardNth23g13 - PDstandardNth33g12) + 
+      gu21*(-PDstandardNth12g33 + PDstandardNth13g23 + PDstandardNth23g13 - 
+      PDstandardNth33g12) - gu22*(PDstandardNth22g33 - 2*PDstandardNth23g23 + 
+      PDstandardNth33g22)) + SQR(G113) + SQR(G123) + SQR(G133) + SQR(G213) + 
+      SQR(G223) + SQR(G233) + SQR(G313) + SQR(G323) + SQR(G333);
+    
+    CCTK_REAL trR = gu11*R11 + (gu12 + gu21)*R12 + (gu13 + gu31)*R13 + 
+      gu22*R22 + (gu23 + gu32)*R23 + gu33*R33;
+    
+    CCTK_REAL Km11 = gu11*K11L + gu12*K12L + gu13*K13L;
+    
+    CCTK_REAL Km21 = gu21*K11L + gu22*K12L + gu23*K13L;
+    
+    CCTK_REAL Km31 = gu31*K11L + gu32*K12L + gu33*K13L;
+    
+    CCTK_REAL Km12 = gu11*K12L + gu12*K22L + gu13*K23L;
+    
+    CCTK_REAL Km22 = gu21*K12L + gu22*K22L + gu23*K23L;
+    
+    CCTK_REAL Km32 = gu31*K12L + gu32*K22L + gu33*K23L;
+    
+    CCTK_REAL Km13 = gu11*K13L + gu12*K23L + gu13*K33L;
+    
+    CCTK_REAL Km23 = gu21*K13L + gu22*K23L + gu23*K33L;
+    
+    CCTK_REAL Km33 = gu31*K13L + gu32*K23L + gu33*K33L;
+    
+    CCTK_REAL trK = Km11 + Km22 + Km33;
+    
+    CCTK_REAL HL = -2*(Km12*Km21 + Km13*Km31 + Km23*Km32) + trR - 
+      SQR(Km11) - SQR(Km22) - SQR(Km33) + SQR(trK);
+    
+    CCTK_REAL M1L = gu21*(-(G112*K11L) + G111*K12L - G212*K12L - G312*K13L 
+      + G211*K22L + G311*K23L - PDstandardNth1K12 + PDstandardNth2K11) + 
+      gu22*(-(G122*K11L) + G112*K12L - G222*K12L - G322*K13L + G212*K22L + 
+      G312*K23L - PDstandardNth1K22 + PDstandardNth2K12) + gu23*(-(G123*K11L) 
+      + G113*K12L - G223*K12L - G323*K13L + G213*K22L + G313*K23L - 
+      PDstandardNth1K23 + PDstandardNth2K13) + gu31*(-(G113*K11L) - G213*K12L 
+      + G111*K13L - G313*K13L + G211*K23L + G311*K33L - PDstandardNth1K13 + 
+      PDstandardNth3K11) + gu32*(-(G123*K11L) - G223*K12L + G112*K13L - 
+      G323*K13L + G212*K23L + G312*K33L - PDstandardNth1K23 + 
+      PDstandardNth3K12) + gu33*(-(G133*K11L) - G233*K12L + G113*K13L - 
+      G333*K13L + G213*K23L + G313*K33L - PDstandardNth1K33 + 
+      PDstandardNth3K13);
+    
+    CCTK_REAL M2L = gu11*(G112*K11L + (-G111 + G212)*K12L + G312*K13L - 
+      G211*K22L - G311*K23L + PDstandardNth1K12 - PDstandardNth2K11) + 
+      gu12*(G122*K11L + (-G112 + G222)*K12L + G322*K13L - G212*K22L - 
+      G312*K23L + PDstandardNth1K22 - PDstandardNth2K12) + gu13*(G123*K11L + 
+      (-G113 + G223)*K12L + G323*K13L - G213*K22L - G313*K23L + 
+      PDstandardNth1K23 - PDstandardNth2K13) + gu31*(-(G113*K12L) + G112*K13L 
+      - G213*K22L + G212*K23L - G313*K23L + G312*K33L - PDstandardNth2K13 + 
+      PDstandardNth3K12) + gu32*(-(G123*K12L) + G122*K13L - G223*K22L + 
+      G222*K23L - G323*K23L + G322*K33L - PDstandardNth2K23 + 
+      PDstandardNth3K22) + gu33*(-(G133*K12L) + G123*K13L - G233*K22L + 
+      G223*K23L - G333*K23L + G323*K33L - PDstandardNth2K33 + 
+      PDstandardNth3K23);
+    
+    CCTK_REAL M3L = gu11*(G113*K11L + G213*K12L + (-G111 + G313)*K13L - 
+      G211*K23L - G311*K33L + PDstandardNth1K13 - PDstandardNth3K11) + 
+      gu12*(G123*K11L + G223*K12L + (-G112 + G323)*K13L - G212*K23L - 
+      G312*K33L + PDstandardNth1K23 - PDstandardNth3K12) + gu21*(G113*K12L - 
+      G112*K13L + G213*K22L - G212*K23L + G313*K23L - G312*K33L + 
+      PDstandardNth2K13 - PDstandardNth3K12) + gu13*(G133*K11L + G233*K12L + 
+      (-G113 + G333)*K13L - G213*K23L - G313*K33L + PDstandardNth1K33 - 
+      PDstandardNth3K13) + gu22*(G123*K12L - G122*K13L + G223*K22L - 
+      G222*K23L + G323*K23L - G322*K33L + PDstandardNth2K23 - 
+      PDstandardNth3K22) + gu23*(G133*K12L - G123*K13L + G233*K22L - 
+      G223*K23L + G333*K23L - G323*K33L + PDstandardNth2K33 - 
+      PDstandardNth3K23);
     
     
     /* Copy local copies back to grid functions */
@@ -416,8 +424,6 @@ void ML_ADM_constraints_Body(cGH const * restrict const cctkGH, int const dir, i
     M1[index] = M1L;
     M2[index] = M2L;
     M3[index] = M3L;
-    
-    /* Copy local copies back to subblock grid functions */
   }
   LC_ENDLOOP3 (ML_ADM_constraints);
 }
diff --git a/ML_ADM/src/ML_ADM_constraints_boundary.c b/ML_ADM/src/ML_ADM_constraints_boundary.c
index fc7a5d4..82b8dcc 100644
--- a/ML_ADM/src/ML_ADM_constraints_boundary.c
+++ b/ML_ADM/src/ML_ADM_constraints_boundary.c
@@ -28,17 +28,6 @@ void ML_ADM_constraints_boundary_Body(cGH const * restrict const cctkGH, int con
   
   /* Declare finite differencing variables */
   
-  /* Declare predefined quantities */
-  // CCTK_REAL p1o12dx = INITVALUE;
-  // CCTK_REAL p1o12dy = INITVALUE;
-  // CCTK_REAL p1o12dz = INITVALUE;
-  // CCTK_REAL p1o144dxdy = INITVALUE;
-  // CCTK_REAL p1o144dxdz = INITVALUE;
-  // CCTK_REAL p1o144dydz = INITVALUE;
-  // CCTK_REAL pm1o12dx2 = INITVALUE;
-  // CCTK_REAL pm1o12dy2 = INITVALUE;
-  // CCTK_REAL pm1o12dz2 = INITVALUE;
-  
   if (verbose > 1)
   {
     CCTK_VInfo(CCTK_THORNSTRING,"Entering ML_ADM_constraints_boundary_Body");
@@ -88,37 +77,23 @@ void ML_ADM_constraints_boundary_Body(cGH const * restrict const cctkGH, int con
             cctk_lsh[0],cctk_lsh[1],cctk_lsh[2])
   {
     // int index = INITVALUE;
-    // int subblock_index = INITVALUE;
     int const index = CCTK_GFINDEX3D(cctkGH,i,j,k);
-    int const subblock_index = i - min[0] + (max[0] - min[0]) * (j - min[1] + (max[1]-min[1]) * (k - min[2]));
-    
-    /* Declare shorthands */
-    
-    /* Declare local copies of grid functions */
-    // CCTK_REAL HL = INITVALUE;
-    // CCTK_REAL M1L = INITVALUE, M2L = INITVALUE, M3L = INITVALUE;
-    /* Declare precomputed derivatives*/
-    
     /* Declare derivatives */
     
     /* Assign local copies of grid functions */
     
-    /* Assign local copies of subblock grid functions */
-    
     /* Include user supplied include files */
     
-    /* Precompute derivatives (new style) */
-    
-    /* Precompute derivatives (old style) */
+    /* Precompute derivatives */
     
     /* Calculate temporaries and grid functions */
-    CCTK_REAL const HL  =  0;
+    CCTK_REAL HL = 0;
     
-    CCTK_REAL const M1L  =  0;
+    CCTK_REAL M1L = 0;
     
-    CCTK_REAL const M2L  =  0;
+    CCTK_REAL M2L = 0;
     
-    CCTK_REAL const M3L  =  0;
+    CCTK_REAL M3L = 0;
     
     
     /* Copy local copies back to grid functions */
@@ -126,8 +101,6 @@ void ML_ADM_constraints_boundary_Body(cGH const * restrict const cctkGH, int con
     M1[index] = M1L;
     M2[index] = M2L;
     M3[index] = M3L;
-    
-    /* Copy local copies back to subblock grid functions */
   }
   LC_ENDLOOP3 (ML_ADM_constraints_boundary);
 }
diff --git a/ML_ADM/src/ML_ADM_convertFromADMBase.c b/ML_ADM/src/ML_ADM_convertFromADMBase.c
index c2b7b5f..43fc8be 100644
--- a/ML_ADM/src/ML_ADM_convertFromADMBase.c
+++ b/ML_ADM/src/ML_ADM_convertFromADMBase.c
@@ -28,17 +28,6 @@ void ML_ADM_convertFromADMBase_Body(cGH const * restrict const cctkGH, int const
   
   /* Declare finite differencing variables */
   
-  /* Declare predefined quantities */
-  // CCTK_REAL p1o12dx = INITVALUE;
-  // CCTK_REAL p1o12dy = INITVALUE;
-  // CCTK_REAL p1o12dz = INITVALUE;
-  // CCTK_REAL p1o144dxdy = INITVALUE;
-  // CCTK_REAL p1o144dxdz = INITVALUE;
-  // CCTK_REAL p1o144dydz = INITVALUE;
-  // CCTK_REAL pm1o12dx2 = INITVALUE;
-  // CCTK_REAL pm1o12dy2 = INITVALUE;
-  // CCTK_REAL pm1o12dz2 = INITVALUE;
-  
   if (verbose > 1)
   {
     CCTK_VInfo(CCTK_THORNSTRING,"Entering ML_ADM_convertFromADMBase_Body");
@@ -88,95 +77,63 @@ void ML_ADM_convertFromADMBase_Body(cGH const * restrict const cctkGH, int const
             cctk_lsh[0],cctk_lsh[1],cctk_lsh[2])
   {
     // int index = INITVALUE;
-    // int subblock_index = INITVALUE;
     int const index = CCTK_GFINDEX3D(cctkGH,i,j,k);
-    int const subblock_index = i - min[0] + (max[0] - min[0]) * (j - min[1] + (max[1]-min[1]) * (k - min[2]));
-    
-    /* Declare shorthands */
-    
-    /* Declare local copies of grid functions */
-    // CCTK_REAL alpL = INITVALUE;
-    // CCTK_REAL alphaL = INITVALUE;
-    // CCTK_REAL beta1L = INITVALUE, beta2L = INITVALUE, beta3L = INITVALUE;
-    // CCTK_REAL betaxL = INITVALUE;
-    // CCTK_REAL betayL = INITVALUE;
-    // CCTK_REAL betazL = INITVALUE;
-    // CCTK_REAL g11L = INITVALUE, g12L = INITVALUE, g13L = INITVALUE, g22L = INITVALUE, g23L = INITVALUE, g33L = INITVALUE;
-    // CCTK_REAL gxxL = INITVALUE;
-    // CCTK_REAL gxyL = INITVALUE;
-    // CCTK_REAL gxzL = INITVALUE;
-    // CCTK_REAL gyyL = INITVALUE;
-    // CCTK_REAL gyzL = INITVALUE;
-    // CCTK_REAL gzzL = INITVALUE;
-    // CCTK_REAL K11L = INITVALUE, K12L = INITVALUE, K13L = INITVALUE, K22L = INITVALUE, K23L = INITVALUE, K33L = INITVALUE;
-    // CCTK_REAL kxxL = INITVALUE;
-    // CCTK_REAL kxyL = INITVALUE;
-    // CCTK_REAL kxzL = INITVALUE;
-    // CCTK_REAL kyyL = INITVALUE;
-    // CCTK_REAL kyzL = INITVALUE;
-    // CCTK_REAL kzzL = INITVALUE;
-    /* Declare precomputed derivatives*/
-    
     /* Declare derivatives */
     
     /* Assign local copies of grid functions */
-    CCTK_REAL const alpL = alp[index];
-    CCTK_REAL const betaxL = betax[index];
-    CCTK_REAL const betayL = betay[index];
-    CCTK_REAL const betazL = betaz[index];
-    CCTK_REAL const gxxL = gxx[index];
-    CCTK_REAL const gxyL = gxy[index];
-    CCTK_REAL const gxzL = gxz[index];
-    CCTK_REAL const gyyL = gyy[index];
-    CCTK_REAL const gyzL = gyz[index];
-    CCTK_REAL const gzzL = gzz[index];
-    CCTK_REAL const kxxL = kxx[index];
-    CCTK_REAL const kxyL = kxy[index];
-    CCTK_REAL const kxzL = kxz[index];
-    CCTK_REAL const kyyL = kyy[index];
-    CCTK_REAL const kyzL = kyz[index];
-    CCTK_REAL const kzzL = kzz[index];
-    
-    /* Assign local copies of subblock grid functions */
+    CCTK_REAL  alpL = alp[index];
+    CCTK_REAL  betaxL = betax[index];
+    CCTK_REAL  betayL = betay[index];
+    CCTK_REAL  betazL = betaz[index];
+    CCTK_REAL  gxxL = gxx[index];
+    CCTK_REAL  gxyL = gxy[index];
+    CCTK_REAL  gxzL = gxz[index];
+    CCTK_REAL  gyyL = gyy[index];
+    CCTK_REAL  gyzL = gyz[index];
+    CCTK_REAL  gzzL = gzz[index];
+    CCTK_REAL  kxxL = kxx[index];
+    CCTK_REAL  kxyL = kxy[index];
+    CCTK_REAL  kxzL = kxz[index];
+    CCTK_REAL  kyyL = kyy[index];
+    CCTK_REAL  kyzL = kyz[index];
+    CCTK_REAL  kzzL = kzz[index];
     
     /* Include user supplied include files */
     
-    /* Precompute derivatives (new style) */
-    
-    /* Precompute derivatives (old style) */
+    /* Precompute derivatives */
     
     /* Calculate temporaries and grid functions */
-    CCTK_REAL const g11L  =  gxxL;
+    CCTK_REAL g11L = gxxL;
     
-    CCTK_REAL const g12L  =  gxyL;
+    CCTK_REAL g12L = gxyL;
     
-    CCTK_REAL const g13L  =  gxzL;
+    CCTK_REAL g13L = gxzL;
     
-    CCTK_REAL const g22L  =  gyyL;
+    CCTK_REAL g22L = gyyL;
     
-    CCTK_REAL const g23L  =  gyzL;
+    CCTK_REAL g23L = gyzL;
     
-    CCTK_REAL const g33L  =  gzzL;
+    CCTK_REAL g33L = gzzL;
     
-    CCTK_REAL const K11L  =  kxxL;
+    CCTK_REAL K11L = kxxL;
     
-    CCTK_REAL const K12L  =  kxyL;
+    CCTK_REAL K12L = kxyL;
     
-    CCTK_REAL const K13L  =  kxzL;
+    CCTK_REAL K13L = kxzL;
     
-    CCTK_REAL const K22L  =  kyyL;
+    CCTK_REAL K22L = kyyL;
     
-    CCTK_REAL const K23L  =  kyzL;
+    CCTK_REAL K23L = kyzL;
     
-    CCTK_REAL const K33L  =  kzzL;
+    CCTK_REAL K33L = kzzL;
     
-    CCTK_REAL const alphaL  =  alpL;
+    CCTK_REAL alphaL = alpL;
     
-    CCTK_REAL const beta1L  =  betaxL;
+    CCTK_REAL beta1L = betaxL;
     
-    CCTK_REAL const beta2L  =  betayL;
+    CCTK_REAL beta2L = betayL;
     
-    CCTK_REAL const beta3L  =  betazL;
+    CCTK_REAL beta3L = betazL;
     
     
     /* Copy local copies back to grid functions */
@@ -196,8 +153,6 @@ void ML_ADM_convertFromADMBase_Body(cGH const * restrict const cctkGH, int const
     K22[index] = K22L;
     K23[index] = K23L;
     K33[index] = K33L;
-    
-    /* Copy local copies back to subblock grid functions */
   }
   LC_ENDLOOP3 (ML_ADM_convertFromADMBase);
 }
diff --git a/ML_ADM/src/ML_ADM_convertToADMBase.c b/ML_ADM/src/ML_ADM_convertToADMBase.c
index 8c9ea1c..3a00d9f 100644
--- a/ML_ADM/src/ML_ADM_convertToADMBase.c
+++ b/ML_ADM/src/ML_ADM_convertToADMBase.c
@@ -28,17 +28,6 @@ void ML_ADM_convertToADMBase_Body(cGH const * restrict const cctkGH, int const d
   
   /* Declare finite differencing variables */
   
-  /* Declare predefined quantities */
-  // CCTK_REAL p1o12dx = INITVALUE;
-  // CCTK_REAL p1o12dy = INITVALUE;
-  // CCTK_REAL p1o12dz = INITVALUE;
-  // CCTK_REAL p1o144dxdy = INITVALUE;
-  // CCTK_REAL p1o144dxdz = INITVALUE;
-  // CCTK_REAL p1o144dydz = INITVALUE;
-  // CCTK_REAL pm1o12dx2 = INITVALUE;
-  // CCTK_REAL pm1o12dy2 = INITVALUE;
-  // CCTK_REAL pm1o12dz2 = INITVALUE;
-  
   if (verbose > 1)
   {
     CCTK_VInfo(CCTK_THORNSTRING,"Entering ML_ADM_convertToADMBase_Body");
@@ -88,107 +77,71 @@ void ML_ADM_convertToADMBase_Body(cGH const * restrict const cctkGH, int const d
             cctk_lsh[0],cctk_lsh[1],cctk_lsh[2])
   {
     // int index = INITVALUE;
-    // int subblock_index = INITVALUE;
     int const index = CCTK_GFINDEX3D(cctkGH,i,j,k);
-    int const subblock_index = i - min[0] + (max[0] - min[0]) * (j - min[1] + (max[1]-min[1]) * (k - min[2]));
-    
-    /* Declare shorthands */
-    
-    /* Declare local copies of grid functions */
-    // CCTK_REAL alpL = INITVALUE;
-    // CCTK_REAL alphaL = INITVALUE;
-    // CCTK_REAL beta1L = INITVALUE, beta2L = INITVALUE, beta3L = INITVALUE;
-    // CCTK_REAL betaxL = INITVALUE;
-    // CCTK_REAL betayL = INITVALUE;
-    // CCTK_REAL betazL = INITVALUE;
-    // CCTK_REAL dtalpL = INITVALUE;
-    // CCTK_REAL dtbetaxL = INITVALUE;
-    // CCTK_REAL dtbetayL = INITVALUE;
-    // CCTK_REAL dtbetazL = INITVALUE;
-    // CCTK_REAL g11L = INITVALUE, g12L = INITVALUE, g13L = INITVALUE, g22L = INITVALUE, g23L = INITVALUE, g33L = INITVALUE;
-    // CCTK_REAL gxxL = INITVALUE;
-    // CCTK_REAL gxyL = INITVALUE;
-    // CCTK_REAL gxzL = INITVALUE;
-    // CCTK_REAL gyyL = INITVALUE;
-    // CCTK_REAL gyzL = INITVALUE;
-    // CCTK_REAL gzzL = INITVALUE;
-    // CCTK_REAL K11L = INITVALUE, K12L = INITVALUE, K13L = INITVALUE, K22L = INITVALUE, K23L = INITVALUE, K33L = INITVALUE;
-    // CCTK_REAL kxxL = INITVALUE;
-    // CCTK_REAL kxyL = INITVALUE;
-    // CCTK_REAL kxzL = INITVALUE;
-    // CCTK_REAL kyyL = INITVALUE;
-    // CCTK_REAL kyzL = INITVALUE;
-    // CCTK_REAL kzzL = INITVALUE;
-    /* Declare precomputed derivatives*/
-    
     /* Declare derivatives */
     
     /* Assign local copies of grid functions */
-    CCTK_REAL const alphaL = alpha[index];
-    CCTK_REAL const beta1L = beta1[index];
-    CCTK_REAL const beta2L = beta2[index];
-    CCTK_REAL const beta3L = beta3[index];
-    CCTK_REAL const g11L = g11[index];
-    CCTK_REAL const g12L = g12[index];
-    CCTK_REAL const g13L = g13[index];
-    CCTK_REAL const g22L = g22[index];
-    CCTK_REAL const g23L = g23[index];
-    CCTK_REAL const g33L = g33[index];
-    CCTK_REAL const K11L = K11[index];
-    CCTK_REAL const K12L = K12[index];
-    CCTK_REAL const K13L = K13[index];
-    CCTK_REAL const K22L = K22[index];
-    CCTK_REAL const K23L = K23[index];
-    CCTK_REAL const K33L = K33[index];
-    
-    /* Assign local copies of subblock grid functions */
+    CCTK_REAL  alphaL = alpha[index];
+    CCTK_REAL  beta1L = beta1[index];
+    CCTK_REAL  beta2L = beta2[index];
+    CCTK_REAL  beta3L = beta3[index];
+    CCTK_REAL  g11L = g11[index];
+    CCTK_REAL  g12L = g12[index];
+    CCTK_REAL  g13L = g13[index];
+    CCTK_REAL  g22L = g22[index];
+    CCTK_REAL  g23L = g23[index];
+    CCTK_REAL  g33L = g33[index];
+    CCTK_REAL  K11L = K11[index];
+    CCTK_REAL  K12L = K12[index];
+    CCTK_REAL  K13L = K13[index];
+    CCTK_REAL  K22L = K22[index];
+    CCTK_REAL  K23L = K23[index];
+    CCTK_REAL  K33L = K33[index];
     
     /* Include user supplied include files */
     
-    /* Precompute derivatives (new style) */
-    
-    /* Precompute derivatives (old style) */
+    /* Precompute derivatives */
     
     /* Calculate temporaries and grid functions */
-    CCTK_REAL const gxxL  =  g11L;
+    CCTK_REAL gxxL = g11L;
     
-    CCTK_REAL const gxyL  =  g12L;
+    CCTK_REAL gxyL = g12L;
     
-    CCTK_REAL const gxzL  =  g13L;
+    CCTK_REAL gxzL = g13L;
     
-    CCTK_REAL const gyyL  =  g22L;
+    CCTK_REAL gyyL = g22L;
     
-    CCTK_REAL const gyzL  =  g23L;
+    CCTK_REAL gyzL = g23L;
     
-    CCTK_REAL const gzzL  =  g33L;
+    CCTK_REAL gzzL = g33L;
     
-    CCTK_REAL const kxxL  =  K11L;
+    CCTK_REAL kxxL = K11L;
     
-    CCTK_REAL const kxyL  =  K12L;
+    CCTK_REAL kxyL = K12L;
     
-    CCTK_REAL const kxzL  =  K13L;
+    CCTK_REAL kxzL = K13L;
     
-    CCTK_REAL const kyyL  =  K22L;
+    CCTK_REAL kyyL = K22L;
     
-    CCTK_REAL const kyzL  =  K23L;
+    CCTK_REAL kyzL = K23L;
     
-    CCTK_REAL const kzzL  =  K33L;
+    CCTK_REAL kzzL = K33L;
     
-    CCTK_REAL const alpL  =  alphaL;
+    CCTK_REAL alpL = alphaL;
     
-    CCTK_REAL const dtalpL  =  0;
+    CCTK_REAL dtalpL = 0;
     
-    CCTK_REAL const betaxL  =  beta1L;
+    CCTK_REAL betaxL = beta1L;
     
-    CCTK_REAL const betayL  =  beta2L;
+    CCTK_REAL betayL = beta2L;
     
-    CCTK_REAL const betazL  =  beta3L;
+    CCTK_REAL betazL = beta3L;
     
-    CCTK_REAL const dtbetaxL  =  0;
+    CCTK_REAL dtbetaxL = 0;
     
-    CCTK_REAL const dtbetayL  =  0;
+    CCTK_REAL dtbetayL = 0;
     
-    CCTK_REAL const dtbetazL  =  0;
+    CCTK_REAL dtbetazL = 0;
     
     
     /* Copy local copies back to grid functions */
@@ -212,8 +165,6 @@ void ML_ADM_convertToADMBase_Body(cGH const * restrict const cctkGH, int const d
     kyy[index] = kyyL;
     kyz[index] = kyzL;
     kzz[index] = kzzL;
-    
-    /* Copy local copies back to subblock grid functions */
   }
   LC_ENDLOOP3 (ML_ADM_convertToADMBase);
 }