diff --git a/src/binary_c_parameters.h b/src/binary_c_parameters.h
index 98bb8913cfefd48e19b8ade353501da3b137c718..df5307d68a3a80382ae34965b2c2b1ce849485c7 100644
--- a/src/binary_c_parameters.h
+++ b/src/binary_c_parameters.h
@@ -1398,7 +1398,7 @@
  * see nucsyn/nucsyn.h for details of parts you can switch on 
  * off.
  ************************************************************/
-//#define NUCSYN
+#define NUCSYN
 
 /************************************************************
  * Stellar colour library
@@ -1954,7 +1954,7 @@
 /*
  * Logging for Gaia-like HRD
  */
-#define GAIAHRD
+//#define GAIAHRD
 
 #ifdef GAIAHRD
 #ifndef RESOLVE_POSTAGB
diff --git a/src/binary_c_structures.h b/src/binary_c_structures.h
index 43d20ef738cda02b1187ecd403f71fa2fd2fd3d6..93289a383f8e7a6345016bf53a31131e34dcefa6 100644
--- a/src/binary_c_structures.h
+++ b/src/binary_c_structures.h
@@ -358,10 +358,8 @@ struct tmpstore_t {
 #endif//NOVAE
 
 #endif//NUCSYN
-#ifdef GAIAHRD
     double * unresolved_magnitudes;
     double * stellar_magnitudes[NUMBER_OF_STARS];
-#endif//GAIAHRD
     double * comenv_lambda_data;
     double * Peters_grav_wave_merger_time_data;
     size_t raw_buffer_size;
diff --git a/src/logging/log_every_timestep.c b/src/logging/log_every_timestep.c
index cf947a224ecd6cf6289c0800214a9a581171e7d4..5bbbd3517068dd1d4e1ae7ebb48077d13458a2a8 100644
--- a/src/logging/log_every_timestep.c
+++ b/src/logging/log_every_timestep.c
@@ -2602,7 +2602,6 @@ void log_every_timestep(struct stardata_t * RESTRICT const stardata)
     }
 #endif// ZW2019_SNIA_LOG
 
-#define GAIAHRD
 #ifdef GAIAHRD
     {
         double L,Teff;
diff --git a/src/memory/free_tmpstore.c b/src/memory/free_tmpstore.c
index e842606dda5d1339fa1dae591c261564dd5ba58d..e48c06a31c88831dc9853b4b6a2e21ab19172151 100644
--- a/src/memory/free_tmpstore.c
+++ b/src/memory/free_tmpstore.c
@@ -14,6 +14,7 @@ void free_tmpstore(struct tmpstore_t * RESTRICT const tmpstore)
 #ifdef KICK_CDF_TABLE
         Delete_data_table(tmpstore->cdf_table);
 #endif
+
         Tmp_free(unresolved_magnitudes);
         {
             Star_number k;
@@ -21,7 +22,8 @@ void free_tmpstore(struct tmpstore_t * RESTRICT const tmpstore)
             {
                 Tmp_free(stellar_magnitudes[k]);
             }
-        }        
+        }
+
         Tmp_free(raw_buffer);
         Tmp_free(stellar_structure_newstar);
         Tmp_free(stellar_evolution_newstar);
diff --git a/src/nucsyn/nucsyn_parameters.h b/src/nucsyn/nucsyn_parameters.h
index c53527665d7ed88e43bd2fcb418a69eb38462366..0b67abc82d463c04c7c6059f572219758b8ce0dd 100644
--- a/src/nucsyn/nucsyn_parameters.h
+++ b/src/nucsyn/nucsyn_parameters.h
@@ -740,7 +740,7 @@ undances with s-process
 /* define NUCSYN_GCE to modify yield output for gce.pl
  * NB this just activates other defines, and turns some off.
  */
-#define NUCSYN_GCE
+//#define NUCSYN_GCE
 
 #ifdef NUCSYN_GCE