remove some hard coding in util.sh