3 files changed, 1 insertions, 19 deletions
diff --git a/src/DisplayApp/DisplayApp.cpp b/src/DisplayApp/DisplayApp.cpp
index c42639c7..01c3aa96 100644
--- a/src/DisplayApp/DisplayApp.cpp
+++ b/src/DisplayApp/DisplayApp.cpp
@@ -163,13 +163,9 @@ void DisplayApp::Refresh() {
         lvgl.SetFullRefresh(Components::LittleVgl::FullRefreshDirections::Down);
         currentScreen.reset(nullptr);
         currentScreen.reset(new Screens::FirmwareUpdate(this, bleController));
+        onClockApp = false;
 
         break;
-      case Messages::BleFirmwareUpdateFinished:
-        lvgl.SetFullRefresh(Components::LittleVgl::FullRefreshDirections::Down);
-        currentScreen.reset(nullptr);
-        currentScreen.reset(new Screens::Clock(this, dateTimeController, batteryController, bleController));
-        break;
     }
   }
 }
diff --git a/src/DisplayApp/Screens/FirmwareUpdate.cpp b/src/DisplayApp/Screens/FirmwareUpdate.cpp
index 138211c4..e831114d 100644
--- a/src/DisplayApp/Screens/FirmwareUpdate.cpp
+++ b/src/DisplayApp/Screens/FirmwareUpdate.cpp
@@ -26,15 +26,6 @@ FirmwareUpdate::FirmwareUpdate(Pinetime::Applications::DisplayApp *app, Pinetime
   lv_label_set_text(percentLabel, "");
   lv_obj_set_auto_realign(percentLabel, true);
   lv_obj_align(percentLabel, bar1, LV_ALIGN_OUT_TOP_MID, 0, 60);
-
-  button = lv_btn_create(lv_scr_act(), NULL);
-  //lv_obj_set_event_cb(button, event_handler);
-  lv_obj_align(button, NULL, LV_ALIGN_IN_BOTTOM_MID, 0, 0);
-  lv_obj_set_hidden(button, true);
-
-  labelBtn = lv_label_create(button, NULL);
-  lv_label_set_text(labelBtn, "Back");
-  lv_obj_set_hidden(labelBtn, true);
 }
 
 FirmwareUpdate::~FirmwareUpdate() {
@@ -88,7 +79,4 @@ void FirmwareUpdate::UpdateValidated() {
 void FirmwareUpdate::UpdateError() {
   lv_label_set_recolor(percentLabel, true);
   lv_label_set_text(percentLabel, "#ff0000 Error!#");
-
-  lv_obj_set_hidden(labelBtn, false);
-  lv_obj_set_hidden(button, false);
 }
diff --git a/src/DisplayApp/Screens/FirmwareUpdate.h b/src/DisplayApp/Screens/FirmwareUpdate.h
index 87e93959..a571d667 100644
--- a/src/DisplayApp/Screens/FirmwareUpdate.h
+++ b/src/DisplayApp/Screens/FirmwareUpdate.h
@@ -31,8 +31,6 @@ namespace Pinetime {
           lv_obj_t* bar1;
           lv_obj_t* percentLabel;
           lv_obj_t* titleLabel;
-          lv_obj_t* labelBtn;
-          lv_obj_t* button;
           mutable char percentStr[10];
           bool running = true;
           States state;