move header and remove extra