diff --git a/src/modules/commander/Commander.cpp b/src/modules/commander/Commander.cpp
index 8e782c1ac9..5a6014ac65 100644
--- a/src/modules/commander/Commander.cpp
+++ b/src/modules/commander/Commander.cpp
@@ -52,12 +52,10 @@
 #include "state_machine_helper.h"
 
 /* PX4 headers */
-#include <dataman/dataman.h>
 #include <drivers/drv_hrt.h>
 #include <drivers/drv_tone_alarm.h>
 #include <lib/geo/geo.h>
 #include <mathlib/mathlib.h>
-#include <navigator/navigation.h>
 #include <px4_platform_common/events.h>
 #include <px4_platform_common/px4_config.h>
 #include <px4_platform_common/defines.h>
@@ -2223,8 +2221,6 @@ Commander::run()
 				} else {
 					_vehicle_status.power_input_valid = true;
 				}
-
-				_system_power_usb_connected = system_power.usb_connected;
 			}
 		}
 
@@ -3064,11 +3060,6 @@ Commander::run()
 
 		_status_changed = false;
 
-		/* store last position lock state */
-		_last_local_altitude_valid = _vehicle_status_flags.local_altitude_valid;
-		_last_local_position_valid = _vehicle_status_flags.local_position_valid;
-		_last_global_position_valid = _vehicle_status_flags.global_position_valid;
-
 		_was_armed = _arm_state_machine.isArmed();
 
 		arm_auth_update(now, params_updated);
diff --git a/src/modules/commander/Commander.hpp b/src/modules/commander/Commander.hpp
index 0c573ed48b..d38c5ade7b 100644
--- a/src/modules/commander/Commander.hpp
+++ b/src/modules/commander/Commander.hpp
@@ -351,10 +351,6 @@ private:
 	hrt_abstime	_last_print_mode_reject_time{0};	///< To remember when last notification was sent
 	bool            _mode_switch_mapped{false};
 
-	bool		_last_local_altitude_valid{false};
-	bool		_last_local_position_valid{false};
-	bool		_last_global_position_valid{false};
-
 	bool		_last_overload{false};
 
 	hrt_abstime	_last_valid_manual_control_setpoint{0};
@@ -378,7 +374,6 @@ private:
 	bool		_was_armed{false};
 	bool		_failsafe_old{false};	///< check which state machines for changes, clear "changed" flag
 	bool		_have_taken_off_since_arming{false};
-	bool		_system_power_usb_connected{false};
 
 	geofence_result_s	_geofence_result{};
 	vehicle_land_detected_s	_vehicle_land_detected{};