Removed a bunch of crap