Remove use of cases classes from track representation