Cleanup of manifest
Cleanup of manifest