Removed some stuff that shouldn't have been there in the first place