Some more cleanup

We'll just consider your copy the master until we finish. Cool?