Eliminate unnecessary headers