clean up url-encoding file
Merge https://github.com/marijnh/defservice