diff --git a/CMakeLists.txt b/CMakeLists.txt
index bcf31b41..cafe7948 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -359,8 +359,8 @@ set(SRC_FILES
 	src/TrayIcon.cpp
 	src/UserSettingsPage.cpp
 	src/UsersModel.cpp
-	src/RoomsModel.cpp
 	src/RoomDirectoryModel.cpp
+	src/RoomsModel.cpp
 	src/Utils.cpp
 	src/WebRTCSession.cpp
 	src/WelcomePage.cpp
@@ -565,8 +565,8 @@ qt5_wrap_cpp(MOC_HEADERS
 	src/TrayIcon.h
 	src/UserSettingsPage.h
 	src/UsersModel.h
-	src/RoomsModel.h
 	src/RoomDirectoryModel.h
+	src/RoomsModel.h
 	src/WebRTCSession.h
 	src/WelcomePage.h
 	src/ReadReceiptsModel.h
diff --git a/resources/qml/RoomDirectory.qml b/resources/qml/RoomDirectory.qml
index f31df64d..b01c1e00 100644
--- a/resources/qml/RoomDirectory.qml
+++ b/resources/qml/RoomDirectory.qml
@@ -6,7 +6,6 @@ import QtQuick 2.9
 import QtQuick.Controls 2.3
 import QtQuick.Layouts 1.3
 import im.nheko 1.0
-import im.nheko.RoomDirectoryModel 1.0
 
 ApplicationWindow {
     id: roomDirectoryWindow
@@ -40,7 +39,7 @@ ApplicationWindow {
             Layout.fillWidth: true
 
             font.pixelSize: fontMetrics.font.pixelSize
-            padding: Math.ceil(1.5 * Nheko.paddingSmall)
+            padding: Nheko.paddingMedium
             color: Nheko.colors.text
             placeholderText: qsTr("Search for public rooms")
             onTextChanged: searchTimer.restart()
@@ -57,7 +56,6 @@ ApplicationWindow {
     ListView {
         id: roomDirView
         anchors.fill: parent
-        height: parent.height - searchBarLayout.height
         model: RoomDirectoryModel {
             id: roomDir
         }
@@ -67,7 +65,7 @@ ApplicationWindow {
             property color background: Nheko.colors.window
             property color importantText: Nheko.colors.text
             property color unimportantText: Nheko.colors.buttonText
-            property int avatarSize: Math.ceil(fontMetrics.lineSpacing * 4)
+            property int avatarSize: fontMetrics.lineSpacing * 4
 
             color: background
             
@@ -121,7 +119,7 @@ ApplicationWindow {
                         Layout.preferredWidth: parent.width
                         spacing: Nheko.paddingSmall
                         Layout.alignment: Qt.AlignVCenter | Qt.AlignLeft
-			Layout.preferredHeight: Math.ceil(fontMetrics.lineSpacing * 4)
+			Layout.preferredHeight: fontMetrics.lineSpacing * 4
 
                         Label {
                             id: roomTopic
diff --git a/resources/qml/RoomList.qml b/resources/qml/RoomList.qml
index e8aacf75..6074f063 100644
--- a/resources/qml/RoomList.qml
+++ b/resources/qml/RoomList.qml
@@ -565,7 +565,6 @@ Component {
                     ToolTip.text: qsTr("Room directory")
                     Layout.margins: Nheko.paddingMedium
 			onClicked: {
-                        console.debug("Roomdir clicked");
                         var win = roomDirectoryComponent.createObject(timelineRoot);
                         win.show();
                     } 
diff --git a/resources/res.qrc b/resources/res.qrc
index 3e417d4c..b46b726c 100644
--- a/resources/res.qrc
+++ b/resources/res.qrc
@@ -143,11 +143,6 @@
         <file>qml/emoji/StickerPicker.qml</file>
         <file>qml/UserProfile.qml</file>
         <file>qml/RoomDirectory.qml</file>
-	      <file>qml/delegates/MessageDelegate.qml</file>
-        <file>qml/delegates/TextMessage.qml</file>
-        <file>qml/delegates/NoticeMessage.qml</file>
-        <file>qml/delegates/ImageMessage.qml</file>
-        <file>qml/delegates/PlayableMediaMessage.qml</file>
         <file>qml/delegates/MessageDelegate.qml</file>
         <file>qml/delegates/Encrypted.qml</file>
         <file>qml/delegates/FileMessage.qml</file>
diff --git a/src/RoomDirectoryModel.cpp b/src/RoomDirectoryModel.cpp
index 06bd9d8a..2c633491 100644
--- a/src/RoomDirectoryModel.cpp
+++ b/src/RoomDirectoryModel.cpp
@@ -42,9 +42,7 @@ RoomDirectoryModel::resetDisplayedData()
         nextBatch_    = "";
         canFetchMore_ = true;
 
-        beginRemoveRows(QModelIndex(), 0, static_cast<int>(publicRoomsData_.size()));
         publicRoomsData_.clear();
-        endRemoveRows();
 
         endResetModel();
 }
@@ -87,8 +85,7 @@ RoomDirectoryModel::getViasForRoom(const std::vector<std::string> &aliases)
 
         std::transform(
           aliases.begin(), aliases.end(), std::back_inserter(vias), [](const auto &alias) {
-                  const auto roomAliasDelimiter = ":";
-                  return alias.substr(alias.find(roomAliasDelimiter) + 1);
+                  return alias.substr(alias.find(":") + 1);
           });
 
         return vias;
diff --git a/src/RoomDirectoryModel.h b/src/RoomDirectoryModel.h
index c7089a1e..952ae3ff 100644
--- a/src/RoomDirectoryModel.h
+++ b/src/RoomDirectoryModel.h
@@ -51,7 +51,6 @@ public:
 
         inline bool canFetchMore(const QModelIndex &) const override
         {
-                nhlog::net()->debug("determining if can fetch more");
                 return canFetchMore_;
         }
         void fetchMore(const QModelIndex &) override;
diff --git a/src/timeline/TimelineViewManager.cpp b/src/timeline/TimelineViewManager.cpp
index da68d503..ff60856a 100644
--- a/src/timeline/TimelineViewManager.cpp
+++ b/src/timeline/TimelineViewManager.cpp
@@ -287,7 +287,7 @@ TimelineViewManager::TimelineViewManager(CallManager *callManager, ChatPage *par
                                          "Error: Only enums");
 
         qmlRegisterType<RoomDirectoryModel>(
-          "im.nheko.RoomDirectoryModel", 1, 0, "RoomDirectoryModel");
+          "im.nheko", 1, 0, "RoomDirectoryModel");
 
 #ifdef USE_QUICK_VIEW
         view      = new QQuickView(parent);