Tidy manual helper module.
Move header token generation.
Remove header helper module.