rootfs cleanup

Change-Id: I358271f882c4d47c2b4802aa38272eeb1b53385c