Removed unnecessary crap