Revert the use of remove_container(force=True...)