Unclose FSWatcher instance upon new add
Remove unused vars