Get rid of proxy ip handling