got rid of unnecessary locators