Remove ProxyGenerator