Watcher enhancements

* add code to insert protocol lines
* delete dead code