Remove unused configuration.
Merge branch 'master' into pimp-pin