Removing trr legacy
Merging