Remove old, tightly-coupled "watchlib.py" code