remove print statements
use new cvlsshutils
manual merge, conflicting whitespace