removed some crap that got included
