PIM-2288: Remove useless code