For ENG-6607, cleanup based on Paul's review comments
For ENG-6607, remove unused DummyUndoQuantum