Unnecessary headers remove