Removed Proxies and updated related tests.