make comment clearer in RemoveOldContainer
add basic support for environment vars