Removing proxying logic - will be handled by ProxyManager in future