Make per-server list per-proxy as well. Also remove some junk we don't need any more.