Remove Interval class, define terms.