Fixed two locators, removed unused import