Remove the billable / non billable since they are no longer relavent.