Fix watcher logic and remove webshims for now