remove unused settings
factor out filewatcher
2.1.4
Merge branch 'filewatcher'