Update notes for submitted changes

* Revert "Refactor waitcondition resources to allow easier subclassing"