diff --git a/doc/todo/VFALCO_TODO.txt b/doc/todo/VFALCO_TODO.txt
index 7a78ff1e2..5e94a6edf 100644
--- a/doc/todo/VFALCO_TODO.txt
+++ b/doc/todo/VFALCO_TODO.txt
@@ -3,11 +3,10 @@ RIPPLE TODO
 --------------------------------------------------------------------------------
 
 Vinnie's List: Changes day to day, descending priority
+- PeerFinder work
 - Fix and tidy up broken beast classes
 - Validators work
-- Open Source aftermath
-
-- Parse Validator line using cribbed code
+  * Parse Validator line using cribbed code
 - Parse ContentBodyBuffer from HTTPResponse
 - HTTPMessage improvements
 - HTTPClient improvements based on HTTPServer
diff --git a/src/BeastConfig.h b/src/BeastConfig.h
index 05dc73cdc..3ca315422 100644
--- a/src/BeastConfig.h
+++ b/src/BeastConfig.h
@@ -174,12 +174,6 @@
 #define RIPPLE_USE_NEW_VALIDATORS 0
 #endif
 
-// Turning this on makes the Application object get destroyed,
-// which is part of an attempt to have a "clean exit."
-#ifndef RIPPLE_APPLICATION_CLEAN_EXIT
-#define RIPPLE_APPLICATION_CLEAN_EXIT 1
-#endif
-
 // This is only here temporarily. Use it to turn off the sending of
 // "ANNOUNCE" messages if you suspect that you're having problems
 // because of it.
@@ -187,6 +181,10 @@
 #define RIPPLE_USE_MT_ANNOUNCE 0
 #endif
 
+#ifndef RIPPLE_USE_PEERFINDER
+#define RIPPLE_USE_PEERFINDER 0
+#endif
+
 // Here temporarily
 // Controls whether or not the new RPC::Manager logic will be
 // used to invoke RPC commands before they pass to the original code.