diff --git a/configure.ac b/configure.ac
index 4437d6e57..be379278a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.61)
-AC_INIT([cantera], [1.8.0], [nick@ices.utexas.edu])
+AC_INIT([cantera], [2.0.0], [nick@ices.utexas.edu])
 AC_CONFIG_HEADER(config.h)
 AC_CONFIG_AUX_DIR([build-aux])
 #AX_ENABLE_BUILDDIR
@@ -113,10 +113,6 @@ AC_OUTPUT(Makefile                                                         \
                    test_problems/VCSnonideal/Makefile                      \
                    test_problems/cathermo/Makefile                         \
                    test_problems/cathermo/DH_graph_1/Makefile              \
-                   test_problems/cathermo/DH_graph_acommon/Makefile        \
-                   test_problems/cathermo/DH_graph_bdotak/Makefile         \
-                   test_problems/cathermo/DH_graph_NM/Makefile             \
-                   test_problems/cathermo/DH_graph_Pitzer/Makefile         \
                    test_problems/cathermo/HMW_dupl_test/Makefile           \
                    test_problems/cathermo/HMW_graph_CpvT/Makefile          \
                    test_problems/cathermo/HMW_graph_HvT/Makefile           \
diff --git a/test_problems/cathermo/Makefile.am b/test_problems/cathermo/Makefile.am
index 43ebfb83a..2b2438d21 100644
--- a/test_problems/cathermo/Makefile.am
+++ b/test_problems/cathermo/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS  = DH_graph_1 DH_graph_acommon DH_graph_bdotak DH_graph_Pitzer DH_graph_NM HMW_dupl_test HMW_graph_CpvT
+SUBDIRS  = DH_graph_1 HMW_dupl_test HMW_graph_CpvT
 SUBDIRS += HMW_graph_CpvT HMW_graph_GvT HMW_graph_VvT HMW_test_3 HMW_graph_GvI HMW_graph_HvT HMW_test_1    
 SUBDIRS += issp/ stoichSubSSTP/ testIAPWSPres/ testWaterPDSS/ VPissp/
 SUBDIRS += ims/ testIAPWS/ testIAPWSTripP/ testWaterTP/ wtWater/