CFY-3 continue teardown work