@yves-del-medico will be cleaned-up as part of next sprint.