Manifest clean up