Cleanup, and might've fixed proxies

^