Further slimdown & fixes

This repo is for myself, so I'm cutting out the stuff I don't use.