diff --git a/spring-cloud-netflix-turbine-stream/pom.xml b/spring-cloud-netflix-turbine-stream/pom.xml
index e7c7b0da..b17c352e 100644
--- a/spring-cloud-netflix-turbine-stream/pom.xml
+++ b/spring-cloud-netflix-turbine-stream/pom.xml
@@ -78,13 +78,6 @@
 			<groupId>io.reactivex</groupId>
 			<artifactId>rxjava</artifactId>
 		</dependency>
-		<dependency>
-			<groupId>org.projectlombok</groupId>
-			<artifactId>lombok</artifactId>
-			<!-- Only needed at compile time -->
-			<scope>compile</scope>
-			<optional>true</optional>
-		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-tomcat</artifactId>
diff --git a/spring-cloud-netflix-turbine-stream/src/main/java/org/springframework/cloud/netflix/turbine/stream/HystrixStreamAggregator.java b/spring-cloud-netflix-turbine-stream/src/main/java/org/springframework/cloud/netflix/turbine/stream/HystrixStreamAggregator.java
index ca5b5f42..d50de613 100644
--- a/spring-cloud-netflix-turbine-stream/src/main/java/org/springframework/cloud/netflix/turbine/stream/HystrixStreamAggregator.java
+++ b/spring-cloud-netflix-turbine-stream/src/main/java/org/springframework/cloud/netflix/turbine/stream/HystrixStreamAggregator.java
@@ -20,6 +20,8 @@ import java.io.IOException;
 import java.util.List;
 import java.util.Map;
 
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.integration.annotation.ServiceActivator;
 import org.springframework.messaging.handler.annotation.Payload;
@@ -28,16 +30,16 @@ import org.springframework.util.StringUtils;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 
-import lombok.extern.apachecommons.CommonsLog;
 import rx.subjects.PublishSubject;
 
 /**
  * @author Spencer Gibb
  */
-@CommonsLog
 @Component // needed for ServiceActivator to be picked up
 public class HystrixStreamAggregator {
 
+	private static final Log log = LogFactory.getLog(HystrixStreamAggregator.class);
+
 	private ObjectMapper objectMapper;
 
 	private PublishSubject<Map<String, Object>> subject;
diff --git a/spring-cloud-netflix-turbine-stream/src/main/java/org/springframework/cloud/netflix/turbine/stream/TurbineStreamConfiguration.java b/spring-cloud-netflix-turbine-stream/src/main/java/org/springframework/cloud/netflix/turbine/stream/TurbineStreamConfiguration.java
index 4f6bda97..d67541c3 100644
--- a/spring-cloud-netflix-turbine-stream/src/main/java/org/springframework/cloud/netflix/turbine/stream/TurbineStreamConfiguration.java
+++ b/spring-cloud-netflix-turbine-stream/src/main/java/org/springframework/cloud/netflix/turbine/stream/TurbineStreamConfiguration.java
@@ -21,6 +21,8 @@ import java.util.Map;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicBoolean;
 
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.cloud.client.actuator.HasFeatures;
@@ -39,7 +41,6 @@ import io.netty.buffer.ByteBuf;
 import io.reactivex.netty.RxNetty;
 import io.reactivex.netty.protocol.http.server.HttpServer;
 import io.reactivex.netty.protocol.text.sse.ServerSentEvent;
-import lombok.extern.apachecommons.CommonsLog;
 import rx.Observable;
 import rx.subjects.PublishSubject;
 
@@ -47,10 +48,11 @@ import rx.subjects.PublishSubject;
  * @author Spencer Gibb
  */
 @Configuration
-@CommonsLog
 @EnableConfigurationProperties(TurbineStreamProperties.class)
 public class TurbineStreamConfiguration implements SmartLifecycle {
 
+	private static final Log log = LogFactory.getLog(TurbineStreamConfiguration.class);
+
 	private AtomicBoolean running = new AtomicBoolean(false);
 
 	@Autowired
diff --git a/spring-cloud-netflix-turbine-stream/src/main/java/org/springframework/cloud/netflix/turbine/stream/TurbineStreamProperties.java b/spring-cloud-netflix-turbine-stream/src/main/java/org/springframework/cloud/netflix/turbine/stream/TurbineStreamProperties.java
index 6c919ab5..4ff99342 100644
--- a/spring-cloud-netflix-turbine-stream/src/main/java/org/springframework/cloud/netflix/turbine/stream/TurbineStreamProperties.java
+++ b/spring-cloud-netflix-turbine-stream/src/main/java/org/springframework/cloud/netflix/turbine/stream/TurbineStreamProperties.java
@@ -21,13 +21,13 @@ import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.cloud.netflix.hystrix.HystrixConstants;
 import org.springframework.http.MediaType;
 
-import lombok.Data;
+import java.util.Objects;
 
 /**
  * @author Dave Syer
+ * @author Gregor Zurowski
  */
 @ConfigurationProperties("turbine.stream")
-@Data
 public class TurbineStreamProperties {
 
 	@Value("${server.port:8989}")
@@ -36,4 +36,53 @@ public class TurbineStreamProperties {
 	private String destination = HystrixConstants.HYSTRIX_STREAM_DESTINATION;
 
 	private String contentType = MediaType.APPLICATION_JSON_VALUE;
+
+	public int getPort() {
+		return port;
+	}
+
+	public void setPort(int port) {
+		this.port = port;
+	}
+
+	public String getDestination() {
+		return destination;
+	}
+
+	public void setDestination(String destination) {
+		this.destination = destination;
+	}
+
+	public String getContentType() {
+		return contentType;
+	}
+
+	public void setContentType(String contentType) {
+		this.contentType = contentType;
+	}
+
+	@Override
+	public boolean equals(Object o) {
+		if (this == o) return true;
+		if (o == null || getClass() != o.getClass()) return false;
+		TurbineStreamProperties that = (TurbineStreamProperties) o;
+		return port == that.port &&
+				Objects.equals(destination, that.destination) &&
+				Objects.equals(contentType, that.contentType);
+	}
+
+	@Override
+	public int hashCode() {
+		return Objects.hash(port, destination, contentType);
+	}
+
+	@Override
+	public String toString() {
+		return new StringBuilder("TurbineStreamProperties{")
+				.append("port=").append(port).append(", ")
+				.append("destination='").append(destination).append("', ")
+				.append("contentType='").append(contentType).append("'}")
+				.toString();
+	}
+
 }