removed some obsolete stuff, fixed #230