diff --git a/flink-staging/flink-streaming/flink-streaming-examples/src/main/java/org/apache/flink/streaming/examples/windowing/StockPrices.java b/flink-staging/flink-streaming/flink-streaming-examples/src/main/java/org/apache/flink/streaming/examples/windowing/StockPrices.java
index 4fba8986df576a090258c8082b699f5b467d1004..ab29d3c3f605539ac828c6dbc5ff2b58fd6c8f62 100644
--- a/flink-staging/flink-streaming/flink-streaming-examples/src/main/java/org/apache/flink/streaming/examples/windowing/StockPrices.java
+++ b/flink-staging/flink-streaming/flink-streaming-examples/src/main/java/org/apache/flink/streaming/examples/windowing/StockPrices.java
@@ -17,7 +17,6 @@
 
 package org.apache.flink.streaming.examples.windowing;
 
-import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Random;
@@ -204,7 +203,7 @@ public class StockPrices {
 	// DATA TYPES
 	// *************************************************************************
 
-	public static class StockPrice implements Serializable {
+	public static class StockPrice {
 
 		private static final long serialVersionUID = 1L;
 		public String symbol;
@@ -227,7 +226,7 @@ public class StockPrices {
 		}
 	}
 
-	public static class Count implements Serializable {
+	public static class Count {
 		
 		private static final long serialVersionUID = 1L;
 		public String symbol;
diff --git a/flink-staging/flink-streaming/flink-streaming-examples/src/main/scala/org/apache/flink/streaming/scala/examples/windowing/TopSpeedWindowing.scala b/flink-staging/flink-streaming/flink-streaming-examples/src/main/scala/org/apache/flink/streaming/scala/examples/windowing/TopSpeedWindowing.scala
index 76f4d2d408bbd17938218bc70318d72b2d97e8c9..9102ed77a1f838c4275ff6aced30d0166e4e7729 100644
--- a/flink-staging/flink-streaming/flink-streaming-examples/src/main/scala/org/apache/flink/streaming/scala/examples/windowing/TopSpeedWindowing.scala
+++ b/flink-staging/flink-streaming/flink-streaming-examples/src/main/scala/org/apache/flink/streaming/scala/examples/windowing/TopSpeedWindowing.scala
@@ -38,7 +38,7 @@ import scala.util.Random
  */
 object TopSpeedWindowing {
 
-  case class CarEvent(carId: Int, speed: Int, distance: Double, time: Long) extends Serializable
+  case class CarEvent(carId: Int, speed: Int, distance: Double, time: Long)
 
   def main(args: Array[String]) {
     if (!parseParameters(args)) {