Proxy and some cleanup