PIM-1430 : code cosmetic + remove useless uses