PIM-2163: Remove useless statements