diff --git a/src/game/Object.h b/src/game/Object.h
index 43add24d98d..2fd45b45688 100644
--- a/src/game/Object.h
+++ b/src/game/Object.h
@@ -127,7 +127,7 @@ class TRINITY_DLL_SPEC Object
     public:
         virtual ~Object ( );
 
-        const bool& IsInWorld() const { return m_inWorld; }
+        const bool IsInWorld() const { return m_inWorld; }
         virtual void AddToWorld()
         {
             if(m_inWorld)
diff --git a/src/game/ObjectAccessor.h b/src/game/ObjectAccessor.h
index d1549712f30..1f413e2db40 100644
--- a/src/game/ObjectAccessor.h
+++ b/src/game/ObjectAccessor.h
@@ -164,22 +164,11 @@ class TRINITY_DLL_DECL ObjectAccessor : public Trinity::Singleton<ObjectAccessor
             return HashMapHolder<Creature>::GetContainer();
         }
 
-        HashMapHolder<Unit>::MapType& GetUnits()
-        {
-            return HashMapHolder<Unit>::GetContainer();
-        }
-
         HashMapHolder<GameObject>::MapType& GetGameObjects()
         {
             return HashMapHolder<GameObject>::GetContainer();
         }
 
-        // note: possibly very heavy
-        HashMapHolder<WorldObject>::MapType& GetWorldObjects()
-        {
-            return HashMapHolder<WorldObject>::GetContainer();
-        }
-
         template<class T> void AddObject(T *object)
         {
             HashMapHolder<T>::Insert(object);