Clean up the code
Validation of Shashlik SimHits
More files
Merge pull request #4073 from bsunanda/Phase2-shk24

Phase2 shk24