Improve remote connection handling and remove alway_yes when developing locally

See merge request !62