removed the proxy stuff