Cleanup
Add url check for XHR wrapper