Update notes for submitted changes

* Add generic keystone cleanup mechanism