[arch-dev-public] ABS cleanup