diff --git a/Cantera/src/base/config.h.in b/Cantera/src/base/config.h.in
index 919ac2c2c..5fa501e69 100644
--- a/Cantera/src/base/config.h.in
+++ b/Cantera/src/base/config.h.in
@@ -9,13 +9,6 @@
 //                    refering to branch number within svn
 %(CANTERA_VERSION)s
 
-// Integer for major number of Cantera
-#define CANTERA_VERSION_MAJORNUMBER  18
-// Flag indicating it's part of major version 18
-#define CANTERA_VERSION_18       1
-//  Flag indicating it's a development version
-#define CANTERA_VERSION_18_XXX   1
-
 //------------------------ Development flags ------------------//
 //
 // Compile in additional debug printing where available.
@@ -82,10 +75,6 @@ typedef  int          ftnlen;       // Fortran hidden string length type
 // windows, with gcc being used as the compiler.
 %(CYGWIN)s
 
-// Identify whether the operating system is windows based, with
-// microsoft vc++ being used as the compiler
-%(WINMSVC)s
-
 // Identify whether the operating system is solaris 
 // with a native compiler 
 %(SOLARIS)s
@@ -108,11 +97,6 @@ typedef  int          ftnlen;       // Fortran hidden string length type
 %(NEEDS_GENERIC_TEMPL_STATIC_DECL)s
 
 //--------------------- Python ------------------------------------
-// This path to the python executable is created during
-// Cantera's setup. It identifies the python executable 
-// used to run Python to process .cti files. Note that this is only
-// used if environment variable PYTHON_CMD is not set.
-%(PYTHON_EXE)s
 
 // If this is defined, the Cantera Python interface will use the
 // Numeric package
diff --git a/SConstruct b/SConstruct
index 0b8a5e1a7..12dae6c78 100644
--- a/SConstruct
+++ b/SConstruct
@@ -741,14 +741,12 @@ cdefine('DEBUG_MODE', 'debug')
 configh['SOLARIS'] = 1 if env['OS'] == 'Solaris' else None
 configh['DARWIN'] = 1 if env['OS'] == 'Darwin' else None
 configh['CYGWIN'] = 1 if env['OS'] == 'Cygwin' else None
-configh['WINMSVC'] = 1 if env['OS'] == 'Windows' else None
 cdefine('NEEDS_GENERIC_TEMPL_STATIC_DECL', 'OS', 'Solaris')
 
 cdefine('HAS_NUMPY', 'python_array', 'numpy')
 cdefine('HAS_NUMARRAY', 'python_array', 'numarray')
 cdefine('HAS_NUMERIC', 'python_array', 'numeric')
 cdefine('HAS_NO_PYTHON', 'python_package', 'none')
-configh['PYTHON_EXE'] = quoted(env['python_cmd']) if env['python_package'] != 'none' else None
 
 cdefine('HAS_SUNDIALS', 'use_sundials', 'y')
 if env['use_sundials']:
diff --git a/tools/testtools/csvdiff.cpp b/tools/testtools/csvdiff.cpp
index f1513d511..ce0811242 100644
--- a/tools/testtools/csvdiff.cpp
+++ b/tools/testtools/csvdiff.cpp
@@ -26,7 +26,7 @@
 #include <float.h>
 #include <limits.h>
 #include "kernel/config.h"
-#ifndef WINMSVC
+#ifndef _MSC_VER
 #include <unistd.h>
 #else
 #include <string>
@@ -70,7 +70,7 @@ int Max_Input_Str_Ln = MAX_INPUT_STR_LN;
 /*****************************************************************************/
 /*****************************************************************************/
 
-#ifdef WINMSVC
+#ifdef _MSC_VER
 /*
  * Windows doesn't have getopt(). This is an incomplete version that
  * does enough to handle required functionality.