diff --git a/benchmark/src/main/java/com/datatorrent/benchmark/CouchBaseInputOperator.java b/benchmark/src/main/java/com/datatorrent/benchmark/CouchBaseInputOperator.java
index 8ab7d4b..5a904ff 100644
--- a/benchmark/src/main/java/com/datatorrent/benchmark/CouchBaseInputOperator.java
+++ b/benchmark/src/main/java/com/datatorrent/benchmark/CouchBaseInputOperator.java
@@ -15,7 +15,6 @@
  */
 package com.datatorrent.benchmark;
 
-import com.datatorrent.common.util.DTThrowable;
 import com.datatorrent.contrib.couchbase.AbstractCouchBaseInputOperator;
 import com.datatorrent.contrib.couchbase.CouchBaseWindowStore;
 import java.util.ArrayList;
diff --git a/benchmark/src/test/java/com/datatorrent/benchmark/testbench/FilterClassifierAppTest.java b/benchmark/src/test/java/com/datatorrent/benchmark/testbench/FilterClassifierAppTest.java
index 801d820..dd6fd51 100644
--- a/benchmark/src/test/java/com/datatorrent/benchmark/testbench/FilterClassifierAppTest.java
+++ b/benchmark/src/test/java/com/datatorrent/benchmark/testbench/FilterClassifierAppTest.java
@@ -16,8 +16,6 @@
 package com.datatorrent.benchmark.testbench;
 
 import com.datatorrent.api.LocalMode;
-import com.datatorrent.benchmark.testbench.EventClassifierApp;
-import com.datatorrent.benchmark.testbench.EventClassifierNumberToHashDoubleAppTest;
 import java.io.InputStream;
 import org.apache.hadoop.conf.Configuration;
 import org.junit.Test;
diff --git a/contrib/src/main/java/com/datatorrent/contrib/aerospike/AbstractAerospikeGetOperator.java b/contrib/src/main/java/com/datatorrent/contrib/aerospike/AbstractAerospikeGetOperator.java
index 0c812d3..85e1136 100644
--- a/contrib/src/main/java/com/datatorrent/contrib/aerospike/AbstractAerospikeGetOperator.java
+++ b/contrib/src/main/java/com/datatorrent/contrib/aerospike/AbstractAerospikeGetOperator.java
@@ -21,7 +21,6 @@
 import com.aerospike.client.query.RecordSet;
 import com.aerospike.client.query.Statement;
 import com.datatorrent.api.DefaultOutputPort;
-import com.datatorrent.api.annotation.OutputPortFieldAnnotation;
 import com.datatorrent.common.util.DTThrowable;
 import com.datatorrent.lib.db.AbstractStoreInputOperator;
 import org.slf4j.Logger;
diff --git a/contrib/src/main/java/com/datatorrent/contrib/apachelog/ApacheLogInputGenerator.java b/contrib/src/main/java/com/datatorrent/contrib/apachelog/ApacheLogInputGenerator.java
index 0d69446..df9b5cf 100644
--- a/contrib/src/main/java/com/datatorrent/contrib/apachelog/ApacheLogInputGenerator.java
+++ b/contrib/src/main/java/com/datatorrent/contrib/apachelog/ApacheLogInputGenerator.java
@@ -22,7 +22,6 @@
 import java.util.*;
 import java.util.concurrent.ArrayBlockingQueue;
 import javax.validation.constraints.NotNull;
-import org.apache.commons.io.FileUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/contrib/src/main/java/com/datatorrent/contrib/cassandra/AbstractCassandraInputOperator.java b/contrib/src/main/java/com/datatorrent/contrib/cassandra/AbstractCassandraInputOperator.java
index 5fe822d..86b6782 100644
--- a/contrib/src/main/java/com/datatorrent/contrib/cassandra/AbstractCassandraInputOperator.java
+++ b/contrib/src/main/java/com/datatorrent/contrib/cassandra/AbstractCassandraInputOperator.java
@@ -24,7 +24,6 @@
 import com.datastax.driver.core.Row;
 
 import com.datatorrent.api.DefaultOutputPort;
-import com.datatorrent.api.annotation.OutputPortFieldAnnotation;
 
 import com.datatorrent.common.util.DTThrowable;
 import com.datatorrent.lib.db.AbstractStoreInputOperator;
diff --git a/contrib/src/main/java/com/datatorrent/contrib/hbase/AbstractHBaseWindowPutOutputOperator.java b/contrib/src/main/java/com/datatorrent/contrib/hbase/AbstractHBaseWindowPutOutputOperator.java
index 068abc8..dde69dc 100644
--- a/contrib/src/main/java/com/datatorrent/contrib/hbase/AbstractHBaseWindowPutOutputOperator.java
+++ b/contrib/src/main/java/com/datatorrent/contrib/hbase/AbstractHBaseWindowPutOutputOperator.java
@@ -21,7 +21,6 @@
 import java.util.Iterator;
 import java.util.List;
 
-import javax.management.RuntimeErrorException;
 
 import org.apache.hadoop.hbase.client.HTable;
 import org.apache.hadoop.hbase.client.Put;
diff --git a/contrib/src/main/java/com/datatorrent/contrib/hbase/HBaseGetOperator.java b/contrib/src/main/java/com/datatorrent/contrib/hbase/HBaseGetOperator.java
index e53f431..247cc05 100644
--- a/contrib/src/main/java/com/datatorrent/contrib/hbase/HBaseGetOperator.java
+++ b/contrib/src/main/java/com/datatorrent/contrib/hbase/HBaseGetOperator.java
@@ -17,7 +17,6 @@
 
 import org.apache.hadoop.hbase.KeyValue;
 import org.apache.hadoop.hbase.client.Get;
-import org.apache.hadoop.hbase.client.HTable;
 import org.apache.hadoop.hbase.client.Result;
 
 /**
diff --git a/contrib/src/main/java/com/datatorrent/contrib/hbase/HBaseInputOperator.java b/contrib/src/main/java/com/datatorrent/contrib/hbase/HBaseInputOperator.java
index 98e0ba0..c4f57d4 100644
--- a/contrib/src/main/java/com/datatorrent/contrib/hbase/HBaseInputOperator.java
+++ b/contrib/src/main/java/com/datatorrent/contrib/hbase/HBaseInputOperator.java
@@ -15,7 +15,6 @@
  */
 package com.datatorrent.contrib.hbase;
 
-import com.datatorrent.api.annotation.OutputPortFieldAnnotation;
 import com.datatorrent.api.Context.OperatorContext;
 import com.datatorrent.api.DefaultOutputPort;
 import com.datatorrent.api.InputOperator;
diff --git a/contrib/src/main/java/com/datatorrent/contrib/hbase/HBaseOutputOperator.java b/contrib/src/main/java/com/datatorrent/contrib/hbase/HBaseOutputOperator.java
index e3494bc..8638ea6 100644
--- a/contrib/src/main/java/com/datatorrent/contrib/hbase/HBaseOutputOperator.java
+++ b/contrib/src/main/java/com/datatorrent/contrib/hbase/HBaseOutputOperator.java
@@ -19,7 +19,6 @@
 import com.datatorrent.api.DAG;
 import com.datatorrent.api.DefaultInputPort;
 import com.datatorrent.api.Operator;
-import com.datatorrent.api.annotation.InputPortFieldAnnotation;
 import org.apache.hadoop.hbase.util.Bytes;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/contrib/src/main/java/com/datatorrent/contrib/kafka/AbstractKafkaSinglePortInputOperator.java b/contrib/src/main/java/com/datatorrent/contrib/kafka/AbstractKafkaSinglePortInputOperator.java
index 3125768..f1cf33c 100644
--- a/contrib/src/main/java/com/datatorrent/contrib/kafka/AbstractKafkaSinglePortInputOperator.java
+++ b/contrib/src/main/java/com/datatorrent/contrib/kafka/AbstractKafkaSinglePortInputOperator.java
@@ -15,7 +15,6 @@
  */
 package com.datatorrent.contrib.kafka;
 
-import com.datatorrent.api.annotation.OutputPortFieldAnnotation;
 import com.datatorrent.api.DefaultOutputPort;
 
 import kafka.message.Message;
diff --git a/contrib/src/main/java/com/datatorrent/contrib/kafka/KafkaSinglePortOutputOperator.java b/contrib/src/main/java/com/datatorrent/contrib/kafka/KafkaSinglePortOutputOperator.java
index 312988b..5201772 100644
--- a/contrib/src/main/java/com/datatorrent/contrib/kafka/KafkaSinglePortOutputOperator.java
+++ b/contrib/src/main/java/com/datatorrent/contrib/kafka/KafkaSinglePortOutputOperator.java
@@ -15,7 +15,6 @@
  */
 package com.datatorrent.contrib.kafka;
 
-import com.datatorrent.api.annotation.InputPortFieldAnnotation;
 import com.datatorrent.api.DefaultInputPort;
 import kafka.producer.KeyedMessage;
 
diff --git a/contrib/src/main/java/com/datatorrent/contrib/mongodb/MongoDBInputOperator.java b/contrib/src/main/java/com/datatorrent/contrib/mongodb/MongoDBInputOperator.java
index 93b3fe2..27e6ebb 100644
--- a/contrib/src/main/java/com/datatorrent/contrib/mongodb/MongoDBInputOperator.java
+++ b/contrib/src/main/java/com/datatorrent/contrib/mongodb/MongoDBInputOperator.java
@@ -15,7 +15,6 @@
  */
 package com.datatorrent.contrib.mongodb;
 
-import com.datatorrent.api.annotation.OutputPortFieldAnnotation;
 import com.datatorrent.api.Context.OperatorContext;
 import com.datatorrent.api.DefaultOutputPort;
 import com.datatorrent.api.InputOperator;
diff --git a/contrib/src/main/java/com/datatorrent/contrib/mongodb/MongoDBOutputOperator.java b/contrib/src/main/java/com/datatorrent/contrib/mongodb/MongoDBOutputOperator.java
index 33ece40..75306a4 100644
--- a/contrib/src/main/java/com/datatorrent/contrib/mongodb/MongoDBOutputOperator.java
+++ b/contrib/src/main/java/com/datatorrent/contrib/mongodb/MongoDBOutputOperator.java
@@ -15,7 +15,6 @@
  */
 package com.datatorrent.contrib.mongodb;
 
-import com.datatorrent.api.annotation.InputPortFieldAnnotation;
 import com.datatorrent.api.Context.OperatorContext;
 import com.datatorrent.api.DefaultInputPort;
 import com.datatorrent.api.Operator;
diff --git a/contrib/src/main/java/com/datatorrent/contrib/mqtt/AbstractSinglePortMqttInputOperator.java b/contrib/src/main/java/com/datatorrent/contrib/mqtt/AbstractSinglePortMqttInputOperator.java
index b33d42e..096d910 100644
--- a/contrib/src/main/java/com/datatorrent/contrib/mqtt/AbstractSinglePortMqttInputOperator.java
+++ b/contrib/src/main/java/com/datatorrent/contrib/mqtt/AbstractSinglePortMqttInputOperator.java
@@ -16,7 +16,6 @@
 package com.datatorrent.contrib.mqtt;
 
 import com.datatorrent.api.DefaultOutputPort;
-import com.datatorrent.api.annotation.OutputPortFieldAnnotation;
 import org.fusesource.mqtt.client.Message;
 
 /**
diff --git a/contrib/src/main/java/com/datatorrent/contrib/mqtt/AbstractSinglePortMqttOutputOperator.java b/contrib/src/main/java/com/datatorrent/contrib/mqtt/AbstractSinglePortMqttOutputOperator.java
index cd1114c..5a213da 100644
--- a/contrib/src/main/java/com/datatorrent/contrib/mqtt/AbstractSinglePortMqttOutputOperator.java
+++ b/contrib/src/main/java/com/datatorrent/contrib/mqtt/AbstractSinglePortMqttOutputOperator.java
@@ -16,7 +16,6 @@
 package com.datatorrent.contrib.mqtt;
 
 import com.datatorrent.api.DefaultInputPort;
-import com.datatorrent.api.annotation.InputPortFieldAnnotation;
 
 /**
  * This is the base implementation for a single port MQTT output operator.&nbsp;
diff --git a/contrib/src/main/java/com/datatorrent/contrib/rabbitmq/AbstractSinglePortRabbitMQInputOperator.java b/contrib/src/main/java/com/datatorrent/contrib/rabbitmq/AbstractSinglePortRabbitMQInputOperator.java
index e7691cf..d7a46f5 100644
--- a/contrib/src/main/java/com/datatorrent/contrib/rabbitmq/AbstractSinglePortRabbitMQInputOperator.java
+++ b/contrib/src/main/java/com/datatorrent/contrib/rabbitmq/AbstractSinglePortRabbitMQInputOperator.java
@@ -15,7 +15,6 @@
  */
 package com.datatorrent.contrib.rabbitmq;
 
-import com.datatorrent.api.annotation.OutputPortFieldAnnotation;
 import com.datatorrent.api.DefaultOutputPort;
 
 /**
diff --git a/contrib/src/main/java/com/datatorrent/contrib/splunk/AbstractSplunkInputOperator.java b/contrib/src/main/java/com/datatorrent/contrib/splunk/AbstractSplunkInputOperator.java
index b5630b7..8fa79a7 100644
--- a/contrib/src/main/java/com/datatorrent/contrib/splunk/AbstractSplunkInputOperator.java
+++ b/contrib/src/main/java/com/datatorrent/contrib/splunk/AbstractSplunkInputOperator.java
@@ -22,7 +22,6 @@
 import org.slf4j.LoggerFactory;
 import com.datatorrent.api.DefaultOutputPort;
 import com.datatorrent.api.Context.OperatorContext;
-import com.datatorrent.api.annotation.OutputPortFieldAnnotation;
 
 import com.datatorrent.lib.db.AbstractStoreInputOperator;
 
diff --git a/contrib/src/main/java/com/datatorrent/contrib/zmq/AbstractSinglePortZeroMQInputOperator.java b/contrib/src/main/java/com/datatorrent/contrib/zmq/AbstractSinglePortZeroMQInputOperator.java
index fc2cc6e..817f681 100644
--- a/contrib/src/main/java/com/datatorrent/contrib/zmq/AbstractSinglePortZeroMQInputOperator.java
+++ b/contrib/src/main/java/com/datatorrent/contrib/zmq/AbstractSinglePortZeroMQInputOperator.java
@@ -15,7 +15,6 @@
  */
 package com.datatorrent.contrib.zmq;
 
-import com.datatorrent.api.annotation.OutputPortFieldAnnotation;
 import com.datatorrent.api.DefaultOutputPort;
 
 /**
diff --git a/contrib/src/test/java/com/datatorrent/contrib/accumulo/AccumuloRowTupleGenerator.java b/contrib/src/test/java/com/datatorrent/contrib/accumulo/AccumuloRowTupleGenerator.java
index 720884e..2980df5 100644
--- a/contrib/src/test/java/com/datatorrent/contrib/accumulo/AccumuloRowTupleGenerator.java
+++ b/contrib/src/test/java/com/datatorrent/contrib/accumulo/AccumuloRowTupleGenerator.java
@@ -19,7 +19,6 @@
 import com.datatorrent.api.Context.OperatorContext;
 import com.datatorrent.api.DefaultOutputPort;
 import com.datatorrent.api.InputOperator;
-import com.datatorrent.api.annotation.OutputPortFieldAnnotation;
 
 /**
  *
diff --git a/contrib/src/test/java/com/datatorrent/contrib/hbase/HBaseColTupleGenerator.java b/contrib/src/test/java/com/datatorrent/contrib/hbase/HBaseColTupleGenerator.java
index 4707afc..73a96d8 100644
--- a/contrib/src/test/java/com/datatorrent/contrib/hbase/HBaseColTupleGenerator.java
+++ b/contrib/src/test/java/com/datatorrent/contrib/hbase/HBaseColTupleGenerator.java
@@ -15,7 +15,6 @@
  */
 package com.datatorrent.contrib.hbase;
 
-import com.datatorrent.api.annotation.OutputPortFieldAnnotation;
 import com.datatorrent.api.BaseOperator;
 import com.datatorrent.api.Context.OperatorContext;
 import com.datatorrent.api.DefaultOutputPort;
diff --git a/contrib/src/test/java/com/datatorrent/contrib/hbase/HBaseRowStringGenerator.java b/contrib/src/test/java/com/datatorrent/contrib/hbase/HBaseRowStringGenerator.java
index 2e8b1df..7149ac3 100644
--- a/contrib/src/test/java/com/datatorrent/contrib/hbase/HBaseRowStringGenerator.java
+++ b/contrib/src/test/java/com/datatorrent/contrib/hbase/HBaseRowStringGenerator.java
@@ -15,8 +15,6 @@
  */
 package com.datatorrent.contrib.hbase;
 
-import com.datatorrent.lib.io.SimpleSinglePortInputOperator;
-import com.datatorrent.api.annotation.OutputPortFieldAnnotation;
 import com.datatorrent.api.BaseOperator;
 import com.datatorrent.api.Context.OperatorContext;
 import com.datatorrent.api.DefaultOutputPort;
diff --git a/contrib/src/test/java/com/datatorrent/contrib/hbase/HBaseRowTupleGenerator.java b/contrib/src/test/java/com/datatorrent/contrib/hbase/HBaseRowTupleGenerator.java
index 7fd28d3..8adca58 100644
--- a/contrib/src/test/java/com/datatorrent/contrib/hbase/HBaseRowTupleGenerator.java
+++ b/contrib/src/test/java/com/datatorrent/contrib/hbase/HBaseRowTupleGenerator.java
@@ -15,8 +15,6 @@
  */
 package com.datatorrent.contrib.hbase;
 
-import com.datatorrent.lib.io.SimpleSinglePortInputOperator;
-import com.datatorrent.api.annotation.OutputPortFieldAnnotation;
 import com.datatorrent.api.BaseOperator;
 import com.datatorrent.api.Context.OperatorContext;
 import com.datatorrent.api.DefaultOutputPort;
diff --git a/contrib/src/test/java/com/datatorrent/contrib/hdht/WALTest.java b/contrib/src/test/java/com/datatorrent/contrib/hdht/WALTest.java
index b23a373..cbb86c8 100644
--- a/contrib/src/test/java/com/datatorrent/contrib/hdht/WALTest.java
+++ b/contrib/src/test/java/com/datatorrent/contrib/hdht/WALTest.java
@@ -23,8 +23,6 @@
 import com.datatorrent.contrib.hdht.MutableKeyValue;
 import com.datatorrent.lib.util.TestUtils;
 import com.esotericsoftware.kryo.Kryo;
-import com.esotericsoftware.kryo.io.ByteBufferInput;
-import com.esotericsoftware.kryo.io.ByteBufferOutput;
 import com.google.common.util.concurrent.MoreExecutors;
 
 import org.junit.Assert;
diff --git a/contrib/src/test/java/org/apache/hadoop/io/file/tfile/TestDTFile.java b/contrib/src/test/java/org/apache/hadoop/io/file/tfile/TestDTFile.java
index 966a39c..94ba05f 100644
--- a/contrib/src/test/java/org/apache/hadoop/io/file/tfile/TestDTFile.java
+++ b/contrib/src/test/java/org/apache/hadoop/io/file/tfile/TestDTFile.java
@@ -32,7 +32,6 @@
 import org.apache.hadoop.io.file.tfile.DTFile.Reader;
 import org.apache.hadoop.io.file.tfile.DTFile.Writer;
 import org.apache.hadoop.io.file.tfile.DTFile.Reader.Scanner;
-import org.junit.Ignore;
 
 /**
  * test tfile features.
diff --git a/demos/dimensions/src/main/java/com/datatorrent/demos/dimensions/benchmark/HDHTBenchmarkApplication.java b/demos/dimensions/src/main/java/com/datatorrent/demos/dimensions/benchmark/HDHTBenchmarkApplication.java
index 0f8af85..762aba3 100644
--- a/demos/dimensions/src/main/java/com/datatorrent/demos/dimensions/benchmark/HDHTBenchmarkApplication.java
+++ b/demos/dimensions/src/main/java/com/datatorrent/demos/dimensions/benchmark/HDHTBenchmarkApplication.java
@@ -23,7 +23,6 @@
 import com.datatorrent.contrib.hdht.tfile.TFileImpl;
 
 import org.apache.hadoop.conf.Configuration;
-import org.apache.hadoop.io.file.tfile.DTFile;
 
 /**
  * HDHTBenchmarkApplication
diff --git a/demos/dimensions/src/main/java/com/datatorrent/demos/dimensions/generic/JsonAdInfoGenerator.java b/demos/dimensions/src/main/java/com/datatorrent/demos/dimensions/generic/JsonAdInfoGenerator.java
index ec2a7ba..80b275c 100644
--- a/demos/dimensions/src/main/java/com/datatorrent/demos/dimensions/generic/JsonAdInfoGenerator.java
+++ b/demos/dimensions/src/main/java/com/datatorrent/demos/dimensions/generic/JsonAdInfoGenerator.java
@@ -16,7 +16,6 @@
 package com.datatorrent.demos.dimensions.generic;
 
 import com.datatorrent.api.DefaultOutputPort;
-import com.datatorrent.api.annotation.OutputPortFieldAnnotation;
 import com.datatorrent.demos.dimensions.ads.AdInfo;
 import com.datatorrent.demos.dimensions.ads.InputItemGenerator;
 import org.codehaus.jackson.map.ObjectMapper;
diff --git a/demos/dimensions/src/main/java/com/datatorrent/demos/dimensions/generic/JsonSalesGenerator.java b/demos/dimensions/src/main/java/com/datatorrent/demos/dimensions/generic/JsonSalesGenerator.java
index 78c62d2..06b3027 100644
--- a/demos/dimensions/src/main/java/com/datatorrent/demos/dimensions/generic/JsonSalesGenerator.java
+++ b/demos/dimensions/src/main/java/com/datatorrent/demos/dimensions/generic/JsonSalesGenerator.java
@@ -18,16 +18,13 @@
 import com.datatorrent.api.Context;
 import com.datatorrent.api.DefaultOutputPort;
 import com.datatorrent.api.InputOperator;
-import com.datatorrent.api.annotation.OutputPortFieldAnnotation;
 import com.google.common.collect.Maps;
 import org.codehaus.jackson.map.ObjectMapper;
 import org.codehaus.jackson.map.annotate.JsonSerialize;
 
 import javax.validation.constraints.Min;
 import java.util.Map;
-import java.util.NavigableMap;
 import java.util.Random;
-import java.util.TreeMap;
 
 /**
  * Generates sales events data and sends them out as JSON encoded byte arrays.
diff --git a/demos/dimensions/src/main/java/com/datatorrent/demos/dimensions/generic/JsonToMapConverter.java b/demos/dimensions/src/main/java/com/datatorrent/demos/dimensions/generic/JsonToMapConverter.java
index 7b308dc..79bba79 100644
--- a/demos/dimensions/src/main/java/com/datatorrent/demos/dimensions/generic/JsonToMapConverter.java
+++ b/demos/dimensions/src/main/java/com/datatorrent/demos/dimensions/generic/JsonToMapConverter.java
@@ -19,8 +19,6 @@
 import com.datatorrent.api.BaseOperator;
 import com.datatorrent.api.DefaultInputPort;
 import com.datatorrent.api.DefaultOutputPort;
-import com.datatorrent.api.annotation.InputPortFieldAnnotation;
-import com.datatorrent.api.annotation.OutputPortFieldAnnotation;
 import com.datatorrent.api.annotation.Stateless;
 import com.datatorrent.common.util.DTThrowable;
 import org.codehaus.jackson.map.ObjectMapper;
diff --git a/demos/frauddetect/src/main/java/com/datatorrent/demos/frauddetect/BankIdNumberKey.java b/demos/frauddetect/src/main/java/com/datatorrent/demos/frauddetect/BankIdNumberKey.java
index a67e6bb..995f0c2 100644
--- a/demos/frauddetect/src/main/java/com/datatorrent/demos/frauddetect/BankIdNumberKey.java
+++ b/demos/frauddetect/src/main/java/com/datatorrent/demos/frauddetect/BankIdNumberKey.java
@@ -18,7 +18,6 @@
 import com.datatorrent.lib.util.TimeBucketKey;
 
 import java.io.Serializable;
-import java.util.Calendar;
 
 /**
  * Bank Id Number Key
diff --git a/demos/frauddetect/src/main/java/com/datatorrent/demos/frauddetect/MerchantKey.java b/demos/frauddetect/src/main/java/com/datatorrent/demos/frauddetect/MerchantKey.java
index 18f2c03..f3b2cea 100644
--- a/demos/frauddetect/src/main/java/com/datatorrent/demos/frauddetect/MerchantKey.java
+++ b/demos/frauddetect/src/main/java/com/datatorrent/demos/frauddetect/MerchantKey.java
@@ -15,10 +15,8 @@
  */
 package com.datatorrent.demos.frauddetect;
 
-import com.datatorrent.lib.util.TimeBucketKey;
 
 import java.io.Serializable;
-import java.util.Calendar;
 
 /**
  * A time-based key for merchant data.
diff --git a/demos/frauddetect/src/main/java/com/datatorrent/demos/frauddetect/MerchantTransactionBucketOperator.java b/demos/frauddetect/src/main/java/com/datatorrent/demos/frauddetect/MerchantTransactionBucketOperator.java
index a0a6c07..0c22386 100644
--- a/demos/frauddetect/src/main/java/com/datatorrent/demos/frauddetect/MerchantTransactionBucketOperator.java
+++ b/demos/frauddetect/src/main/java/com/datatorrent/demos/frauddetect/MerchantTransactionBucketOperator.java
@@ -19,12 +19,10 @@
 import com.datatorrent.api.DefaultInputPort;
 import com.datatorrent.api.DefaultOutputPort;
 import com.datatorrent.lib.util.KeyValPair;
-import com.datatorrent.lib.util.TimeBucketKey;
 import java.text.DecimalFormat;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.util.Calendar;
 import java.util.HashMap;
 import java.util.Map;
 import org.apache.commons.lang.mutable.MutableDouble;
diff --git a/demos/machinedata/src/main/java/com/datatorrent/demos/machinedata/Application.java b/demos/machinedata/src/main/java/com/datatorrent/demos/machinedata/Application.java
index 71988b7..302e703 100644
--- a/demos/machinedata/src/main/java/com/datatorrent/demos/machinedata/Application.java
+++ b/demos/machinedata/src/main/java/com/datatorrent/demos/machinedata/Application.java
@@ -15,24 +15,14 @@
  */
 package com.datatorrent.demos.machinedata;
 
-import com.datatorrent.api.Context;
-import com.datatorrent.api.Context.OperatorContext;
-import com.datatorrent.api.Context.PortContext;
 import com.datatorrent.api.DAG;
-import com.datatorrent.api.DAG.Locality;
-import com.datatorrent.api.Operator.InputPort;
-import com.datatorrent.api.Operator.OutputPort;
 import com.datatorrent.api.StreamingApplication;
 import com.datatorrent.api.annotation.ApplicationAnnotation;
 
 import com.datatorrent.demos.machinedata.data.MachineKey;
-import com.datatorrent.demos.machinedata.operator.CalculatorOperator;
 import com.datatorrent.demos.machinedata.operator.MachineInfoAveragingOperator;
 import com.datatorrent.demos.machinedata.operator.MachineInfoAveragingPrerequisitesOperator;
 import com.datatorrent.contrib.redis.RedisKeyValPairOutputOperator;
-import com.datatorrent.contrib.redis.RedisMapOutputOperator;
-import com.datatorrent.contrib.redis.RedisStore;
-import com.datatorrent.lib.io.ConsoleOutputOperator;
 import com.datatorrent.lib.io.SmtpOutputOperator;
 
 import java.util.Map;
diff --git a/demos/machinedata/src/main/java/com/datatorrent/demos/machinedata/DimensionGenerator.java b/demos/machinedata/src/main/java/com/datatorrent/demos/machinedata/DimensionGenerator.java
index 0a86935..ba81768 100644
--- a/demos/machinedata/src/main/java/com/datatorrent/demos/machinedata/DimensionGenerator.java
+++ b/demos/machinedata/src/main/java/com/datatorrent/demos/machinedata/DimensionGenerator.java
@@ -19,10 +19,8 @@
 import com.datatorrent.api.Context;
 import com.datatorrent.api.DefaultInputPort;
 import com.datatorrent.api.DefaultOutputPort;
-import com.datatorrent.api.InputOperator;
 import com.datatorrent.demos.machinedata.data.MachineInfo;
 import com.datatorrent.demos.machinedata.data.MachineKey;
-import com.datatorrent.lib.util.KeyValPair;
 
 import java.util.*;
 
diff --git a/demos/machinedata/src/main/java/com/datatorrent/demos/machinedata/InputReceiver.java b/demos/machinedata/src/main/java/com/datatorrent/demos/machinedata/InputReceiver.java
index 3376213..734eece 100644
--- a/demos/machinedata/src/main/java/com/datatorrent/demos/machinedata/InputReceiver.java
+++ b/demos/machinedata/src/main/java/com/datatorrent/demos/machinedata/InputReceiver.java
@@ -21,7 +21,6 @@
 import com.datatorrent.api.InputOperator;
 import com.datatorrent.demos.machinedata.data.MachineInfo;
 import com.datatorrent.demos.machinedata.data.MachineKey;
-import com.datatorrent.lib.util.KeyValPair;
 
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
diff --git a/demos/machinedata/src/main/java/com/datatorrent/demos/machinedata/operator/MachineInfoAveragingOperator.java b/demos/machinedata/src/main/java/com/datatorrent/demos/machinedata/operator/MachineInfoAveragingOperator.java
index d4385f2..e79040d 100644
--- a/demos/machinedata/src/main/java/com/datatorrent/demos/machinedata/operator/MachineInfoAveragingOperator.java
+++ b/demos/machinedata/src/main/java/com/datatorrent/demos/machinedata/operator/MachineInfoAveragingOperator.java
@@ -22,7 +22,6 @@
 import com.datatorrent.demos.machinedata.data.MachineInfo;
 import com.datatorrent.demos.machinedata.data.MachineKey;
 import com.datatorrent.demos.machinedata.data.AverageData;
-import com.datatorrent.demos.machinedata.data.ResourceType;
 import com.datatorrent.lib.util.KeyHashValPair;
 import com.datatorrent.lib.util.KeyValPair;
 
diff --git a/demos/machinedata/src/main/java/com/datatorrent/demos/machinedata/operator/MachineInfoAveragingPrerequisitesOperator.java b/demos/machinedata/src/main/java/com/datatorrent/demos/machinedata/operator/MachineInfoAveragingPrerequisitesOperator.java
index e6ef490..26cadd3 100644
--- a/demos/machinedata/src/main/java/com/datatorrent/demos/machinedata/operator/MachineInfoAveragingPrerequisitesOperator.java
+++ b/demos/machinedata/src/main/java/com/datatorrent/demos/machinedata/operator/MachineInfoAveragingPrerequisitesOperator.java
@@ -22,11 +22,8 @@
 import com.datatorrent.demos.machinedata.data.MachineKey;
 import com.datatorrent.demos.machinedata.data.MachineInfo;
 import com.datatorrent.demos.machinedata.data.AverageData;
-import com.datatorrent.lib.math.Average;
 import com.datatorrent.lib.util.KeyHashValPair;
 
-import org.apache.commons.lang.mutable.MutableDouble;
-import org.apache.commons.lang.mutable.MutableLong;
 
 import java.util.HashMap;
 import java.util.Map;
diff --git a/demos/mobile/src/main/java/com/datatorrent/demos/mobile/PhoneEntryOperator.java b/demos/mobile/src/main/java/com/datatorrent/demos/mobile/PhoneEntryOperator.java
index d603664..82f7861 100644
--- a/demos/mobile/src/main/java/com/datatorrent/demos/mobile/PhoneEntryOperator.java
+++ b/demos/mobile/src/main/java/com/datatorrent/demos/mobile/PhoneEntryOperator.java
@@ -4,7 +4,6 @@
 import com.datatorrent.api.DefaultInputPort;
 import com.datatorrent.api.DefaultOutputPort;
 import com.datatorrent.api.annotation.InputPortFieldAnnotation;
-import com.datatorrent.api.annotation.OutputPortFieldAnnotation;
 import com.google.common.collect.Maps;
 import com.google.common.collect.Range;
 import org.slf4j.Logger;
diff --git a/demos/mobile/src/main/java/com/datatorrent/demos/mobile/PhoneMovementGenerator.java b/demos/mobile/src/main/java/com/datatorrent/demos/mobile/PhoneMovementGenerator.java
index c9208b8..ad409bc 100644
--- a/demos/mobile/src/main/java/com/datatorrent/demos/mobile/PhoneMovementGenerator.java
+++ b/demos/mobile/src/main/java/com/datatorrent/demos/mobile/PhoneMovementGenerator.java
@@ -35,7 +35,6 @@
 import com.datatorrent.api.DefaultInputPort;
 import com.datatorrent.api.DefaultOutputPort;
 import com.datatorrent.api.annotation.InputPortFieldAnnotation;
-import com.datatorrent.api.annotation.OutputPortFieldAnnotation;
 
 import com.datatorrent.lib.counters.BasicCounters;
 import com.datatorrent.lib.util.HighLow;
diff --git a/demos/mroperator/src/main/java/com/datatorrent/demos/mroperator/LogCountsPerHour.java b/demos/mroperator/src/main/java/com/datatorrent/demos/mroperator/LogCountsPerHour.java
index 61f894d..31475c1 100644
--- a/demos/mroperator/src/main/java/com/datatorrent/demos/mroperator/LogCountsPerHour.java
+++ b/demos/mroperator/src/main/java/com/datatorrent/demos/mroperator/LogCountsPerHour.java
@@ -29,7 +29,6 @@
 import org.apache.hadoop.mapred.MapReduceBase;
 import org.apache.hadoop.mapred.OutputCollector;
 import org.apache.hadoop.mapred.Reporter;
-import org.apache.hadoop.mapred.KeyValueTextInputFormat;
 import org.apache.hadoop.mapred.TextOutputFormat;
 import org.apache.hadoop.mapred.JobClient;
 import org.apache.hadoop.mapred.FileInputFormat;
diff --git a/demos/mroperator/src/test/java/com/datatorrent/demos/mroperator/WordCountMRApplicationTest.java b/demos/mroperator/src/test/java/com/datatorrent/demos/mroperator/WordCountMRApplicationTest.java
index a8f6200..5f222ef 100644
--- a/demos/mroperator/src/test/java/com/datatorrent/demos/mroperator/WordCountMRApplicationTest.java
+++ b/demos/mroperator/src/test/java/com/datatorrent/demos/mroperator/WordCountMRApplicationTest.java
@@ -28,7 +28,6 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 
 import com.datatorrent.api.LocalMode;
diff --git a/demos/pi/src/main/java/com/datatorrent/demos/pi/Application.java b/demos/pi/src/main/java/com/datatorrent/demos/pi/Application.java
index 8e0bf72..841b9e2 100644
--- a/demos/pi/src/main/java/com/datatorrent/demos/pi/Application.java
+++ b/demos/pi/src/main/java/com/datatorrent/demos/pi/Application.java
@@ -15,7 +15,6 @@
  */
 package com.datatorrent.demos.pi;
 
-import com.datatorrent.api.Context.OperatorContext;
 import org.apache.hadoop.conf.Configuration;
 
 import com.datatorrent.lib.io.ConsoleOutputOperator;
diff --git a/demos/scalability/src/main/java/com/datatorrent/demos/scalability/InputDimensionGenerator.java b/demos/scalability/src/main/java/com/datatorrent/demos/scalability/InputDimensionGenerator.java
index 61c52fc..2f61bbc 100644
--- a/demos/scalability/src/main/java/com/datatorrent/demos/scalability/InputDimensionGenerator.java
+++ b/demos/scalability/src/main/java/com/datatorrent/demos/scalability/InputDimensionGenerator.java
@@ -18,8 +18,6 @@
 import com.datatorrent.api.BaseOperator;
 import com.datatorrent.api.DefaultInputPort;
 import com.datatorrent.api.DefaultOutputPort;
-import com.datatorrent.api.annotation.InputPortFieldAnnotation;
-import com.datatorrent.api.annotation.OutputPortFieldAnnotation;
 
 /**
  * <p>InputDimensionGenerator class.</p>
diff --git a/demos/scalability/src/main/java/com/datatorrent/demos/scalability/InputItemGenerator.java b/demos/scalability/src/main/java/com/datatorrent/demos/scalability/InputItemGenerator.java
index bf6bb14..a855c15 100644
--- a/demos/scalability/src/main/java/com/datatorrent/demos/scalability/InputItemGenerator.java
+++ b/demos/scalability/src/main/java/com/datatorrent/demos/scalability/InputItemGenerator.java
@@ -18,7 +18,6 @@
 import com.datatorrent.api.Context.OperatorContext;
 import com.datatorrent.api.DefaultOutputPort;
 import com.datatorrent.api.InputOperator;
-import com.datatorrent.api.annotation.OutputPortFieldAnnotation;
 import java.util.Random;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/demos/twitter/src/main/java/com/datatorrent/demos/twitter/TwitterTopWordsApplication.java b/demos/twitter/src/main/java/com/datatorrent/demos/twitter/TwitterTopWordsApplication.java
index 67d706a..3fc7e76 100644
--- a/demos/twitter/src/main/java/com/datatorrent/demos/twitter/TwitterTopWordsApplication.java
+++ b/demos/twitter/src/main/java/com/datatorrent/demos/twitter/TwitterTopWordsApplication.java
@@ -18,7 +18,6 @@
 
 import com.datatorrent.api.DAG;
 import com.datatorrent.api.StreamingApplication;
-import com.datatorrent.api.DAG.Locality;
 import com.datatorrent.api.annotation.ApplicationAnnotation;
 import com.datatorrent.contrib.twitter.TwitterSampleInput;
 import com.datatorrent.lib.algo.UniqueCounter;
diff --git a/demos/twitter/src/main/java/com/datatorrent/demos/twitter/WindowedTopCounter.java b/demos/twitter/src/main/java/com/datatorrent/demos/twitter/WindowedTopCounter.java
index 9411cdd..3ac6951 100644
--- a/demos/twitter/src/main/java/com/datatorrent/demos/twitter/WindowedTopCounter.java
+++ b/demos/twitter/src/main/java/com/datatorrent/demos/twitter/WindowedTopCounter.java
@@ -25,8 +25,6 @@
 
 import com.datatorrent.api.*;
 import com.datatorrent.api.Context.OperatorContext;
-import com.datatorrent.api.annotation.InputPortFieldAnnotation;
-import com.datatorrent.api.annotation.OutputPortFieldAnnotation;
 import java.util.*;
 
 /**
diff --git a/demos/wordcount/src/main/java/com/datatorrent/demos/wordcount/Application.java b/demos/wordcount/src/main/java/com/datatorrent/demos/wordcount/Application.java
index 7b12418..08dedb5 100644
--- a/demos/wordcount/src/main/java/com/datatorrent/demos/wordcount/Application.java
+++ b/demos/wordcount/src/main/java/com/datatorrent/demos/wordcount/Application.java
@@ -15,7 +15,6 @@
  */
 package com.datatorrent.demos.wordcount;
 
-import com.datatorrent.api.DAG.Locality;
 import com.datatorrent.api.annotation.ApplicationAnnotation;
 import com.datatorrent.api.StreamingApplication;
 import com.datatorrent.api.DAG;
diff --git a/demos/yahoofinance/src/main/java/com/datatorrent/demos/yahoofinance/YahooFinanceApplicationWithChart.java b/demos/yahoofinance/src/main/java/com/datatorrent/demos/yahoofinance/YahooFinanceApplicationWithChart.java
index 5c35a4a..014c268 100644
--- a/demos/yahoofinance/src/main/java/com/datatorrent/demos/yahoofinance/YahooFinanceApplicationWithChart.java
+++ b/demos/yahoofinance/src/main/java/com/datatorrent/demos/yahoofinance/YahooFinanceApplicationWithChart.java
@@ -19,7 +19,6 @@
 
 import org.apache.hadoop.conf.Configuration;
 
-import com.datatorrent.api.Context.OperatorContext;
 import com.datatorrent.api.annotation.ApplicationAnnotation;
 import com.datatorrent.api.DAG;
 import com.datatorrent.demos.yahoofinance.StockTickInput;
diff --git a/demos/yahoofinance/src/main/java/com/datatorrent/demos/yahoofinance/YahooFinanceCSVInputOperator.java b/demos/yahoofinance/src/main/java/com/datatorrent/demos/yahoofinance/YahooFinanceCSVInputOperator.java
index e3a2bc3..1155d12 100644
--- a/demos/yahoofinance/src/main/java/com/datatorrent/demos/yahoofinance/YahooFinanceCSVInputOperator.java
+++ b/demos/yahoofinance/src/main/java/com/datatorrent/demos/yahoofinance/YahooFinanceCSVInputOperator.java
@@ -23,7 +23,6 @@
 import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
 import org.apache.commons.httpclient.HttpClient;
diff --git a/library/src/main/java/com/datatorrent/lib/chart/XYChartOperator.java b/library/src/main/java/com/datatorrent/lib/chart/XYChartOperator.java
index 60f208a..b5469bc 100644
--- a/library/src/main/java/com/datatorrent/lib/chart/XYChartOperator.java
+++ b/library/src/main/java/com/datatorrent/lib/chart/XYChartOperator.java
@@ -20,8 +20,6 @@
 import java.util.TreeMap;
 
 import com.datatorrent.api.DefaultInputPort;
-import com.datatorrent.api.annotation.InputPortFieldAnnotation;
-import com.datatorrent.api.annotation.OutputPortFieldAnnotation;
 import com.datatorrent.lib.util.KeyValPair;
 
 /**
diff --git a/library/src/main/java/com/datatorrent/lib/db/jdbc/AbstractJdbcNonTransactionableOutputOperator.java b/library/src/main/java/com/datatorrent/lib/db/jdbc/AbstractJdbcNonTransactionableOutputOperator.java
index 10710bc..4f28049 100644
--- a/library/src/main/java/com/datatorrent/lib/db/jdbc/AbstractJdbcNonTransactionableOutputOperator.java
+++ b/library/src/main/java/com/datatorrent/lib/db/jdbc/AbstractJdbcNonTransactionableOutputOperator.java
@@ -18,10 +18,7 @@
 import java.sql.PreparedStatement;
 import java.sql.SQLException;
 
-import javax.annotation.Nonnull;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 import com.datatorrent.api.Context;
 import com.datatorrent.lib.db.AbstractStoreOutputOperator;
diff --git a/library/src/main/java/com/datatorrent/lib/io/AbstractHttpOperator.java b/library/src/main/java/com/datatorrent/lib/io/AbstractHttpOperator.java
index f3a0ce5..7189db3 100644
--- a/library/src/main/java/com/datatorrent/lib/io/AbstractHttpOperator.java
+++ b/library/src/main/java/com/datatorrent/lib/io/AbstractHttpOperator.java
@@ -18,7 +18,6 @@
 import javax.validation.constraints.NotNull;
 
 import com.sun.jersey.api.client.Client;
-import com.sun.jersey.api.client.WebResource;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/library/src/main/java/com/datatorrent/lib/io/CollectionMultiConsoleOutputOperator.java b/library/src/main/java/com/datatorrent/lib/io/CollectionMultiConsoleOutputOperator.java
index 00aae0d..529af5e 100644
--- a/library/src/main/java/com/datatorrent/lib/io/CollectionMultiConsoleOutputOperator.java
+++ b/library/src/main/java/com/datatorrent/lib/io/CollectionMultiConsoleOutputOperator.java
@@ -16,7 +16,6 @@
 package com.datatorrent.lib.io;
 
 import java.util.Collection;
-import java.util.Iterator;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/library/src/main/java/com/datatorrent/lib/io/HttpOutputOperator.java b/library/src/main/java/com/datatorrent/lib/io/HttpOutputOperator.java
index 850b2f9..dcf2ac4 100644
--- a/library/src/main/java/com/datatorrent/lib/io/HttpOutputOperator.java
+++ b/library/src/main/java/com/datatorrent/lib/io/HttpOutputOperator.java
@@ -16,7 +16,6 @@
 package com.datatorrent.lib.io;
 
 import java.net.URI;
-import javax.validation.constraints.NotNull;
 
 /**
  * Sends tuple as POST with JSON content to the given URL.
diff --git a/library/src/main/java/com/datatorrent/lib/io/SmtpOutputOperator.java b/library/src/main/java/com/datatorrent/lib/io/SmtpOutputOperator.java
index 61ea80e..19c5888 100644
--- a/library/src/main/java/com/datatorrent/lib/io/SmtpOutputOperator.java
+++ b/library/src/main/java/com/datatorrent/lib/io/SmtpOutputOperator.java
@@ -24,7 +24,6 @@
 import javax.mail.*;
 import javax.mail.internet.InternetAddress;
 import javax.mail.internet.MimeMessage;
-import javax.validation.Constraint;
 import javax.validation.constraints.AssertTrue;
 import javax.validation.constraints.NotNull;
 
@@ -32,7 +31,6 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 
 /**
diff --git a/library/src/main/java/com/datatorrent/lib/math/Average.java b/library/src/main/java/com/datatorrent/lib/math/Average.java
index d8b32f1..f7d6e18 100644
--- a/library/src/main/java/com/datatorrent/lib/math/Average.java
+++ b/library/src/main/java/com/datatorrent/lib/math/Average.java
@@ -17,8 +17,6 @@
 
 import com.datatorrent.api.DefaultInputPort;
 import com.datatorrent.api.DefaultOutputPort;
-import com.datatorrent.api.annotation.InputPortFieldAnnotation;
-import com.datatorrent.api.annotation.OutputPortFieldAnnotation;
 import com.datatorrent.lib.util.BaseNumberValueOperator;
 
 /**
diff --git a/library/src/main/java/com/datatorrent/lib/math/AverageKeyVal.java b/library/src/main/java/com/datatorrent/lib/math/AverageKeyVal.java
index aad6e45..d08d052 100644
--- a/library/src/main/java/com/datatorrent/lib/math/AverageKeyVal.java
+++ b/library/src/main/java/com/datatorrent/lib/math/AverageKeyVal.java
@@ -17,7 +17,6 @@
 
 import com.datatorrent.api.DefaultInputPort;
 import com.datatorrent.api.DefaultOutputPort;
-import com.datatorrent.api.annotation.InputPortFieldAnnotation;
 import com.datatorrent.api.annotation.OutputPortFieldAnnotation;
 import com.datatorrent.lib.util.BaseNumberKeyValueOperator;
 import com.datatorrent.lib.util.KeyValPair;
diff --git a/library/src/main/java/com/datatorrent/lib/math/AverageMap.java b/library/src/main/java/com/datatorrent/lib/math/AverageMap.java
index 8889ae5..eefc75a 100644
--- a/library/src/main/java/com/datatorrent/lib/math/AverageMap.java
+++ b/library/src/main/java/com/datatorrent/lib/math/AverageMap.java
@@ -23,7 +23,6 @@
 
 import com.datatorrent.api.DefaultInputPort;
 import com.datatorrent.api.DefaultOutputPort;
-import com.datatorrent.api.annotation.InputPortFieldAnnotation;
 import com.datatorrent.lib.util.BaseNumberKeyValueOperator;
 
 /**
diff --git a/library/src/main/java/com/datatorrent/lib/math/Change.java b/library/src/main/java/com/datatorrent/lib/math/Change.java
index 7eaaab3..e579240 100644
--- a/library/src/main/java/com/datatorrent/lib/math/Change.java
+++ b/library/src/main/java/com/datatorrent/lib/math/Change.java
@@ -17,7 +17,6 @@
 
 import com.datatorrent.api.DefaultInputPort;
 import com.datatorrent.api.DefaultOutputPort;
-import com.datatorrent.api.annotation.InputPortFieldAnnotation;
 import com.datatorrent.api.annotation.OutputPortFieldAnnotation;
 import com.datatorrent.lib.util.BaseNumberValueOperator;
 
diff --git a/library/src/main/java/com/datatorrent/lib/math/ChangeAlert.java b/library/src/main/java/com/datatorrent/lib/math/ChangeAlert.java
index 748e2a9..2dbe776 100644
--- a/library/src/main/java/com/datatorrent/lib/math/ChangeAlert.java
+++ b/library/src/main/java/com/datatorrent/lib/math/ChangeAlert.java
@@ -19,8 +19,6 @@
 
 import com.datatorrent.api.DefaultInputPort;
 import com.datatorrent.api.DefaultOutputPort;
-import com.datatorrent.api.annotation.InputPortFieldAnnotation;
-import com.datatorrent.api.annotation.OutputPortFieldAnnotation;
 import com.datatorrent.lib.util.BaseNumberValueOperator;
 import com.datatorrent.lib.util.KeyValPair;
 
diff --git a/library/src/main/java/com/datatorrent/lib/math/ChangeAlertKeyVal.java b/library/src/main/java/com/datatorrent/lib/math/ChangeAlertKeyVal.java
index 2d41c79..105bcf0 100644
--- a/library/src/main/java/com/datatorrent/lib/math/ChangeAlertKeyVal.java
+++ b/library/src/main/java/com/datatorrent/lib/math/ChangeAlertKeyVal.java
@@ -23,8 +23,6 @@
 
 import com.datatorrent.api.DefaultInputPort;
 import com.datatorrent.api.DefaultOutputPort;
-import com.datatorrent.api.annotation.InputPortFieldAnnotation;
-import com.datatorrent.api.annotation.OutputPortFieldAnnotation;
 import com.datatorrent.lib.util.BaseNumberKeyValueOperator;
 import com.datatorrent.lib.util.KeyValPair;
 
diff --git a/library/src/main/java/com/datatorrent/lib/math/ChangeAlertMap.java b/library/src/main/java/com/datatorrent/lib/math/ChangeAlertMap.java
index 719cd52..fd18f94 100644
--- a/library/src/main/java/com/datatorrent/lib/math/ChangeAlertMap.java
+++ b/library/src/main/java/com/datatorrent/lib/math/ChangeAlertMap.java
@@ -24,8 +24,6 @@
 
 import com.datatorrent.api.DefaultInputPort;
 import com.datatorrent.api.DefaultOutputPort;
-import com.datatorrent.api.annotation.InputPortFieldAnnotation;
-import com.datatorrent.api.annotation.OutputPortFieldAnnotation;
 import com.datatorrent.lib.util.BaseNumberKeyValueOperator;
 
 /**
diff --git a/library/src/main/java/com/datatorrent/lib/math/ChangeKeyVal.java b/library/src/main/java/com/datatorrent/lib/math/ChangeKeyVal.java
index 2d3fc5a..6a36004 100644
--- a/library/src/main/java/com/datatorrent/lib/math/ChangeKeyVal.java
+++ b/library/src/main/java/com/datatorrent/lib/math/ChangeKeyVal.java
@@ -21,7 +21,6 @@
 
 import com.datatorrent.api.DefaultInputPort;
 import com.datatorrent.api.DefaultOutputPort;
-import com.datatorrent.api.annotation.InputPortFieldAnnotation;
 import com.datatorrent.api.annotation.OutputPortFieldAnnotation;
 
 import com.datatorrent.lib.util.BaseNumberKeyValueOperator;
diff --git a/library/src/main/java/com/datatorrent/lib/math/ChangeMap.java b/library/src/main/java/com/datatorrent/lib/math/ChangeMap.java
index a32b374..f02943d 100644
--- a/library/src/main/java/com/datatorrent/lib/math/ChangeMap.java
+++ b/library/src/main/java/com/datatorrent/lib/math/ChangeMap.java
@@ -22,7 +22,6 @@
 
 import com.datatorrent.api.DefaultInputPort;
 import com.datatorrent.api.DefaultOutputPort;
-import com.datatorrent.api.annotation.InputPortFieldAnnotation;
 import com.datatorrent.api.annotation.OutputPortFieldAnnotation;
 
 import com.datatorrent.lib.util.BaseNumberKeyValueOperator;
diff --git a/library/src/main/java/com/datatorrent/lib/math/CompareMap.java b/library/src/main/java/com/datatorrent/lib/math/CompareMap.java
index 1a74f3d..d2d5272 100644
--- a/library/src/main/java/com/datatorrent/lib/math/CompareMap.java
+++ b/library/src/main/java/com/datatorrent/lib/math/CompareMap.java
@@ -16,7 +16,6 @@
 package com.datatorrent.lib.math;
 
 import com.datatorrent.api.DefaultOutputPort;
-import com.datatorrent.api.annotation.OutputPortFieldAnnotation;
 import com.datatorrent.api.annotation.Stateless;
 import com.datatorrent.lib.algo.MatchMap;
 import java.util.HashMap;
diff --git a/library/src/main/java/com/datatorrent/lib/math/CompareStringMap.java b/library/src/main/java/com/datatorrent/lib/math/CompareStringMap.java
index 58884d0..72f4421 100644
--- a/library/src/main/java/com/datatorrent/lib/math/CompareStringMap.java
+++ b/library/src/main/java/com/datatorrent/lib/math/CompareStringMap.java
@@ -16,7 +16,6 @@
 package com.datatorrent.lib.math;
 
 import com.datatorrent.api.DefaultOutputPort;
-import com.datatorrent.api.annotation.OutputPortFieldAnnotation;
 import com.datatorrent.api.annotation.Stateless;
 import com.datatorrent.lib.algo.MatchStringMap;
 import java.util.HashMap;
diff --git a/library/src/main/java/com/datatorrent/lib/math/CountKeyVal.java b/library/src/main/java/com/datatorrent/lib/math/CountKeyVal.java
index 0a04cf6..ecc0a7b 100644
--- a/library/src/main/java/com/datatorrent/lib/math/CountKeyVal.java
+++ b/library/src/main/java/com/datatorrent/lib/math/CountKeyVal.java
@@ -23,7 +23,6 @@
 import com.datatorrent.api.DefaultInputPort;
 import com.datatorrent.api.DefaultOutputPort;
 import com.datatorrent.api.StreamCodec;
-import com.datatorrent.api.annotation.InputPortFieldAnnotation;
 import com.datatorrent.api.annotation.OutputPortFieldAnnotation;
 import com.datatorrent.lib.util.BaseKeyValueOperator;
 import com.datatorrent.lib.util.KeyValPair;
diff --git a/library/src/main/java/com/datatorrent/lib/math/CountMap.java b/library/src/main/java/com/datatorrent/lib/math/CountMap.java
index eda92ed..a71553b 100644
--- a/library/src/main/java/com/datatorrent/lib/math/CountMap.java
+++ b/library/src/main/java/com/datatorrent/lib/math/CountMap.java
@@ -22,8 +22,6 @@
 
 import com.datatorrent.api.DefaultInputPort;
 import com.datatorrent.api.DefaultOutputPort;
-import com.datatorrent.api.annotation.InputPortFieldAnnotation;
-import com.datatorrent.api.annotation.OutputPortFieldAnnotation;
 import com.datatorrent.lib.util.BaseKeyValueOperator;
 import com.datatorrent.lib.util.UnifierHashMapInteger;
 
diff --git a/library/src/main/java/com/datatorrent/lib/math/ExceptMap.java b/library/src/main/java/com/datatorrent/lib/math/ExceptMap.java
index 28423db..e0c4d29 100644
--- a/library/src/main/java/com/datatorrent/lib/math/ExceptMap.java
+++ b/library/src/main/java/com/datatorrent/lib/math/ExceptMap.java
@@ -19,7 +19,6 @@
 import java.util.Map;
 
 import com.datatorrent.api.DefaultOutputPort;
-import com.datatorrent.api.annotation.OutputPortFieldAnnotation;
 import com.datatorrent.api.annotation.Stateless;
 import com.datatorrent.lib.algo.MatchMap;
 import com.datatorrent.lib.util.UnifierHashMap;
diff --git a/library/src/main/java/com/datatorrent/lib/math/ExceptStringMap.java b/library/src/main/java/com/datatorrent/lib/math/ExceptStringMap.java
index df1d49b..414315d 100644
--- a/library/src/main/java/com/datatorrent/lib/math/ExceptStringMap.java
+++ b/library/src/main/java/com/datatorrent/lib/math/ExceptStringMap.java
@@ -19,7 +19,6 @@
 import java.util.Map;
 
 import com.datatorrent.api.DefaultOutputPort;
-import com.datatorrent.api.annotation.OutputPortFieldAnnotation;
 import com.datatorrent.api.annotation.Stateless;
 import com.datatorrent.lib.algo.MatchStringMap;
 import com.datatorrent.lib.util.UnifierHashMap;
diff --git a/library/src/main/java/com/datatorrent/lib/math/Margin.java b/library/src/main/java/com/datatorrent/lib/math/Margin.java
index a03ec7c..2f8d344 100644
--- a/library/src/main/java/com/datatorrent/lib/math/Margin.java
+++ b/library/src/main/java/com/datatorrent/lib/math/Margin.java
@@ -17,9 +17,7 @@
 
 import com.datatorrent.api.DefaultInputPort;
 import com.datatorrent.api.DefaultOutputPort;
-import com.datatorrent.api.annotation.InputPortFieldAnnotation;
 import com.datatorrent.api.annotation.OperatorAnnotation;
-import com.datatorrent.api.annotation.OutputPortFieldAnnotation;
 import com.datatorrent.lib.util.BaseNumberValueOperator;
 
 /**
diff --git a/library/src/main/java/com/datatorrent/lib/math/MarginMap.java b/library/src/main/java/com/datatorrent/lib/math/MarginMap.java
index cddbd72..ad328ce 100644
--- a/library/src/main/java/com/datatorrent/lib/math/MarginMap.java
+++ b/library/src/main/java/com/datatorrent/lib/math/MarginMap.java
@@ -17,8 +17,6 @@
 
 import com.datatorrent.api.DefaultInputPort;
 import com.datatorrent.api.DefaultOutputPort;
-import com.datatorrent.api.annotation.InputPortFieldAnnotation;
-import com.datatorrent.api.annotation.OutputPortFieldAnnotation;
 import com.datatorrent.lib.util.BaseNumberKeyValueOperator;
 import com.datatorrent.lib.util.UnifierHashMap;
 import java.util.HashMap;
diff --git a/library/src/main/java/com/datatorrent/lib/math/Max.java b/library/src/main/java/com/datatorrent/lib/math/Max.java
index 3b411bb..fe38ea1 100644
--- a/library/src/main/java/com/datatorrent/lib/math/Max.java
+++ b/library/src/main/java/com/datatorrent/lib/math/Max.java
@@ -18,8 +18,6 @@
 import com.datatorrent.api.DefaultInputPort;
 import com.datatorrent.api.DefaultOutputPort;
 import com.datatorrent.api.Operator.Unifier;
-import com.datatorrent.api.annotation.InputPortFieldAnnotation;
-import com.datatorrent.api.annotation.OutputPortFieldAnnotation;
 import com.datatorrent.lib.util.BaseNumberValueOperator;
 
 /**
diff --git a/library/src/main/java/com/datatorrent/lib/math/MaxMap.java b/library/src/main/java/com/datatorrent/lib/math/MaxMap.java
index 973af35..cf651a5 100644
--- a/library/src/main/java/com/datatorrent/lib/math/MaxMap.java
+++ b/library/src/main/java/com/datatorrent/lib/math/MaxMap.java
@@ -21,8 +21,6 @@
 import com.datatorrent.api.DefaultInputPort;
 import com.datatorrent.api.DefaultOutputPort;
 import com.datatorrent.api.Operator.Unifier;
-import com.datatorrent.api.annotation.InputPortFieldAnnotation;
-import com.datatorrent.api.annotation.OutputPortFieldAnnotation;
 import com.datatorrent.lib.util.BaseNumberKeyValueOperator;
 
 /**
diff --git a/library/src/main/java/com/datatorrent/lib/math/Min.java b/library/src/main/java/com/datatorrent/lib/math/Min.java
index b4b927d..24c0411 100644
--- a/library/src/main/java/com/datatorrent/lib/math/Min.java
+++ b/library/src/main/java/com/datatorrent/lib/math/Min.java
@@ -18,8 +18,6 @@
 import com.datatorrent.api.DefaultInputPort;
 import com.datatorrent.api.DefaultOutputPort;
 import com.datatorrent.api.Operator.Unifier;
-import com.datatorrent.api.annotation.InputPortFieldAnnotation;
-import com.datatorrent.api.annotation.OutputPortFieldAnnotation;
 import com.datatorrent.lib.util.BaseNumberValueOperator;
 
 /**
diff --git a/library/src/main/java/com/datatorrent/lib/math/MinMap.java b/library/src/main/java/com/datatorrent/lib/math/MinMap.java
index 0cee55a..80c4208 100644
--- a/library/src/main/java/com/datatorrent/lib/math/MinMap.java
+++ b/library/src/main/java/com/datatorrent/lib/math/MinMap.java
@@ -18,8 +18,6 @@
 import com.datatorrent.api.DefaultInputPort;
 import com.datatorrent.api.DefaultOutputPort;
 import com.datatorrent.api.Operator.Unifier;
-import com.datatorrent.api.annotation.InputPortFieldAnnotation;
-import com.datatorrent.api.annotation.OutputPortFieldAnnotation;
 import com.datatorrent.lib.util.BaseNumberKeyValueOperator;
 import java.util.HashMap;
 import java.util.Map;
diff --git a/library/src/main/java/com/datatorrent/lib/math/Quotient.java b/library/src/main/java/com/datatorrent/lib/math/Quotient.java
index d55e03c..85b041d 100644
--- a/library/src/main/java/com/datatorrent/lib/math/Quotient.java
+++ b/library/src/main/java/com/datatorrent/lib/math/Quotient.java
@@ -17,9 +17,7 @@
 
 import com.datatorrent.api.DefaultInputPort;
 import com.datatorrent.api.DefaultOutputPort;
-import com.datatorrent.api.annotation.InputPortFieldAnnotation;
 import com.datatorrent.api.annotation.OperatorAnnotation;
-import com.datatorrent.api.annotation.OutputPortFieldAnnotation;
 import com.datatorrent.lib.util.BaseNumberValueOperator;
 
 /**
diff --git a/library/src/main/java/com/datatorrent/lib/math/QuotientMap.java b/library/src/main/java/com/datatorrent/lib/math/QuotientMap.java
index 6221ea2..e2b86f1 100644
--- a/library/src/main/java/com/datatorrent/lib/math/QuotientMap.java
+++ b/library/src/main/java/com/datatorrent/lib/math/QuotientMap.java
@@ -25,8 +25,6 @@
 
 import com.datatorrent.api.DefaultInputPort;
 import com.datatorrent.api.DefaultOutputPort;
-import com.datatorrent.api.annotation.InputPortFieldAnnotation;
-import com.datatorrent.api.annotation.OutputPortFieldAnnotation;
 import com.datatorrent.lib.util.BaseNumberKeyValueOperator;
 
 /**
diff --git a/library/src/main/java/com/datatorrent/lib/math/Range.java b/library/src/main/java/com/datatorrent/lib/math/Range.java
index 349250c..9fe536d 100644
--- a/library/src/main/java/com/datatorrent/lib/math/Range.java
+++ b/library/src/main/java/com/datatorrent/lib/math/Range.java
@@ -17,8 +17,6 @@
 
 import com.datatorrent.api.DefaultInputPort;
 import com.datatorrent.api.DefaultOutputPort;
-import com.datatorrent.api.annotation.InputPortFieldAnnotation;
-import com.datatorrent.api.annotation.OutputPortFieldAnnotation;
 import com.datatorrent.lib.util.BaseNumberValueOperator;
 import com.datatorrent.lib.util.HighLow;
 import com.datatorrent.lib.util.UnifierRange;
diff --git a/library/src/main/java/com/datatorrent/lib/math/RangeMap.java b/library/src/main/java/com/datatorrent/lib/math/RangeMap.java
index 190fd6c..c0bb4c1 100644
--- a/library/src/main/java/com/datatorrent/lib/math/RangeMap.java
+++ b/library/src/main/java/com/datatorrent/lib/math/RangeMap.java
@@ -20,8 +20,6 @@
 
 import com.datatorrent.api.DefaultInputPort;
 import com.datatorrent.api.DefaultOutputPort;
-import com.datatorrent.api.annotation.InputPortFieldAnnotation;
-import com.datatorrent.api.annotation.OutputPortFieldAnnotation;
 import com.datatorrent.lib.util.BaseNumberKeyValueOperator;
 import com.datatorrent.lib.util.HighLow;
 import com.datatorrent.lib.util.UnifierHashMapRange;
diff --git a/library/src/main/java/com/datatorrent/lib/math/Sum.java b/library/src/main/java/com/datatorrent/lib/math/Sum.java
index ecc6188..e2e4c1a 100644
--- a/library/src/main/java/com/datatorrent/lib/math/Sum.java
+++ b/library/src/main/java/com/datatorrent/lib/math/Sum.java
@@ -21,7 +21,6 @@
 import com.datatorrent.api.DefaultInputPort;
 import com.datatorrent.api.DefaultOutputPort;
 import com.datatorrent.api.Operator.Unifier;
-import com.datatorrent.api.annotation.InputPortFieldAnnotation;
 import com.datatorrent.api.annotation.OutputPortFieldAnnotation;
 import com.datatorrent.lib.util.BaseNumberValueOperator;
 import com.datatorrent.lib.util.UnifierSumNumber;
diff --git a/library/src/main/java/com/datatorrent/lib/math/SumCountMap.java b/library/src/main/java/com/datatorrent/lib/math/SumCountMap.java
index be3a563..bea6574 100644
--- a/library/src/main/java/com/datatorrent/lib/math/SumCountMap.java
+++ b/library/src/main/java/com/datatorrent/lib/math/SumCountMap.java
@@ -17,7 +17,6 @@
 
 import com.datatorrent.api.DefaultInputPort;
 import com.datatorrent.api.DefaultOutputPort;
-import com.datatorrent.api.annotation.InputPortFieldAnnotation;
 import com.datatorrent.api.annotation.OutputPortFieldAnnotation;
 import com.datatorrent.lib.util.BaseNumberKeyValueOperator;
 import com.datatorrent.lib.util.UnifierHashMapInteger;
diff --git a/library/src/main/java/com/datatorrent/lib/math/SumMap.java b/library/src/main/java/com/datatorrent/lib/math/SumMap.java
index cc4f10b..d5a6959 100644
--- a/library/src/main/java/com/datatorrent/lib/math/SumMap.java
+++ b/library/src/main/java/com/datatorrent/lib/math/SumMap.java
@@ -17,7 +17,6 @@
 
 import com.datatorrent.api.DefaultInputPort;
 import com.datatorrent.api.DefaultOutputPort;
-import com.datatorrent.api.annotation.InputPortFieldAnnotation;
 import com.datatorrent.api.annotation.OutputPortFieldAnnotation;
 import com.datatorrent.lib.util.BaseNumberKeyValueOperator;
 import com.datatorrent.lib.util.UnifierHashMapSumKeys;
diff --git a/library/src/main/java/com/datatorrent/lib/math/XmlKeyValueStringCartesianProduct.java b/library/src/main/java/com/datatorrent/lib/math/XmlKeyValueStringCartesianProduct.java
index cf88b64..80ccad3 100644
--- a/library/src/main/java/com/datatorrent/lib/math/XmlKeyValueStringCartesianProduct.java
+++ b/library/src/main/java/com/datatorrent/lib/math/XmlKeyValueStringCartesianProduct.java
@@ -16,7 +16,6 @@
 package com.datatorrent.lib.math;
 
 import com.datatorrent.api.DefaultOutputPort;
-import com.datatorrent.api.annotation.OutputPortFieldAnnotation;
 import org.xml.sax.InputSource;
 
 import java.io.StringReader;
diff --git a/library/src/main/java/com/datatorrent/lib/multiwindow/AbstractSlidingWindow.java b/library/src/main/java/com/datatorrent/lib/multiwindow/AbstractSlidingWindow.java
index 9edb298..2c363aa 100644
--- a/library/src/main/java/com/datatorrent/lib/multiwindow/AbstractSlidingWindow.java
+++ b/library/src/main/java/com/datatorrent/lib/multiwindow/AbstractSlidingWindow.java
@@ -22,7 +22,6 @@
 import com.datatorrent.api.BaseOperator;
 import com.datatorrent.api.Context.OperatorContext;
 import com.datatorrent.api.DefaultInputPort;
-import com.datatorrent.api.annotation.InputPortFieldAnnotation;
 
 /**
  *
diff --git a/library/src/main/java/com/datatorrent/lib/multiwindow/AbstractSlidingWindowKeyVal.java b/library/src/main/java/com/datatorrent/lib/multiwindow/AbstractSlidingWindowKeyVal.java
index 04292b4..c87268e 100644
--- a/library/src/main/java/com/datatorrent/lib/multiwindow/AbstractSlidingWindowKeyVal.java
+++ b/library/src/main/java/com/datatorrent/lib/multiwindow/AbstractSlidingWindowKeyVal.java
@@ -22,7 +22,6 @@
 import javax.validation.constraints.Min;
 
 import com.datatorrent.api.DefaultInputPort;
-import com.datatorrent.api.annotation.InputPortFieldAnnotation;
 import com.datatorrent.lib.util.BaseNumberKeyValueOperator;
 import com.datatorrent.lib.util.KeyValPair;
 
diff --git a/library/src/main/java/com/datatorrent/lib/stream/ArrayListToItem.java b/library/src/main/java/com/datatorrent/lib/stream/ArrayListToItem.java
index c137e16..a7145b8 100644
--- a/library/src/main/java/com/datatorrent/lib/stream/ArrayListToItem.java
+++ b/library/src/main/java/com/datatorrent/lib/stream/ArrayListToItem.java
@@ -17,8 +17,6 @@
 
 import com.datatorrent.api.DefaultInputPort;
 import com.datatorrent.api.DefaultOutputPort;
-import com.datatorrent.api.annotation.InputPortFieldAnnotation;
-import com.datatorrent.api.annotation.OutputPortFieldAnnotation;
 import com.datatorrent.api.annotation.Stateless;
 import com.datatorrent.lib.util.BaseKeyOperator;
 import java.util.ArrayList;
diff --git a/library/src/main/java/com/datatorrent/lib/stream/ConsolidatorKeyVal.java b/library/src/main/java/com/datatorrent/lib/stream/ConsolidatorKeyVal.java
index 113b9d8..f94e838 100644
--- a/library/src/main/java/com/datatorrent/lib/stream/ConsolidatorKeyVal.java
+++ b/library/src/main/java/com/datatorrent/lib/stream/ConsolidatorKeyVal.java
@@ -24,7 +24,6 @@
 import com.datatorrent.api.Operator;
 import com.datatorrent.api.annotation.InputPortFieldAnnotation;
 import com.datatorrent.api.annotation.OperatorAnnotation;
-import com.datatorrent.api.annotation.OutputPortFieldAnnotation;
 import com.datatorrent.lib.util.KeyValPair;
 
 /**
diff --git a/library/src/main/java/com/datatorrent/lib/stream/DevNull.java b/library/src/main/java/com/datatorrent/lib/stream/DevNull.java
index dd487d1..c0d518d 100644
--- a/library/src/main/java/com/datatorrent/lib/stream/DevNull.java
+++ b/library/src/main/java/com/datatorrent/lib/stream/DevNull.java
@@ -17,7 +17,6 @@
 
 import com.datatorrent.api.BaseOperator;
 import com.datatorrent.api.DefaultInputPort;
-import com.datatorrent.api.annotation.InputPortFieldAnnotation;
 import com.datatorrent.api.annotation.Stateless;
 
 /**
diff --git a/library/src/main/java/com/datatorrent/lib/stream/DevNullCounter.java b/library/src/main/java/com/datatorrent/lib/stream/DevNullCounter.java
index 2e2e25d..cb4b688 100644
--- a/library/src/main/java/com/datatorrent/lib/stream/DevNullCounter.java
+++ b/library/src/main/java/com/datatorrent/lib/stream/DevNullCounter.java
@@ -18,7 +18,6 @@
 import com.datatorrent.api.BaseOperator;
 import com.datatorrent.api.DefaultInputPort;
 import com.datatorrent.api.Context.OperatorContext;
-import com.datatorrent.api.annotation.InputPortFieldAnnotation;
 
 import javax.validation.constraints.Min;
 import org.slf4j.Logger;
diff --git a/library/src/main/java/com/datatorrent/lib/stream/HashMapToKeyValPair.java b/library/src/main/java/com/datatorrent/lib/stream/HashMapToKeyValPair.java
index 4cd262e..c43c9ed 100644
--- a/library/src/main/java/com/datatorrent/lib/stream/HashMapToKeyValPair.java
+++ b/library/src/main/java/com/datatorrent/lib/stream/HashMapToKeyValPair.java
@@ -17,7 +17,6 @@
 
 import com.datatorrent.api.DefaultInputPort;
 import com.datatorrent.api.DefaultOutputPort;
-import com.datatorrent.api.annotation.InputPortFieldAnnotation;
 import com.datatorrent.api.annotation.OutputPortFieldAnnotation;
 import com.datatorrent.api.annotation.Stateless;
 import com.datatorrent.lib.util.BaseKeyValueOperator;
diff --git a/library/src/main/java/com/datatorrent/lib/stream/JsonByteArrayOperator.java b/library/src/main/java/com/datatorrent/lib/stream/JsonByteArrayOperator.java
index 6dac771..a93ff05 100644
--- a/library/src/main/java/com/datatorrent/lib/stream/JsonByteArrayOperator.java
+++ b/library/src/main/java/com/datatorrent/lib/stream/JsonByteArrayOperator.java
@@ -27,8 +27,6 @@
 import com.datatorrent.api.BaseOperator;
 import com.datatorrent.api.DefaultInputPort;
 import com.datatorrent.api.DefaultOutputPort;
-import com.datatorrent.api.annotation.InputPortFieldAnnotation;
-import com.datatorrent.api.annotation.OutputPortFieldAnnotation;
 import com.datatorrent.common.util.DTThrowable;
 
 /**
diff --git a/library/src/main/java/com/datatorrent/lib/stream/KeyValPairToHashMap.java b/library/src/main/java/com/datatorrent/lib/stream/KeyValPairToHashMap.java
index 80282de..c6187ca 100644
--- a/library/src/main/java/com/datatorrent/lib/stream/KeyValPairToHashMap.java
+++ b/library/src/main/java/com/datatorrent/lib/stream/KeyValPairToHashMap.java
@@ -17,8 +17,6 @@
 
 import com.datatorrent.api.DefaultInputPort;
 import com.datatorrent.api.DefaultOutputPort;
-import com.datatorrent.api.annotation.InputPortFieldAnnotation;
-import com.datatorrent.api.annotation.OutputPortFieldAnnotation;
 import com.datatorrent.api.annotation.Stateless;
 import com.datatorrent.lib.util.BaseKeyValueOperator;
 import com.datatorrent.lib.util.KeyValPair;
diff --git a/library/src/main/java/com/datatorrent/lib/stream/RoundRobinHashMap.java b/library/src/main/java/com/datatorrent/lib/stream/RoundRobinHashMap.java
index 3a06e5d..e340514 100644
--- a/library/src/main/java/com/datatorrent/lib/stream/RoundRobinHashMap.java
+++ b/library/src/main/java/com/datatorrent/lib/stream/RoundRobinHashMap.java
@@ -17,8 +17,6 @@
 
 import com.datatorrent.api.DefaultInputPort;
 import com.datatorrent.api.DefaultOutputPort;
-import com.datatorrent.api.annotation.InputPortFieldAnnotation;
-import com.datatorrent.api.annotation.OutputPortFieldAnnotation;
 import com.datatorrent.lib.util.BaseKeyValueOperator;
 import java.util.HashMap;
 
diff --git a/library/src/main/java/com/datatorrent/lib/stream/StreamDuplicater.java b/library/src/main/java/com/datatorrent/lib/stream/StreamDuplicater.java
index 06888b9..c8b008f 100644
--- a/library/src/main/java/com/datatorrent/lib/stream/StreamDuplicater.java
+++ b/library/src/main/java/com/datatorrent/lib/stream/StreamDuplicater.java
@@ -17,8 +17,6 @@
 
 import com.datatorrent.api.DefaultInputPort;
 import com.datatorrent.api.DefaultOutputPort;
-import com.datatorrent.api.annotation.InputPortFieldAnnotation;
-import com.datatorrent.api.annotation.OutputPortFieldAnnotation;
 import com.datatorrent.api.annotation.Stateless;
 import com.datatorrent.lib.util.BaseKeyOperator;
 
diff --git a/library/src/main/java/com/datatorrent/lib/stream/StreamMerger.java b/library/src/main/java/com/datatorrent/lib/stream/StreamMerger.java
index ee79960..4ab05e3 100644
--- a/library/src/main/java/com/datatorrent/lib/stream/StreamMerger.java
+++ b/library/src/main/java/com/datatorrent/lib/stream/StreamMerger.java
@@ -18,8 +18,6 @@
 import com.datatorrent.api.BaseOperator;
 import com.datatorrent.api.DefaultInputPort;
 import com.datatorrent.api.DefaultOutputPort;
-import com.datatorrent.api.annotation.InputPortFieldAnnotation;
-import com.datatorrent.api.annotation.OutputPortFieldAnnotation;
 import com.datatorrent.api.annotation.Stateless;
 
 /**
diff --git a/library/src/main/java/com/datatorrent/lib/streamquery/OrderByRule.java b/library/src/main/java/com/datatorrent/lib/streamquery/OrderByRule.java
index 567b67d..4285a92 100644
--- a/library/src/main/java/com/datatorrent/lib/streamquery/OrderByRule.java
+++ b/library/src/main/java/com/datatorrent/lib/streamquery/OrderByRule.java
@@ -16,7 +16,6 @@
 package com.datatorrent.lib.streamquery;
 
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.Map;
 import java.util.TreeMap;
 
diff --git a/library/src/main/java/com/datatorrent/lib/util/AbstractBaseFrequentKeyValueMap.java b/library/src/main/java/com/datatorrent/lib/util/AbstractBaseFrequentKeyValueMap.java
index 506a6a6..e877c42 100644
--- a/library/src/main/java/com/datatorrent/lib/util/AbstractBaseFrequentKeyValueMap.java
+++ b/library/src/main/java/com/datatorrent/lib/util/AbstractBaseFrequentKeyValueMap.java
@@ -16,7 +16,6 @@
 package com.datatorrent.lib.util;
 
 import com.datatorrent.api.DefaultInputPort;
-import com.datatorrent.api.annotation.InputPortFieldAnnotation;
 
 import java.util.HashMap;
 import java.util.Map;
diff --git a/library/src/main/java/com/datatorrent/lib/util/BaseLineTokenizer.java b/library/src/main/java/com/datatorrent/lib/util/BaseLineTokenizer.java
index bfbe9e0..8116fa3 100644
--- a/library/src/main/java/com/datatorrent/lib/util/BaseLineTokenizer.java
+++ b/library/src/main/java/com/datatorrent/lib/util/BaseLineTokenizer.java
@@ -17,7 +17,6 @@
 
 import com.datatorrent.api.BaseOperator;
 import com.datatorrent.api.DefaultInputPort;
-import com.datatorrent.api.annotation.InputPortFieldAnnotation;
 
 import javax.validation.constraints.NotNull;
 
diff --git a/library/src/main/java/com/datatorrent/lib/xml/AbstractXmlDOMOperator.java b/library/src/main/java/com/datatorrent/lib/xml/AbstractXmlDOMOperator.java
index c6ab43e..d81ec38 100644
--- a/library/src/main/java/com/datatorrent/lib/xml/AbstractXmlDOMOperator.java
+++ b/library/src/main/java/com/datatorrent/lib/xml/AbstractXmlDOMOperator.java
@@ -16,7 +16,6 @@
 package com.datatorrent.lib.xml;
 
 import com.datatorrent.api.*;
-import com.datatorrent.api.annotation.InputPortFieldAnnotation;
 import com.datatorrent.common.util.DTThrowable;
 import javax.xml.parsers.*;
 import org.w3c.dom.Document;
diff --git a/library/src/test/java/com/datatorrent/lib/math/MaxKeyValTest.java b/library/src/test/java/com/datatorrent/lib/math/MaxKeyValTest.java
index 79c1eab..776d12a 100644
--- a/library/src/test/java/com/datatorrent/lib/math/MaxKeyValTest.java
+++ b/library/src/test/java/com/datatorrent/lib/math/MaxKeyValTest.java
@@ -24,7 +24,6 @@
 import com.datatorrent.api.DefaultInputPort;
 import com.datatorrent.api.DefaultOutputPort;
 import com.datatorrent.api.InputOperator;
-import com.datatorrent.api.annotation.OutputPortFieldAnnotation;
 
 import com.datatorrent.lib.testbench.CountAndLastTupleTestSink;
 import com.datatorrent.lib.util.KeyValPair;
diff --git a/library/src/test/java/com/datatorrent/lib/math/MaxMapTest.java b/library/src/test/java/com/datatorrent/lib/math/MaxMapTest.java
index c579e79..0665c1a 100644
--- a/library/src/test/java/com/datatorrent/lib/math/MaxMapTest.java
+++ b/library/src/test/java/com/datatorrent/lib/math/MaxMapTest.java
@@ -25,7 +25,6 @@
 import com.datatorrent.api.DefaultInputPort;
 import com.datatorrent.api.DefaultOutputPort;
 import com.datatorrent.api.InputOperator;
-import com.datatorrent.api.annotation.OutputPortFieldAnnotation;
 
 import com.datatorrent.lib.testbench.CountAndLastTupleTestSink;
 
diff --git a/library/src/test/java/com/datatorrent/lib/math/MinKeyValTest.java b/library/src/test/java/com/datatorrent/lib/math/MinKeyValTest.java
index ef7ac30..f6cb5c5 100644
--- a/library/src/test/java/com/datatorrent/lib/math/MinKeyValTest.java
+++ b/library/src/test/java/com/datatorrent/lib/math/MinKeyValTest.java
@@ -24,7 +24,6 @@
 import com.datatorrent.api.DefaultInputPort;
 import com.datatorrent.api.DefaultOutputPort;
 import com.datatorrent.api.InputOperator;
-import com.datatorrent.api.annotation.OutputPortFieldAnnotation;
 
 import com.datatorrent.lib.testbench.CountAndLastTupleTestSink;
 import com.datatorrent.lib.util.KeyValPair;
diff --git a/library/src/test/java/com/datatorrent/lib/multiwindow/SlidingWindowTest.java b/library/src/test/java/com/datatorrent/lib/multiwindow/SlidingWindowTest.java
index 61e08ee..a880d86 100644
--- a/library/src/test/java/com/datatorrent/lib/multiwindow/SlidingWindowTest.java
+++ b/library/src/test/java/com/datatorrent/lib/multiwindow/SlidingWindowTest.java
@@ -24,7 +24,6 @@
 import com.google.common.collect.Lists;
 
 import com.datatorrent.api.DefaultOutputPort;
-import com.datatorrent.api.annotation.OutputPortFieldAnnotation;
 
 import com.datatorrent.lib.testbench.CollectorTestSink;
 
diff --git a/library/src/test/java/com/datatorrent/lib/util/AlertEscalationOperatorTest.java b/library/src/test/java/com/datatorrent/lib/util/AlertEscalationOperatorTest.java
index 5cd4e8b..068cb9d 100644
--- a/library/src/test/java/com/datatorrent/lib/util/AlertEscalationOperatorTest.java
+++ b/library/src/test/java/com/datatorrent/lib/util/AlertEscalationOperatorTest.java
@@ -5,8 +5,6 @@
 package com.datatorrent.lib.util;
 
 import com.datatorrent.lib.testbench.CountAndLastTupleTestSink;
-import java.util.HashMap;
-import java.util.Map;
 import org.junit.Assert;
 import org.junit.Test;