more cpio cleanups