CFY-999 more cleanup