Update notes for submitted changes

* Add server to clean up even in case of errors