headers cleanups