Update notes for submitted changes

* Revert "Store clients in context"