PIM-2332: Remove useless code content