removed some unused crap