diff --git a/spring-cloud-config-monitor/pom.xml b/spring-cloud-config-monitor/pom.xml
index d7cb670d..cb9aa5a0 100644
--- a/spring-cloud-config-monitor/pom.xml
+++ b/spring-cloud-config-monitor/pom.xml
@@ -35,12 +35,6 @@
 			<groupId>org.springframework.cloud</groupId>
 			<artifactId>spring-cloud-bus</artifactId>
 		</dependency>
-		<dependency>
-			<groupId>org.projectlombok</groupId>
-			<artifactId>lombok</artifactId>
-			<!-- Only needed at compile time -->
-			<optional>true</optional>
-		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-autoconfigure-processor</artifactId>
diff --git a/spring-cloud-config-monitor/src/main/java/org/springframework/cloud/config/monitor/FileMonitorConfiguration.java b/spring-cloud-config-monitor/src/main/java/org/springframework/cloud/config/monitor/FileMonitorConfiguration.java
index 20fb5393..9646a85a 100644
--- a/spring-cloud-config-monitor/src/main/java/org/springframework/cloud/config/monitor/FileMonitorConfiguration.java
+++ b/spring-cloud-config-monitor/src/main/java/org/springframework/cloud/config/monitor/FileMonitorConfiguration.java
@@ -33,6 +33,8 @@ import java.util.Collections;
 import java.util.LinkedHashSet;
 import java.util.Set;
 
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.cloud.config.server.environment.AbstractScmEnvironmentRepository;
 import org.springframework.cloud.config.server.environment.NativeEnvironmentRepository;
@@ -47,8 +49,6 @@ import org.springframework.scheduling.annotation.EnableScheduling;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.util.PatternMatchUtils;
 
-import lombok.extern.apachecommons.CommonsLog;
-
 /**
  * Configuration for a file watcher that detects changes in local files related to the
  * environment repository. If any files change the {@link PropertyPathEndpoint} is pinged
@@ -59,10 +59,11 @@ import lombok.extern.apachecommons.CommonsLog;
  *
  */
 @Configuration
-@CommonsLog
 @EnableScheduling
 public class FileMonitorConfiguration implements SmartLifecycle, ResourceLoaderAware {
 
+	private static final Log log = LogFactory.getLog(FileMonitorConfiguration.class);
+
 	@Autowired
 	PropertyPathEndpoint endpoint;
 
diff --git a/spring-cloud-config-monitor/src/main/java/org/springframework/cloud/config/monitor/PropertyPathNotification.java b/spring-cloud-config-monitor/src/main/java/org/springframework/cloud/config/monitor/PropertyPathNotification.java
index cd52774d..caf71288 100644
--- a/spring-cloud-config-monitor/src/main/java/org/springframework/cloud/config/monitor/PropertyPathNotification.java
+++ b/spring-cloud-config-monitor/src/main/java/org/springframework/cloud/config/monitor/PropertyPathNotification.java
@@ -16,17 +16,12 @@
 
 package org.springframework.cloud.config.monitor;
 
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
 /**
  * Simple abstraction of a list of paths that changed in a repository.
  *
  * @author Dave Syer
  *
  */
-@Data
-@NoArgsConstructor
 public class PropertyPathNotification {
 
 	public PropertyPathNotification(String... paths) {
@@ -35,4 +30,43 @@ public class PropertyPathNotification {
 
 	private String[] paths;
 
+	public PropertyPathNotification() {
+	}
+
+	public String[] getPaths() {
+		return this.paths;
+	}
+
+	public void setPaths(String[] paths) {
+		this.paths = paths;
+	}
+
+	public boolean equals(Object o) {
+		if (o == this)
+			return true;
+		if (!(o instanceof PropertyPathNotification))
+			return false;
+		final PropertyPathNotification other = (PropertyPathNotification) o;
+		if (!other.canEqual(this))
+			return false;
+		if (!java.util.Arrays.deepEquals(this.getPaths(), other.getPaths()))
+			return false;
+		return true;
+	}
+
+	public int hashCode() {
+		final int PRIME = 59;
+		int result = 1;
+		result = result * PRIME + java.util.Arrays.deepHashCode(this.getPaths());
+		return result;
+	}
+
+	protected boolean canEqual(Object other) {
+		return other instanceof PropertyPathNotification;
+	}
+
+	public String toString() {
+		return "PropertyPathNotification(paths=" + java.util.Arrays
+				.deepToString(this.getPaths()) + ")";
+	}
 }
diff --git a/spring-cloud-starter-config/pom.xml b/spring-cloud-starter-config/pom.xml
index b70f2a41..a55d9a7f 100644
--- a/spring-cloud-starter-config/pom.xml
+++ b/spring-cloud-starter-config/pom.xml
@@ -32,12 +32,5 @@
 			<groupId>com.fasterxml.jackson.core</groupId>
 			<artifactId>jackson-databind</artifactId>
 		</dependency>
-		<dependency>
-			<groupId>org.projectlombok</groupId>
-			<artifactId>lombok</artifactId>
-			<!-- Only needed at compile time -->
-			<scope>compile</scope>
-			<optional>true</optional>
-		</dependency>
 	</dependencies>
 </project>