All tests pass again.  Lots of cleanup.  Glad it landed it a no-revert endpoint.