diff --git a/software/firmware/.settings/language.settings.xml b/software/firmware/.settings/language.settings.xml
index 49bbe7e6..438e4d2e 100644
--- a/software/firmware/.settings/language.settings.xml
+++ b/software/firmware/.settings/language.settings.xml
@@ -5,7 +5,7 @@
 			<provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
 			<provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
 			<provider copy-of="extension" id="org.eclipse.cdt.managedbuilder.core.GCCBuildCommandParser"/>
-			<provider class="org.eclipse.cdt.managedbuilder.language.settings.providers.GCCBuiltinSpecsDetector" console="false" env-hash="1347002660722691700" id="org.eclipse.embedcdt.managedbuild.cross.arm.core.GCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT Arm Cross GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} ${cross_toolchain_flags} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
+			<provider class="org.eclipse.cdt.managedbuilder.language.settings.providers.GCCBuiltinSpecsDetector" console="false" env-hash="-495364040879034531" id="org.eclipse.embedcdt.managedbuild.cross.arm.core.GCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT Arm Cross GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} ${cross_toolchain_flags} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
 				<language-scope id="org.eclipse.cdt.core.gcc"/>
 				<language-scope id="org.eclipse.cdt.core.g++"/>
 			</provider>
diff --git a/software/firmware/src/peripherals/src/system.c b/software/firmware/src/peripherals/src/system.c
index 1f3bbadb..769285e4 100644
--- a/software/firmware/src/peripherals/src/system.c
+++ b/software/firmware/src/peripherals/src/system.c
@@ -250,7 +250,7 @@ void system_enter_power_off_mode(uint32_t wake_on_gpio, uint32_t wake_on_timesta
    bluetooth_deinit();
    buttons_deinit();
    buzzer_deinit();
-   imu_deinit();
+   // TODO: UNCOMMENT: imu_deinit();
    leds_deinit();
    ranging_radio_deinit();
    storage_deinit();
diff --git a/software/firmware/src/tasks/app_task_ranging.c b/software/firmware/src/tasks/app_task_ranging.c
index d0e4c68e..16da375c 100644
--- a/software/firmware/src/tasks/app_task_ranging.c
+++ b/software/firmware/src/tasks/app_task_ranging.c
@@ -265,9 +265,9 @@ void AppTaskRanging(void *uid)
       storage_flush_and_shutdown();
    else
    {
-      storage_write_motion_status(imu_read_in_motion());
+      // TODO: UNCOMMENT: storage_write_motion_status(imu_read_in_motion());
       battery_register_event_callback(battery_event_handler);
-      imu_register_motion_change_callback(motion_change_handler, OPERATION_MODE_ACCONLY);
+      // TODO: UNCOMMENT: imu_register_motion_change_callback(motion_change_handler, OPERATION_MODE_ACCONLY);
    }
 #endif
 
diff --git a/software/firmware/src/tasks/app_tasks.c b/software/firmware/src/tasks/app_tasks.c
index d1c2e381..2d299681 100644
--- a/software/firmware/src/tasks/app_tasks.c
+++ b/software/firmware/src/tasks/app_tasks.c
@@ -33,7 +33,7 @@ void run_tasks(void)
    battery_monitor_init();
    bluetooth_init(uid);
    buzzer_init();
-   imu_init();
+   // TODO: UNCOMMENT: imu_init();
    leds_init();
    rtc_init();
    storage_init();