Updated locators, removed unused imports