Removing more header junk