diff --git a/src/components/structures/RoomSubList.js b/src/components/structures/RoomSubList.js
index b00130f13d..e90934c58f 100644
--- a/src/components/structures/RoomSubList.js
+++ b/src/components/structures/RoomSubList.js
@@ -42,7 +42,6 @@ const RoomSubList = React.createClass({
         list: PropTypes.arrayOf(PropTypes.object).isRequired,
         label: PropTypes.string.isRequired,
         tagName: PropTypes.string,
-        editable: PropTypes.bool,
 
         order: PropTypes.string.isRequired,
 
@@ -205,15 +204,9 @@ const RoomSubList = React.createClass({
     },
 
     makeRoomTiles: function() {
-        const DNDRoomTile = sdk.getComponent("rooms.DNDRoomTile");
         const RoomTile = sdk.getComponent("rooms.RoomTile");
         return this.state.sortedList.map((room, index) => {
-            // XXX: is it evil to pass in this as a prop to RoomTile? Yes.
-
-            // We should only use <DNDRoomTile /> when editable
-            const RoomTileComponent = this.props.editable ? DNDRoomTile : RoomTile;
-            return <RoomTileComponent
-                index={index} // For DND
+            return <RoomTile
                 room={room}
                 roomSubList={this}
                 tagName={this.props.tagName}
@@ -371,26 +364,14 @@ const RoomSubList = React.createClass({
             }
         }
 
-        if (this.state.sortedList.length > 0 || this.props.extraTiles.length > 0 || this.props.editable) {
+        if (this.state.sortedList.length > 0 || this.props.extraTiles.length > 0) {
 
             const subList = this.state.hidden ? undefined : content;
 
-            const subListContent = <div className={"mx_RoomSubList"}>
+            return <div className={"mx_RoomSubList"}>
                 {this._getHeaderJsx()}
                 {subList}
             </div>;
-
-            return this.props.editable ?
-                <Droppable
-                    droppableId={"room-sub-list-droppable_" + this.props.tagName}
-                    type="draggable-RoomTile"
-                >
-                    {(provided, snapshot) => (
-                        <div ref={provided.innerRef}>
-                            {subListContent}
-                        </div>
-                    )}
-                </Droppable> : subListContent;
         } else {
             const Loader = sdk.getComponent("elements.Spinner");
             if (this.props.showSpinner) {
diff --git a/src/components/views/rooms/DNDRoomTile.js b/src/components/views/rooms/DNDRoomTile.js
deleted file mode 100644
index 69c2f979ed..0000000000
--- a/src/components/views/rooms/DNDRoomTile.js
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
-Copyright 2015, 2016 OpenMarket Ltd
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-import React from 'react';
-import { Draggable } from 'react-beautiful-dnd';
-import RoomTile from '../../../components/views/rooms/RoomTile';
-
-import classNames from 'classnames';
-
-export default class DNDRoomTile extends React.PureComponent {
-    constructor() {
-        super();
-        this.getClassName = this.getClassName.bind(this);
-    }
-
-    getClassName(isDragging) {
-        return classNames({
-            "mx_DNDRoomTile": true,
-            "mx_DNDRoomTile_dragging": isDragging,
-        });
-    }
-
-    render() {
-        const props = this.props;
-
-        return <div>
-            <Draggable
-                key={props.room.roomId}
-                draggableId={props.tagName + '_' + props.room.roomId}
-                index={props.index}
-                type="draggable-RoomTile"
-            >
-                { (provided, snapshot) => {
-                    return (
-                        <div>
-                            <div
-                                ref={provided.innerRef}
-                                {...provided.draggableProps}
-                                {...provided.dragHandleProps}
-                            >
-                                <div className={this.getClassName(snapshot.isDragging)}>
-                                    <RoomTile {...props} />
-                                </div>
-                            </div>
-                            { provided.placeholder }
-                        </div>
-                    );
-                } }
-            </Draggable>
-        </div>;
-    }
-}
diff --git a/src/components/views/rooms/RoomList.js b/src/components/views/rooms/RoomList.js
index 5ed2ef1fbe..1ab7c4dd3b 100644
--- a/src/components/views/rooms/RoomList.js
+++ b/src/components/views/rooms/RoomList.js
@@ -631,7 +631,6 @@ module.exports = React.createClass({
                 <RoomSubList list={[]}
                              extraTiles={this._makeGroupInviteTiles(self.props.searchFilter)}
                              label={_t('Community Invites')}
-                             editable={false}
                              order="recent"
                              isInvite={true}
                              collapsed={self.props.collapsed}
@@ -643,7 +642,6 @@ module.exports = React.createClass({
 
                 <RoomSubList list={self.state.lists['im.vector.fake.invite']}
                              label={_t('Invites')}
-                             editable={false}
                              order="recent"
                              isInvite={true}
                              incomingCall={self.state.incomingCall}
@@ -658,7 +656,6 @@ module.exports = React.createClass({
                              label={_t('Favourites')}
                              tagName="m.favourite"
                              emptyContent={this._getEmptyContent('m.favourite')}
-                             editable={true}
                              order="manual"
                              incomingCall={self.state.incomingCall}
                              collapsed={self.props.collapsed}
@@ -672,7 +669,6 @@ module.exports = React.createClass({
                              tagName="im.vector.fake.direct"
                              emptyContent={this._getEmptyContent('im.vector.fake.direct')}
                              headerItems={this._getHeaderItems('im.vector.fake.direct')}
-                             editable={true}
                              order="recent"
                              incomingCall={self.state.incomingCall}
                              collapsed={self.props.collapsed}
@@ -684,7 +680,6 @@ module.exports = React.createClass({
 
                 <RoomSubList list={self.state.lists['im.vector.fake.recent']}
                              label={_t('Rooms')}
-                             editable={true}
                              emptyContent={this._getEmptyContent('im.vector.fake.recent')}
                              headerItems={this._getHeaderItems('im.vector.fake.recent')}
                              order="recent"
@@ -702,7 +697,6 @@ module.exports = React.createClass({
                              label={labelForTagName(tagName)}
                              tagName={tagName}
                              emptyContent={this._getEmptyContent(tagName)}
-                             editable={true}
                              order="manual"
                              incomingCall={self.state.incomingCall}
                              collapsed={self.props.collapsed}
@@ -717,7 +711,6 @@ module.exports = React.createClass({
                              label={_t('Low priority')}
                              tagName="m.lowpriority"
                              emptyContent={this._getEmptyContent('m.lowpriority')}
-                             editable={true}
                              order="recent"
                              incomingCall={self.state.incomingCall}
                              collapsed={self.props.collapsed}
@@ -735,7 +728,6 @@ module.exports = React.createClass({
                                  </div>
                              }
                              label={_t('Historical')}
-                             editable={false}
                              order="recent"
                              collapsed={self.props.collapsed}
                              alwaysShowHeader={true}
@@ -750,7 +742,6 @@ module.exports = React.createClass({
                 <RoomSubList list={self.state.lists['m.server_notice']}
                              label={_t('System Alerts')}
                              tagName="m.lowpriority"
-                             editable={false}
                              order="recent"
                              incomingCall={self.state.incomingCall}
                              collapsed={self.props.collapsed}