diff --git a/src/displayapp/WatchFaces.h b/src/displayapp/WatchFaces.h
index 46573534..d35bd4f0 100644
--- a/src/displayapp/WatchFaces.h
+++ b/src/displayapp/WatchFaces.h
@@ -5,9 +5,6 @@ namespace Pinetime {
     enum class WatchFace : uint8_t {
       Digital = 0,
       Analog = 1,
-      PineTimeStyle = 2,
-      Terminal = 3,
-      Infineat = 4,
       CasioStyleG7710 = 5,
       Fuzzy = 6,
     };
diff --git a/src/displayapp/screens/Clock.cpp b/src/displayapp/screens/Clock.cpp
index 1cd16d7a..9eb2090e 100644
--- a/src/displayapp/screens/Clock.cpp
+++ b/src/displayapp/screens/Clock.cpp
@@ -8,11 +8,8 @@
 #include "components/settings/Settings.h"
 #include "displayapp/DisplayApp.h"
 #include "displayapp/screens/WatchFaceDigital.h"
-#include "displayapp/screens/WatchFaceTerminal.h"
-#include "displayapp/screens/WatchFaceInfineat.h"
 #include "displayapp/screens/WatchFaceAnalog.h"
 #include "displayapp/screens/WatchFaceFuzzy.h"
-#include "displayapp/screens/WatchFacePineTimeStyle.h"
 #include "displayapp/screens/WatchFaceCasioStyleG7710.h"
 
 using namespace Pinetime::Applications::Screens;
@@ -44,15 +41,6 @@ Clock::Clock(Controllers::DateTime& dateTimeController,
         case WatchFace::Analog:
           return WatchFaceAnalogScreen();
           break;
-        case WatchFace::PineTimeStyle:
-          return WatchFacePineTimeStyleScreen();
-          break;
-        case WatchFace::Terminal:
-          return WatchFaceTerminalScreen();
-          break;
-        case WatchFace::Infineat:
-          return WatchFaceInfineatScreen();
-          break;
         case WatchFace::CasioStyleG7710:
           return WatchFaceCasioStyleG7710();
           break;
@@ -95,36 +83,6 @@ std::unique_ptr<Screen> Clock::WatchFaceAnalogScreen() {
                                                     settingsController);
 }
 
-std::unique_ptr<Screen> Clock::WatchFacePineTimeStyleScreen() {
-  return std::make_unique<Screens::WatchFacePineTimeStyle>(dateTimeController,
-                                                           batteryController,
-                                                           bleController,
-                                                           notificationManager,
-                                                           settingsController,
-                                                           motionController,
-                                                           weatherService);
-}
-
-std::unique_ptr<Screen> Clock::WatchFaceTerminalScreen() {
-  return std::make_unique<Screens::WatchFaceTerminal>(dateTimeController,
-                                                      batteryController,
-                                                      bleController,
-                                                      notificationManager,
-                                                      settingsController,
-                                                      heartRateController,
-                                                      motionController);
-}
-
-std::unique_ptr<Screen> Clock::WatchFaceInfineatScreen() {
-  return std::make_unique<Screens::WatchFaceInfineat>(dateTimeController,
-                                                      batteryController,
-                                                      bleController,
-                                                      notificationManager,
-                                                      settingsController,
-                                                      motionController,
-                                                      filesystem);
-}
-
 std::unique_ptr<Screen> Clock::WatchFaceCasioStyleG7710() {
   return std::make_unique<Screens::WatchFaceCasioStyleG7710>(dateTimeController,
                                                              batteryController,
diff --git a/src/displayapp/screens/settings/SettingWatchFace.h b/src/displayapp/screens/settings/SettingWatchFace.h
index ebfce01c..7b6c5a76 100644
--- a/src/displayapp/screens/settings/SettingWatchFace.h
+++ b/src/displayapp/screens/settings/SettingWatchFace.h
@@ -44,9 +44,6 @@ namespace Pinetime {
         std::array<Screens::CheckboxList::Item, settingsPerScreen * nScreens> watchfaces {
           {{"Digital face", true},
            {"Analog face", true},
-           {"PineTimeStyle", true},
-           {"Terminal", true},
-           {"Infineat face", Applications::Screens::WatchFaceInfineat::IsAvailable(filesystem)},
            {"Casio G7710", Applications::Screens::WatchFaceCasioStyleG7710::IsAvailable(filesystem)},
            {"Fuzzy Clock", true},
            {"", false}}};