[PATCH 1/4] Cleanup build