Remove scala.Tuple2 from APIs