removing CMD=$(which cmd) style things