Cleanup header

@marcmerlin: can you look at this?

cc: @marcmerlin