diff --git a/Grid/communicator/Communicator_mpi3.cc b/Grid/communicator/Communicator_mpi3.cc
index cb03ca46..15b8cbfd 100644
--- a/Grid/communicator/Communicator_mpi3.cc
+++ b/Grid/communicator/Communicator_mpi3.cc
@@ -48,7 +48,7 @@ void CartesianCommunicator::Init(int *argc, char ***argv)
 #if defined (A64FX) || defined (A64FXFIXEDSIZE)
 #ifndef TOFU
 #define TOFU
-#pragma message ("MPI_THREAD_SINGLE")
+#pragma message ("TOFU network / MPI_THREAD_SINGLE")
 #endif
 #endif
 
diff --git a/Grid/simd/Grid_a64fx-fixedsize.h b/Grid/simd/Grid_a64fx-fixedsize.h
index edccfa82..3a0066d1 100644
--- a/Grid/simd/Grid_a64fx-fixedsize.h
+++ b/Grid/simd/Grid_a64fx-fixedsize.h
@@ -39,7 +39,6 @@
 
 // gcc 10 features
 #if __ARM_FEATURE_SVE_BITS==512
-#pragma message("building for A64FX / fixed SVE data type size")
 /* gcc 10.0.1 and gcc 10.1 bug using ACLE data types  CAS-159553-Y1K4C6
    workaround: use gcc's internal data types, bugfix expected for gcc 10.2
 typedef svbool_t    pred __attribute__((arm_sve_vector_bits(512)));
diff --git a/Grid/simd/Grid_vector_types.h b/Grid/simd/Grid_vector_types.h
index ddf37ba9..e2624e15 100644
--- a/Grid/simd/Grid_vector_types.h
+++ b/Grid/simd/Grid_vector_types.h
@@ -120,26 +120,18 @@ accelerator_inline Grid_half sfw_float_to_half(float ff) {
   #if defined(A64FX) || defined(A64FXFIXEDSIZE) // breakout A64FX SVE ACLE here
     #include <arm_sve.h>
     #if defined(A64FX) // VLA
-      #ifndef MSGVLA
       #pragma message("building for A64FX / SVE ACLE VLA")
-      #define MSGVLA
-      #endif
       #if defined(ARMCLANGCOMPAT)
-        #ifndef MSGCOMPAT
         #pragma message("applying armclang fix")
-        #define MSGCOMPAT
-        #endif
       #endif
       #include "Grid_a64fx-2.h"
     #endif
     #if defined(A64FXFIXEDSIZE) // fixed size data types
+      #pragma message("building for A64FX / SVE ACLE fixed size")
       #include "Grid_a64fx-fixedsize.h"
     #endif
   #else
-    #ifndef MSGGEN
     #pragma message("building for GEN") // generic
-    #define MSGGEN
-    #endif
     #include "Grid_generic.h"
   #endif
 #endif