[PATCH 1/2] Cleanup build