Edited locators, removed unused elements