CFY-588 use cfy teardown