Fixup! Add cleanup of container.