cleanup some deprecated code

Pierre-Yves Davidrequested to merge
topic/default/deprec-cleanup into branch/default

Merge request reports