deleting unused code and more work on TreeWatcher