Merge "remove logic in saveConfiguration"