cleanup user actions amd MC truth
Merge pull request #4803 from civanch/track_truth_cleaned

cleanup user actions and MC truth