Consumes migration of TrackSelectors

A few classes had not been changed