Cleanup pass (should really do these before committing changes...)