in progress: Stage 5 fixes/cleanup
in progress: Stage 5 fixes/cleanup

* Restore various reducedData & zprvResetReducedData calls (accidental
deletes in last commit)
* Consolidate Stage 5 into a single function

jamesjun/spoke