final headers cleanup