Index: /trunk/EventBenchCore/src/de/ugoe/cs/eventbench/data/ReplayableEvent.java
===================================================================
--- /trunk/EventBenchCore/src/de/ugoe/cs/eventbench/data/ReplayableEvent.java	(revision 404)
+++ /trunk/EventBenchCore/src/de/ugoe/cs/eventbench/data/ReplayableEvent.java	(revision 405)
@@ -160,31 +160,4 @@
 		this.decorator = decorator;
 	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see de.ugoe.cs.eventbench.data.Event#equals(java.lang.Object)
-	 */
-	@Override
-	public boolean equals(Object other) {
-		if (this == other) {
-			return true;
-		}
-		if (other instanceof ReplayableEvent<?>) {
-			ReplayableEvent<?> otherEvent = (ReplayableEvent<?>) other;
-			if (replayEvents != null) {
-				return super.equals(otherEvent)
-						&& replayEvents.equals(otherEvent.replayEvents)
-						&& replayValid == otherEvent.replayValid;
-			} else {
-				return super.equals(otherEvent)
-						&& otherEvent.replayEvents == null
-						&& replayValid == otherEvent.replayValid;
-			}
-
-		} else {
-			return false;
-		}
-	}
 	
 	@Override
@@ -192,20 +165,3 @@
 		return (other instanceof ReplayableEvent<?>);
 	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see de.ugoe.cs.eventbench.data.Event#hashCode()
-	 */
-	@Override
-	public int hashCode() {
-		int multiplier = 17;
-		int hash = super.hashCode();
-		if (replayEvents != null) {
-			hash = multiplier * hash + replayEvents.hashCode();
-		}
-		hash = multiplier * hash + (replayValid ? 1 : 0);
-
-		return hash;
-	}
 }