CFY-1196 remove 'type' from inputs