CFY-1377 remove base type