dont run unsetv func, for build channel check; minor other cleanup's