Merge "Remove check_remote_connectivity related  methods"