Type cleanup

Michiel Cottaarrequested to merge
cleanup into master

Merge request reports