Fix removal of containers on exit