Remove conflicting undocumented options.
Update notes on cmsd option patch.