Manifest: Cleanup