Merge "reflect: Clean up Proxy to remove dead code"