New OpenSSH version testing and some cleanups.