small headers cleanup