- Switching to XHR (requests from HTTPS sites to HTTP sites are also blocked with XHR so workaround changes)
- Switching to log to trace
- Cleaning up unused stuff