Clean-up as preparation to merge aartfaac reader branch

Andre Offringarequested to merge
aartfaac-cleanup into master

This is in preparation to merge !1245 . This MR contains changes that do not affect any behaviour.

Edited by Andre Offringa

Merge request reports