Use phase/step fns as dispatch fns
Cleanup unneeded fns
More reorganization