PIM-2232 related clean-up