FMS-467 : Remove duplicated information