Clean up Mixpanel event tracking
Merge Susie's changes