Added container cleanup.