Manifest cleanup