diff --git a/CMakeLists.txt b/CMakeLists.txt
index c403ba4ea..3e6f40bbd 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -190,7 +190,7 @@ endif()
 
 add_subdirectory(examples)
 add_subdirectory(src)
-add_subdirectory(tests)
+# add_subdirectory(tests)
 add_subdirectory(tools)
 
 if (K4A_BUILD_DOCS)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 6b81079d8..46371b300 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -15,22 +15,13 @@ endif()
 # Add folders in Alphabetical order to help reduce merge issues
 add_subdirectory(allocator)
 add_subdirectory(calibration)
-add_subdirectory(capturesync)
-add_subdirectory(color)
-add_subdirectory(color_mcu)
-add_subdirectory(depth)
-add_subdirectory(depth_mcu)
 add_subdirectory(deloader)
-add_subdirectory(dewrapper)
 add_subdirectory(dynlib)
 add_subdirectory(global)
-add_subdirectory(image)
-add_subdirectory(imu)
 add_subdirectory(logging)
 add_subdirectory(math)
 add_subdirectory(queue)
 add_subdirectory(rwlock)
 add_subdirectory(tewrapper)
-add_subdirectory(transformation)
-add_subdirectory(usbcommand)
+
 
diff --git a/src/allocator/CMakeLists.txt b/src/allocator/CMakeLists.txt
index 714027454..27bae766b 100644
--- a/src/allocator/CMakeLists.txt
+++ b/src/allocator/CMakeLists.txt
@@ -1,18 +1,17 @@
 # Copyright (c) Microsoft Corporation. All rights reserved.
 # Licensed under the MIT License.
 
-add_library(k4a_allocator STATIC 
+add_library(k4a_allocator STATIC
             allocator.c
             )
 
 # Consumers should #include <k4ainternal/allocator.h>
-target_include_directories(k4a_allocator PUBLIC 
+target_include_directories(k4a_allocator PUBLIC
     ${K4A_PRIV_INCLUDE_DIR})
 
 # Dependencies of this library
-target_link_libraries(k4a_allocator PUBLIC 
+target_link_libraries(k4a_allocator PUBLIC
     azure::aziotsharedutil
-    k4ainternal::image
     k4ainternal::logging)
 
 # Define alias for other targets to link against
diff --git a/src/orbbec/imu_sync/imusync.c b/src/orbbec/imu_sync/imusync.c
index 07ad2bd66..0ff43a673 100644
--- a/src/orbbec/imu_sync/imusync.c
+++ b/src/orbbec/imu_sync/imusync.c
@@ -1,4 +1,4 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
+// Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
 // This library