removed some more crap