Cleaning up

Enjoyable in theory, annoying as hell in practice. Also, forgot NEI
plugins and addons.