Update and remove headers