Remove more unnecessary headers