removing a bunch of unnecessary crap