CFY-1025 more cleanup