Removed all references to WHO