removing even more crap