[arch-dev-public] Latest round of cleanup