Start removing CommTrackUser from the codebase