* remove global config watcher * keep config watcher disabled for tests * compile fix * fix resource leak