diff --git a/subiquity/controllers/ceph.py b/subiquity/controllers/ceph.py
deleted file mode 100644
index ee0bfc01..00000000
--- a/subiquity/controllers/ceph.py
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 2015 Canonical, Ltd.
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero General Public License as
-# published by the Free Software Foundation, either version 3 of the
-# License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Affero General Public License for more details.
-#
-# You should have received a copy of the GNU Affero General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-import logging
-
-from subiquitycore.controller import BaseController
-
-from subiquity.models import CephDiskModel
-
-log = logging.getLogger("subiquitycore.controller.ceph")
-
-
-class CephDiskController(BaseController):
-    signals = [
-        ('ceph:show',          'ceph'),
-        ('ceph:finish',        'ceph_handler')
-        ('ceph:fetch-key-usb', 'fetch_key_usb'),
-        ('ceph:fetch-key-ssh', 'fetch_key_ssh')
-    ]
-
-    def __init__(self, common):
-        super().__init__(common)
-        self.model = CephDiskModel()
-
-    def ceph(self):
-        pass
-
-    def ceph_handler(self):
-        pass
-
-    def fetch_key_usb(self):
-        pass
-
-    def fetch_key_ssh(self):
-        pass
diff --git a/subiquity/controllers/iscsi.py b/subiquity/controllers/iscsi.py
deleted file mode 100644
index 5a591e5c..00000000
--- a/subiquity/controllers/iscsi.py
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 2015 Canonical, Ltd.
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero General Public License as
-# published by the Free Software Foundation, either version 3 of the
-# License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Affero General Public License for more details.
-#
-# You should have received a copy of the GNU Affero General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-import logging
-
-from subiquitycore.controller import BaseController
-
-from subiquity.models import IscsiDiskModel
-
-log = logging.getLogger("subiquitycore.controller.iscsi")
-
-
-class IscsiDiskController(BaseController):
-    signals = [
-        ('iscsi:show',                         'iscsi'),
-        ('iscsi:finish',                       'iscsi_handler'),
-        ('iscsi:discover-volumes',             'discover_volumes'),
-        ('iscsi:custom-discovery-credentials', 'custom_discovery_credentials'),
-        ('iscsi:manual-volume-details',        'manual_volume_details'),
-    ]
-
-    def __init__(self, common):
-        super().__init__(common)
-        self.model = IscsiDiskModel()
-
-    def iscsi(self):
-        pass
-
-    def iscsi_handler(self):
-        pass
-
-    def discover_volumes(self):
-        pass
-
-    def custom_discovery_credentials(self):
-        pass
-
-    def manual_volume_details(self):
-        pass
diff --git a/subiquity/controllers/raid.py b/subiquity/controllers/raid.py
deleted file mode 100644
index 41ee9886..00000000
--- a/subiquity/controllers/raid.py
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 2015 Canonical, Ltd.
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero General Public License as
-# published by the Free Software Foundation, either version 3 of the
-# License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Affero General Public License for more details.
-#
-# You should have received a copy of the GNU Affero General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-import logging
-
-from subiquitycore.controller import BaseController
-
-from subiquity.models import RaidDiskModel
-
-log = logging.getLogger("subiquitycore.controller.raid")
-
-
-class RaidDiskController(BaseController):
-    signals = [
-        ('menu:raid:main',      'raid'),
-        ('raid:finish',         'raid_handler'),
-        ('raid:set-raid-level', 'set_raid_level'),
-        ('raid:set-hot-spares', 'set_hot_spares'),
-        ('raid:set-chunk-size', 'set_chunk_size'),
-    ]
-
-    def __init__(self, common):
-        super().__init__(common)
-        self.model = RaidDiskModel()
-
-    def raid(self):
-        pass
-
-    def raid_handler(self):
-        pass