Remove unused querystring, allow specifying a custom broker URL.