consolidate scp ops and ditch sshpass

sshpass fails automatically without a trusted key