minor
Simplify start flow.
Cleanup