Cleaning up heading classes that remained.