manifest: Cleanup