fix: remove watchers wrapper