Merge "Remove duplicate configuration"