removed some crap. this branch fixes #173