PIM-1460 : remove useless use statement
PIM-1460 : fix mapping inconsistency