diff --git a/skins/base/views/organisms/CreateRoom.js b/skins/base/views/organisms/CreateRoom.js
index ae250db9..4fd7a93e 100644
--- a/skins/base/views/organisms/CreateRoom.js
+++ b/skins/base/views/organisms/CreateRoom.js
@@ -25,8 +25,6 @@ var ComponentBroker = require('../../../../src/ComponentBroker');
 var PresetValues = require('../../../../src/controllers/atoms/create_room/Presets').Presets;
 
 var CreateRoomButton = ComponentBroker.get("atoms/create_room/CreateRoomButton");
-var RoomNameTextbox = ComponentBroker.get("atoms/create_room/RoomNameTextbox");
-var RoomTopic = ComponentBroker.get("atoms/create_room/RoomTopic");
 var RoomAlias = ComponentBroker.get("atoms/create_room/RoomAlias");
 var Presets = ComponentBroker.get("atoms/create_room/Presets");
 var UserSelector = ComponentBroker.get("molecules/UserSelector");
diff --git a/src/ComponentBroker.js b/src/ComponentBroker.js
index 62741073..431f4766 100644
--- a/src/ComponentBroker.js
+++ b/src/ComponentBroker.js
@@ -62,8 +62,6 @@ require('../skins/base/views/atoms/LogoutButton');
 require('../skins/base/views/atoms/EnableNotificationsButton');
 require('../skins/base/views/atoms/MessageTimestamp');
 require('../skins/base/views/atoms/create_room/CreateRoomButton');
-require('../skins/base/views/atoms/create_room/RoomNameTextbox');
-require('../skins/base/views/atoms/create_room/RoomTopic');
 require('../skins/base/views/atoms/create_room/RoomAlias');
 require('../skins/base/views/atoms/create_room/Presets');
 require('../skins/base/views/atoms/EditableText');