Cfy 1231 fix teardown