diff --git a/APMrover2/APMrover2.pde b/APMrover2/APMrover2.pde
index 6554751b71..91a43c5290 100644
--- a/APMrover2/APMrover2.pde
+++ b/APMrover2/APMrover2.pde
@@ -402,10 +402,6 @@ static const 	float t7			= 10000000.0;
 // A counter used to count down valid gps fixes to allow the gps estimate to settle
 // before recording our home position (and executing a ground start if we booted with an air start)
 static uint8_t 	ground_start_count	= 5;
-// Used to compute a speed estimate from the first valid gps fixes to decide if we are 
-// on the ground or in the air.  Used to decide if a ground start is appropriate if we
-// booted with an air start.
-static int16_t     ground_start_avg;
 
 ////////////////////////////////////////////////////////////////////////////////
 // Location & Navigation
@@ -538,8 +534,6 @@ static float G_Dt						= 0.02;
 static int32_t 	perf_mon_timer;
 // The maximum main loop execution time recorded in the current performance monitoring interval
 static uint32_t 	G_Dt_max;
-// The number of gps fixes recorded in the current performance monitoring interval
-static uint8_t 	gps_fix_count = 0;
 
 ////////////////////////////////////////////////////////////////////////////////
 // System Timers
@@ -840,11 +834,9 @@ static void update_GPS_10Hz(void)
     have_position = ahrs.get_position(current_loc);
 
 	if (g_gps->new_data && g_gps->status() >= GPS::GPS_OK_FIX_3D) {
-		gps_fix_count++;
 
 		if(ground_start_count > 1){
 			ground_start_count--;
-			ground_start_avg += g_gps->ground_speed_cm;
 
 		} else if (ground_start_count == 1) {
 			// We countdown N number of good GPS fixes
diff --git a/APMrover2/system.pde b/APMrover2/system.pde
index 5d4524a2bd..3e957cbda4 100644
--- a/APMrover2/system.pde
+++ b/APMrover2/system.pde
@@ -403,7 +403,6 @@ static void update_notify()
 static void resetPerfData(void) {
 	mainLoop_count 			= 0;
 	G_Dt_max 				= 0;
-	gps_fix_count 			= 0;
 	perf_mon_timer 			= millis();
 }