Update notes for submitted changes

* Add context as param to cleanup function