Updated senders watcher to not use a container.
Removed unused class.