some header cleanup