Update notes for submitted changes

* Cleanup/refactoring of servers model