diff --git a/mutalyzer/models.py b/mutalyzer/models.py
index 1665d68dd7c5be8c23078846538e9f09fcc03713..32686750d31b82be40e96b851e6c011a16e06c1c 100644
--- a/mutalyzer/models.py
+++ b/mutalyzer/models.py
@@ -14,6 +14,9 @@ Additional attributes values for the spyne String model:
 
 @todo: Use Mandatory.* models in the ClassModel extensions?
 @todo: See if it improves client code if we use Array(_, nillable=False).
+@todo: Move all these models to the mutalyzer.services package and refactor
+  all uses of them in other places. The SOAP_NAMESPACE variable can then also
+  be moved there.
 """
 
 
diff --git a/mutalyzer/output.py b/mutalyzer/output.py
index 3f720ea03c88791417917a465cc0f7941ed69e8b..3ca1c8a71d8a998463262074fd0fae17f8a5c84c 100644
--- a/mutalyzer/output.py
+++ b/mutalyzer/output.py
@@ -27,7 +27,6 @@ import time
 
 from mutalyzer import util
 from mutalyzer.config import settings
-from mutalyzer.models import SoapMessage
 
 
 class Output() :