Deprecate old 'url' field, remove dead code and some refactorings
Merge pull request #2271 from kenchris/xwalk_refac

Deprecate old 'url' field, remove dead code and some refactorings