[arch-dev-public] repo cleanup: step 2