PIM-1555 Mapping cleanup