update code to remove locator from loc_mapper only