removed headers not used. re #7393
Merge branch 'feature/7393_mcstas_event' into develop