further clean-up of shell scripts