Manifest Cleanup for Organization