Merge "Remove unused properties from config files"