diff --git a/spring-data-jdbc/src/main/java/org/springframework/data/jdbc/core/convert/DefaultDataAccessStrategy.java b/spring-data-jdbc/src/main/java/org/springframework/data/jdbc/core/convert/DefaultDataAccessStrategy.java
index 45cbb671d3..3249ad8461 100644
--- a/spring-data-jdbc/src/main/java/org/springframework/data/jdbc/core/convert/DefaultDataAccessStrategy.java
+++ b/spring-data-jdbc/src/main/java/org/springframework/data/jdbc/core/convert/DefaultDataAccessStrategy.java
@@ -24,8 +24,6 @@
 import java.util.Optional;
 import java.util.stream.Stream;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 import org.jspecify.annotations.Nullable;
 
 import org.springframework.dao.EmptyResultDataAccessException;
@@ -72,8 +70,6 @@
  */
 public class DefaultDataAccessStrategy implements DataAccessStrategy {
 
-	private final Log logger = LogFactory.getLog(getClass());
-
 	private final SqlGeneratorSource sqlGeneratorSource;
 	private final RelationalMappingContext context;
 	private final JdbcConverter converter;
@@ -155,11 +151,8 @@ public NamedParameterJdbcOperations getJdbcOperations() {
 	public <S> boolean update(S objectToSave, Class<S> domainType) {
 
 		SqlIdentifierParameterSource parameterSource = parametersFactory.forUpdate(objectToSave, domainType);
-		if (parameterSource.size() <= 1) {
-			return true; // returning true, because conceptually the one row was correctly updated
-		}
-
-		return operations.update(sql(domainType).getUpdate(), parameterSource) != 0;
+		return parameterSource.size() <= 1 // returning true, because conceptually the one row was correctly updated
+				|| operations.update(sql(domainType).getUpdate(), parameterSource) != 0;
 	}
 
 	@Override
diff --git a/spring-data-jdbc/src/main/java/org/springframework/data/jdbc/core/convert/RowDocumentExtractorSupport.java b/spring-data-jdbc/src/main/java/org/springframework/data/jdbc/core/convert/RowDocumentExtractorSupport.java
index f8f24fe68b..d552ba3e1e 100644
--- a/spring-data-jdbc/src/main/java/org/springframework/data/jdbc/core/convert/RowDocumentExtractorSupport.java
+++ b/spring-data-jdbc/src/main/java/org/springframework/data/jdbc/core/convert/RowDocumentExtractorSupport.java
@@ -266,25 +266,6 @@ private void readEntity(RS row, RowDocument document, AggregatePath basePath,
 			}
 		}
 
-		/**
-		 * Read properties of embedded from the result set and store them under their column names
-		 */
-		private void collectEmbeddedValues(RS row, RowDocument document, RelationalPersistentProperty property,
-				AggregatePath path) {
-
-			RelationalPersistentEntity<?> embeddedHolder = aggregateContext.getRequiredPersistentEntity(property);
-			for (RelationalPersistentProperty embeddedProperty : embeddedHolder) {
-
-				if (embeddedProperty.isQualified() || embeddedProperty.isCollectionLike() || embeddedProperty.isEntity()) {
-					// hell, no!
-					throw new UnsupportedOperationException("Reading maps and collections into embeddable isn't supported yet");
-				}
-
-				AggregatePath nested = path.append(embeddedProperty);
-				aggregateContext.collectValue(row, nested, document, nested.getColumnInfo().name());
-			}
-		}
-
 		@Override
 		boolean hasResult() {
 
diff --git a/spring-data-r2dbc/src/main/java/org/springframework/data/r2dbc/repository/query/ExpressionEvaluatingParameterBinder.java b/spring-data-r2dbc/src/main/java/org/springframework/data/r2dbc/repository/query/ExpressionEvaluatingParameterBinder.java
index 6b8bfe5912..776f41e6dd 100644
--- a/spring-data-r2dbc/src/main/java/org/springframework/data/r2dbc/repository/query/ExpressionEvaluatingParameterBinder.java
+++ b/spring-data-r2dbc/src/main/java/org/springframework/data/r2dbc/repository/query/ExpressionEvaluatingParameterBinder.java
@@ -61,7 +61,6 @@ class ExpressionEvaluatingParameterBinder {
 	 *
 	 * @param bindTarget must not be {@literal null}.
 	 * @param parameterAccessor must not be {@literal null}.
-	 * @param evaluator must not be {@literal null}.
 	 */
 	void bind(BindTarget bindTarget,
 			RelationalParameterAccessor parameterAccessor, ValueEvaluationContext evaluationContext) {
@@ -110,7 +109,7 @@ private void bindParameters(BindTarget bindSpec,
 
 			Optional<String> name = bindableParameter.getName();
 
-			if (name.isPresent() && (isNamedParameterReferencedFromQuery(name)) || !expressionQuery.getBindings().isEmpty()) {
+			if (name.isPresent() && isNamedParameterReferencedFromQuery(name) || !expressionQuery.getBindings().isEmpty()) {
 
 				if (!isNamedParameterReferencedFromQuery(name)) {
 					continue;
@@ -148,7 +147,7 @@ private org.springframework.r2dbc.core.Parameter getBindValue(org.springframewor
 
 	private boolean isNamedParameterReferencedFromQuery(Optional<String> name) {
 
-		if (!name.isPresent()) {
+		if (name.isEmpty()) {
 			return false;
 		}