diff --git a/spring-cloud-function-web/src/main/java/org/springframework/cloud/function/web/flux/FunctionController.java b/spring-cloud-function-web/src/main/java/org/springframework/cloud/function/web/flux/FunctionController.java
index eda8fa7c9..6892f0e55 100644
--- a/spring-cloud-function-web/src/main/java/org/springframework/cloud/function/web/flux/FunctionController.java
+++ b/spring-cloud-function-web/src/main/java/org/springframework/cloud/function/web/flux/FunctionController.java
@@ -96,8 +96,7 @@ public class FunctionController {
 			if (logger.isDebugEnabled()) {
 				logger.debug("Handled POST with function");
 			}
-			return ResponseEntity.ok()
-					.body(response(request, function, single, result));
+			return ResponseEntity.ok().body(response(request, function, single, result));
 		}
 
 		if (consumer != null) {
@@ -175,9 +174,8 @@ public class FunctionController {
 			result = response(request, supplier, true, supplier(supplier));
 		}
 		if (inspector.isMessage(function)) {
-			if (inspector.isMessage(function)) {
-				result = Flux.from(result).map(message -> MessageUtils.unpack(function, message));
-			}
+			result = Flux.from(result)
+					.map(message -> MessageUtils.unpack(function, message));
 		}
 		return ResponseEntity.ok().body(result);
 	}
diff --git a/spring-cloud-function-web/src/main/java/org/springframework/cloud/function/web/util/HeaderUtils.java b/spring-cloud-function-web/src/main/java/org/springframework/cloud/function/web/util/HeaderUtils.java
index 2d5a89db9..4e27fa274 100644
--- a/spring-cloud-function-web/src/main/java/org/springframework/cloud/function/web/util/HeaderUtils.java
+++ b/spring-cloud-function-web/src/main/java/org/springframework/cloud/function/web/util/HeaderUtils.java
@@ -17,10 +17,8 @@ package org.springframework.cloud.function.web.util;
 
 import java.util.Arrays;
 import java.util.Collection;
-import java.util.HashSet;
 import java.util.LinkedHashMap;
 import java.util.Map;
-import java.util.Set;
 
 import org.springframework.http.HttpHeaders;
 import org.springframework.messaging.MessageHeaders;