diff --git a/src/main/java/com/cisco/gerrit/plugins/slack/PublishEventListener.java b/src/main/java/com/cisco/gerrit/plugins/slack/PublishEventListener.java
index 42faa86..f366d8a 100644
--- a/src/main/java/com/cisco/gerrit/plugins/slack/PublishEventListener.java
+++ b/src/main/java/com/cisco/gerrit/plugins/slack/PublishEventListener.java
@@ -83,7 +83,7 @@
 
         config = new ProjectConfig(configFactory, ALL_PROJECTS);
 
-        messageGenerator = MessageGeneratorFactory.newInstance(event, config);
+        messageGenerator = MessageGeneratorFactory.newInstance(event);
       }
 
       if (messageGenerator.shouldPublish()) {
diff --git a/src/main/java/com/cisco/gerrit/plugins/slack/message/MessageGeneratorFactory.java b/src/main/java/com/cisco/gerrit/plugins/slack/message/MessageGeneratorFactory.java
index 18ae7f6..f4dc367 100644
--- a/src/main/java/com/cisco/gerrit/plugins/slack/message/MessageGeneratorFactory.java
+++ b/src/main/java/com/cisco/gerrit/plugins/slack/message/MessageGeneratorFactory.java
@@ -93,12 +93,11 @@
    * Creates a new MessageGenerator for unsupported events.
    *
    * @param event An Event instance
-   * @param config A ProjectConfig instance for the given event
    * @return A MessageGenerator instance capable of generating a message for an unsupported Event.
    */
-  public static MessageGenerator newInstance(Event event, ProjectConfig config) {
+  public static MessageGenerator newInstance(Event event) {
     UnsupportedMessageGenerator messageGenerator;
-    messageGenerator = new UnsupportedMessageGenerator(event, config);
+    messageGenerator = new UnsupportedMessageGenerator(event);
 
     return messageGenerator;
   }
diff --git a/src/main/java/com/cisco/gerrit/plugins/slack/message/UnsupportedMessageGenerator.java b/src/main/java/com/cisco/gerrit/plugins/slack/message/UnsupportedMessageGenerator.java
index 323c976..714a617 100644
--- a/src/main/java/com/cisco/gerrit/plugins/slack/message/UnsupportedMessageGenerator.java
+++ b/src/main/java/com/cisco/gerrit/plugins/slack/message/UnsupportedMessageGenerator.java
@@ -17,7 +17,6 @@
 
 package com.cisco.gerrit.plugins.slack.message;
 
-import com.cisco.gerrit.plugins.slack.config.ProjectConfig;
 import com.google.gerrit.server.events.Event;
 
 /**
@@ -27,16 +26,14 @@
  * @author Matthew Montgomery
  */
 public class UnsupportedMessageGenerator implements MessageGenerator {
-  private ProjectConfig config;
   private Event event;
 
-  UnsupportedMessageGenerator(Event event, ProjectConfig config) {
+  UnsupportedMessageGenerator(Event event) {
     if (event == null) {
       throw new NullPointerException("event cannot be null");
     }
 
     this.event = event;
-    this.config = config;
   }
 
   @Override
