Clean up mockup locator complex methods