locator reference logic removed