Remove leftovers from branch 'terms2', complements bc670a8cbe