Remove calls to loc_mapper