- clean up recently introduced changes for ambiguity resolution to better track number of ambiguities in previous epoch