Drop locate argument everywhere public-facing

Drop locate argument everywhere public-facing #751