PIM-1802 : remove old/deprecated classes
PIM-1802 : remove deprecated classes