diff --git a/cmake/FindCppUnitLite.cmake b/cmake/FindCppUnitLite.cmake
deleted file mode 100644
index 57628b8fa..000000000
--- a/cmake/FindCppUnitLite.cmake
+++ /dev/null
@@ -1,30 +0,0 @@
-# This is FindCppUnitLite.cmake
-# CMake module to locate the CppUnit package
-# The following variables will be defined:
-#
-# CppUnitLite_FOUND          : TRUE if the package has been successfully found
-# CppUnitLite_INCLUDE_DIR    : paths to CppUnitLite's INCLUDE directories
-# CppUnitLite_LIBS           : paths to CppUnitLite's libraries
-
-# Find include dirs
-find_path(_CppUnitLite_INCLUDE_DIR CppUnitLite/Test.h
-    PATHS ${CMAKE_INSTALL_PREFIX}/include "$ENV{HOME}/include" /usr/local/include /usr/include )
-
-# Find libraries
-find_library(_CppUnitLite_LIB NAMES CppUnitLite
-  HINTS ${CMAKE_INSTALL_PREFIX}/lib "$ENV{HOME}/lib" /usr/local/lib /usr/lib)
-
-set (CppUnitLite_INCLUDE_DIR  ${_CppUnitLite_INCLUDE_DIR} CACHE STRING "CppUnitLite INCLUDE directories")
-set (CppUnitLite_LIBS         ${_CppUnitLite_LIB} CACHE STRING "CppUnitLite libraries")
-
-# handle the QUIETLY and REQUIRED arguments and set LIBXML2_FOUND to TRUE
-# if all listed variables are TRUE
-include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(CppUnitLite DEFAULT_MSG
-                                  _CppUnitLite_INCLUDE_DIR _CppUnitLite_LIB)
-
-mark_as_advanced(_CppUnitLite_INCLUDE_DIR _CppUnitLite_LIB )
- 
-
-
-
diff --git a/cmake/FindGTSAM.cmake b/cmake/FindGTSAM.cmake
deleted file mode 100644
index 6748ae462..000000000
--- a/cmake/FindGTSAM.cmake
+++ /dev/null
@@ -1,30 +0,0 @@
-# This is FindGTSAM.cmake
-# CMake module to locate the GTSAM package
-# The following variables will be defined:
-#
-# GTSAM_FOUND          : TRUE if the package has been successfully found
-# GTSAM_INCLUDE_DIR    : paths to GTSAM's INCLUDE directories
-# GTSAM_LIBS           : paths to GTSAM's libraries
-
-# Find include dirs
-find_path(_gtsam_INCLUDE_DIR gtsam/inference/FactorGraph.h
-  PATHS ${CMAKE_INSTALL_PREFIX}/include "$ENV{HOME}/include" /usr/local/include /usr/include )
-
-# Find libraries
-find_library(_gtsam_LIB NAMES gtsam
-  HINTS ${CMAKE_INSTALL_PREFIX}/lib "$ENV{HOME}/lib" /usr/local/lib /usr/lib)
-
-set (GTSAM_INCLUDE_DIR ${_gtsam_INCLUDE_DIR} CACHE STRING "GTSAM INCLUDE directories")
-set (GTSAM_LIBS        ${_gtsam_LIB} CACHE STRING "GTSAM libraries")
-
-# handle the QUIETLY and REQUIRED arguments and set LIBXML2_FOUND to TRUE
-# if all listed variables are TRUE
-include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(GTSAM DEFAULT_MSG
-                                  _gtsam_INCLUDE_DIR _gtsam_LIB)
-
-mark_as_advanced(_gtsam_INCLUDE_DIR _gtsam_LIB )
- 
-
-
-
diff --git a/cmake/FindWrap.cmake b/cmake/FindWrap.cmake
deleted file mode 100644
index 733f6aa7d..000000000
--- a/cmake/FindWrap.cmake
+++ /dev/null
@@ -1,30 +0,0 @@
-# This is FindWrap.cmake
-# CMake module to locate the Wrap tool and header after installation package
-# The following variables will be defined:
-#
-# Wrap_FOUND          : TRUE if the package has been successfully found
-# Wrap_CMD            : command for executing wrap
-# Wrap_INCLUDE_DIR    : paths to Wrap's INCLUDE directories
-
-# Find include dir
-find_path(_Wrap_INCLUDE_DIR wrap/matlab.h
-    PATHS ${CMAKE_INSTALL_PREFIX}/include "$ENV{HOME}/include" /usr/local/include /usr/include )
-
-# Find the installed executable
-find_program(_Wrap_CMD NAMES wrap 
-    PATHS ${CMAKE_INSTALL_PREFIX}/bin "$ENV{HOME}/bin" /usr/local/bin /usr/bin )
-        
-set (Wrap_INCLUDE_DIR  ${_Wrap_INCLUDE_DIR} CACHE STRING "Wrap INCLUDE directories")
-set (Wrap_CMD  ${_Wrap_CMD} CACHE STRING "Wrap executable location")
-
-# handle the QUIETLY and REQUIRED arguments and set LIBXML2_FOUND to TRUE
-# if all listed variables are TRUE
-include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(Wrap DEFAULT_MSG
-                                  _Wrap_INCLUDE_DIR _Wrap_CMD)
-
-mark_as_advanced(_Wrap_INCLUDE_DIR _Wrap_CMD )
- 
-
-
-
diff --git a/cmake/GtsamMatlabWrap.cmake b/cmake/GtsamMatlabWrap.cmake
deleted file mode 100644
index 8c2098b1d..000000000
--- a/cmake/GtsamMatlabWrap.cmake
+++ /dev/null
@@ -1,48 +0,0 @@
-# Macros for using wrap functionality
-macro(find_mexextension)
-    ## Determine the mex extension
-    # Apple Macintosh (64-bit) mexmaci64
-    # Linux (32-bit) mexglx
-    # Linux (64-bit) mexa64
-    # Microsoft Windows (32-bit) mexw32
-    # Windows (64-bit) mexw64
-    
-    # only support 64-bit apple
-    if(CMAKE_HOST_APPLE)
-        set(GTSAM_MEX_BIN_EXTENSION_default mexmaci64)
-    endif(CMAKE_HOST_APPLE)
-    
-    if(NOT CMAKE_HOST_APPLE)
-        # check 64 bit
-        if( ${CMAKE_SIZEOF_VOID_P} EQUAL 4 )
-          set( HAVE_64_BIT 0 )
-        endif( ${CMAKE_SIZEOF_VOID_P} EQUAL 4 )
-        
-        if( ${CMAKE_SIZEOF_VOID_P} EQUAL 8 )
-          set( HAVE_64_BIT 1 )
-        endif( ${CMAKE_SIZEOF_VOID_P} EQUAL 8 )
-        
-        # Check for linux machines
-        if (CMAKE_HOST_UNIX)
-            if (HAVE_64_BIT)
-                set(GTSAM_MEX_BIN_EXTENSION_default mexa64)
-            else (HAVE_64_BIT)
-                set(GTSAM_MEX_BIN_EXTENSION_default mexglx)
-            endif (HAVE_64_BIT)
-        endif(CMAKE_HOST_UNIX)
-        
-        # Check for windows machines
-        if (CMAKE_HOST_WIN32)
-            if (HAVE_64_BIT)
-                set(GTSAM_MEX_BIN_EXTENSION_default mexw64)
-            else (HAVE_64_BIT)
-                set(GTSAM_MEX_BIN_EXTENSION_default mexw32)
-            endif (HAVE_64_BIT)
-        endif(CMAKE_HOST_WIN32)
-    endif(NOT CMAKE_HOST_APPLE)
-    
-    # Allow for setting mex extension manually
-    set(GTSAM_MEX_BIN_EXTENSION ${GTSAM_MEX_BIN_EXTENSION_default} CACHE DOCSTRING "Extension for matlab mex files")
-    message(STATUS "Detected Matlab mex extension: ${GTSAM_MEX_BIN_EXTENSION_default}")
-    message(STATUS "Current Matlab mex extension: ${GTSAM_MEX_BIN_EXTENSION}")
-endmacro(find_mexextension)
\ No newline at end of file
diff --git a/cmake/GtsamPrinting.cmake b/cmake/GtsamPrinting.cmake
deleted file mode 100644
index b6f3ca4ef..000000000
--- a/cmake/GtsamPrinting.cmake
+++ /dev/null
@@ -1,10 +0,0 @@
-# print configuration variables
-# Usage:
-#print_config_flag(${GTSAM_BUILD_TESTS} "Build Tests                ")
-macro(print_config_flag flag msg)
-    if ("${flag}" STREQUAL "ON")
-        message(STATUS "  ${msg}: Enabled")
-    else ("${flag}" STREQUAL "ON")
-        message(STATUS "  ${msg}: Disabled")
-    endif ("${flag}" STREQUAL "ON")
-endmacro(print_config_flag)
\ No newline at end of file
diff --git a/cmake/GtsamTesting.cmake b/cmake/GtsamTesting.cmake
deleted file mode 100644
index 28683c98b..000000000
--- a/cmake/GtsamTesting.cmake
+++ /dev/null
@@ -1,65 +0,0 @@
-# Build macros for using tests
-
-# Collects all tests in an adjacent tests folder and builds them
-macro(gtsam_add_tests subdir libs)
-    add_custom_target(check.${subdir} COMMAND ${CMAKE_CTEST_COMMAND})
-    file(GLOB tests_srcs "tests/test*.cpp")
-    foreach(test_src ${tests_srcs})
-        get_filename_component(test_base ${test_src} NAME_WE)
-        set( test_bin ${test_base} )
-        message(STATUS "Adding Test ${test_bin}") 
-        add_executable(${test_bin} ${test_src})
-        add_dependencies(check.${subdir} ${test_bin})
-        add_dependencies(check ${test_bin})
-        add_test(${test_base} ${EXECUTABLE_OUTPUT_PATH}${test_bin} )
-        if (GTSAM_BUILD_CONVENIENCE_LIBRARIES)
-            add_dependencies(${test_bin} ${libs} CppUnitLite)
-            target_link_libraries(${test_bin} ${libs} ${Boost_LIBRARIES} CppUnitLite)
-        else()
-            add_dependencies(${test_bin} gtsam-static)
-            target_link_libraries(${test_bin} ${Boost_LIBRARIES} gtsam-static CppUnitLite)
-        endif()
-        add_custom_target(${test_bin}.run ${EXECUTABLE_OUTPUT_PATH}${test_bin} ${ARGN})
-    endforeach(test_src)
-endmacro()
-
-# Collects all tests in an adjacent tests folder and builds them
-# This version forces the use of libs, as necessary for wrap/tests
-macro(gtsam_add_external_tests subdir libs)
-    add_custom_target(check.${subdir} COMMAND ${CMAKE_CTEST_COMMAND})
-    file(GLOB tests_srcs "tests/test*.cpp")
-    foreach(test_src ${tests_srcs})
-        get_filename_component(test_base ${test_src} NAME_WE)
-        set( test_bin ${test_base} )
-        message(STATUS "Adding Test ${test_bin}") 
-        add_executable(${test_bin} ${test_src})
-        add_dependencies(check.${subdir} ${test_bin})
-        add_dependencies(check ${test_bin})
-        add_test(${test_base} ${EXECUTABLE_OUTPUT_PATH}${test_bin} )
-        add_dependencies(${test_bin} ${libs} CppUnitLite)
-        target_link_libraries(${test_bin} ${libs} ${Boost_LIBRARIES} CppUnitLite)
-        add_custom_target(${test_bin}.run ${EXECUTABLE_OUTPUT_PATH}${test_bin} ${ARGN})
-    endforeach(test_src)
-endmacro()
-
-# Collects timing scripts and builds them
-macro(gtsam_add_timing subdir libs)
-    add_custom_target(timing.${subdir})
-    file(GLOB base_timing_srcs "tests/time*.cpp") 
-    foreach(time_src ${base_timing_srcs})
-        get_filename_component(time_base ${time_src} NAME_WE)
-        set( time_bin ${time_base} )
-        message(STATUS "Adding Timing Benchmark ${time_bin}")
-        add_executable(${time_bin} ${time_src})
-        add_dependencies(timing.${subdir} ${time_bin})
-        add_dependencies(timing ${time_bin})
-        if (GTSAM_BUILD_CONVENIENCE_LIBRARIES)
-            add_dependencies(${time_bin} ${libs})
-            target_link_libraries(${time_bin} ${libs} ${Boost_LIBRARIES} CppUnitLite)
-        else()
-            add_dependencies(${time_bin} gtsam-static)
-            target_link_libraries(${time_bin} ${Boost_LIBRARIES} gtsam-static CppUnitLite)
-        endif()
-        add_custom_target(${time_bin}.run ${EXECUTABLE_OUTPUT_PATH}${time_bin} ${ARGN})
-    endforeach(time_src)
-endmacro()
\ No newline at end of file