header cleanup