A little bit of clean up

Podhorszki, Norbertrequested to merge
github/fork/germasch/cleanup into master

Created by: germasch

This one is hopefully not so controversial:

  • Use DataMapEntry instead of std::pair to make the code more readable.
  • do a bit of header cleanup
  • remove one left over IOType mapping bit which is not necessary anymoe

Merge request reports