PAHMA-979: minor cleanup of batch shell scripts