more encapsulated header cleanup