Updated room watchers to use disposehandler.