diff --git a/libraries/CMakeLists.txt b/libraries/CMakeLists.txt
index 88ff0993d8e..59495bae32b 100644
--- a/libraries/CMakeLists.txt
+++ b/libraries/CMakeLists.txt
@@ -52,8 +52,6 @@ set_property(GLOBAL PROPERTY CTEST_CUSTOM_TESTS_IGNORE
   yubico_otp wrap_data wrap info import_rsa import_authkey generate_hmac generate_ec\
   attest pbkdf2 parsing ${_CTEST_CUSTOM_TESTS_IGNORE}")
 
-add_subdirectory( rodeos )
-
 find_package(OpenSSL REQUIRED)
 option(AMQP-CPP_LINUX_TCP CACHE ON)
 add_subdirectory( amqp-cpp EXCLUDE_FROM_ALL )
diff --git a/libraries/chain/backing_store/tests/benchmark_kv.cpp b/libraries/chain/backing_store/tests/benchmark_kv.cpp
index fa53f5317e4..12e240e72c3 100644
--- a/libraries/chain/backing_store/tests/benchmark_kv.cpp
+++ b/libraries/chain/backing_store/tests/benchmark_kv.cpp
@@ -571,7 +571,7 @@ int main(int argc, char* argv[]) {
             return 1;
          }
       }
-   } catch (boost::wrapexcept<boost::program_options::required_option>& ex) {
+   } catch (boost::program_options::required_option& ex) {
       // This exception is thrown whenever required options are not supplied.
       // Need to catch it or we will get a crash.
       if (vmap.count("help") == 0) {
diff --git a/libraries/chain/include/eosio/chain/backing_store/db_combined.hpp b/libraries/chain/include/eosio/chain/backing_store/db_combined.hpp
index 2bad39caefb..707a8020257 100644
--- a/libraries/chain/include/eosio/chain/backing_store/db_combined.hpp
+++ b/libraries/chain/include/eosio/chain/backing_store/db_combined.hpp
@@ -207,7 +207,7 @@ class rocksdb_whole_db_table_collector {
          all_secondary_indices_;
 };
 
-auto process_all = []() { return true; };
+constexpr auto process_all = []() { return true; };
 
 enum class key_context { complete, standalone };
 template<typename Receiver, typename Function = std::decay_t < decltype(process_all)>>
diff --git a/programs/CMakeLists.txt b/programs/CMakeLists.txt
index 3caa9cac797..5eb775072b7 100644
--- a/programs/CMakeLists.txt
+++ b/programs/CMakeLists.txt
@@ -4,5 +4,3 @@ add_subdirectory( keosd )
 add_subdirectory( eosio-launcher )
 add_subdirectory( eosio-blocklog )
 add_subdirectory( nodeos-sectl )
-add_subdirectory( rodeos )
-add_subdirectory( eosio-tester )
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 5eb3b426314..229514244ba 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -55,7 +55,6 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/eosio_blocklog_prune_test.py ${CMAKE_
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/cli_test.py ${CMAKE_CURRENT_BINARY_DIR}/cli_test.py COPYONLY)
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/plugin_http_api_test.py ${CMAKE_CURRENT_BINARY_DIR}/plugin_http_api_test.py COPYONLY)
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/resource_monitor_plugin_test.py ${CMAKE_CURRENT_BINARY_DIR}/resource_monitor_plugin_test.py COPYONLY)
-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/rodeos_test.py ${CMAKE_CURRENT_BINARY_DIR}/rodeos_test.py COPYONLY)
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/test_filter.wasm ${CMAKE_CURRENT_BINARY_DIR}/test_filter.wasm COPYONLY)
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/trace_plugin_test.py ${CMAKE_CURRENT_BINARY_DIR}/trace_plugin_test.py COPYONLY)
 
@@ -112,8 +111,6 @@ add_test(NAME light_validation_sync_test COMMAND tests/light_validation_sync_tes
 set_property(TEST light_validation_sync_test PROPERTY LABELS nonparallelizable_tests)
 add_test(NAME eosio_blocklog_prune_test COMMAND tests/eosio_blocklog_prune_test.py -v --clean-run --dump-error-detail WORKING_DIRECTORY ${CMAKE_BINARY_DIR})
 set_property(TEST eosio_blocklog_prune_test PROPERTY LABELS nonparallelizable_tests)
-add_test(NAME rodeos_test COMMAND tests/rodeos_test.py -v --clean-run --dump-error-detail WORKING_DIRECTORY ${CMAKE_BINARY_DIR})
-set_property(TEST rodeos_test PROPERTY LABELS nonparallelizable_tests)
 
 # Long running tests
 add_test(NAME nodeos_sanity_lr_test COMMAND tests/nodeos_run_test.py -v --sanity-test --clean-run --dump-error-detail WORKING_DIRECTORY ${CMAKE_BINARY_DIR})