add cleanup and envvar utilities