diff --git a/src/console.cpp b/src/console.cpp
index e436b0c6d..1f82c9941 100644
--- a/src/console.cpp
+++ b/src/console.cpp
@@ -746,7 +746,7 @@ std::vector<bool> EMSESPConsole::ptys_;
 #endif
 
 EMSESPConsole::EMSESPConsole(EMSESP & emsesp, Stream & stream, bool local)
-    : APP_SHELL_TYPE(emsesp, stream, ShellContext::MAIN, local ? (CommandFlags::USER | CommandFlags::LOCAL) : CommandFlags::USER)
+    : EMSESPShell(emsesp, stream, ShellContext::MAIN, local ? (CommandFlags::USER | CommandFlags::LOCAL) : CommandFlags::USER)
     , name_("ttyS0")
 #ifndef EMSESP_STANDALONE
     , pty_(std::numeric_limits<size_t>::max())
@@ -758,7 +758,7 @@ EMSESPConsole::EMSESPConsole(EMSESP & emsesp, Stream & stream, bool local)
 
 #ifndef EMSESP_STANDALONE
 EMSESPConsole::EMSESPConsole(EMSESP & emsesp, Stream & stream, const IPAddress & addr, uint16_t port)
-    : APP_SHELL_TYPE(emsesp, stream, ShellContext::MAIN, CommandFlags::USER)
+    : EMSESPShell(emsesp, stream, ShellContext::MAIN, CommandFlags::USER)
     , addr_(addr)
     , port_(port) {
     std::array<char, 16> text;
diff --git a/src/console_stream.h b/src/console_stream.h
index 1d2531d4e..ca862754e 100644
--- a/src/console_stream.h
+++ b/src/console_stream.h
@@ -22,13 +22,9 @@
 
 #include "console.h"
 
-// #define APP_SHELL_TYPE uuid::console::StreamConsole, public EMSESPShell
-#define APP_SHELL_TYPE EMSESPShell
-// #define APP_SHELL_TYPE uuid::console::StreamConsole
-
 namespace emsesp {
 
-class EMSESPConsole : public APP_SHELL_TYPE {
+class EMSESPConsole : public EMSESPShell {
   public:
     EMSESPConsole(EMSESP & emsesp, Stream & stream, bool local);
 #ifndef ENV_NATIVE
diff --git a/src/emsesp.h b/src/emsesp.h
index b949292a4..a5aa902af 100644
--- a/src/emsesp.h
+++ b/src/emsesp.h
@@ -92,10 +92,13 @@ class Shower;
 
 class EMSESP {
   public:
+    EMSESP();
     ~EMSESP() = default;
     virtual void start();
     virtual void loop();
 
+    static uuid::log::Logger logger();
+
     static void publish_device_values(uint8_t device_type);
     static void publish_other_values();
     static void publish_sensor_values(const bool time, const bool force = false);
@@ -226,10 +229,6 @@ class EMSESP {
     static WebLogService           webLogService;
     static WebCustomizationService webCustomizationService;
 
-    static uuid::log::Logger logger();
-
-    EMSESP();
-
   private:
     static std::string device_tostring(const uint8_t device_id);
     static void        process_UBADevices(std::shared_ptr<const Telegram> telegram);