Cleanup mco ddl
Merge pull request #4679 from danmcp/cleanup_mco_ddl

Merged by openshift-bot