WIP: typetree cleanup

Closed Praetorius, Simon requested to merge issue/typetree_cleanup into master

Merge request reports