-some cleanup wrt completion scripts