Remove deprecated ConfigurationHolder usage