Cleaned up some header relationships.