Cleanup after the Big Build Change.