Remove unnecessary function
Comment
Begin refactoring locators into their own dedicated classes