[PATCH 1/5] Cleanup build leftovers