diff --git a/contrib/lineeditor.py b/contrib/lineeditor.py
index a042a8a8b0..eb7d176024 100644
--- a/contrib/lineeditor.py
+++ b/contrib/lineeditor.py
@@ -14,6 +14,13 @@ Features of the editor:
  search&replace text anywhere in buffer
  formatting of buffer, or selection, to certain width + indentations
  allow to echo the input or not depending on your client.
+
+
+Whereas the editor is intended to be called from other commands that
+requires more elaborate text editing of data, there is also a
+stand-alone editor command for editing Attributes at the end of this
+module. To use it just import and add it to your default cmdset.
+
 """
 
 import re
@@ -624,9 +631,9 @@ class CmdEditor(Command):
     Usage:
       @editor <obj>/<attr>
 
-    This will start Evennia's powerful line editor, which
-    has a host of commands on its own. Use :h for a list
-    of commands.
+    This will start Evennia's powerful line editor to edit an
+    Attribute. The editor has a host of commands on its own. Use :h
+    for a list of commands.
 
     """
 
diff --git a/src/commands/cmdhandler.py b/src/commands/cmdhandler.py
index 11c53b3243..de21c3c1cc 100644
--- a/src/commands/cmdhandler.py
+++ b/src/commands/cmdhandler.py
@@ -421,12 +421,6 @@ def cmdhandler(called_by, raw_string, _testing=False, callertype="session", sess
             else:
                 caller.ndb.last_cmd = None
 
-            # cleanup
-            del cmd.caller
-            del cmd.player
-            del cmd.session
-            del cmd.cmdset
-
             # Done! This returns a deferred. By default, Evennia does
             # not use this at all.
             returnValue(ret)