Remove UrlGenerator swap

Signed-off-by: Mathieu Doyon <mathieu.doyon@studiofrenetic.com>
Merge Conflict

Signed-off-by: Mathieu Doyon <mathieu.doyon@studiofrenetic.com>