[wallace] finishing up cleaning up the element locators for internal tools