Mix code and format changes

Remove some SSH-1 stuff, remove some logging stuff, trim trailing spaces