Update notes for submitted changes

* Make cleanup methods lazy