Remove the problematic locking code
Fix an issue where tool discovery sometimes croaks
Update tool config for SF model to point to a public Url