CFY-1145 cleanup