Extend encodeURI, remove auth-only

Extend the encodeURI function to accept Dicts, remove remaining
auth-only code