Clean up bindings/watcher logic