rootfs cleanup

Change-Id: Iabec726012f08cefd45411d8c8e165d729b318ef