Remove the locate implementation.
Add locate to use comma as a preferred.