Cleanup of manifest