Remove spdy and default_server, move VPN server up