diff --git a/devices.py b/devices.py
index 5190108..e5c8990 100644
--- a/devices.py
+++ b/devices.py
@@ -57,7 +57,7 @@ components = [
     },
     {
         "name": "slit_und",
-        "type": "slic.devices.xoptics.slits:SlitFourBlades_old",
+        "type": "slic.devices.xoptics.slits:SlitTwinUnit",
         "args": ["SARFE10-OAPU044"],
         "kwargs": {},
         "desc": "Slit after Undulator",
@@ -94,19 +94,11 @@ components = [
         "desc": "Profile monitor after Alvra Mirror 1",
         "type": "slic.devices.xdiagnostics.profile_monitors:Pprm",
     },
-    # {
-        # "name": "slitSwitch",
-        # "z_und": 92,
-        # "desc": "Slit in Optics hutch after Photon switchyard and before Bernina optics",
-        # "type": "slic.devices.xoptics.slits:SlitBlades_old",
-        # "args": ["SAROP21-OAPU092"],
-        # "kwargs": {},
-    # },
     {
         "name": "slit_switch",
         "z_und": 92,
         "desc": "Slit in Optics hutch after Photon switchyard and before Bernina optics",
-        "type": "slic.devices.xoptics.slits_new:SlitBlades",
+        "type": "slic.devices.xoptics.slits:SlitUnit",
         "args": ["SAROP21-OAPU092"],
         "kwargs": {},
     },
@@ -220,17 +212,9 @@ components = [
         "kwargs": {},
         "z_und": 136,
         "desc": "Slits behind attenuator",
-        "type": "slic.devices.xoptics.slits_new:SlitPosWidth",
+        "type": "slic.devices.xoptics.slits:SlitUnitCW",
         "lazy": True,
     },
-    # {
-        # "name": "slitAtt",
-        # "args": ["SAROP21-OAPU136"],
-        # "kwargs": {},
-        # "z_und": 136,
-        # "desc": "Slits behind attenuator",
-        # "type": "slic.devices.xoptics.slits:SlitPosWidth_old",
-    # },
     {
         "name": "mon_att",
         "args": ["SAROP21-PBPS138"],
@@ -286,8 +270,7 @@ components = [
          "kwargs": {"pvname": "SARES20-MF1"},
          "z_und": 141,
          "desc": "Slits behind Kb",
-         "type": "slic.devices.xoptics.slits_new:SlitBlades_JJ",
-         #"type": "slic.devices.xoptics.slits:SlitBladesJJ_old",
+         "type": "slic.devices.xoptics.slits:SlitUnitJJ",
      },
     {
         "name": "gps",
@@ -543,10 +526,10 @@ components = [
         "lazy": False,
     },
     {
-        "args": [[Component('slit_und'),Component('slit_switch'),Component('slit_att'),Component('slit_kb')]],
+        "args": ["Slits", [Component('slit_und'),Component('slit_switch'),Component('slit_att'),Component('slit_kb')]],
         "name": "slits",
         "desc": "collection of all slits",
-        "type": "slic.devices.xoptics.slitcollection:SlitCollection",
+        "type": "slic.core.device:SimpleDevice",
         "kwargs": {},
         "lazy": False,
     },