Removed old Proxy classes
Removed old Proxy classes