PIM-3452: Remove useless code