Build identified cleanups
6 files changed