CFY-1442 remove redundant code