Removed not needed crap. Fixes #48