CFY-1433 cleanup