Review main Merged

17676[TASK] Remove deprecated code

Wouter Wolters CR +2 V +2 Normal +20 −179 updated 06/03/13, 20:49