Cleaned legacy shell script support code