File watch changes

When client disconnects remove any watches. If client reconnects re-add
same watches.