Support hosts and tunnels config files.
Remove cruft.