diff --git a/Modules/moduleinfo.h b/Modules/moduleinfo.h
index 4e6cbf9c828009ef399e176abf99ad7116a8b82e..d830b71328fde986627a81a3402dbacbd9d98cde 100644
--- a/Modules/moduleinfo.h
+++ b/Modules/moduleinfo.h
@@ -14,7 +14,6 @@ enum ModuleId {
     BROKERTEST,
     GRAPH,
     TABLE,
-    IMAGEVIEWER,
     MESSAGEVIEWER,
     MAVLINK,
     FSMVIEWER,
diff --git a/Modules/moduleslist.cpp b/Modules/moduleslist.cpp
index 0df43fdbe83ea914d71984a26fb539a9fef8c05d..05021a43831ba8b0dc53cc00eac3efdc29434cf3 100644
--- a/Modules/moduleslist.cpp
+++ b/Modules/moduleslist.cpp
@@ -11,7 +11,6 @@
 #include "Modules/Test/testmodule.h"
 #include "Modules/Graph/graphmodule.h"
 #include "Modules/Table/tablemodule.h"
-#include "Modules/ImageViewer/imageviewermodule.h"
 #include "Modules/MessageViewer/messagesviewermodule.h"
 #include "Modules/Mavlink/mavlinkmodule.h"
 #include "Modules/TreeViewer/treeviewermodule.h"
@@ -109,15 +108,6 @@ void ModulesList::createModuleList() {
     addModuleInfo(tableModule);
 #endif
 
-#ifdef IMAGEVIEWERMODULE_H
-    ModuleInfo imageViewer(ModuleId::IMAGEVIEWER, "ImageViewer", ModuleCategory::DATAVISUAL);
-    imageViewer.setFactory([]() {
-        return new ImageViewerModule();
-    });
-    imageViewer.addModuleSourceFiles("Modules/ImageViewer/");
-    addModuleInfo(imageViewer);
-#endif
-
 #ifdef MESSAGESVIEWERMODULE_H
     ModuleInfo msgViewer(ModuleId::MESSAGEVIEWER, "MessageViewer", ModuleCategory::DATAVISUAL);
     msgViewer.setFactory([]() {
diff --git a/SkywardHub.pro b/SkywardHub.pro
index f91b30015b7e153f15be9567f13fa46402606d93..60efd1d3ba24ce4afb1f5800253d2da71670ea87 100644
--- a/SkywardHub.pro
+++ b/SkywardHub.pro
@@ -34,10 +34,6 @@ SOURCES += \
     Modules/FileStream/filestreammodule.cpp \
     Modules/Graph/graphmodule.cpp \
     Modules/Graph/qcustomplot.cpp \
-    Modules/ImageViewer/customgraphicsscene.cpp \
-    Modules/ImageViewer/imagevieweritem.cpp \
-    Modules/ImageViewer/imageviewermodule.cpp \
-    Modules/ImageViewer/imageviewersettings.cpp \
     Modules/MainWindow/skywardhubmainwindow.cpp \
     Modules/MainWindow/window.cpp \
     Modules/Mavlink/mavlinkcommandadapter.cpp \
@@ -80,9 +76,6 @@ HEADERS += \
     Core/Message/modulemessage.h \
     Core/Message/topic.h \
     Core/Message/topicfilter.h \
-    Core/Messages/messagefield.h \
-    Core/Messages/modulemessage.h \
-    Core/Messages/topic.h \
     Core/module.h \
     Core/moduleeventshandler.h \
     Core/modulemessagesbroker.h \
@@ -96,10 +89,6 @@ HEADERS += \
     Modules/FileStream/filestreammodule.h \
     Modules/Graph/graphmodule.h \
     Modules/Graph/qcustomplot.h \
-    Modules/ImageViewer/customgraphicsscene.h \
-    Modules/ImageViewer/imagevieweritem.h \
-    Modules/ImageViewer/imageviewermodule.h \
-    Modules/ImageViewer/imageviewersettings.h \
     Modules/MainWindow/skywardhubmainwindow.h \
     Modules/MainWindow/window.h \
     Modules/Mavlink/mavlinkcommandadapter.h \
@@ -140,8 +129,6 @@ FORMS += \
     Modules/Empty/emptymodule.ui \
     Modules/FileStream/filestreammodule.ui \
     Modules/Graph/graphmodule.ui \
-    Modules/ImageViewer/imageviewermodule.ui \
-    Modules/ImageViewer/imageviewersettings.ui \
     Modules/MainWindow/skywardhubmainwindow.ui \
     Modules/MainWindow/window.ui \
     Modules/Mavlink/mavlinkmodule.ui \