diff --git a/src/ydb.c b/src/ydb.c
index d8445c10ea1..9f1c9f8a6fb 100644
--- a/src/ydb.c
+++ b/src/ydb.c
@@ -467,17 +467,8 @@ static int toku_env_close(DB_ENV * env, u_int32_t flags) {
 	toku_ydb_unlock();  // ydb lock must not be held when shutting down minicron
 	toku_cachetable_minicron_shutdown(env->i->cachetable);
         if (env->i->logger) {
-#if 0
-            // TODO lock problems (see test_db_remove.c).  may want to require an environment.
             r0 = toku_checkpoint(env->i->cachetable, env->i->logger, NULL, NULL, NULL, NULL, NULL);
             assert(r0 == 0);
-#else
-            // TODO locks?
-            r0 = toku_cachetable_begin_checkpoint(env->i->cachetable, env->i->logger);
-            if (r0 == 0)
-                toku_cachetable_end_checkpoint(env->i->cachetable, env->i->logger, NULL, NULL, NULL);
-            assert(r0 == 0);
-#endif
             r0 = toku_logger_shutdown(env->i->logger); assert(r0 == 0);
         }
 	toku_ydb_lock();