Re: [arch-dev-public] core and base cleanup, again