Update notes for submitted changes

* Split user and admin cleanup to 2 separate classes