Removing the proxy stuff