Cleaning up locators