CFY-1318 cleanup code