removed some crap