Update notes for submitted changes

* Remove direct assignments of context attributes