PIM-1851: Remove useless class