Some header cleanup