[Cleanup] Further cleanup of the build
Fix build one more time