CFY-1232 cleanup