--- a/Discovery/Src/t7.c	Sat Mar 16 19:58:52 2019 +0000
+++ b/Discovery/Src/t7.c	Sun Mar 17 19:16:59 2019 +0100
@@ -74,10 +74,6 @@
 /* Exported variables --------------------------------------------------------*/
 
 /* Private variables ---------------------------------------------------------*/
-float depthLastCall[9] = { 0,0,0,0,0,0,0,0,0};
-uint8_t idDepthLastCall = 0;
-float temperatureLastCall[3] = { 0,0,0};
-uint8_t idTemperatureLastCall = 0;
 
 GFX_DrawCfgScreen	t7screen;
 GFX_DrawCfgScreen	t7screenCompass;
@@ -663,7 +659,7 @@
         ytop = 800 - state;
     else
         ytop = 0 + state;
-    Gfx_write_label_var(&t7screen,  300,800, ytop,&FontT48,CLUT_Font020,"SLEEP SLEEP SLEEP");
+    Gfx_write_label_var(&t7screen,  300,800, ytop,&FontT48,CLUT_Font020,"Shutting down...");
 }
 
 void t7_refresh_surface(void)
@@ -2053,7 +2049,7 @@
     t7_colorscheme_mod(TextL2);
     GFX_write_string(&FontT105,&t7l2,TextL2,1);
 
-    /* ascentrate graph */
+    /* ascent rate graph */
     if(stateUsed->lifeData.ascent_rate_meter_per_min > 0)
     {
     	if(!pSettings->FlipDisplay)
@@ -2474,8 +2470,6 @@
     const SDecoinfo * pDecoinfoStandard;
     const SDecoinfo * pDecoinfoFuture;
     float fCNS;
-
-    float temperatureThisCall;
     float temperature;
 
     if(stateUsed->diveSettings.deco_type.ub.standard == GF_MODE)
@@ -2503,14 +2497,7 @@
     /* Temperature */
     case 1:
     default:
-        // mean value
-        temperatureThisCall = unit_temperature_float(stateUsed->lifeData.temperature_celsius);
-        temperature = (temperatureThisCall + temperatureLastCall[0] + temperatureLastCall[1] + temperatureLastCall[2]) / 4.0f;
-        idTemperatureLastCall++;
-        if(idTemperatureLastCall >= 3)
-            idTemperatureLastCall = 0;
-        temperatureLastCall[idTemperatureLastCall] = temperatureThisCall;
-        // output
+    	temperature = unit_temperature_float(stateUsed->lifeData.temperature_celsius);
         headerText[2] = TXT_Temperature;
         textpointer = snprintf(text,TEXTSIZE,"\020\016%01.1f \140",temperature); // "\016\016%01.1f `" + C or F
         if(settingsGetPointer()->nonMetricalSystem == 0)