area: remove unnecessary header
entity: remove unnecessary header