Revert "Improve clarity of updates to item watchers"

This reverts commit ad84a788e43543a8f82599eadfc8e3825af9451a.
Revert "Improve error handling and clean up updates/watchers views"

This reverts commit c7eca2fb4bb8e293f7922b46fb3e6aef0ca85c45.