Qual: Removed TODO, deprecated code and deprecated properties. This also
fix missing combo box of contacts onto CC.