diff --git a/cmake/FPrime.cmake b/cmake/FPrime.cmake
index 0dc89c37bf..cc597ffa39 100644
--- a/cmake/FPrime.cmake
+++ b/cmake/FPrime.cmake
@@ -107,16 +107,14 @@ macro(fprime_setup_standard_targets)
         register_fprime_build_autocoder(autocoder/fpp)
         register_fprime_build_autocoder(autocoder/ai_xml)
         register_fprime_build_autocoder(autocoder/packets)
-        register_fprime_target(target/refresh_cache)
         register_fprime_target(target/version)
         register_fprime_target(target/install)
         register_fprime_ut_target(target/ut)
 
         if (FPRIME_ENABLE_UTIL_TARGETS)
-            register_fprime_target(target/impl)
+            register_fprime_target(target/refresh_cache)
             register_fprime_ut_target(target/check)
             register_fprime_ut_target(target/check_leak)
-            register_fprime_ut_target(target/testimpl)
         endif()
     endif()
 endmacro(fprime_setup_standard_targets)
diff --git a/cmake/target/impl.cmake b/cmake/target/impl.cmake
deleted file mode 100644
index c8fd499950..0000000000
--- a/cmake/target/impl.cmake
+++ /dev/null
@@ -1,40 +0,0 @@
-####
-# impl.cmake:
-#
-# This target invokes the code template generation available as part of the fprime autocoder. It implements
-# the target interface described here: [Targets](Targets.md).
-#
-# - `add_module_target`: adds sub-targets for '<MODULE_NAME>_impl'
-####
-
-####
-# impl `add_global_target`:
-#
-# Does nothing. Prevents default target.
-####
-function(impl_add_global_target TARGET)
-endfunction()
-####
-# impl `add_deployment_target`:
-#
-# Does nothing. Prevents default "roll-up" target.
-####
-function(impl_add_deployment_target MODULE TARGET SOURCES DEPENDENCIES FULL_DEPENDENCIES)
-endfunction()
-
-####
-# Impl function `add_module_target`:
-#
-# Adds a module-by-module target for producing implementations. Take in the Ai.xml file and produces a set template
-# files. Note: the impl autocoder path is: fpp (already run by the main build) followed by ai-impl.
-#
-# - **MODULE:** name of the module
-# - **TARGET:** name of the top-target (e.g. dict). Use ${MODULE_NAME}_${TARGET_NAME} for a module specific target
-# - **SOURCE_FILES:** list of source file inputs from the CMakeList.txt setup
-# - **DEPENDENCIES:** MOD_DEPS input from CMakeLists.txt
-####
-function(impl_add_module_target MODULE TARGET SOURCE_FILES DEPENDENCIES)
-    get_target_name(${TARGET} ${MODULE})
-    run_ac_set("${SOURCE_FILES}" autocoder/fpp autocoder/ai_impl)
-    add_custom_target("${TARGET_MOD_NAME}" DEPENDS ${AC_GENERATED})
-endfunction(impl_add_module_target)
diff --git a/cmake/target/testimpl.cmake b/cmake/target/testimpl.cmake
deleted file mode 100644
index 598d14d83b..0000000000
--- a/cmake/target/testimpl.cmake
+++ /dev/null
@@ -1,46 +0,0 @@
-####
-# testimpl.cmake:
-#
-# This target invokes the unit test code template generation available as part of the fprime autocoder. It implements
-# the target interface described here: [Targets](Targets.md).
-#
-# - `add_module_target`: adds sub-targets for '<MODULE_NAME>_test_impl'
-#
-# Note: this should be registered as a ut target
-####
-
-####
-# Function `testimpl_add_global_target`:
-#
-# Does nothing.
-####
-function(testimpl_add_global_target TARGET)
-endfunction()
-
-####
-# Function `testimpl_add_deployment_target`:
-#
-# Does nothing.
-####
-function(testimpl_add_deployment_target MODULE TARGET SOURCES DEPENDENCIES FULL_DEPENDENCIES)
-endfunction()
-
-####
-# Function `testimpl_add_module_target`:
-#
-# Adds a module-by-module target for producing ut implementations. Take in the Ai.xml file and produces a set of test
-# templates. Note: the testimpl autocoder path is: fpp (already run by the main build) followed by ai-ut-impl.
-#
-# - **MODULE:** name of the module
-# - **TARGET:** name of the top-target (e.g. dict). Use ${MODULE_NAME}_${TARGET_NAME} for a module specific target
-# - **SOURCE_FILES:** list of source file inputs from the CMakeList.txt setup
-# - **DEPENDENCIES:** MOD_DEPS input from CMakeLists.txt
-####
-function(testimpl_add_module_target MODULE TARGET SOURCE_FILES DEPENDENCIES)
-    get_target_name(${TARGET} ${MODULE})
-    # Try to generate dictionaries for every AC input file
-    if (NOT TARGET "${TARGET_MOD_NAME}")
-        run_ac_set("${SOURCE_FILES}" autocoder/fpp autocoder/ai_ut_impl)
-        add_custom_target("${TARGET_MOD_NAME}" DEPENDS ${AC_GENERATED})
-    endif()
-endfunction(testimpl_add_module_target)