Removing leftovers of old infrastructure.
cmr:v1.7
Add new rte headers in files that need them.