Remove terms of use for federation, changes from branch 'terms2'