[arch-dev-public] Clean up the base group