Cleanup across a few more files.