Cleanup new module/state and add to docs