diff --git a/src/game/Entities/Player/Player.cpp b/src/game/Entities/Player/Player.cpp
index dc4293a5b..623f5f60c 100644
--- a/src/game/Entities/Player/Player.cpp
+++ b/src/game/Entities/Player/Player.cpp
@@ -12657,7 +12657,7 @@ Item* Player::EquipItem(uint16 pos, Item* pItem, bool update)
     UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_EQUIP_ITEM, pItem->GetEntry());
     UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_EQUIP_EPIC_ITEM, pItem->GetEntry(), slot);
 
-	sScriptMgr->OnEquip(this, pItem, bag, slot, update);
+    sScriptMgr->OnEquip(this, pItem, bag, slot, update);
     return pItem;
 }
 
diff --git a/src/game/Handlers/BattleGroundHandler.cpp b/src/game/Handlers/BattleGroundHandler.cpp
index 69d32a132..922ad3020 100644
--- a/src/game/Handlers/BattleGroundHandler.cpp
+++ b/src/game/Handlers/BattleGroundHandler.cpp
@@ -169,9 +169,7 @@ void WorldSession::HandleBattlemasterJoinOpcode(WorldPacket & recvData)
         sBattlegroundMgr->BuildBattlegroundStatusPacket(&data, bgt, queueSlot, STATUS_WAIT_QUEUE, avgWaitTime, 0, 0, TEAM_NEUTRAL);
         SendPacket(&data);
 
-		//#define sScriptMgr ACE_Singleton<ScriptMgr, ACE_Null_Mutex>::instance()
-		ScriptMgr* sScriptMgr;
-		sScriptMgr->OnPlayerJoinBG(_player, sBattlegroundMgr->GetBattlegroundTemplate(ginfo->BgTypeId));
+        sScriptMgr->OnPlayerJoinBG(_player, sBattlegroundMgr->GetBattlegroundTemplate(ginfo->BgTypeId));
 		
     }
     // check if group can queue:
@@ -251,8 +249,7 @@ void WorldSession::HandleBattlemasterJoinOpcode(WorldPacket & recvData)
             sBattlegroundMgr->BuildGroupJoinedBattlegroundPacket(&data, err);
             member->GetSession()->SendPacket(&data);
 
-			ScriptMgr* sScriptMgr;
-			sScriptMgr->OnPlayerJoinBG(member, sBattlegroundMgr->GetBattlegroundTemplate(member->GetBattlegroundTypeId()));
+            sScriptMgr->OnPlayerJoinBG(member, sBattlegroundMgr->GetBattlegroundTemplate(member->GetBattlegroundTypeId()));
         }
     }
 }
@@ -662,8 +659,7 @@ void WorldSession::HandleBattlemasterJoinArena(WorldPacket & recvData)
         sBattlegroundMgr->BuildBattlegroundStatusPacket(&data, bgt, queueSlot, STATUS_WAIT_QUEUE, avgWaitTime, 0, arenatype, TEAM_NEUTRAL);
         SendPacket(&data);
 
-		ScriptMgr* sScriptMgr;
-		sScriptMgr->OnPlayerJoinArena(_player, sBattlegroundMgr->GetBattlegroundTemplate(ginfo->BgTypeId));
+        sScriptMgr->OnPlayerJoinArena(_player, sBattlegroundMgr->GetBattlegroundTemplate(ginfo->BgTypeId));
     }
     // check if group can queue:
     else
@@ -759,8 +755,7 @@ void WorldSession::HandleBattlemasterJoinArena(WorldPacket & recvData)
             sBattlegroundMgr->BuildGroupJoinedBattlegroundPacket(&data, err);
             member->GetSession()->SendPacket(&data);
 
-			ScriptMgr* sScriptMgr;
-			sScriptMgr->OnPlayerJoinArena(member, sBattlegroundMgr->GetBattlegroundTemplate(member->GetBattlegroundTypeId()));
+            sScriptMgr->OnPlayerJoinArena(member, sBattlegroundMgr->GetBattlegroundTemplate(member->GetBattlegroundTypeId()));
         }
 
         // pussywizard: schedule update for rated arena
diff --git a/src/game/Scripting/ScriptMgr.cpp b/src/game/Scripting/ScriptMgr.cpp
index 55c75baff..a9fab945d 100644
--- a/src/game/Scripting/ScriptMgr.cpp
+++ b/src/game/Scripting/ScriptMgr.cpp
@@ -1437,12 +1437,6 @@ void ScriptMgr::OnGroupDisband(Group* group)
     FOREACH_SCRIPT(GroupScript)->OnDisband(group);
 }
 
-/*void ScriptMgr::OnGroupJoinBG(Group* group, Battleground* bg)
-{
-	ASSERT(group);
-	FOREACH_SCRIPT(GroupScript)->OnGroupJoinBG(group, bg);
-}*/
-
 void ScriptMgr::OnGlobalItemDelFromDB(SQLTransaction& trans, uint32 itemGuid)
 {
     ASSERT(trans);
diff --git a/src/game/Scripting/ScriptMgr.h b/src/game/Scripting/ScriptMgr.h
index 89b71c08b..916d48c53 100644
--- a/src/game/Scripting/ScriptMgr.h
+++ b/src/game/Scripting/ScriptMgr.h
@@ -790,16 +790,16 @@ class PlayerScript : public ScriptObject
         virtual void OnAfterSetVisibleItemSlot(Player* /*player*/, uint8 /*slot*/, Item* /*item*/) { }
                
         // After an item has been moved from inventory
-		virtual void OnAfterMoveItemFromInventory(Player* /*player*/, Item* /*it*/, uint8 /*bag*/, uint8 /*slot*/, bool /*update*/) { }
+        virtual void OnAfterMoveItemFromInventory(Player* /*player*/, Item* /*it*/, uint8 /*bag*/, uint8 /*slot*/, bool /*update*/) { }
 
-		// After an item has been equipped
-		virtual void OnEquip(Player* /*player*/, Item* /*it*/, uint8 /*bag*/, uint8 /*slot*/, bool /*update*/) { }
+        // After an item has been equipped
+        virtual void OnEquip(Player* /*player*/, Item* /*it*/, uint8 /*bag*/, uint8 /*slot*/, bool /*update*/) { }
 
-		// After player enters queue for BG
-		virtual void OnPlayerJoinBG(Player* player, Battleground* bg) { }
+        // After player enters queue for BG
+        virtual void OnPlayerJoinBG(Player* player, Battleground* bg) { }
 
-		// After player enters queue for Arena
-		virtual void OnPlayerJoinArena(Player* player, Battleground* bg) { }
+        // After player enters queue for Arena
+        virtual void OnPlayerJoinArena(Player* player, Battleground* bg) { }
 };
 
 class GuildScript : public ScriptObject
@@ -869,9 +869,6 @@ class GroupScript : public ScriptObject
 
         // Called when a group is disbanded.
         virtual void OnDisband(Group* /*group*/) { }
-
-		// After group enters queue for BG or Arena
-		//virtual void OnGroupJoinBG(Group* group, Battleground* bg) { }
 };
 
 // following hooks can be used anywhere and are not db bounded
@@ -1101,9 +1098,9 @@ class ScriptMgr
         void OnPlayerBeingCharmed(Player* player, Unit* charmer, uint32 oldFactionId, uint32 newFactionId);
         void OnAfterPlayerSetVisibleItemSlot(Player* player, uint8 slot, Item *item);
         void OnAfterPlayerMoveItemFromInventory(Player* player, Item* it, uint8 bag, uint8 slot, bool update);
-		void OnEquip(Player* player, Item* it, uint8 bag, uint8 slot, bool update);
-		void OnPlayerJoinBG(Player* player, Battleground* bg);
-		void OnPlayerJoinArena(Player* player, Battleground* bg);
+        void OnEquip(Player* player, Item* it, uint8 bag, uint8 slot, bool update);
+        void OnPlayerJoinBG(Player* player, Battleground* bg);
+        void OnPlayerJoinArena(Player* player, Battleground* bg);
 
     public: /* GuildScript */
 
@@ -1127,7 +1124,6 @@ class ScriptMgr
         void OnGroupRemoveMember(Group* group, uint64 guid, RemoveMethod method, uint64 kicker, const char* reason);
         void OnGroupChangeLeader(Group* group, uint64 newLeaderGuid, uint64 oldLeaderGuid);
         void OnGroupDisband(Group* group);
-		//void OnGroupJoinBG(Group* group, Battleground* bg);
 
     public: /* GlobalScript */
         void OnGlobalItemDelFromDB(SQLTransaction& trans, uint32 itemGuid);