Proxy support
Removed the experimental proxy support