CFY-1231 cleanup