Patch headers cleanup