Cleanup after creating temporary containers

Also clean up the existing ones that were introduced in the last version.

Related to #21 (closed) - temporary containters aren't being destroyed