roll back some changes not needed

src/dodal/beamlines/i22.py

@@ -41,11 +41,13 @@
 )
 
 
-def saxs() -> PilatusDetector:
-    return NXSasPilatus(
+def saxs(
+    wait_for_connection: bool = True, fake_with_ophyd_sim: bool = False
+) -> PilatusDetector:
+    return device_instantiation(
+        NXSasPilatus,
         "-EA-PILAT-01:",
         name="saxs",
-        directory_provider=get_directory_provider(),
         drv_suffix="CAM:",
         hdf_suffix="HDF5:",
         metadata_holder=NXSasMetadataHolder(
@@ -57,6 +59,7 @@ def saxs() -> PilatusDetector:
             sensor_thickness=(0.45, "mm"),
             distance=(4711.833684146172, "mm"),
         ),
+        directory_provider=get_directory_provider(),
     )
 
 

src/dodal/common/beamlines/beamline_utils.py

@@ -1,19 +1,9 @@
 import inspect
-from typing import (
-    Callable,
-    Dict,
-    Final,
-    List,
-    Optional,
-    Protocol,
-    TypeVar,
-    cast,
-)
+from typing import Callable, Dict, Final, List, Optional, TypeVar, cast
 
 from bluesky.run_engine import call_in_bluesky_event_loop
 from ophyd import Device as OphydV1Device
 from ophyd.sim import make_fake_device
-from ophyd_async.core import DEFAULT_TIMEOUT
 from ophyd_async.core import Device as OphydV2Device
 from ophyd_async.core import wait_for_connection as v2_device_wait_for_connection
 
@@ -75,23 +65,6 @@ def wait_for_connection(
 
 T = TypeVar("T", bound=AnyDevice)
 
-D = TypeVar("D", bound=OphydV2Device, covariant=True)
-
-
-class DeviceFactory(Protocol[D]):
-    def __call__(
-        self, connect: bool = False, timeout: float = DEFAULT_TIMEOUT
-    ) -> D: ...
-
-
-F = Callable[[], D]
-
-_device_is_lazy: Dict[DeviceFactory, bool] = {}
-
-
-def get_device_factories() -> Dict[DeviceFactory, bool]:
-    return _device_is_lazy.copy()
-
 
 @skip_device()
 def device_instantiation(