Remove unused header munging