diff --git a/src/main/java/net/onrc/onos/apps/forwarding/IForwardingService.java b/src/main/java/net/onrc/onos/apps/forwarding/IForwardingService.java
index 6968999..e8a8d7a 100644
--- a/src/main/java/net/onrc/onos/apps/forwarding/IForwardingService.java
+++ b/src/main/java/net/onrc/onos/apps/forwarding/IForwardingService.java
@@ -10,8 +10,6 @@
  * notified when a flow has been installed.
  * <p/>
  * This should be refactored to a listener framework in the future.
- *
- * @author jono
  */
 public interface IForwardingService extends IFloodlightService {
     /**
diff --git a/src/main/java/net/onrc/onos/core/datagrid/web/IntentResource.java b/src/main/java/net/onrc/onos/core/datagrid/web/IntentResource.java
index bdb6634..1dc05a2 100644
--- a/src/main/java/net/onrc/onos/core/datagrid/web/IntentResource.java
+++ b/src/main/java/net/onrc/onos/core/datagrid/web/IntentResource.java
@@ -31,7 +31,7 @@
 import org.slf4j.LoggerFactory;
 
 /**
- * @author nickkaranatsios
+ * old REST API implementation for the Intents.
  */
 public class IntentResource extends ServerResource {
     private static final Logger log = LoggerFactory.getLogger(IntentResource.class);
diff --git a/src/main/java/net/onrc/onos/core/devicemanager/IOnosDeviceService.java b/src/main/java/net/onrc/onos/core/devicemanager/IOnosDeviceService.java
index e0ab4f6..ee38c6a 100644
--- a/src/main/java/net/onrc/onos/core/devicemanager/IOnosDeviceService.java
+++ b/src/main/java/net/onrc/onos/core/devicemanager/IOnosDeviceService.java
@@ -7,8 +7,6 @@
  * {@link OnosDeviceManager} doesn't yet provide any API to fellow modules,
  * however making it export a dummy service means we can specify it as
  * a dependency of Forwarding.
- *
- * @author jono
  */
 public interface IOnosDeviceService extends IFloodlightService {
 
diff --git a/src/main/java/net/onrc/onos/core/flowprogrammer/FlowProgrammer.java b/src/main/java/net/onrc/onos/core/flowprogrammer/FlowProgrammer.java
index 8a3739d..b5912d5 100644
--- a/src/main/java/net/onrc/onos/core/flowprogrammer/FlowProgrammer.java
+++ b/src/main/java/net/onrc/onos/core/flowprogrammer/FlowProgrammer.java
@@ -29,8 +29,6 @@
  * immediately kicks synchronization to keep switch's flow table latest state.
  * Adversely, when a switch is removed from network, FlowProgrammer immediately
  * stops synchronization.
- *
- * @author Brian
  */
 public class FlowProgrammer implements IFloodlightModule,
         IOFSwitchListener {
diff --git a/src/main/java/net/onrc/onos/core/flowprogrammer/FlowPusher.java b/src/main/java/net/onrc/onos/core/flowprogrammer/FlowPusher.java
index a3ee412..bd41a95 100644
--- a/src/main/java/net/onrc/onos/core/flowprogrammer/FlowPusher.java
+++ b/src/main/java/net/onrc/onos/core/flowprogrammer/FlowPusher.java
@@ -81,8 +81,6 @@
  * Each processing thread reads messages from queues and sends it to switches
  * in round-robin. Processing thread also calculates rate of sending to suppress
  * excessive message sending.
- *
- * @author Naoki Shiota
  */
 public final class FlowPusher implements IFlowPusherService, IOFMessageListener {
     private static final Logger log = LoggerFactory.getLogger(FlowPusher.class);
@@ -112,8 +110,6 @@
     /**
      * SwitchQueue represents message queue attached to a switch.
      * This consists of queue itself and variables used for limiting sending rate.
-     *
-     * @author Naoki Shiota
      */
     private static class SwitchQueue {
         List<Queue<SwitchQueueEntry>> rawQueues;
@@ -238,8 +234,6 @@
 
     /**
      * BarrierInfo holds information to specify barrier message sent to switch.
-     *
-     * @author Naoki
      */
     private static final class BarrierInfo {
         final long dpid;
@@ -303,8 +297,6 @@
 
     /**
      * Main thread that reads messages from queues and sends them to switches.
-     *
-     * @author Naoki Shiota
      */
     private class FlowPusherThread extends Thread {
         private Map<IOFSwitch, SwitchQueue> assignedQueues
diff --git a/src/main/java/net/onrc/onos/core/flowprogrammer/FlowSynchronizer.java b/src/main/java/net/onrc/onos/core/flowprogrammer/FlowSynchronizer.java
index 7ec93f6..b0de5bf 100644
--- a/src/main/java/net/onrc/onos/core/flowprogrammer/FlowSynchronizer.java
+++ b/src/main/java/net/onrc/onos/core/flowprogrammer/FlowSynchronizer.java
@@ -32,8 +32,6 @@
  * In addition to IFlowSyncService, FlowSynchronizer periodically reads flow
  * tables from switches and compare them with GraphDB to drop unnecessary
  * flows and/or to install missing flows.
- *
- * @author Brian
  */
 public class FlowSynchronizer implements IFlowSyncService {
 
@@ -78,8 +76,6 @@
 
     /**
      * Synchronizer represents main thread of synchronization.
-     *
-     * @author Brian
      */
     protected class Synchronizer implements Callable<SyncResult> {
         IOFSwitch sw;
@@ -254,8 +250,6 @@
     /**
      * FlowEntryWrapper represents abstract FlowEntry which is embodied
      * by FlowEntryId (from GraphDB) or OFFlowStatisticsReply (from switch).
-     *
-     * @author Brian
      */
     class FlowEntryWrapper {
         FlowEntryId flowEntryId;
diff --git a/src/main/java/net/onrc/onos/core/flowprogrammer/IFlowPusherService.java b/src/main/java/net/onrc/onos/core/flowprogrammer/IFlowPusherService.java
index c1b0c41..37911a8 100644
--- a/src/main/java/net/onrc/onos/core/flowprogrammer/IFlowPusherService.java
+++ b/src/main/java/net/onrc/onos/core/flowprogrammer/IFlowPusherService.java
@@ -17,8 +17,6 @@
  * read a message from queue and send it to switch in order.
  * To guarantee message has been installed, FlowPusherService can add barrier
  * message to queue and can notify when barrier message is sent to switch.
- *
- * @author Naoki Shiota
  */
 public interface IFlowPusherService extends IFloodlightService {
     public static enum MsgPriority {
diff --git a/src/main/java/net/onrc/onos/core/flowprogrammer/IFlowSyncService.java b/src/main/java/net/onrc/onos/core/flowprogrammer/IFlowSyncService.java
index f2d5989..0fd4524 100644
--- a/src/main/java/net/onrc/onos/core/flowprogrammer/IFlowSyncService.java
+++ b/src/main/java/net/onrc/onos/core/flowprogrammer/IFlowSyncService.java
@@ -8,8 +8,6 @@
 /**
  * FlowSyncService is a service to synchronize GraphDB and switch's flow table.
  * FlowSyncService offers APIs to trigger and interrupt synchronization explicitly.
- *
- * @author Brian
  */
 public interface IFlowSyncService extends IFloodlightService {
     public Future<SyncResult> synchronize(IOFSwitch sw);
diff --git a/src/main/java/net/onrc/onos/core/main/IOFSwitchPortListener.java b/src/main/java/net/onrc/onos/core/main/IOFSwitchPortListener.java
index ba21ffc..edf4539 100644
--- a/src/main/java/net/onrc/onos/core/main/IOFSwitchPortListener.java
+++ b/src/main/java/net/onrc/onos/core/main/IOFSwitchPortListener.java
@@ -8,7 +8,7 @@
 import org.openflow.protocol.OFPhysicalPort;
 
 /**
- * @author y-higuchi
+ * Extra event handler added to IOFSwitchListener by ONOS.
  */
 public interface IOFSwitchPortListener extends IOFSwitchListener {
 
diff --git a/src/main/java/net/onrc/onos/core/main/IOnosRemoteSwitch.java b/src/main/java/net/onrc/onos/core/main/IOnosRemoteSwitch.java
index 1218555..54d9372 100644
--- a/src/main/java/net/onrc/onos/core/main/IOnosRemoteSwitch.java
+++ b/src/main/java/net/onrc/onos/core/main/IOnosRemoteSwitch.java
@@ -6,7 +6,8 @@
 import net.floodlightcontroller.core.IOFSwitch;
 
 /**
- * @author y-higuchi
+ * Additional interface added to IOFSwitch by ONOS
+ * to represent remote Switch.
  */
 public interface IOnosRemoteSwitch extends IOFSwitch {
 
diff --git a/src/main/java/net/onrc/onos/core/registry/IControllerRegistryService.java b/src/main/java/net/onrc/onos/core/registry/IControllerRegistryService.java
index e06f158..5af1ac1 100644
--- a/src/main/java/net/onrc/onos/core/registry/IControllerRegistryService.java
+++ b/src/main/java/net/onrc/onos/core/registry/IControllerRegistryService.java
@@ -19,8 +19,6 @@
  * control of a switch (MASTER role) at once. Controllers therefore need a
  * mechanism that enables them to decide who should control a each switch.
  * The registry service provides this mechanism.
- *
- * @author jono
  */
 public interface IControllerRegistryService extends IFloodlightService {
 
diff --git a/src/main/java/net/onrc/onos/core/registry/ZookeeperRegistry.java b/src/main/java/net/onrc/onos/core/registry/ZookeeperRegistry.java
index 7bc2a75..103438e 100644
--- a/src/main/java/net/onrc/onos/core/registry/ZookeeperRegistry.java
+++ b/src/main/java/net/onrc/onos/core/registry/ZookeeperRegistry.java
@@ -52,8 +52,6 @@
 /**
  * A registry service that uses Zookeeper. All data is stored in Zookeeper,
  * so this can be used as a global registry in a multi-node ONOS cluster.
- *
- * @author jono
  */
 public class ZookeeperRegistry implements IFloodlightModule,
                                           IControllerRegistryService {
diff --git a/src/main/java/net/onrc/onos/core/topology/DeviceImpl.java b/src/main/java/net/onrc/onos/core/topology/DeviceImpl.java
index 6bb133a..fc1628e 100644
--- a/src/main/java/net/onrc/onos/core/topology/DeviceImpl.java
+++ b/src/main/java/net/onrc/onos/core/topology/DeviceImpl.java
@@ -6,7 +6,7 @@
 import net.floodlightcontroller.util.MACAddress;
 
 /**
- * @author Toshio Koide (t-koide@onlab.us)
+ * Device Object stored in In-memory Topology.
  */
 public class DeviceImpl extends TopologyObject implements Device {
 
diff --git a/src/test/java/net/onrc/onos/core/devicemanager/OnosDeviceManagerTest.java b/src/test/java/net/onrc/onos/core/devicemanager/OnosDeviceManagerTest.java
index 2eb83d4..0b9defb 100644
--- a/src/test/java/net/onrc/onos/core/devicemanager/OnosDeviceManagerTest.java
+++ b/src/test/java/net/onrc/onos/core/devicemanager/OnosDeviceManagerTest.java
@@ -41,8 +41,6 @@
 import org.openflow.protocol.OFType;
 
 /**
- * @author patrick.liu@huawei.com
- *         <p/>
  *         Unit tests for the Device Manager module (OnosDeviceManger).
  *         These test cases check the result of add/delete device and
  *         verify the result of processPacketIn through inject faked packets
diff --git a/src/test/java/net/onrc/onos/core/intent/ConstrainedBFSTreeTest.java b/src/test/java/net/onrc/onos/core/intent/ConstrainedBFSTreeTest.java
index 0e4ce87..4a58b90 100644
--- a/src/test/java/net/onrc/onos/core/intent/ConstrainedBFSTreeTest.java
+++ b/src/test/java/net/onrc/onos/core/intent/ConstrainedBFSTreeTest.java
@@ -11,7 +11,7 @@
 import org.junit.Test;
 
 /**
- * @author Toshio Koide (t-koide@onlab.us)
+ * Unit tests for ConstrainedBFSTree class.
  */
 public class ConstrainedBFSTreeTest {
     static final long LOCAL_PORT = 0xFFFEL;
diff --git a/src/test/java/net/onrc/onos/core/intent/ConstrainedShortestPathIntentTest.java b/src/test/java/net/onrc/onos/core/intent/ConstrainedShortestPathIntentTest.java
index c8a4e0d..f3ada97 100644
--- a/src/test/java/net/onrc/onos/core/intent/ConstrainedShortestPathIntentTest.java
+++ b/src/test/java/net/onrc/onos/core/intent/ConstrainedShortestPathIntentTest.java
@@ -13,7 +13,7 @@
 import com.esotericsoftware.kryo.io.Output;
 
 /**
- * @author Toshio Koide (t-koide@onlab.us)
+ * Unit tests for ConstrainedShortestPathIntent class.
  */
 public class ConstrainedShortestPathIntentTest {
     @Before
diff --git a/src/test/java/net/onrc/onos/core/intent/ErrorIntentTest.java b/src/test/java/net/onrc/onos/core/intent/ErrorIntentTest.java
index 82b6061..448ffcc 100644
--- a/src/test/java/net/onrc/onos/core/intent/ErrorIntentTest.java
+++ b/src/test/java/net/onrc/onos/core/intent/ErrorIntentTest.java
@@ -10,8 +10,6 @@
 
 /**
  * Unit tests for the ErrorIntent class.
- *
- * @author Toshio Koide (t-koide@onlab.us)
  */
 public class ErrorIntentTest {
 
diff --git a/src/test/java/net/onrc/onos/core/intent/IntentMapTest.java b/src/test/java/net/onrc/onos/core/intent/IntentMapTest.java
index a13ff49..49d26a5 100644
--- a/src/test/java/net/onrc/onos/core/intent/IntentMapTest.java
+++ b/src/test/java/net/onrc/onos/core/intent/IntentMapTest.java
@@ -15,7 +15,7 @@
 import org.junit.Test;
 
 /**
- * @author Toshio Koide (t-koide@onlab.us)
+ * Unit tests for IntentMap class.
  */
 public class IntentMapTest {
 
diff --git a/src/test/java/net/onrc/onos/core/intent/IntentOperationListTest.java b/src/test/java/net/onrc/onos/core/intent/IntentOperationListTest.java
index 876d2b1..afc903d 100644
--- a/src/test/java/net/onrc/onos/core/intent/IntentOperationListTest.java
+++ b/src/test/java/net/onrc/onos/core/intent/IntentOperationListTest.java
@@ -13,7 +13,7 @@
 import com.esotericsoftware.kryo.io.Output;
 
 /**
- * @author Toshio Koide (t-koide@onlab.us)
+ * Unit tests for IntentOperationList.
  */
 public class IntentOperationListTest {
 
diff --git a/src/test/java/net/onrc/onos/core/intent/IntentOperationTest.java b/src/test/java/net/onrc/onos/core/intent/IntentOperationTest.java
index 6519508..378e499 100644
--- a/src/test/java/net/onrc/onos/core/intent/IntentOperationTest.java
+++ b/src/test/java/net/onrc/onos/core/intent/IntentOperationTest.java
@@ -10,8 +10,6 @@
 
 /**
  * Unit tests for the IntentOperation class.
- *
- * @author Toshio Koide (t-koide@onlab.us)
  */
 public class IntentOperationTest {
 
diff --git a/src/test/java/net/onrc/onos/core/intent/IntentTest.java b/src/test/java/net/onrc/onos/core/intent/IntentTest.java
index 64139a4..d8a1690 100644
--- a/src/test/java/net/onrc/onos/core/intent/IntentTest.java
+++ b/src/test/java/net/onrc/onos/core/intent/IntentTest.java
@@ -9,7 +9,7 @@
 import org.junit.Test;
 
 /**
- * @author Toshio Koide (t-koide@onlab.us)
+ * Unit tests for Intent.
  */
 public class IntentTest {
     @Test
diff --git a/src/test/java/net/onrc/onos/core/intent/MockTopology.java b/src/test/java/net/onrc/onos/core/intent/MockTopology.java
index 27fd96a..ddbdbe7 100644
--- a/src/test/java/net/onrc/onos/core/intent/MockTopology.java
+++ b/src/test/java/net/onrc/onos/core/intent/MockTopology.java
@@ -9,8 +9,6 @@
 /**
  * A mock class of Topology.
  * This class should be used only by test codes.
- *
- * @author Toshio Koide (t-koide@onlab.us)
  */
 public class MockTopology extends TopologyImpl {
     // TODO this class doesn't seem like it should extend TopologyImpl. It
diff --git a/src/test/java/net/onrc/onos/core/intent/PathIntentTest.java b/src/test/java/net/onrc/onos/core/intent/PathIntentTest.java
index eaef4c7..43ce79f 100644
--- a/src/test/java/net/onrc/onos/core/intent/PathIntentTest.java
+++ b/src/test/java/net/onrc/onos/core/intent/PathIntentTest.java
@@ -13,7 +13,7 @@
 import com.esotericsoftware.kryo.io.Output;
 
 /**
- * @author Toshio Koide (t-koide@onlab.us)
+ * Unit tests for PathIntent.
  */
 public class PathIntentTest {
     @Before
diff --git a/src/test/java/net/onrc/onos/core/intent/ShortestPathIntentTest.java b/src/test/java/net/onrc/onos/core/intent/ShortestPathIntentTest.java
index 87397c0..5fc4452 100644
--- a/src/test/java/net/onrc/onos/core/intent/ShortestPathIntentTest.java
+++ b/src/test/java/net/onrc/onos/core/intent/ShortestPathIntentTest.java
@@ -11,7 +11,7 @@
 import com.esotericsoftware.kryo.io.Output;
 
 /**
- * @author Toshio Koide (t-koide@onlab.us)
+ * Unit tests for ShortestPathIntent.
  */
 public class ShortestPathIntentTest {
     @Before
diff --git a/src/test/java/net/onrc/onos/core/intent/runtime/PathCalcRuntimeModuleTest.java b/src/test/java/net/onrc/onos/core/intent/runtime/PathCalcRuntimeModuleTest.java
index 262042f..9623436 100644
--- a/src/test/java/net/onrc/onos/core/intent/runtime/PathCalcRuntimeModuleTest.java
+++ b/src/test/java/net/onrc/onos/core/intent/runtime/PathCalcRuntimeModuleTest.java
@@ -37,8 +37,6 @@
 import org.powermock.modules.junit4.PowerMockRunner;
 
 /**
- * @author Ray Milkey (ray@onlab.us)
- *         <p/>
  *         Unit tests for the Path Calculation Runtime module (PathCalcRuntimeModule).
  *         These test cases check the results of creating paths, deleting paths, and
  *         rerouting paths.  The topology, controller registry, and data grid are
diff --git a/src/test/java/net/onrc/onos/core/intent/runtime/UseCaseTest.java b/src/test/java/net/onrc/onos/core/intent/runtime/UseCaseTest.java
index cdae6d8..d911d2f 100644
--- a/src/test/java/net/onrc/onos/core/intent/runtime/UseCaseTest.java
+++ b/src/test/java/net/onrc/onos/core/intent/runtime/UseCaseTest.java
@@ -50,8 +50,6 @@
  * Temporary test cases for the ONS2014 demo.
  * These test cases should be modified and be moved to appropriate classes
  * (ex. PathCalcRuntimeModuleTest, PlanInstallModuleTest, etc.)
- *
- * @author Toshio Koide (t-koide@onlab.us)
  */
 @RunWith(PowerMockRunner.class)
 @PrepareForTest(PathCalcRuntimeModule.class)
diff --git a/src/test/java/net/onrc/onos/core/registry/StandaloneRegistryTest.java b/src/test/java/net/onrc/onos/core/registry/StandaloneRegistryTest.java
index bb62657..6eb6687 100644
--- a/src/test/java/net/onrc/onos/core/registry/StandaloneRegistryTest.java
+++ b/src/test/java/net/onrc/onos/core/registry/StandaloneRegistryTest.java
@@ -29,8 +29,6 @@
 
 /**
  * Unit test for {@link StandaloneRegistry}.
- *
- * @author Naoki Shiota
  */
 public class StandaloneRegistryTest {
 
@@ -47,8 +45,6 @@
      * specific times (specified by constructor parameter). Particularly, the first time callback
      * called is supposed for registration, this class has an independent latch to wait for
      * the first callback.
-     *
-     * @author Naoki Shiota
      */
     public static class LoggingCallback implements ControlChangeCallback {
         private LinkedList<Long> dpidsCalledback = new LinkedList<Long>();
diff --git a/src/test/java/net/onrc/onos/core/registry/ZookeeperRegistryTest.java b/src/test/java/net/onrc/onos/core/registry/ZookeeperRegistryTest.java
index f73616e..ca56736 100644
--- a/src/test/java/net/onrc/onos/core/registry/ZookeeperRegistryTest.java
+++ b/src/test/java/net/onrc/onos/core/registry/ZookeeperRegistryTest.java
@@ -43,8 +43,6 @@
  * Unit test for {@link ZookeeperRegistry}.
  * NOTE: {@link FloodlightTestCase} conflicts with PowerMock. If FloodLight-related methods need to be tested,
  * implement another test class to test them.
- *
- * @author Naoki Shiota
  */
 @RunWith(PowerMockRunner.class)
 @PrepareForTest({ZookeeperRegistry.class, CuratorFramework.class, CuratorFrameworkFactory.class,