remove Config
Merge branch 'hotfix/iss6'