diff --git a/src/singletons/emotemanager.cpp b/src/singletons/emotemanager.cpp
index 5ca1d8026..e48e28830 100644
--- a/src/singletons/emotemanager.cpp
+++ b/src/singletons/emotemanager.cpp
@@ -1,11 +1,8 @@
 #include "singletons/emotemanager.hpp"
 
 #include "application.hpp"
-#include "common.hpp"
 #include "controllers/accounts/accountcontroller.hpp"
 
-#include <QFile>
-
 using namespace chatterino::providers::twitch;
 using namespace chatterino::messages;
 
@@ -27,12 +24,6 @@ void EmoteManager::initialize()
     this->gifTimer.initialize();
 }
 
-util::EmoteData EmoteManager::getCheerImage(long long amount, bool animated)
-{
-    // TODO: fix this xD
-    return util::EmoteData();
-}
-
 }  // namespace singletons
 }  // namespace chatterino
 
diff --git a/src/singletons/emotemanager.hpp b/src/singletons/emotemanager.hpp
index a3d0da6f1..667c76bcf 100644
--- a/src/singletons/emotemanager.hpp
+++ b/src/singletons/emotemanager.hpp
@@ -2,14 +2,11 @@
 
 #define GIF_FRAME_LENGTH 33
 
-#include "messages/image.hpp"
 #include "providers/bttv/bttvemotes.hpp"
 #include "providers/emoji/emojis.hpp"
 #include "providers/ffz/ffzemotes.hpp"
 #include "providers/twitch/twitchemotes.hpp"
 #include "singletons/helper/giftimer.hpp"
-#include "util/concurrentmap.hpp"
-#include "util/emotemap.hpp"
 
 #include <QString>
 
@@ -21,20 +18,14 @@ class EmoteManager
 public:
     ~EmoteManager() = delete;
 
+    void initialize();
+
     providers::twitch::TwitchEmotes twitch;
     providers::bttv::BTTVEmotes bttv;
     providers::ffz::FFZEmotes ffz;
     providers::emoji::Emojis emojis;
 
     GIFTimer gifTimer;
-
-    void initialize();
-
-    util::EmoteData getCheerImage(long long int amount, bool animated);
-
-    // Bit badge/emotes?
-    // TODO: Move to twitch emote provider
-    util::ConcurrentMap<QString, messages::Image *> miscImageCache;
 };
 
 }  // namespace singletons