diff --git a/ohmpi/hardware_components/dummy_dps5005.py b/ohmpi/hardware_components/dummy_dps5005.py
deleted file mode 100644
index 0bb675f85d2f179975e2b7d2c3aa54f7b13c9df4..0000000000000000000000000000000000000000
--- a/ohmpi/hardware_components/dummy_dps5005.py
+++ /dev/null
@@ -1,104 +0,0 @@
-from ohmpi.hardware_components.abstract_hardware_components import PwrAbstract
-import numpy as np
-import datetime
-import os
-import time
-from ohmpi.utils import enforce_specs
-
-# hardware characteristics and limitations
-SPECS = {'model': {'default': os.path.basename(__file__).rstrip('.py')},
-         'voltage': {'default': 12., 'max': 50., 'min': 0.},
-         'voltage_min': {'default': 0},
-         'voltage_max': {'default': 0},
-         'current_max': {'default': 60.},
-         'current_adjustable': {'default': False},
-         'voltage_adjustable': {'default': True},
-         'pwr_latency': {'default': .5}
-         }
-
-# TODO: Complete this code... handle modbus connection
-
-
-class Pwr(PwrAbstract):
-    def __init__(self, **kwargs):
-        if 'model' not in kwargs.keys():
-            for key in SPECS.keys():
-                kwargs = enforce_specs(kwargs, SPECS, key)
-            subclass_init = False
-        else:
-            subclass_init = True
-        super().__init__(**kwargs)
-        if not subclass_init:
-            self.exec_logger.event(f'{self.model}\tpwr_init\tbegin\t{datetime.datetime.utcnow()}')
-        #assert isinstance(self.connection, Instrument)
-        # if a controller is passed in kwargs, it will be instantiated
-        #if self.ctl is None:
-        #    self.ctl = ctl_module.Ctl(**CTL_CONFIG)
-        #self.connection = self.ctl.interfaces[kwargs.pop('connection', ctl_connection)]
-        self._voltage = kwargs['voltage']
-        self._current_max = kwargs['current_max']
-        self.voltage_adjustable = True
-        self.current_adjustable = False
-        self._current = np.nan
-        self._pwr_state = 'off'
-        self._pwr_latency = kwargs['pwr_latency']
-        if not subclass_init:
-            self.exec_logger.event(f'{self.model}\tpwr_init\tend\t{datetime.datetime.utcnow()}')
-
-    @property
-    def current(self):
-        return self._current
-
-    @current.setter
-    def current(self, value, **kwargs):
-        self.exec_logger.debug(f'Current cannot be set on {self.model}')
-
-    def _retrieve_voltage(self):
-        self._voltage = self.connection.read_register(0x0002, 2)
-
-    @property
-    def voltage(self):
-        # return PwrAbstract.voltage.fget(self)
-        return self._voltage
-
-    @voltage.setter
-    def voltage(self, value):
-        self.connection.write_register(0x0000, value, 2)
-        self._voltage = value
-
-    def battery_voltage(self):
-        self._battery_voltage = self.connection.read_register(0x05, 2)
-        return self._battery_voltage
-
-    def current_max(self, value):  # [mA]
-        value = value * 1.2  # To set DPS max current slightly above (20%) the limit to avoid regulation artefacts
-        self.connection.write_register(0x0001, int(value*1000), 0)
-
-    @property
-    def pwr_state(self):
-        return self._pwr_state
-
-    @pwr_state.setter
-    def pwr_state(self, state):
-        """Switches pwr on or off.
-
-            Parameters
-            ----------
-            state : str
-                'on', 'off'
-            """
-        if state == 'on':
-            self.connection.write_register(0x09, 1)
-            self.current_max(self._current_max)
-            self._pwr_state = 'on'
-            self.exec_logger.debug(f'{self.model} is on')
-            time.sleep(self._pwr_latency) # from pwr specs
-
-        elif state == 'off':
-            self.connection.write_register(0x09, 0)
-            self._pwr_state = 'off'
-            self.exec_logger.debug(f'{self.model} is off')
-
-    def reload_settings(self):
-        # self.voltage(self._voltage)
-        self.current_max(self._current_max)
diff --git a/ohmpi/hardware_components/pwr_dps5005.py b/ohmpi/hardware_components/pwr_dps5005.py
index 5f91ac836d9b6e8454c3ab23c70d3448fe27a94f..4ec2f292917f09c575666b92a7054c729728405b 100644
--- a/ohmpi/hardware_components/pwr_dps5005.py
+++ b/ohmpi/hardware_components/pwr_dps5005.py
@@ -61,6 +61,7 @@ class Pwr(PwrAbstract):
 
     @voltage.setter
     def voltage(self, value):
+        value = float(value)
         self.connection.write_register(0x0000, value, 2)
         self._voltage = value
 
diff --git a/ohmpi/hardware_components/pwr_dps5005_fixed.py b/ohmpi/hardware_components/pwr_dps5005_fixed.py
deleted file mode 100644
index 0bdbe0724b4d9aae03c785742758ffee1c28220b..0000000000000000000000000000000000000000
--- a/ohmpi/hardware_components/pwr_dps5005_fixed.py
+++ /dev/null
@@ -1,38 +0,0 @@
-from ohmpi.hardware_components.abstract_hardware_components import PwrAbstract
-import numpy as np
-import datetime
-import os
-import time
-from ohmpi.utils import enforce_specs
-from minimalmodbus import Instrument  # noqa
-from ohmpi.hardware_components.pwr_batt import Pwr as Pwr_batt
-
-# hardware characteristics and limitations
-SPECS = {'model': {'default': os.path.basename(__file__).rstrip('.py')},
-         'voltage': {'default': 12., 'max': 50., 'min': 0.},
-         'voltage_min': {'default': 0},
-         'voltage_max': {'default': 0},
-         'current_max': {'default': 60.},
-         'current_adjustable': {'default': False},
-         'voltage_adjustable': {'default': False},
-         'pwr_latency': {'default': .5}
-         }
-
-
-class Pwr(Pwr_batt):
-    def __init__(self, **kwargs):
-        if 'model' not in kwargs.keys():
-            for key in SPECS.keys():
-                kwargs = enforce_specs(kwargs, SPECS, key)
-            subclass_init = False
-        else:
-            subclass_init = True
-        super().__init__(**kwargs)
-        if not subclass_init:
-            self.exec_logger.event(f'{self.model}\tpwr_init\tbegin\t{datetime.datetime.utcnow()}')
-        self._voltage = kwargs['voltage']
-        self._current = np.nan
-        # self._state = 'on'
-        if not subclass_init:
-            self.exec_logger.event(f'{self.model}\tpwr_init\tend\t{datetime.datetime.utcnow()}')
-