Cleanup

Probably going to abandon this branch, it's a waste of time trying to do
two things at once.