Removing extraneous headers