some cleanup, mixpanel tracking