Update notes for submitted changes

* Implement cleanup method in driver