remove more references to math::tuple