Add support for removing intermediate containers