Remove legacy

Merged Andreas Marek requested to merge remove_legacy into master_pre_stage

Merge request reports