removing bunch of unneeded stuff
whack more