Removed unnecessary code and re-added cheats