rootfs cleanup

Change-Id: Id6177e6aa52ae191c43b1d84bf2f081fb2b69d71