Revert "Merge pull request #254 from ndomar/c3s1_send_notifications"

This reverts commit 0d5d1dbde5b847f4f9069ddbc27b8561d886895c, reversing
changes made to ae19f5580882158c55dd200af8a35de574871cf5.
Moved UML
Merge pull request #256 from ndomar/revert_derwy_merged

Revert "Merge pull request #254 from ndomar/c3s1_send_notifications"