diff --git a/tangostationcontrol/tangostationcontrol/clients/opcua_client.py b/tangostationcontrol/tangostationcontrol/clients/opcua_client.py
index f94ec4e16fa7d1baf117d8108bc3f896560df70f..9b8637f339858768e026da152975efa4af1cce88 100644
--- a/tangostationcontrol/tangostationcontrol/clients/opcua_client.py
+++ b/tangostationcontrol/tangostationcontrol/clients/opcua_client.py
@@ -9,7 +9,7 @@ from tangostationcontrol.clients.comms_client import AsyncCommClient
 import logging
 logger = logging.getLogger()
 
-__all__ = ["OPCUAConnection", "event_loop"]
+__all__ = ["OPCUAConnection", "ProtocolAttribute"]
 
 numpy_to_OPCua_dict = {
     numpy.bool_: asyncua.ua.VariantType.Boolean,
diff --git a/tangostationcontrol/tangostationcontrol/common/measures.py b/tangostationcontrol/tangostationcontrol/common/measures.py
index 58b3c90f456ef3060d1431a7809395e1e63be237..596e0ff4e9c229a6ea848e0ac40c2a3edddc27e4 100644
--- a/tangostationcontrol/tangostationcontrol/common/measures.py
+++ b/tangostationcontrol/tangostationcontrol/common/measures.py
@@ -37,6 +37,7 @@ import tarfile
 import datetime
 import os
 import sys
+import shutil
 
 # Where to store the measures table sets
 IERS_ROOTDIR = "/opt/IERS"
@@ -135,7 +136,7 @@ def download_measures() -> str:
             shutil.rmtree(iers_dir_final)
         except Exception as e:
             # move out of the way instead then
-            iers_dir_final.rename(iers_final.with_suffix("delete-me"))
+            iers_dir_final.rename(iers_dir_final.with_suffix("delete-me"))
 
     # update our name to reflect the correct timestamp
     iers_dir_download.rename(iers_dir_final)
diff --git a/tangostationcontrol/tangostationcontrol/devices/apsct.py b/tangostationcontrol/tangostationcontrol/devices/apsct.py
index 58c91bc5036e4de799f2b42c4cc1cbd5cd04bb22..243d1584065678a480577dcdea69eba654cb5207 100644
--- a/tangostationcontrol/tangostationcontrol/devices/apsct.py
+++ b/tangostationcontrol/tangostationcontrol/devices/apsct.py
@@ -21,7 +21,7 @@ import numpy
 from tangostationcontrol.clients.attribute_wrapper import attribute_wrapper
 from tangostationcontrol.common.entrypoint import entry
 from tangostationcontrol.common.lofar_logging import device_logging_to_python
-from tangostationcontrol.devices.device_decorators import *
+from tangostationcontrol.devices.device_decorators import only_in_states
 from tangostationcontrol.devices.opcua_device import opcua_device
 from tangostationcontrol.devices.lofar_device import lofar_device
 
diff --git a/tangostationcontrol/tangostationcontrol/devices/boot.py b/tangostationcontrol/tangostationcontrol/devices/boot.py
index 90daa4954b90cd8722e4162f651532db072cb93f..c14c7476021f18e313463bfe8ac82e86c46ccb25 100644
--- a/tangostationcontrol/tangostationcontrol/devices/boot.py
+++ b/tangostationcontrol/tangostationcontrol/devices/boot.py
@@ -21,7 +21,7 @@ from tango import AttrWriteType, DeviceProxy, DevState, DevSource
 # Additional import
 import numpy
 
-from tangostationcontrol.devices.device_decorators import *
+from tangostationcontrol.devices.device_decorators import only_in_states
 
 from tangostationcontrol.common.entrypoint import entry
 from tangostationcontrol.devices.lofar_device import lofar_device
diff --git a/tangostationcontrol/tangostationcontrol/devices/observation.py b/tangostationcontrol/tangostationcontrol/devices/observation.py
index 7a99b13d3c64e96eaed4568dce169176fd9e78ce..6fcfafa22411a2f46b3c077afb4dbd06bd9ee14f 100644
--- a/tangostationcontrol/tangostationcontrol/devices/observation.py
+++ b/tangostationcontrol/tangostationcontrol/devices/observation.py
@@ -14,7 +14,7 @@ from time import time
 from tangostationcontrol.common.entrypoint import entry
 from tangostationcontrol.common.lofar_logging import device_logging_to_python, log_exceptions
 from tangostationcontrol.common.lofar_version import get_version
-from tangostationcontrol.devices.device_decorators import *
+from tangostationcontrol.devices.device_decorators import only_in_states, only_when_on, fault_on_error
 
 from json import loads
 
diff --git a/tangostationcontrol/tangostationcontrol/devices/observation_control.py b/tangostationcontrol/tangostationcontrol/devices/observation_control.py
index 9d1c459a0bc29f50d88d81d37ba7fd040de9a480..0d116c34fdf7f697fa89525991c67d2e0658d72b 100644
--- a/tangostationcontrol/tangostationcontrol/devices/observation_control.py
+++ b/tangostationcontrol/tangostationcontrol/devices/observation_control.py
@@ -17,7 +17,7 @@ from json import loads
 from tangostationcontrol.common.entrypoint import entry
 from tangostationcontrol.common.lofar_logging import device_logging_to_python, log_exceptions
 from tangostationcontrol.common.lofar_version import get_version
-from tangostationcontrol.devices.device_decorators import *
+from tangostationcontrol.devices.device_decorators import only_in_states, only_when_on, fault_on_error
 from tangostationcontrol.devices.observation import Observation
 
 import logging
@@ -145,7 +145,7 @@ class ObservationControl(Device):
     @log_exceptions()
     @DebugIt()
     def Fault(self):
-        stop_all_observations()
+        self.stop_all_observations()
         self.set_state(DevState.FAULT)
 
     @only_when_on()
diff --git a/tangostationcontrol/tangostationcontrol/devices/recv.py b/tangostationcontrol/tangostationcontrol/devices/recv.py
index ec09e216f63ccc7ce39cb3ed7bad589f05a88a50..090d6349c929266bf5a49d65772c36cdc3b820cf 100644
--- a/tangostationcontrol/tangostationcontrol/devices/recv.py
+++ b/tangostationcontrol/tangostationcontrol/devices/recv.py
@@ -26,7 +26,7 @@ from tangostationcontrol.beam.geo import ETRS_to_ITRF, ITRF_to_GEO
 from tangostationcontrol.common.entrypoint import entry
 from tangostationcontrol.common.lofar_logging import device_logging_to_python
 from tangostationcontrol.clients.attribute_wrapper import attribute_wrapper
-from tangostationcontrol.devices.device_decorators import *
+from tangostationcontrol.devices.device_decorators import only_in_states
 from tangostationcontrol.devices.opcua_device import opcua_device
 from tangostationcontrol.devices.lofar_device import lofar_device
 
diff --git a/tangostationcontrol/tangostationcontrol/devices/tilebeam.py b/tangostationcontrol/tangostationcontrol/devices/tilebeam.py
index fff2beba61230d0777c68f1f90c7f99fa1c2c3eb..0c8eb401f9fd6be41677d0295e9463c6d1f8ebe9 100644
--- a/tangostationcontrol/tangostationcontrol/devices/tilebeam.py
+++ b/tangostationcontrol/tangostationcontrol/devices/tilebeam.py
@@ -20,7 +20,7 @@ from tango import Util
 from tangostationcontrol.common.entrypoint import entry
 from tangostationcontrol.common.lofar_logging import device_logging_to_python, log_exceptions
 from tangostationcontrol.beam.delays import delay_calculator
-from tangostationcontrol.devices.device_decorators import *
+from tangostationcontrol.devices.device_decorators import only_in_states, fault_on_error
 from tangostationcontrol.devices.beam_device import beam_device
 
 import logging
diff --git a/tangostationcontrol/tangostationcontrol/examples/load_from_disk/ini_device.py b/tangostationcontrol/tangostationcontrol/examples/load_from_disk/ini_device.py
index 032c9b01b2a5447111d6245ffcba1bd610b3b655..430addb9be61ae29ead58a17b8c4096d18d3bcea 100644
--- a/tangostationcontrol/tangostationcontrol/examples/load_from_disk/ini_device.py
+++ b/tangostationcontrol/tangostationcontrol/examples/load_from_disk/ini_device.py
@@ -19,7 +19,7 @@ import numpy
 # Additional import
 from tangostationcontrol.clients.attribute_wrapper import attribute_wrapper
 from tangostationcontrol.devices.lofar_device import lofar_device
-from tangostationcontrol.examples.load_from_disk.ini_client import *
+from tangostationcontrol.examples.load_from_disk.ini_client import ini_client
 
 import logging
 logger = logging.getLogger()
diff --git a/tangostationcontrol/tangostationcontrol/integration_test/default/toolkit/test_archiver.py b/tangostationcontrol/tangostationcontrol/integration_test/default/toolkit/test_archiver.py
index 05cfe5bf41241d2cf142479026d91b07f332e384..c63a78363d343be702a2f2cd5addcf253ae1a82e 100644
--- a/tangostationcontrol/tangostationcontrol/integration_test/default/toolkit/test_archiver.py
+++ b/tangostationcontrol/tangostationcontrol/integration_test/default/toolkit/test_archiver.py
@@ -8,13 +8,14 @@
 # See LICENSE.txt for more info.
 
 from tangostationcontrol.integration_test.base import BaseIntegrationTestCase
-from tangostationcontrol.toolkit.archiver import *
+from tangostationcontrol.toolkit.archiver import Archiver
 from tangostationcontrol.toolkit.retriever import RetrieverTimescale
 from tangostationcontrol.toolkit.archiver_util import attribute_fqdn
 from tangostationcontrol.integration_test.device_proxy import TestDeviceProxy
 
 import time
 from datetime import datetime
+from tango import DevState
 
 
 class TestArchiver(BaseIntegrationTestCase):
diff --git a/tangostationcontrol/tangostationcontrol/statistics_writer/udp_dev/udp_write_manager.py b/tangostationcontrol/tangostationcontrol/statistics_writer/udp_dev/udp_write_manager.py
index d8e234225237bac1796f11afe80045c3e09b15d8..9ba412576d1ffdee1c7819467e2292286869079e 100644
--- a/tangostationcontrol/tangostationcontrol/statistics_writer/udp_dev/udp_write_manager.py
+++ b/tangostationcontrol/tangostationcontrol/statistics_writer/udp_dev/udp_write_manager.py
@@ -7,7 +7,7 @@ from statistics_writer.udp_dev import udp_server as udp
 import netifaces as ni
 from packet import SSTPacket
 
-__all__ = ["statistics_writer"]
+__all__ = ["Statistics_Writer"]
 
 
 class Statistics_Writer:
diff --git a/tangostationcontrol/tangostationcontrol/test/beam/test_delays.py b/tangostationcontrol/tangostationcontrol/test/beam/test_delays.py
index 3b3900138c2a9f0a9394b02f6272745fa53bdb6d..b984660d677c81349c134d9be7c7441924253fc6 100644
--- a/tangostationcontrol/tangostationcontrol/test/beam/test_delays.py
+++ b/tangostationcontrol/tangostationcontrol/test/beam/test_delays.py
@@ -1,6 +1,6 @@
 import datetime
 
-from tangostationcontrol.beam.delays import *
+from tangostationcontrol.beam.delays import delay_calculator
 from tangostationcontrol.test import base
 
 
diff --git a/tangostationcontrol/tangostationcontrol/test/clients/test_attr_wrapper.py b/tangostationcontrol/tangostationcontrol/test/clients/test_attr_wrapper.py
index c55e9d1c09fcf4d78d52b520d0d5b8b7ee96e60e..13702c87caaac779f94c292e8dbe41ddf0e6e1bd 100644
--- a/tangostationcontrol/tangostationcontrol/test/clients/test_attr_wrapper.py
+++ b/tangostationcontrol/tangostationcontrol/test/clients/test_attr_wrapper.py
@@ -7,12 +7,12 @@
 """
 
 # External imports
-from tango import DevState, DevFailed
+from tango import DevState, DevFailed, AttrWriteType
 
 # Internal imports
 from tangostationcontrol.test.clients.test_client import test_client
-from tangostationcontrol.clients.attribute_wrapper import *
-from tangostationcontrol.devices.lofar_device import *
+from tangostationcontrol.clients.attribute_wrapper import attribute_wrapper
+from tangostationcontrol.devices.lofar_device import lofar_device
 import tangostationcontrol.devices.lofar_device
 
 # Test imports
@@ -21,6 +21,7 @@ from tangostationcontrol.test import base
 
 import asyncio
 import mock
+import numpy
 
 scalar_dims = (1,)
 spectrum_dims = (4,)
diff --git a/tangostationcontrol/tox.ini b/tangostationcontrol/tox.ini
index 40f6e5cf38bace12fc00a2ccba1c0515678906c3..a788f870f7a1a3482913d01f0a39c3e25f6b3394 100644
--- a/tangostationcontrol/tox.ini
+++ b/tangostationcontrol/tox.ini
@@ -77,5 +77,5 @@ commands =
 
 [flake8]
 filename = *.py,.stestr.conf,.txt
-select = W292,B601,B602,T100,M001,F401,B001,B002,B003,B004,B005,B006,B007,B008,B009,B010,B011,B012,B013,B014.B015,B016,B017,B018
-exclude=.tox,.egg-info,libhdbpp-python
+select = W292,B601,B602,T100,M001,F401,B001,B002,B003,B004,B005,B006,B007,B008,B009,B010,B011,B012,B013,B014.B015,B016,B017,B018, F401, F402, F403, F404, F405, F811, F812, F821, F822, F823, F831
+exclude=.tox,.egg-info,libhdbpp-python, SNMP_mib_loading