Remove unused config files
Remove subtitutions of config files as well
Merge pull request #1339 from samoht/master

Remove unused config files