wip: clean up header