misc header cleanup