Remove trip grouping
New API modifications