Added proxy setting and remove vi edit.