Locate Cleanup

I aim to break down modifications created by the Sacladoc PR. This is the first of them.