Build identified cleanups