Fix missing track_id in master
More uuid removal
Change email to username
fix merge issues
fix merge issue