Removed old, unused stuff
Merge pull request #8 from schmee/remove-unused

[RFC] Removed old, unused stuff