#93 remove BiFunction