Core/Battlegrounds: Removed unneeded code