tuples api cleanup