Removing extra headers