remove old configuration
Merge branch 'master' into public