diff --git a/malcolm/core/block.py b/malcolm/core/block.py
index b2e168922..227f6decb 100644
--- a/malcolm/core/block.py
+++ b/malcolm/core/block.py
@@ -7,6 +7,7 @@
 from malcolm.core.attribute import Attribute
 from malcolm.core.method import Method
 
+
 class DummyLock(object):
 
     def acquire(self):
@@ -18,10 +19,11 @@ def release(self):
     def __enter__(self):
         self.acquire()
 
-    def __exit__(self, type, value, traceback):
+    def __exit__(self, type_, value, traceback):
         self.release()
         return False
 
+
 class LockRelease(object):
     def __init__(self, lock):
         self.lock = lock
@@ -29,10 +31,11 @@ def __init__(self, lock):
     def __enter__(self):
         self.lock.release()
 
-    def __exit__(self, type, value, traceback):
+    def __exit__(self, type_, value, traceback):
         self.lock.acquire()
         return False
 
+
 @Serializable.register_subclass("malcolm:core/Block:1.0")
 class Block(Notifier):
     """Object consisting of a number of Attributes and Methods"""
diff --git a/malcolm/core/controller.py b/malcolm/core/controller.py
index a796f5c4a..b1e1325ab 100644
--- a/malcolm/core/controller.py
+++ b/malcolm/core/controller.py
@@ -89,11 +89,11 @@ def transition(self, state, message):
 
             self.status.set_value(message)
 
-            for method in self.block._methods.values():
+            for method in self.block.methods.values():
                 if method in self.writeable_methods[state]:
-                    self.block._methods[method].set_writeable(True)
+                    self.block.methods[method].set_writeable(True)
                 else:
-                    self.block._methods[method].set_writeable(False)
+                    self.block.methods[method].set_writeable(False)
 
             self.block.notify_subscribers()
 
diff --git a/malcolm/core/spawnable.py b/malcolm/core/spawnable.py
index 6f7ad5ecc..42918bba8 100644
--- a/malcolm/core/spawnable.py
+++ b/malcolm/core/spawnable.py
@@ -22,14 +22,14 @@ def start(self, process=None):
         if process is None:
             process = self.process
         self._initialize()
-        for (func, stop_func) in self._spawn_functions:
+        for (func, _) in self._spawn_functions:
             self._spawned.append(process.spawn(func))
 
     def stop(self):
         """Call registered stop functions"""
 
         self._initialize()
-        for (func, stop_func) in reversed(self._spawn_functions):
+        for (_, stop_func) in reversed(self._spawn_functions):
             if stop_func is not None:
                 stop_func()
 
diff --git a/malcolm/wscomms/wsclientcomms.py b/malcolm/wscomms/wsclientcomms.py
index 97728dae9..43757604d 100644
--- a/malcolm/wscomms/wsclientcomms.py
+++ b/malcolm/wscomms/wsclientcomms.py
@@ -58,7 +58,7 @@ def stop_recv_loop(self):
         # thread
         self.loop.add_callback(self.loop.stop)
 
-    def subscribe_server_blocks(self, conn):
+    def subscribe_server_blocks(self, _):
         """Subscribe to process blocks"""
         request = Request.Subscribe(None, None, [".", "blocks", "value"])
         request.set_id(self.SERVER_BLOCKS_ID)
diff --git a/malcolm/wscomms/wsservercomms.py b/malcolm/wscomms/wsservercomms.py
index c737de4a6..2edfee005 100644
--- a/malcolm/wscomms/wsservercomms.py
+++ b/malcolm/wscomms/wsservercomms.py
@@ -1,8 +1,3 @@
-import os
-import sys
-sys.path.append(os.path.join(os.path.dirname(__file__), ".."))
-import setup_malcolm_paths
-
 from collections import OrderedDict
 import json
 
diff --git a/tests/test_core/test_controller.py b/tests/test_core/test_controller.py
index e0fc467b5..5fab77cc8 100644
--- a/tests/test_core/test_controller.py
+++ b/tests/test_core/test_controller.py
@@ -26,10 +26,10 @@ class TestController(unittest.TestCase):
 
     def setUp(self):
         b = MagicMock()
-        b._methods.values.return_value = ["say_hello", "say_goodbye"]
+        b.methods.values.return_value = ["say_hello", "say_goodbye"]
         self.m1 = MagicMock()
         self.m2 = MagicMock()
-        b._methods.__getitem__.side_effect = [self.m1, self.m2]
+        b.methods.__getitem__.side_effect = [self.m1, self.m2]
         self.c = DummyController(MagicMock(), b)
 
     def test_init(self):