Cleanup
TODO
Merge https://github.com/boskee/Minecraft