diff --git a/CMakeLists.txt b/CMakeLists.txt
index 678c02ec3bc99ef72ad2b0942622b024ddfa47aa..3101d9b0326bea5126c7d8fa49acf54b2272ad3d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -52,7 +52,7 @@ add_executable(groundstation
     src/shared/Core/Message/Message.cpp
     src/shared/Core/Message/Topic.cpp
     src/shared/Core/MessageBroker/MessageBroker.cpp
-    src/shared/Core/MessageBroker/Subscription.cpp
+    # src/shared/Core/MessageBroker/Subscription.cpp
     src/shared/Core/QCustomPlot/QCustomPlot.cpp
     src/shared/Core/Window/Window.cpp
     src/shared/Core/SkywardHubCore.cpp
@@ -63,7 +63,6 @@ add_executable(groundstation
     src/shared/Modules/CompactCommandPad/CommandSelector.cpp
     src/shared/Modules/CompactCommandPad/SendThread.cpp
     src/shared/Modules/Empty/EmptyModule.cpp
-    src/shared/Modules/FileStream/FileStreamModule.cpp
     src/shared/Modules/Graph/Graph.cpp
     src/shared/Modules/IncomingMessagesViewer/IncomingMessagesViewerModule.cpp
     src/shared/Modules/Mavlink/Ports/MavlinkPort.cpp
diff --git a/src/shared/Modules/FileStream/FileStreamModule.h b/src/shared/Modules/FileStream/FileStreamModule.h
deleted file mode 100644
index 5bc7e09fbec7f7497bd8884ee3c3464bd79a46cf..0000000000000000000000000000000000000000
--- a/src/shared/Modules/FileStream/FileStreamModule.h
+++ /dev/null
@@ -1,53 +0,0 @@
-#pragma once
-
-#include <Core/Message/Message.h>
-#include <Modules/Module.h>
-
-#include <QFile>
-#include <QLineEdit>
-#include <QWidget>
-
-namespace Ui
-{
-class FileStreamModule;
-}
-
-class FileStreamModule : public Module
-{
-    Q_OBJECT
-
-public:
-    FileStreamModule();
-    ~FileStreamModule();
-
-    XmlObject toXmlObject() override;
-    void fromXmlObject(const XmlObject& xmlObject) override;
-
-protected:
-    void connectUI();
-    QString getFilePath() const;
-    QString getTopicName() const;
-    void resetTopicName();
-    void onMsgReceived(const Message& msg);
-
-    void onAddTopicClicked();
-    void onStartClicked();
-    void onStopClicked();
-    void onTopicEdit();
-    void disableOnStartElement();
-    void enableElementOnStop();
-    void onFileChanged();
-    void onShowFileClick();
-
-    void addTopic(const QString& topic);
-    std::unique_ptr<QLineEdit> createTopicView(const QString& topic) const;
-
-    void deleteAllTopicViews();
-
-private:
-    Ui::FileStreamModule* ui;
-
-    QList<std::unique_ptr<QLineEdit>> topicViewsList;
-    QList<std::unique_ptr<Subscription>> subscriptions;
-    QFile file;
-};
diff --git a/src/shared/Modules/FileStream/FileStreamModule.ui b/src/shared/Modules/FileStream/FileStreamModule.ui
deleted file mode 100644
index 85693220457cc6d9b16ac3231d87d1d4e0186018..0000000000000000000000000000000000000000
--- a/src/shared/Modules/FileStream/FileStreamModule.ui
+++ /dev/null
@@ -1,155 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>FileStreamModule</class>
- <widget class="QWidget" name="FileStreamModule">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>508</width>
-    <height>209</height>
-   </rect>
-  </property>
-  <property name="windowTitle">
-   <string>Form</string>
-  </property>
-  <layout class="QGridLayout" name="gridLayout">
-   <item row="0" column="2">
-    <widget class="QScrollArea" name="scrollArea">
-     <property name="widgetResizable">
-      <bool>true</bool>
-     </property>
-     <widget class="QWidget" name="scrollAreaWidgetContents">
-      <property name="geometry">
-       <rect>
-        <x>0</x>
-        <y>0</y>
-        <width>486</width>
-        <height>187</height>
-       </rect>
-      </property>
-      <layout class="QVBoxLayout" name="verticalLayout_2">
-       <item>
-        <layout class="QHBoxLayout" name="horizontalLayout_2">
-         <item>
-          <widget class="QRadioButton" name="writeOnFile_radioButton">
-           <property name="text">
-            <string>Write the messages received from the topic into the specified file</string>
-           </property>
-           <property name="checked">
-            <bool>true</bool>
-           </property>
-          </widget>
-         </item>
-        </layout>
-       </item>
-       <item>
-        <layout class="QHBoxLayout" name="horizontalLayout_4">
-         <item>
-          <widget class="QLineEdit" name="filePath_lineEdit">
-           <property name="placeholderText">
-            <string>File path</string>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <widget class="QPushButton" name="showFile_button">
-           <property name="text">
-            <string>Show</string>
-           </property>
-          </widget>
-         </item>
-        </layout>
-       </item>
-       <item>
-        <layout class="QVBoxLayout" name="topics_layout">
-         <item>
-          <layout class="QHBoxLayout" name="horizontalLayout">
-           <item>
-            <widget class="QLabel" name="label_2">
-             <property name="text">
-              <string>Topic List  </string>
-             </property>
-            </widget>
-           </item>
-           <item>
-            <widget class="QLineEdit" name="topicName_lineEdit">
-             <property name="placeholderText">
-              <string>Topic name</string>
-             </property>
-            </widget>
-           </item>
-           <item>
-            <widget class="QPushButton" name="addTopic_button">
-             <property name="text">
-              <string>Add</string>
-             </property>
-            </widget>
-           </item>
-          </layout>
-         </item>
-         <item>
-          <layout class="QHBoxLayout" name="horizontalLayout_3">
-           <item>
-            <widget class="QLabel" name="label_4">
-             <property name="text">
-              <string>To remove a topic, clear the Line Edit control</string>
-             </property>
-             <property name="alignment">
-              <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
-             </property>
-            </widget>
-           </item>
-           <item>
-            <spacer name="horizontalSpacer">
-             <property name="orientation">
-              <enum>Qt::Horizontal</enum>
-             </property>
-             <property name="sizeHint" stdset="0">
-              <size>
-               <width>40</width>
-               <height>20</height>
-              </size>
-             </property>
-            </spacer>
-           </item>
-           <item>
-            <widget class="QPushButton" name="stop_button">
-             <property name="text">
-              <string>Stop</string>
-             </property>
-            </widget>
-           </item>
-           <item>
-            <widget class="QPushButton" name="start_button">
-             <property name="text">
-              <string>Start</string>
-             </property>
-            </widget>
-           </item>
-          </layout>
-         </item>
-        </layout>
-       </item>
-       <item>
-        <spacer name="verticalSpacer">
-         <property name="orientation">
-          <enum>Qt::Vertical</enum>
-         </property>
-         <property name="sizeHint" stdset="0">
-          <size>
-           <width>20</width>
-           <height>40</height>
-          </size>
-         </property>
-        </spacer>
-       </item>
-      </layout>
-     </widget>
-    </widget>
-   </item>
-  </layout>
- </widget>
- <resources/>
- <connections/>
-</ui>
diff --git a/src/shared/Modules/ModulesList.cpp b/src/shared/Modules/ModulesList.cpp
index 7eaa0ce0961d2a7549e792395ceda05af657fb5f..3e4e884ee2027fe0342c6835a9b9c9f8f7cc0fd5 100644
--- a/src/shared/Modules/ModulesList.cpp
+++ b/src/shared/Modules/ModulesList.cpp
@@ -23,7 +23,6 @@
 #include <Modules/CommandPad/CommandPad.h>
 #include <Modules/CompactCommandPad/CompactCommandPad.h>
 #include <Modules/Empty/EmptyModule.h>
-#include <Modules/FileStream/FileStreamModule.h>
 #include <Modules/Graph/Graph.h>
 #include <Modules/IncomingMessagesViewer/IncomingMessagesViewerModule.h>
 #include <Modules/MainStateViewer/MainStateViewer.h>
@@ -126,8 +125,6 @@ ModulesList::ModulesList()
 
         ModuleInfo fileStream(ModuleId::FILE_STREAM, "File Stream",
                               ModuleCategory::DATA_SOURCES);
-        fileStream.setFactoryMethod(
-            []() { return std::make_shared<FileStreamModule>(); });
         modulesInfo.append(fileStream);
     }