removed uneeded crap