Removed deprecated config from cm-11.0 branch