Auto-reload change

Removed infinite wait on channel 'done' and removed watcher close (which is never called.)