PIM-1830 Remove obselete mapping back reference