[PATCH 1/3] Cleanup build