util-linux: cleanup & don't remove coreutils arch