Another round of clean-up, hopefully without breaking the world / discovering a terrible bug