diff --git a/evennia/commands/cmdsethandler.py b/evennia/commands/cmdsethandler.py
index d76db3c169..3f01dbcac2 100644
--- a/evennia/commands/cmdsethandler.py
+++ b/evennia/commands/cmdsethandler.py
@@ -212,7 +212,6 @@ def import_cmdset(path, cmdsetobj, emit_to_obj=None, no_logging=False):
             else:
                 errstring = errstring.format(path=python_path, traceback=err, timestamp=logger.timeformat())
             break
-        return None # an error
 
     if errstring:
         # returning an empty error cmdset
@@ -224,7 +223,7 @@ def import_cmdset(path, cmdsetobj, emit_to_obj=None, no_logging=False):
         err_cmdset = _ErrorCmdSet()
         err_cmdset.errmessage = errstring
         return err_cmdset
-
+    return None # undefined error
 
 # classes
 
diff --git a/evennia/contrib/mapbuilder.py b/evennia/contrib/mapbuilder.py
index 0f57417006..5f50908cc5 100644
--- a/evennia/contrib/mapbuilder.py
+++ b/evennia/contrib/mapbuilder.py
@@ -183,11 +183,11 @@ EXAMPLE1_LEGEND = {("♣", "♠"): example1_build_forest,
 # -*- coding: utf-8 -*-
 
 # Add the necessary imports for your instructions here.
-from evennia import create_object
-from typeclasses import rooms, exits
-from evennia.utils import utils
-from random import randint
-import random
+#from evennia import create_object
+#from typeclasses import rooms, exits
+#from evennia.utils import utils
+#from random import randint
+#import random
 
 # This is the same layout as Example 1 but included are characters for exits.
 # We can use these characters to determine which rooms should be connected.
diff --git a/evennia/utils/utils.py b/evennia/utils/utils.py
index 5576d7fa9e..4d1a3b6633 100644
--- a/evennia/utils/utils.py
+++ b/evennia/utils/utils.py
@@ -22,7 +22,7 @@ from os.path import join as osjoin
 from importlib import import_module
 from inspect import ismodule, trace, getmembers, getmodule
 from collections import defaultdict, OrderedDict
-from twisted.internet import threads, defer, reactor
+from twisted.internet import threads, reactor
 from django.conf import settings
 from django.utils import timezone
 from django.utils.translation import ugettext as _