diff --git a/client/cs_benchmark.cpp b/client/cs_benchmark.cpp
index db4dda393f..6139535c68 100644
--- a/client/cs_benchmark.cpp
+++ b/client/cs_benchmark.cpp
@@ -171,25 +171,24 @@ int cpu_benchmarks(BENCHMARK_DESC* bdp) {
 
     bdp->error_str[0] = '\0';
     host_info.clear_host_info();
-// CMC here
+
 #ifdef ANDROID
-  // check for vfp or neon process or no special fp process
-  // namespaces separate the different compilations of the same whetstone.cpp file
-    if ( strstr(gstate.host_info.p_features, " neon ") != NULL ) { 
-      // have ARM neon FP capabilities
-      retval = android_neon::whetstone(host_info.p_fpops, fp_time, MIN_CPU_TIME);
-    }
-    else if ( strstr(gstate.host_info.p_features, " vfp ") != NULL ) { 
-      // have ARM vfp FP capabilities
-      retval = android_vfp::whetstone(host_info.p_fpops, fp_time, MIN_CPU_TIME);
-    }
-    else { // just run normal test
-      retval = whetstone(host_info.p_fpops, fp_time, MIN_CPU_TIME);
+    // check for FP accelerator: VFP, Neon, or none;
+    // run the appropriate version of Whetstone
+    // (separated using namespaces)
+    //
+    if (strstr(gstate.host_info.p_features, " neon ")) { 
+        // have ARM neon FP capabilities
+        retval = android_neon::whetstone(host_info.p_fpops, fp_time, MIN_CPU_TIME);
+    } else if (strstr(gstate.host_info.p_features, " vfp ")) { 
+        // have ARM vfp FP capabilities
+        retval = android_vfp::whetstone(host_info.p_fpops, fp_time, MIN_CPU_TIME);
+    } else { // just run normal test
+        retval = whetstone(host_info.p_fpops, fp_time, MIN_CPU_TIME);
     }
 #else
     retval = whetstone(host_info.p_fpops, fp_time, MIN_CPU_TIME);
 #endif
-// CMC end
     if (retval) {
         bdp->error = true;
         sprintf(bdp->error_str, "FP benchmark ran only %f sec; ignoring", fp_time);
diff --git a/client/whetstone.cpp b/client/whetstone.cpp
index 666364cc46..4b066c3d28 100644
--- a/client/whetstone.cpp
+++ b/client/whetstone.cpp
@@ -34,10 +34,6 @@
 #endif
 
 #include "util.h"
-// CMC android
-#ifdef ANDROID
-#include "whetstone.h"
-#endif
 #include "cpu_benchmark.h"
 
 #ifndef SPDP