removed some useless crap