Cleanup more keith-vs-oss