Update notes for submitted changes

* refine rabbit cleanup