diff --git a/test_problems/cathermo/DH_graph_1/DH_graph_1.cpp b/test_problems/cathermo/DH_graph_1/DH_graph_1.cpp
index 6d87918c8..a6824a3b8 100644
--- a/test_problems/cathermo/DH_graph_1/DH_graph_1.cpp
+++ b/test_problems/cathermo/DH_graph_1/DH_graph_1.cpp
@@ -10,13 +10,6 @@
 using namespace std;
 using namespace Cantera;
 
-void printUsage()
-{
-    cout << "usage: DH_test " <<  endl;
-    cout <<"                -> Everything is hardwired" << endl;
-}
-
-
 int main(int argc, char** argv)
 {
 
diff --git a/test_problems/cathermo/HMW_dupl_test/HMW_dupl_test.cpp b/test_problems/cathermo/HMW_dupl_test/HMW_dupl_test.cpp
index 53c34be2e..e0dd79c33 100644
--- a/test_problems/cathermo/HMW_dupl_test/HMW_dupl_test.cpp
+++ b/test_problems/cathermo/HMW_dupl_test/HMW_dupl_test.cpp
@@ -12,13 +12,6 @@
 using namespace std;
 using namespace Cantera;
 
-void printUsage()
-{
-    cout << "usage: HMW_test " <<  endl;
-    cout <<"                -> Everything is hardwired" << endl;
-}
-
-
 int main(int argc, char** argv)
 {
 
diff --git a/test_problems/cathermo/HMW_graph_CpvT/HMW_graph_CpvT.cpp b/test_problems/cathermo/HMW_graph_CpvT/HMW_graph_CpvT.cpp
index c3231db8b..94d4809ab 100644
--- a/test_problems/cathermo/HMW_graph_CpvT/HMW_graph_CpvT.cpp
+++ b/test_problems/cathermo/HMW_graph_CpvT/HMW_graph_CpvT.cpp
@@ -12,13 +12,6 @@
 using namespace std;
 using namespace Cantera;
 
-void printUsage()
-{
-    cout << "usage: HMW_test " <<  endl;
-    cout <<"                -> Everything is hardwired" << endl;
-}
-
-
 int main(int argc, char** argv)
 {
 
diff --git a/test_problems/cathermo/HMW_graph_GvI/HMW_graph_GvI.cpp b/test_problems/cathermo/HMW_graph_GvI/HMW_graph_GvI.cpp
index 298cbe055..54cf95937 100644
--- a/test_problems/cathermo/HMW_graph_GvI/HMW_graph_GvI.cpp
+++ b/test_problems/cathermo/HMW_graph_GvI/HMW_graph_GvI.cpp
@@ -10,13 +10,6 @@
 using namespace std;
 using namespace Cantera;
 
-void printUsage()
-{
-    cout << "usage: HMW_test " <<  endl;
-    cout <<"                -> Everything is hardwired" << endl;
-}
-
-
 int main(int argc, char** argv)
 {
 
diff --git a/test_problems/cathermo/HMW_graph_GvT/HMW_graph_GvT.cpp b/test_problems/cathermo/HMW_graph_GvT/HMW_graph_GvT.cpp
index a576a9b0c..9cc683f9e 100644
--- a/test_problems/cathermo/HMW_graph_GvT/HMW_graph_GvT.cpp
+++ b/test_problems/cathermo/HMW_graph_GvT/HMW_graph_GvT.cpp
@@ -14,13 +14,6 @@
 using namespace std;
 using namespace Cantera;
 
-void printUsage()
-{
-    cout << "usage: HMW_test " <<  endl;
-    cout <<"                -> Everything is hardwired" << endl;
-}
-
-
 int main(int argc, char** argv)
 {
 
diff --git a/test_problems/cathermo/HMW_graph_HvT/HMW_graph_HvT.cpp b/test_problems/cathermo/HMW_graph_HvT/HMW_graph_HvT.cpp
index 3fd9949c8..fdb901fe3 100644
--- a/test_problems/cathermo/HMW_graph_HvT/HMW_graph_HvT.cpp
+++ b/test_problems/cathermo/HMW_graph_HvT/HMW_graph_HvT.cpp
@@ -12,13 +12,6 @@
 using namespace std;
 using namespace Cantera;
 
-void printUsage()
-{
-    cout << "usage: HMW_test " <<  endl;
-    cout <<"                -> Everything is hardwired" << endl;
-}
-
-
 int main(int argc, char** argv)
 {
 
diff --git a/test_problems/cathermo/HMW_graph_VvT/HMW_graph_VvT.cpp b/test_problems/cathermo/HMW_graph_VvT/HMW_graph_VvT.cpp
index ea9a0273a..1db7a0bda 100644
--- a/test_problems/cathermo/HMW_graph_VvT/HMW_graph_VvT.cpp
+++ b/test_problems/cathermo/HMW_graph_VvT/HMW_graph_VvT.cpp
@@ -11,13 +11,6 @@
 using namespace std;
 using namespace Cantera;
 
-void printUsage()
-{
-    cout << "usage: HMW_test " <<  endl;
-    cout <<"                -> Everything is hardwired" << endl;
-}
-
-
 int main(int argc, char** argv)
 {
 
diff --git a/test_problems/cathermo/HMW_test_1/HMW_test_1.cpp b/test_problems/cathermo/HMW_test_1/HMW_test_1.cpp
index fd41a5d88..95f755efb 100644
--- a/test_problems/cathermo/HMW_test_1/HMW_test_1.cpp
+++ b/test_problems/cathermo/HMW_test_1/HMW_test_1.cpp
@@ -7,12 +7,6 @@ using namespace Cantera;
 
 int CHECK_DEBUG_MODE = 0;
 
-void printUsage()
-{
-    cout << "usage: HMW_test_1 " <<  endl;
-    cout <<"                -> Everything is hardwired" << endl;
-}
-
 void pAtable(HMWSoln* HMW)
 {
     size_t nsp = HMW->nSpecies();
diff --git a/test_problems/cathermo/HMW_test_3/HMW_test_3.cpp b/test_problems/cathermo/HMW_test_3/HMW_test_3.cpp
index 010de4118..9df53a975 100644
--- a/test_problems/cathermo/HMW_test_3/HMW_test_3.cpp
+++ b/test_problems/cathermo/HMW_test_3/HMW_test_3.cpp
@@ -7,12 +7,6 @@ using namespace Cantera;
 
 int CHECK_DEBUG_MODE = 0;
 
-void printUsage()
-{
-    cout << "usage: HMW_test_1 " <<  endl;
-    cout <<"                -> Everything is hardwired" << endl;
-}
-
 void pAtable(HMWSoln* HMW)
 {
     size_t nsp = HMW->nSpecies();
diff --git a/test_problems/cathermo/VPissp/ISSPTester.cpp b/test_problems/cathermo/VPissp/ISSPTester.cpp
index 34eff2e24..bd34ef804 100644
--- a/test_problems/cathermo/VPissp/ISSPTester.cpp
+++ b/test_problems/cathermo/VPissp/ISSPTester.cpp
@@ -24,20 +24,6 @@
 #include <cstdio>
 
 using namespace std;
-
-#ifdef DEBUG_HKM
-int iDebug_HKM = 0;
-#endif
-
-/*****************************************************************/
-/*****************************************************************/
-/*****************************************************************/
-static void printUsage()
-{
-
-}
-
-
 using namespace Cantera;
 
 int main(int argc, char** argv)
@@ -45,31 +31,6 @@ int main(int argc, char** argv)
 #ifdef _MSC_VER
     _set_output_format(_TWO_DIGIT_EXPONENT);
 #endif
-    string infile;
-    // look for command-line options
-    if (argc > 1) {
-        string tok;
-        for (int j = 1; j < argc; j++) {
-            tok = string(argv[j]);
-            if (tok[0] == '-') {
-                size_t nopt = tok.size();
-                for (size_t n = 1; n < nopt; n++) {
-                    if (tok[n] == 'h') {
-                        printUsage();
-                        exit(0);
-                    } else {
-                        printUsage();
-                        exit(1);
-                    }
-                }
-            } else if (infile == "") {
-                infile = tok;
-            } else {
-                printUsage();
-                exit(1);
-            }
-        }
-    }
 
     try {
         double Tkelvin = 1200.;
diff --git a/test_problems/cathermo/ims/IMSTester.cpp b/test_problems/cathermo/ims/IMSTester.cpp
index 671606d29..9baa92eb0 100644
--- a/test_problems/cathermo/ims/IMSTester.cpp
+++ b/test_problems/cathermo/ims/IMSTester.cpp
@@ -22,20 +22,6 @@
 #include <cstdio>
 
 using namespace std;
-
-#ifdef DEBUG_HKM
-int iDebug_HKM = 0;
-#endif
-
-/*****************************************************************/
-/*****************************************************************/
-/*****************************************************************/
-static void printUsage()
-{
-
-}
-
-
 using namespace Cantera;
 
 int main(int argc, char** argv)
@@ -43,31 +29,6 @@ int main(int argc, char** argv)
 #ifdef _MSC_VER
     _set_output_format(_TWO_DIGIT_EXPONENT);
 #endif
-    string infile;
-    // look for command-line options
-    if (argc > 1) {
-        string tok;
-        for (int j = 1; j < argc; j++) {
-            tok = string(argv[j]);
-            if (tok[0] == '-') {
-                size_t nopt = tok.size();
-                for (size_t n = 1; n < nopt; n++) {
-                    if (tok[n] == 'h') {
-                        printUsage();
-                        exit(0);
-                    } else {
-                        printUsage();
-                        exit(1);
-                    }
-                }
-            } else if (infile == "") {
-                infile = tok;
-            } else {
-                printUsage();
-                exit(1);
-            }
-        }
-    }
 
     try {
         double Tkelvin = 298.15;
diff --git a/test_problems/cathermo/issp/ISSPTester.cpp b/test_problems/cathermo/issp/ISSPTester.cpp
index b02dfbcd2..079aebdaf 100644
--- a/test_problems/cathermo/issp/ISSPTester.cpp
+++ b/test_problems/cathermo/issp/ISSPTester.cpp
@@ -24,20 +24,6 @@
 #include <cstdio>
 
 using namespace std;
-
-#ifdef DEBUG_HKM
-int iDebug_HKM = 0;
-#endif
-
-/*****************************************************************/
-/*****************************************************************/
-/*****************************************************************/
-static void printUsage()
-{
-
-}
-
-
 using namespace Cantera;
 
 int main(int argc, char** argv)
@@ -45,31 +31,6 @@ int main(int argc, char** argv)
 #ifdef _MSC_VER
     _set_output_format(_TWO_DIGIT_EXPONENT);
 #endif
-    string infile;
-    // look for command-line options
-    if (argc > 1) {
-        string tok;
-        for (int j = 1; j < argc; j++) {
-            tok = string(argv[j]);
-            if (tok[0] == '-') {
-                size_t nopt = tok.size();
-                for (size_t n = 1; n < nopt; n++) {
-                    if (tok[n] == 'h') {
-                        printUsage();
-                        exit(0);
-                    } else {
-                        printUsage();
-                        exit(1);
-                    }
-                }
-            } else if (infile == "") {
-                infile = tok;
-            } else {
-                printUsage();
-                exit(1);
-            }
-        }
-    }
 
     try {
         double Tkelvin = 1200.;
diff --git a/test_problems/cathermo/stoichSubSSTP/stoichSubSSTP.cpp b/test_problems/cathermo/stoichSubSSTP/stoichSubSSTP.cpp
index effad530e..c3176bfca 100644
--- a/test_problems/cathermo/stoichSubSSTP/stoichSubSSTP.cpp
+++ b/test_problems/cathermo/stoichSubSSTP/stoichSubSSTP.cpp
@@ -13,14 +13,6 @@
 using namespace std;
 using namespace Cantera;
 
-void printUsage()
-{
-    cout << "usage: stoichSubSSTP " <<  endl;
-    cout <<"                -> Everything is hardwired" << endl;
-}
-
-
-
 int main(int argc, char** argv)
 {
     try {
diff --git a/test_problems/surfSolverTest/surfaceSolver.cpp b/test_problems/surfSolverTest/surfaceSolver.cpp
index 189daf054..ef457b45e 100644
--- a/test_problems/surfSolverTest/surfaceSolver.cpp
+++ b/test_problems/surfSolverTest/surfaceSolver.cpp
@@ -22,10 +22,6 @@
 #define MSSIZE 200
 using namespace std;
 
-#ifdef DEBUG_HKM
-int iDebug_HKM = 0;
-#endif
-
 /*****************************************************************/
 /*****************************************************************/
 /*****************************************************************/