diff --git a/src/commands/default/building.py b/src/commands/default/building.py
index 928d19916c..11ed9c8c8d 100644
--- a/src/commands/default/building.py
+++ b/src/commands/default/building.py
@@ -14,7 +14,7 @@ from src.commands.cmdhandler import get_and_merge_cmdsets
 __all__ = ("ObjManipCommand", "CmdSetObjAlias", "CmdCopy",
            "CmdCpAttr", "CmdMvAttr", "CmdCreate", "CmdDebug",
            "CmdDesc", "CmdDestroy", "CmdDig", "CmdTunnel", "CmdLink",
-           "CmdUnLink", "CmdHome", "CmdListCmdSets", "CmdName",
+           "CmdUnLink", "CmdSetHome", "CmdListCmdSets", "CmdName",
            "CmdOpen", "CmdSetAttribute", "CmdTypeclass", "CmdWipe",
            "CmdLock", "CmdExamine", "CmdFind", "CmdTeleport",
            "CmdScript")
@@ -900,7 +900,7 @@ class CmdUnLink(CmdLink):
         # call the @link functionality
         super(CmdUnLink, self).func()
 
-class CmdHome(CmdLink):
+class CmdSetHome(CmdLink):
     """
     @home - control an object's home location
 
@@ -916,6 +916,7 @@ class CmdHome(CmdLink):
     """
 
     key = "@home"
+    aliases = "@sethome"
     locks = "cmd:perm(@home) or perm(Builders)"
     help_category = "Building"
 
diff --git a/src/commands/default/cmdset_default.py b/src/commands/default/cmdset_default.py
index 4266475158..85e3599c9a 100644
--- a/src/commands/default/cmdset_default.py
+++ b/src/commands/default/cmdset_default.py
@@ -76,7 +76,7 @@ class DefaultCmdSet(CmdSet):
         self.add(building.CmdTypeclass())
         self.add(building.CmdLock())
         self.add(building.CmdScript())
-        self.add(building.CmdHome())
+        self.add(building.CmdSetHome())
 
         # Batchprocessor commands
         self.add(batchprocess.CmdBatchCommands())
diff --git a/src/typeclasses/managers.py b/src/typeclasses/managers.py
index c1d8091573..9b61a0d0f7 100644
--- a/src/typeclasses/managers.py
+++ b/src/typeclasses/managers.py
@@ -86,17 +86,6 @@ class TypedObjectManager(idmapper.manager.SharedMemoryManager):
             return None
         return dbref
 
-    #@returns_typeclass_list
-    #def get_with_attr(self, attribute_name, attribute_value=None):
-    #    """
-    #    Returns the typeclassed entity depending on having a given attribute.
-
-    #    attribute_name - only entities with an attribute of this name will be included in match
-    #    attribute_value - if != None, only entities with db.attribute_name=attribute_value will match.
-    #    """
-    #    self.filter() #TODO not implemented
-
-
     @returns_typeclass
     def get_id(self, dbref):
         """