Remove usage of FSWatcher completely