diff --git a/src/lib/deskflow/App.cpp b/src/lib/deskflow/App.cpp
index 200f813f2..285f711b8 100644
--- a/src/lib/deskflow/App.cpp
+++ b/src/lib/deskflow/App.cpp
@@ -206,14 +206,6 @@ void App::initApp(int argc, const char **argv)
 
   // load configuration
   loadConfig();
-
-  if (!argsBase().m_disableTray && m_createTaskBarReceiver) {
-
-    // create a log buffer so we can show the latest message
-    // as a tray icon tooltip
-    BufferedLogOutputter *logBuffer = new BufferedLogOutputter(1000);
-    CLOG->insert(logBuffer, true);
-  }
 }
 
 void App::initIpcClient()
diff --git a/src/lib/deskflow/App.h b/src/lib/deskflow/App.h
index 30fa52645..10a70948e 100644
--- a/src/lib/deskflow/App.h
+++ b/src/lib/deskflow/App.h
@@ -21,8 +21,6 @@
 
 #include <stdexcept>
 
-class IArchTaskBarReceiver;
-class BufferedLogOutputter;
 class ILogOutputter;
 class FileLogOutputter;
 namespace deskflow {
@@ -31,8 +29,6 @@ class Screen;
 class IEventQueue;
 class SocketMultiplexer;
 
-typedef IArchTaskBarReceiver *(*CreateTaskBarReceiverFunc)(const BufferedLogOutputter *, IEventQueue *events);
-
 class App : public IApp
 {
 public:
@@ -127,7 +123,6 @@ private:
   deskflow::ArgsBase *m_args;
   static App *s_instance;
   FileLogOutputter *m_fileLog;
-  CreateTaskBarReceiverFunc m_createTaskBarReceiver;
   ARCH_APP_UTIL m_appUtil;
   IpcClient *m_ipcClient;
   SocketMultiplexer *m_socketMultiplexer;
diff --git a/src/lib/deskflow/ArgsBase.h b/src/lib/deskflow/ArgsBase.h
index fc53ab869..e9b80e5b2 100644
--- a/src/lib/deskflow/ArgsBase.h
+++ b/src/lib/deskflow/ArgsBase.h
@@ -56,9 +56,6 @@ public:
   /// @brief The name of the current computer
   std::string m_name;
 
-  /// @brief Should the app add a tray icon
-  bool m_disableTray = false;
-
   /// @brief Tell the client to talk through IPC to the daemon
   bool m_enableIpc = false;