diff --git a/uc1-application/resources/META-INF/application.properties b/uc1-application/resources/META-INF/application.properties
index 620b1ba0aadb6890c84fb34243dd7ca052f0b791..d2002fd1c8841368d47017b2ce7939bfc42877aa 100644
--- a/uc1-application/resources/META-INF/application.properties
+++ b/uc1-application/resources/META-INF/application.properties
@@ -1,13 +1,3 @@
-cassandra.host=localhost
-cassandra.port=9042
-cassandra.keyspace=titanccp
-cassandra.init.timeout.ms=30000
-
-webserver.enable=true
-webserver.port=8081
-webserver.cors=true
-webserver.gzip=false
-
 kafka.bootstrap.servers=localhost:9092
 kafka.input.topic=input
 kafka.output.topic=output
diff --git a/uc1-application/src/main/java/uc1/application/ConfigurationKeys.java b/uc1-application/src/main/java/uc1/application/ConfigurationKeys.java
index 965881321cc55f8a602ee7292b3e35ddf1ae29d9..27bf70b96364fd58bd8a8df59af6e8f38fcc9b29 100644
--- a/uc1-application/src/main/java/uc1/application/ConfigurationKeys.java
+++ b/uc1-application/src/main/java/uc1/application/ConfigurationKeys.java
@@ -5,34 +5,19 @@ package uc1.application;
  */
 public final class ConfigurationKeys {
 
-  public static final String CASSANDRA_HOST = "cassandra.host";
+	public static final String KAFKA_BOOTSTRAP_SERVERS = "kafka.bootstrap.servers";
 
-  public static final String CASSANDRA_PORT = "cassandra.port";
+	public static final String KAFKA_OUTPUT_TOPIC = "kafka.output.topic";
 
-  public static final String CASSANDRA_KEYSPACE = "cassandra.keyspace";
+	public static final String KAFKA_INPUT_TOPIC = "kafka.input.topic";
 
-  public static final String CASSANDRA_INIT_TIMEOUT_MS = "cassandra.init.timeout.ms";
+	public static final String NUM_THREADS = "num.threads";
 
-  public static final String WEBSERVER_ENABLE = "webserver.enable";
+	public static final String COMMIT_INTERVAL_MS = "commit.interval.ms";
 
-  public static final String WEBSERVER_PORT = "webserver.port";
+	public static final String CACHE_MAX_BYTES_BUFFERING = "cache.max.bytes.buffering";
 
-  public static final String WEBSERVER_CORS = "webserver.cors";
-
-  public static final String WEBSERVER_GZIP = "webserver.gzip";
-
-  public static final String KAFKA_BOOTSTRAP_SERVERS = "kafka.bootstrap.servers";
-
-  public static final String KAFKA_OUTPUT_TOPIC = "kafka.output.topic";
-
-  public static final String KAFKA_INPUT_TOPIC = "kafka.input.topic";
-
-  public static final String NUM_THREADS = "num.threads";
-
-  public static final String COMMIT_INTERVAL_MS = "commit.interval.ms";
-
-  public static final String CACHE_MAX_BYTES_BUFFERING = "cache.max.bytes.buffering";
-
-  private ConfigurationKeys() {}
+	private ConfigurationKeys() {
+	}
 
 }