PIM cleanup