#3744 wipe old container_structure too