Removed configuration duplication