reorg, clean up misuse of h6