diff --git a/flight/Modules/AltitudeHold/altitudehold.c b/flight/Modules/AltitudeHold/altitudehold.c
index 8d1c14542..8855b761c 100644
--- a/flight/Modules/AltitudeHold/altitudehold.c
+++ b/flight/Modules/AltitudeHold/altitudehold.c
@@ -126,10 +126,9 @@ float starting_altitude;
 static void altitudeHoldTask(void *parameters)
 {
 	AltitudeHoldDesiredData altitudeHoldDesired;
-	BaroAltitudeData baroAltitude;
 	StabilizationDesiredData stabilizationDesired;
 
-	portTickType thisTime, lastSysTime, lastUpdateTime;
+	portTickType thisTime, lastUpdateTime;
 	UAVObjEvent ev;
 
 	// Force update of the settings
@@ -140,9 +139,8 @@ static void altitudeHoldTask(void *parameters)
 	enum init_state {WAITING_BARO, WAITIING_INIT, INITED} init = WAITING_BARO;
 
 	// Main task loop
-	lastSysTime = xTaskGetTickCount();
 	while (1) {		
-		bool baro_updated;
+		bool baro_updated = false;
 		// Wait until the AttitudeRaw object is updated, if a timeout then go to failsafe
 		if ( xQueueReceive(queue, &ev, 100 / portTICK_RATE_MS) != pdTRUE )
 		{
diff --git a/flight/PiOS/Common/pios_ms5611.c b/flight/PiOS/Common/pios_ms5611.c
index b1c50e6e6..b6d08e9a7 100644
--- a/flight/PiOS/Common/pios_ms5611.c
+++ b/flight/PiOS/Common/pios_ms5611.c
@@ -43,8 +43,6 @@ ConversionTypeTypeDef CurrentRead;
 MS5611CalibDataTypeDef CalibData;
 
 /* Straight from the datasheet */
-static int32_t X1, X2, X3, B3, B5, B6, P;
-static uint32_t B4, B7;
 static uint32_t RawTemperature;
 static uint32_t RawPressure;
 static int64_t Pressure;