Removing the Retry with predicate overridde