fix typo and remove extra headers