ONE-16: Locators are not properly cleaned

No match.