CFY-3 more cleanup code