This can be removed along with the proxies.