Removed junk

This was a lot more bloated than I thought... I've made it look terrible, but it is compatible with the latest Nightly (as well as pentadactyl).