remove some unnecessary header references