Removed a bunch of unnecessary crap