Removed some code that shouldnt have been there