From 6af5d2fdfc2ddf2a23a3129e6d7711ed7bb5c8ef Mon Sep 17 00:00:00 2001
From: Kirk True <kirk@mustardgrain.com>
Date: Sun, 28 Feb 2010 19:43:55 -0800
Subject: [PATCH] Removed the @author tags from Java source files.

---
 .../ec2-testing/src/java/voldemort/utils/ClusterCleaner.java  | 3 +--
 .../src/java/voldemort/utils/ClusterGenerator.java            | 1 -
 .../src/java/voldemort/utils/ClusterNodeDescriptor.java       | 1 -
 .../ec2-testing/src/java/voldemort/utils/ClusterStarter.java  | 3 +--
 .../ec2-testing/src/java/voldemort/utils/ClusterStopper.java  | 3 +--
 contrib/ec2-testing/src/java/voldemort/utils/Deployer.java    | 3 +--
 .../ec2-testing/src/java/voldemort/utils/Ec2Connection.java   | 3 +--
 .../ec2-testing/src/java/voldemort/utils/HostNamePair.java    | 1 -
 .../ec2-testing/src/java/voldemort/utils/RemoteOperation.java | 3 +--
 contrib/ec2-testing/src/java/voldemort/utils/RemoteTest.java  | 3 +--
 .../java/voldemort/utils/impl/CommandLineParameterizer.java   | 1 -
 .../src/java/voldemort/utils/impl/CommandLineParser.java      | 1 -
 .../java/voldemort/utils/impl/CommandLineRemoteOperation.java | 1 -
 .../src/java/voldemort/utils/impl/CommandOutputListener.java  | 1 -
 .../voldemort/utils/impl/DelegatingCommandOutputListener.java | 1 -
 .../src/java/voldemort/utils/impl/ExitCodeCallable.java       | 1 -
 .../voldemort/utils/impl/LoggingCommandOutputListener.java    | 1 -
 .../src/java/voldemort/utils/impl/RsyncDeployer.java          | 3 +--
 .../src/java/voldemort/utils/impl/SshClusterCleaner.java      | 3 +--
 .../src/java/voldemort/utils/impl/SshClusterStarter.java      | 1 -
 .../src/java/voldemort/utils/impl/SshClusterStopper.java      | 1 -
 .../src/java/voldemort/utils/impl/SshRemoteTest.java          | 1 -
 .../voldemort/utils/impl/StdOutCommandOutputListener.java     | 1 -
 .../src/java/voldemort/utils/impl/TypicaEc2Connection.java    | 3 +--
 .../src/java/voldemort/utils/impl/UnixCommand.java            | 1 -
 .../test/voldemort/utils/Ec2FailureDetectorTest.java          | 4 +---
 contrib/ec2-testing/test/voldemort/utils/Ec2GossipTest.java   | 1 -
 .../ec2-testing/test/voldemort/utils/Ec2RebalanceTest.java    | 1 -
 .../ec2-testing/test/voldemort/utils/Ec2RemoteTestConfig.java | 1 -
 contrib/ec2-testing/test/voldemort/utils/Ec2SmokeTest.java    | 2 --
 .../voldemort/store/readonly/benchmark/BuildTestStore.java    | 1 -
 .../java/voldemort/store/readonly/benchmark/GenerateData.java | 1 -
 .../store/readonly/fetcher/ConfigurableSocketFactory.java     | 3 +--
 .../java/voldemort/store/readonly/fetcher/HdfsFetcher.java    | 1 -
 .../store/readonly/mr/AbstractHadoopStoreBuilderMapper.java   | 1 -
 .../store/readonly/mr/AbstractStoreBuilderConfigurable.java   | 1 -
 .../java/voldemort/store/readonly/mr/HadoopStoreBuilder.java  | 1 -
 .../store/readonly/mr/HadoopStoreBuilderPartitioner.java      | 1 -
 .../store/readonly/mr/HadoopStoreBuilderReducer.java          | 1 -
 .../voldemort/store/readonly/mr/HadoopStoreJobRunner.java     | 1 -
 .../voldemort/store/readonly/fetcher/HdfsFetcherTest.java     | 1 -
 .../voldemort/store/readonly/mr/HadoopStoreBuilderTest.java   | 1 -
 .../voldemort/serialization/mongodb/MongoDBDocSerializer.java | 1 -
 .../serialization/mongodb/MongoDBSerializationFactory.java    | 1 -
 .../voldemort/store/mongodb/MongoDBStorageConfiguration.java  | 1 -
 .../java/voldemort/store/mongodb/MongoDBStorageEngine.java    | 1 -
 .../voldemort/store/mongodb/MongoDBStorageEngineTest.java     | 1 -
 src/java/voldemort/ClusterViewer.java                         | 1 -
 src/java/voldemort/VoldemortApplicationException.java         | 1 -
 src/java/voldemort/VoldemortClientShell.java                  | 1 -
 src/java/voldemort/VoldemortException.java                    | 1 -
 src/java/voldemort/annotations/concurrency/Immutable.java     | 1 -
 src/java/voldemort/annotations/concurrency/LockedBy.java      | 1 -
 src/java/voldemort/annotations/concurrency/NotThreadsafe.java | 1 -
 src/java/voldemort/annotations/concurrency/Threadsafe.java    | 1 -
 src/java/voldemort/annotations/jmx/JmxManaged.java            | 1 -
 src/java/voldemort/annotations/jmx/JmxOperation.java          | 1 -
 src/java/voldemort/annotations/jmx/JmxParam.java              | 1 -
 src/java/voldemort/client/AbstractStoreClientFactory.java     | 1 -
 src/java/voldemort/client/BootstrapFailureException.java      | 3 +--
 src/java/voldemort/client/ClientConfig.java                   | 1 -
 src/java/voldemort/client/ClientThreadPool.java               | 1 -
 src/java/voldemort/client/DefaultStoreClient.java             | 1 -
 src/java/voldemort/client/HttpStoreClientFactory.java         | 1 -
 src/java/voldemort/client/MockStoreClientFactory.java         | 1 -
 src/java/voldemort/client/RoutingTier.java                    | 1 -
 src/java/voldemort/client/SocketStoreClientFactory.java       | 1 -
 src/java/voldemort/client/StoreClient.java                    | 1 -
 src/java/voldemort/client/StoreClientFactory.java             | 3 +--
 src/java/voldemort/client/UpdateAction.java                   | 1 -
 src/java/voldemort/client/protocol/RequestFormat.java         | 1 -
 src/java/voldemort/client/protocol/RequestFormatFactory.java  | 1 -
 src/java/voldemort/client/protocol/RequestFormatType.java     | 1 -
 src/java/voldemort/client/protocol/VoldemortFilter.java       | 1 -
 src/java/voldemort/client/protocol/admin/AdminClient.java     | 1 -
 .../voldemort/client/protocol/admin/AdminClientConfig.java    | 1 -
 .../client/protocol/pb/ProtoBuffClientRequestFormat.java      | 1 -
 src/java/voldemort/client/protocol/pb/ProtoUtils.java         | 1 -
 .../protocol/vold/VoldemortNativeClientRequestFormat.java     | 1 -
 .../voldemort/client/rebalance/RebalanceClusterBuilder.java   | 1 -
 src/java/voldemort/client/rebalance/RebalanceClusterTool.java | 1 -
 src/java/voldemort/cluster/Cluster.java                       | 1 -
 src/java/voldemort/cluster/Node.java                          | 1 -
 .../cluster/failuredetector/AbstractFailureDetector.java      | 1 -
 .../cluster/failuredetector/AsyncRecoveryFailureDetector.java | 1 -
 .../cluster/failuredetector/BannagePeriodFailureDetector.java | 2 --
 .../voldemort/cluster/failuredetector/BasicStoreVerifier.java | 1 -
 .../cluster/failuredetector/ClientStoreVerifier.java          | 1 -
 .../voldemort/cluster/failuredetector/FailureDetector.java    | 2 --
 .../cluster/failuredetector/FailureDetectorConfig.java        | 1 -
 .../cluster/failuredetector/FailureDetectorListener.java      | 1 -
 .../cluster/failuredetector/FailureDetectorUtils.java         | 1 -
 src/java/voldemort/cluster/failuredetector/NodeStatus.java    | 1 -
 .../cluster/failuredetector/NoopFailureDetector.java          | 1 -
 .../cluster/failuredetector/ServerStoreVerifier.java          | 1 -
 src/java/voldemort/cluster/failuredetector/StoreVerifier.java | 1 -
 .../cluster/failuredetector/ThresholdFailureDetector.java     | 1 -
 src/java/voldemort/routing/ConsistentRoutingStrategy.java     | 1 -
 src/java/voldemort/routing/RouteToAllStrategy.java            | 1 -
 src/java/voldemort/routing/RoutingStrategy.java               | 1 -
 src/java/voldemort/routing/RoutingStrategyFactory.java        | 1 -
 src/java/voldemort/routing/RoutingStrategyType.java           | 1 -
 .../voldemort/serialization/DefaultSerializerFactory.java     | 1 -
 src/java/voldemort/serialization/IdentitySerializer.java      | 1 -
 src/java/voldemort/serialization/ObjectSerializer.java        | 1 -
 src/java/voldemort/serialization/SerializationException.java  | 1 -
 src/java/voldemort/serialization/Serializer.java              | 1 -
 src/java/voldemort/serialization/SerializerDefinition.java    | 1 -
 src/java/voldemort/serialization/SerializerFactory.java       | 3 +--
 src/java/voldemort/serialization/SlopSerializer.java          | 1 -
 src/java/voldemort/serialization/StringSerializer.java        | 1 -
 src/java/voldemort/serialization/VersionedSerializer.java     | 1 -
 src/java/voldemort/serialization/json/JsonReader.java         | 1 -
 src/java/voldemort/serialization/json/JsonTypeDefinition.java | 1 -
 src/java/voldemort/serialization/json/JsonTypeSerializer.java | 1 -
 src/java/voldemort/serialization/json/JsonTypes.java          | 1 -
 src/java/voldemort/serialization/json/JsonWriter.java         | 1 -
 src/java/voldemort/server/AbstractService.java                | 1 -
 src/java/voldemort/server/AbstractSocketService.java          | 3 +--
 src/java/voldemort/server/ServiceType.java                    | 1 -
 src/java/voldemort/server/StoreRepository.java                | 1 -
 src/java/voldemort/server/UnableUpdateMetadataException.java  | 1 -
 src/java/voldemort/server/VoldemortConfig.java                | 1 -
 src/java/voldemort/server/VoldemortJsvcDaemon.java            | 1 -
 src/java/voldemort/server/VoldemortServer.java                | 1 -
 src/java/voldemort/server/VoldemortService.java               | 1 -
 src/java/voldemort/server/gossip/GossipService.java           | 1 -
 src/java/voldemort/server/gossip/Gossiper.java                | 1 -
 src/java/voldemort/server/http/HttpService.java               | 1 -
 src/java/voldemort/server/http/StoreServlet.java              | 1 -
 .../server/http/VoldemortServletContextListener.java          | 1 -
 src/java/voldemort/server/http/gui/AdminServlet.java          | 1 -
 src/java/voldemort/server/http/gui/QueryServlet.java          | 1 -
 .../server/http/gui/ReadOnlyStoreManagementServlet.java       | 1 -
 src/java/voldemort/server/http/gui/VelocityEngine.java        | 1 -
 src/java/voldemort/server/jmx/JmxService.java                 | 1 -
 src/java/voldemort/server/niosocket/AsyncRequestHandler.java  | 1 -
 src/java/voldemort/server/niosocket/NioSocketService.java     | 1 -
 src/java/voldemort/server/niosocket/SelectorManager.java      | 1 -
 .../voldemort/server/protocol/AbstractRequestHandler.java     | 1 -
 src/java/voldemort/server/protocol/RequestHandler.java        | 1 -
 src/java/voldemort/server/protocol/RequestHandlerFactory.java | 1 -
 .../server/protocol/SocketRequestHandlerFactory.java          | 1 -
 src/java/voldemort/server/protocol/StreamRequestHandler.java  | 1 -
 .../server/protocol/admin/AdminServiceRequestHandler.java     | 1 -
 src/java/voldemort/server/protocol/admin/AsyncOperation.java  | 1 -
 .../server/protocol/admin/AsyncOperationRepository.java       | 1 -
 .../voldemort/server/protocol/admin/AsyncOperationRunner.java | 1 -
 .../voldemort/server/protocol/admin/AsyncOperationStatus.java | 1 -
 .../voldemort/server/protocol/pb/ProtoBuffRequestHandler.java | 1 -
 .../server/protocol/vold/VoldemortNativeRequestHandler.java   | 1 -
 src/java/voldemort/server/rebalance/RebalancerService.java    | 1 -
 src/java/voldemort/server/scheduler/DataCleanupJob.java       | 1 -
 src/java/voldemort/server/scheduler/RebalancingJob.java       | 1 -
 src/java/voldemort/server/scheduler/SchedulerService.java     | 1 -
 src/java/voldemort/server/scheduler/SlopPusherJob.java        | 3 +--
 src/java/voldemort/server/socket/SocketServer.java            | 1 -
 src/java/voldemort/server/socket/SocketServerSession.java     | 3 +--
 src/java/voldemort/server/socket/SocketService.java           | 3 +--
 src/java/voldemort/server/storage/StorageService.java         | 1 -
 src/java/voldemort/store/DelegatingStore.java                 | 1 -
 src/java/voldemort/store/ErrorCodeMapper.java                 | 1 -
 .../store/InsufficientOperationalNodesException.java          | 1 -
 src/java/voldemort/store/InvalidMetadataException.java        | 1 -
 src/java/voldemort/store/NoSuchCapabilityException.java       | 1 -
 src/java/voldemort/store/PersistenceFailureException.java     | 1 -
 src/java/voldemort/store/StorageConfiguration.java            | 1 -
 src/java/voldemort/store/StorageEngine.java                   | 1 -
 src/java/voldemort/store/StorageInitializationException.java  | 1 -
 src/java/voldemort/store/Store.java                           | 1 -
 src/java/voldemort/store/StoreDefinition.java                 | 1 -
 src/java/voldemort/store/StoreDefinitionBuilder.java          | 1 -
 src/java/voldemort/store/StoreOperationFailureException.java  | 1 -
 src/java/voldemort/store/StoreUtils.java                      | 1 -
 src/java/voldemort/store/UnknownFailure.java                  | 1 -
 src/java/voldemort/store/UnreachableStoreException.java       | 1 -
 src/java/voldemort/store/bdb/BdbStorageConfiguration.java     | 1 -
 src/java/voldemort/store/bdb/BdbStorageEngine.java            | 1 -
 src/java/voldemort/store/compress/lzf/ChunkEncoder.java       | 2 --
 src/java/voldemort/store/compress/lzf/LZF.java                | 1 -
 src/java/voldemort/store/compress/lzf/LZFChunk.java           | 1 -
 src/java/voldemort/store/compress/lzf/LZFDecoder.java         | 2 --
 src/java/voldemort/store/compress/lzf/LZFEncoder.java         | 2 --
 .../store/configuration/ConfigurationStorageEngine.java       | 1 -
 src/java/voldemort/store/gzip/GzipStore.java                  | 1 -
 .../voldemort/store/http/HttpResponseCodeErrorMapper.java     | 2 --
 src/java/voldemort/store/http/HttpStore.java                  | 1 -
 .../store/invalidmetadata/InvalidMetadataCheckingStore.java   | 1 -
 src/java/voldemort/store/logging/LoggingStore.java            | 1 -
 .../voldemort/store/memory/CacheStorageConfiguration.java     | 1 -
 .../voldemort/store/memory/InMemoryStorageConfiguration.java  | 1 -
 src/java/voldemort/store/memory/InMemoryStorageEngine.java    | 2 --
 src/java/voldemort/store/metadata/MetadataStore.java          | 1 -
 src/java/voldemort/store/mysql/MysqlStorageEngine.java        | 1 -
 src/java/voldemort/store/readonly/BinarySearchStrategy.java   | 1 -
 src/java/voldemort/store/readonly/ChunkedFileSet.java         | 1 -
 src/java/voldemort/store/readonly/ExternalSorter.java         | 1 -
 src/java/voldemort/store/readonly/FileFetcher.java            | 1 -
 .../voldemort/store/readonly/InterpolationSearchStrategy.java | 1 -
 src/java/voldemort/store/readonly/JsonStoreBuilder.java       | 1 -
 src/java/voldemort/store/readonly/ReadOnlyStorageEngine.java  | 1 -
 src/java/voldemort/store/readonly/SearchStrategy.java         | 1 -
 src/java/voldemort/store/readonly/StoreSwapper.java           | 1 -
 src/java/voldemort/store/readonly/StringSorter.java           | 1 -
 src/java/voldemort/store/rebalancing/RedirectingStore.java    | 1 -
 src/java/voldemort/store/routed/NodeValue.java                | 3 +--
 src/java/voldemort/store/routed/ReadRepairer.java             | 1 -
 src/java/voldemort/store/routed/RoutedStore.java              | 1 -
 .../voldemort/store/serialized/SerializingStorageEngine.java  | 1 -
 src/java/voldemort/store/serialized/SerializingStore.java     | 1 -
 src/java/voldemort/store/slop/Slop.java                       | 1 -
 src/java/voldemort/store/slop/SlopDetectingStore.java         | 1 -
 src/java/voldemort/store/slop/SloppyStore.java                | 1 -
 src/java/voldemort/store/socket/SocketAndStreams.java         | 1 -
 src/java/voldemort/store/socket/SocketDestination.java        | 1 -
 src/java/voldemort/store/socket/SocketPool.java               | 1 -
 src/java/voldemort/store/socket/SocketResourceFactory.java    | 1 -
 src/java/voldemort/store/socket/SocketStore.java              | 1 -
 src/java/voldemort/store/stats/DataSetStats.java              | 1 -
 src/java/voldemort/store/stats/RequestCounter.java            | 3 +--
 src/java/voldemort/store/stats/StatTrackingStore.java         | 1 -
 src/java/voldemort/store/stats/StoreStats.java                | 1 -
 src/java/voldemort/store/stats/StoreStatsJmx.java             | 1 -
 .../store/versioned/InconsistencyResolvingStore.java          | 1 -
 .../voldemort/store/versioned/VersionIncrementingStore.java   | 1 -
 .../voldemort/store/views/AbstractViewTransformation.java     | 1 -
 .../store/views/UnsupportedViewOperationException.java        | 1 -
 src/java/voldemort/store/views/View.java                      | 1 -
 src/java/voldemort/store/views/ViewStorageEngine.java         | 1 -
 src/java/voldemort/utils/ByteBufferBackedInputStream.java     | 1 -
 src/java/voldemort/utils/ByteBufferBackedOutputStream.java    | 1 -
 src/java/voldemort/utils/ByteUtils.java                       | 1 -
 src/java/voldemort/utils/ClosableIterator.java                | 1 -
 src/java/voldemort/utils/CmdUtils.java                        | 1 -
 src/java/voldemort/utils/ConstantHashFunction.java            | 1 -
 src/java/voldemort/utils/DaemonThreadFactory.java             | 1 -
 src/java/voldemort/utils/DefaultIterable.java                 | 1 -
 src/java/voldemort/utils/DirectoryIterator.java               | 1 -
 src/java/voldemort/utils/EventThrottler.java                  | 1 -
 src/java/voldemort/utils/FnvHashFunction.java                 | 1 -
 src/java/voldemort/utils/HashFunction.java                    | 1 -
 src/java/voldemort/utils/JmxUtils.java                        | 1 -
 src/java/voldemort/utils/NetworkClassLoader.java              | 1 -
 src/java/voldemort/utils/Props.java                           | 1 -
 src/java/voldemort/utils/RebalanceUtils.java                  | 1 -
 src/java/voldemort/utils/ReflectUtils.java                    | 1 -
 src/java/voldemort/utils/StringOutputStream.java              | 1 -
 src/java/voldemort/utils/SystemTime.java                      | 1 -
 src/java/voldemort/utils/Time.java                            | 1 -
 src/java/voldemort/utils/UndefinedPropertyException.java      | 1 -
 src/java/voldemort/utils/Utils.java                           | 1 -
 src/java/voldemort/utils/VoldemortAdminClientShell.java       | 1 -
 src/java/voldemort/utils/WriteThroughCache.java               | 3 +--
 .../utils/pool/ExcessiveInvalidResourcesException.java        | 1 -
 src/java/voldemort/utils/pool/ResourceFactory.java            | 1 -
 src/java/voldemort/utils/pool/ResourcePoolConfig.java         | 1 -
 .../voldemort/versioning/ArbitraryInconsistencyResolver.java  | 1 -
 src/java/voldemort/versioning/ChainedResolver.java            | 1 -
 src/java/voldemort/versioning/ClockEntry.java                 | 1 -
 .../voldemort/versioning/FailingInconsistencyResolver.java    | 1 -
 src/java/voldemort/versioning/InconsistencyResolver.java      | 1 -
 src/java/voldemort/versioning/InconsistentDataException.java  | 1 -
 .../voldemort/versioning/MergingInconsistencyResolver.java    | 1 -
 src/java/voldemort/versioning/ObjectMerger.java               | 1 -
 src/java/voldemort/versioning/ObsoleteVersionException.java   | 1 -
 src/java/voldemort/versioning/Occured.java                    | 1 -
 .../voldemort/versioning/TimeBasedInconsistencyResolver.java  | 1 -
 src/java/voldemort/versioning/VectorClock.java                | 1 -
 .../versioning/VectorClockInconsistencyResolver.java          | 1 -
 src/java/voldemort/versioning/Version.java                    | 1 -
 src/java/voldemort/versioning/Versioned.java                  | 1 -
 src/java/voldemort/xml/ClusterMapper.java                     | 1 -
 src/java/voldemort/xml/StoreDefinitionsMapper.java            | 1 -
 test/common/voldemort/Attempt.java                            | 1 -
 test/common/voldemort/MutableStoreVerifier.java               | 1 -
 test/common/voldemort/ServerTestUtils.java                    | 1 -
 test/common/voldemort/StaticStoreClientFactory.java           | 1 -
 test/common/voldemort/TestUtils.java                          | 1 -
 test/common/voldemort/store/DoNothingStore.java               | 1 -
 test/common/voldemort/store/FailingStore.java                 | 1 -
 test/common/voldemort/utils/ServerJVMTestUtils.java           | 1 -
 test/integration/voldemort/InMemoryMultiThreadedTest.java     | 1 -
 test/integration/voldemort/MultithreadedStressTest.java       | 1 -
 test/integration/voldemort/ReadJson.java                      | 1 -
 test/integration/voldemort/TestClientShutdown.java            | 1 -
 test/integration/voldemort/performance/BdbGrowth.java         | 3 +--
 test/integration/voldemort/performance/MysqlBench.java        | 1 -
 test/integration/voldemort/performance/MysqlGrowth.java       | 1 -
 .../voldemort/performance/RemoteDataGenerator.java            | 1 -
 .../voldemort/store/noop/NoopStorageConfiguration.java        | 1 -
 .../store/pausable/PausableStorageConfiguration.java          | 1 -
 .../voldemort/store/pausable/PausableStorageEngine.java       | 1 -
 .../unit/voldemort/client/AbstractStoreClientFactoryTest.java | 1 -
 test/unit/voldemort/client/AdminServiceBasicTest.java         | 1 -
 test/unit/voldemort/client/AdminServiceFailureTest.java       | 1 -
 test/unit/voldemort/client/AdminServiceFilterTest.java        | 1 -
 test/unit/voldemort/client/AdminServiceMultiJVMTest.java      | 1 -
 test/unit/voldemort/client/HttpStoreClientFactoryTest.java    | 1 -
 test/unit/voldemort/client/SocketStoreClientFactoryTest.java  | 1 -
 test/unit/voldemort/client/rebalance/RebalanceTest.java       | 3 +--
 .../voldemort/routing/PartitionedRoutingStrategyTest.java     | 1 -
 .../serialization/json/JsonBackwardsCompatibilityTest.java    | 1 -
 test/unit/voldemort/serialization/json/JsonReaderTest.java    | 1 -
 .../voldemort/serialization/json/JsonTypeSerializerTest.java  | 1 -
 test/unit/voldemort/server/EndToEndTest.java                  | 1 -
 test/unit/voldemort/server/ServiceTest.java                   | 1 -
 test/unit/voldemort/server/gossip/GossiperTest.java           | 1 -
 .../voldemort/server/protocol/admin/AsyncOperationTest.java   | 1 -
 test/unit/voldemort/server/socket/SocketPoolTest.java         | 1 -
 test/unit/voldemort/server/storage/StorageServiceTest.java    | 1 -
 test/unit/voldemort/store/AbstractByteArrayStoreTest.java     | 1 -
 test/unit/voldemort/store/bdb/BdbSplitStorageEngineTest.java  | 1 -
 test/unit/voldemort/store/http/HttpStoreTest.java             | 1 -
 .../invalidmetadata/InvalidMetadataCheckingStoreTest.java     | 1 -
 .../store/invalidmetadata/ServerSideRoutingTest.java          | 1 -
 test/unit/voldemort/store/logging/LoggingStoreTest.java       | 1 -
 test/unit/voldemort/store/memory/CacheStorageEngineTest.java  | 1 -
 test/unit/voldemort/store/readonly/SearchStrategyTest.java    | 1 -
 .../voldemort/store/rebalancing/RedirectingStoreTest.java     | 1 -
 test/unit/voldemort/store/routed/ReadRepairerTest.java        | 1 -
 test/unit/voldemort/store/routed/RoutedStoreTest.java         | 1 -
 .../unit/voldemort/store/serialized/SerializingStoreTest.java | 1 -
 test/unit/voldemort/store/socket/AbstractSocketStoreTest.java | 1 -
 .../store/socket/ProtocolBuffersSocketStoreTest.java          | 1 -
 .../store/socket/VoldemortNativeSocketStoreTest.java          | 1 -
 test/unit/voldemort/store/views/UpperCaseView.java            | 1 -
 test/unit/voldemort/store/views/ViewStorageEngineTest.java    | 1 -
 test/unit/voldemort/versioning/ClockEntryTest.java            | 1 -
 test/unit/voldemort/versioning/VectorClockTest.java           | 1 -
 329 files changed, 24 insertions(+), 362 deletions(-)

diff --git a/contrib/ec2-testing/src/java/voldemort/utils/ClusterCleaner.java b/contrib/ec2-testing/src/java/voldemort/utils/ClusterCleaner.java
index 8a962927bd..2ecf768042 100644
--- a/contrib/ec2-testing/src/java/voldemort/utils/ClusterCleaner.java
+++ b/contrib/ec2-testing/src/java/voldemort/utils/ClusterCleaner.java
@@ -46,9 +46,8 @@
  * directory upon which this operation is being performed.
  * </ol>
  * 
- * @author Kirk True
  */
 
 public interface ClusterCleaner extends RemoteOperation {
 
-}
\ No newline at end of file
+}
diff --git a/contrib/ec2-testing/src/java/voldemort/utils/ClusterGenerator.java b/contrib/ec2-testing/src/java/voldemort/utils/ClusterGenerator.java
index a91f716897..2422bb39f1 100644
--- a/contrib/ec2-testing/src/java/voldemort/utils/ClusterGenerator.java
+++ b/contrib/ec2-testing/src/java/voldemort/utils/ClusterGenerator.java
@@ -59,7 +59,6 @@
  * the test and server nodes in the test are all on the same network, using the
  * internal host name.
  * 
- * @author Kirk True
  * 
  * @see ClusterNodeDescriptor
  */
diff --git a/contrib/ec2-testing/src/java/voldemort/utils/ClusterNodeDescriptor.java b/contrib/ec2-testing/src/java/voldemort/utils/ClusterNodeDescriptor.java
index 8d57ef8300..fb90a448c5 100644
--- a/contrib/ec2-testing/src/java/voldemort/utils/ClusterNodeDescriptor.java
+++ b/contrib/ec2-testing/src/java/voldemort/utils/ClusterNodeDescriptor.java
@@ -22,7 +22,6 @@
  * ClusterNodeDescriptor is a simple POJO for storing the attributes of a node
  * as needed by the cluster.xml cluster descriptor file.
  * 
- * @author Kirk True
  * 
  * @see ClusterGenerator
  */
diff --git a/contrib/ec2-testing/src/java/voldemort/utils/ClusterStarter.java b/contrib/ec2-testing/src/java/voldemort/utils/ClusterStarter.java
index 787917a603..ed1edb6954 100644
--- a/contrib/ec2-testing/src/java/voldemort/utils/ClusterStarter.java
+++ b/contrib/ec2-testing/src/java/voldemort/utils/ClusterStarter.java
@@ -41,9 +41,8 @@
  * if possible.
  * </ol>
  * 
- * @author Kirk True
  */
 
 public interface ClusterStarter extends RemoteOperation {
 
-}
\ No newline at end of file
+}
diff --git a/contrib/ec2-testing/src/java/voldemort/utils/ClusterStopper.java b/contrib/ec2-testing/src/java/voldemort/utils/ClusterStopper.java
index 11b068cb87..e6d9a67fc6 100644
--- a/contrib/ec2-testing/src/java/voldemort/utils/ClusterStopper.java
+++ b/contrib/ec2-testing/src/java/voldemort/utils/ClusterStopper.java
@@ -44,9 +44,8 @@
  * if possible.
  * </ol>
  * 
- * @author Kirk True
  */
 
 public interface ClusterStopper extends RemoteOperation {
 
-}
\ No newline at end of file
+}
diff --git a/contrib/ec2-testing/src/java/voldemort/utils/Deployer.java b/contrib/ec2-testing/src/java/voldemort/utils/Deployer.java
index 43319e5b85..03c2c85725 100644
--- a/contrib/ec2-testing/src/java/voldemort/utils/Deployer.java
+++ b/contrib/ec2-testing/src/java/voldemort/utils/Deployer.java
@@ -40,9 +40,8 @@
  * directory upon which this operation is being performed.
  * </ol>
  * 
- * @author Kirk True
  */
 
 public interface Deployer extends RemoteOperation {
 
-}
\ No newline at end of file
+}
diff --git a/contrib/ec2-testing/src/java/voldemort/utils/Ec2Connection.java b/contrib/ec2-testing/src/java/voldemort/utils/Ec2Connection.java
index 81eae2bc19..8cabac9273 100644
--- a/contrib/ec2-testing/src/java/voldemort/utils/Ec2Connection.java
+++ b/contrib/ec2-testing/src/java/voldemort/utils/Ec2Connection.java
@@ -27,7 +27,6 @@
  * This API defines methods to create, delete, and retrieve a list of the remote
  * hosts from EC2.
  * 
- * @author Kirk True
  */
 
 public interface Ec2Connection {
@@ -107,4 +106,4 @@ public List<HostNamePair> createInstances(String ami,
 
     public void deleteInstancesByInstanceId(List<String> instanceIds) throws Exception;
 
-}
\ No newline at end of file
+}
diff --git a/contrib/ec2-testing/src/java/voldemort/utils/HostNamePair.java b/contrib/ec2-testing/src/java/voldemort/utils/HostNamePair.java
index c2f2ea64fd..ff35800c5e 100644
--- a/contrib/ec2-testing/src/java/voldemort/utils/HostNamePair.java
+++ b/contrib/ec2-testing/src/java/voldemort/utils/HostNamePair.java
@@ -34,7 +34,6 @@
  * names should be the same. That is, they should be identical and neither
  * should be set to null.
  * 
- * @author Kirk True
  */
 
 public class HostNamePair {
diff --git a/contrib/ec2-testing/src/java/voldemort/utils/RemoteOperation.java b/contrib/ec2-testing/src/java/voldemort/utils/RemoteOperation.java
index 85625e858a..be0c49686a 100644
--- a/contrib/ec2-testing/src/java/voldemort/utils/RemoteOperation.java
+++ b/contrib/ec2-testing/src/java/voldemort/utils/RemoteOperation.java
@@ -26,7 +26,6 @@
  * Should the operation span multiple remote hosts, implementations should
  * perform the operation in parallel with respect to the remote hosts.
  * 
- * @author Kirk True
  */
 
 public interface RemoteOperation {
@@ -41,4 +40,4 @@ public interface RemoteOperation {
 
     public void execute() throws RemoteOperationException;
 
-}
\ No newline at end of file
+}
diff --git a/contrib/ec2-testing/src/java/voldemort/utils/RemoteTest.java b/contrib/ec2-testing/src/java/voldemort/utils/RemoteTest.java
index 617fa029f3..1fb8afefd4 100644
--- a/contrib/ec2-testing/src/java/voldemort/utils/RemoteTest.java
+++ b/contrib/ec2-testing/src/java/voldemort/utils/RemoteTest.java
@@ -52,11 +52,10 @@
  * possible.
  * </ol>
  * 
- * @author Kirk True
  * 
  * @see RemoteTestResult
  */
 
 public interface RemoteTest extends RemoteOperation {
 
-}
\ No newline at end of file
+}
diff --git a/contrib/ec2-testing/src/java/voldemort/utils/impl/CommandLineParameterizer.java b/contrib/ec2-testing/src/java/voldemort/utils/impl/CommandLineParameterizer.java
index 1a182bd6d8..1963c6c6a8 100644
--- a/contrib/ec2-testing/src/java/voldemort/utils/impl/CommandLineParameterizer.java
+++ b/contrib/ec2-testing/src/java/voldemort/utils/impl/CommandLineParameterizer.java
@@ -31,7 +31,6 @@
  * The format for parameters is ${variableName}. These variables appear in a
  * template and are substituted on demand.
  * 
- * @author Kirk True
  */
 
 public class CommandLineParameterizer {
diff --git a/contrib/ec2-testing/src/java/voldemort/utils/impl/CommandLineParser.java b/contrib/ec2-testing/src/java/voldemort/utils/impl/CommandLineParser.java
index f305a426bc..5bb58ea41a 100644
--- a/contrib/ec2-testing/src/java/voldemort/utils/impl/CommandLineParser.java
+++ b/contrib/ec2-testing/src/java/voldemort/utils/impl/CommandLineParser.java
@@ -31,7 +31,6 @@
  * UnixCommand. UnixCommand, in turn, uses the {@link java.lang.ProcessBuilder}
  * class to build up the command to execute.
  * 
- * @author Kirk True
  */
 
 public class CommandLineParser {
diff --git a/contrib/ec2-testing/src/java/voldemort/utils/impl/CommandLineRemoteOperation.java b/contrib/ec2-testing/src/java/voldemort/utils/impl/CommandLineRemoteOperation.java
index d278908c9f..cf0b3da533 100644
--- a/contrib/ec2-testing/src/java/voldemort/utils/impl/CommandLineRemoteOperation.java
+++ b/contrib/ec2-testing/src/java/voldemort/utils/impl/CommandLineRemoteOperation.java
@@ -46,7 +46,6 @@
  * line invocations are then placed (in arbitrary order) into a list that is
  * returned to the caller.
  * 
- * @author Kirk True
  * 
  * @param <T> Return type for the operation, specific to the subclass
  *        implementation
diff --git a/contrib/ec2-testing/src/java/voldemort/utils/impl/CommandOutputListener.java b/contrib/ec2-testing/src/java/voldemort/utils/impl/CommandOutputListener.java
index 9fcdc12cc9..1dc0697245 100644
--- a/contrib/ec2-testing/src/java/voldemort/utils/impl/CommandOutputListener.java
+++ b/contrib/ec2-testing/src/java/voldemort/utils/impl/CommandOutputListener.java
@@ -29,7 +29,6 @@
  * progress, etc. So this mechanism should not be used for anything much more
  * than logging or incidental state management.
  * 
- * @author Kirk True
  */
 
 public interface CommandOutputListener {
diff --git a/contrib/ec2-testing/src/java/voldemort/utils/impl/DelegatingCommandOutputListener.java b/contrib/ec2-testing/src/java/voldemort/utils/impl/DelegatingCommandOutputListener.java
index 4cc5616783..e8987ae605 100644
--- a/contrib/ec2-testing/src/java/voldemort/utils/impl/DelegatingCommandOutputListener.java
+++ b/contrib/ec2-testing/src/java/voldemort/utils/impl/DelegatingCommandOutputListener.java
@@ -20,7 +20,6 @@
  * Abstract implementation of CommandOutputListener that allows chaining of
  * calls to outputReceived.
  * 
- * @author Kirk True
  */
 
 public abstract class DelegatingCommandOutputListener implements CommandOutputListener {
diff --git a/contrib/ec2-testing/src/java/voldemort/utils/impl/ExitCodeCallable.java b/contrib/ec2-testing/src/java/voldemort/utils/impl/ExitCodeCallable.java
index 1fd3487442..653237d1d1 100644
--- a/contrib/ec2-testing/src/java/voldemort/utils/impl/ExitCodeCallable.java
+++ b/contrib/ec2-testing/src/java/voldemort/utils/impl/ExitCodeCallable.java
@@ -22,7 +22,6 @@
  * ExitCodeCallable is an implementation of Callable to allow the UnixCommand to
  * be executed in the context of a thread pool.
  * 
- * @author Kirk True
  * 
  * @param <T> Type of return object
  */
diff --git a/contrib/ec2-testing/src/java/voldemort/utils/impl/LoggingCommandOutputListener.java b/contrib/ec2-testing/src/java/voldemort/utils/impl/LoggingCommandOutputListener.java
index 71509ee098..dae6b4e876 100644
--- a/contrib/ec2-testing/src/java/voldemort/utils/impl/LoggingCommandOutputListener.java
+++ b/contrib/ec2-testing/src/java/voldemort/utils/impl/LoggingCommandOutputListener.java
@@ -22,7 +22,6 @@
  * LoggingCommandOutputListener simply takes the output from the remote system
  * and logs it using the logging API.
  * 
- * @author Kirk True
  */
 
 public class LoggingCommandOutputListener extends DelegatingCommandOutputListener {
diff --git a/contrib/ec2-testing/src/java/voldemort/utils/impl/RsyncDeployer.java b/contrib/ec2-testing/src/java/voldemort/utils/impl/RsyncDeployer.java
index 52d0904ad5..7bf69c7d1d 100644
--- a/contrib/ec2-testing/src/java/voldemort/utils/impl/RsyncDeployer.java
+++ b/contrib/ec2-testing/src/java/voldemort/utils/impl/RsyncDeployer.java
@@ -37,7 +37,6 @@
  * going out to the shell to do this, but rsync is very flexible and can ride
  * over SSH.
  * 
- * @author Kirk True
  */
 
 public class RsyncDeployer extends CommandLineRemoteOperation implements Deployer {
@@ -130,4 +129,4 @@ protected Callable<?> getCallable(UnixCommand command) {
         return new ExitCodeCallable(command, commandOutputListener);
     }
 
-}
\ No newline at end of file
+}
diff --git a/contrib/ec2-testing/src/java/voldemort/utils/impl/SshClusterCleaner.java b/contrib/ec2-testing/src/java/voldemort/utils/impl/SshClusterCleaner.java
index 68ce7212b0..37bc8f4f15 100644
--- a/contrib/ec2-testing/src/java/voldemort/utils/impl/SshClusterCleaner.java
+++ b/contrib/ec2-testing/src/java/voldemort/utils/impl/SshClusterCleaner.java
@@ -33,7 +33,6 @@
  * SshClusterCleaner is an implementation of ClusterCleaner that cleans a
  * particular data directory.
  * 
- * @author Kirk True
  */
 
 public class SshClusterCleaner extends CommandLineRemoteOperation implements ClusterCleaner {
@@ -97,4 +96,4 @@ public void execute() throws RemoteOperationException {
         if(logger.isInfoEnabled())
             logger.info("Cleaning remote hosts complete");
     }
-}
\ No newline at end of file
+}
diff --git a/contrib/ec2-testing/src/java/voldemort/utils/impl/SshClusterStarter.java b/contrib/ec2-testing/src/java/voldemort/utils/impl/SshClusterStarter.java
index ec7b02b7ef..b11e741b5a 100644
--- a/contrib/ec2-testing/src/java/voldemort/utils/impl/SshClusterStarter.java
+++ b/contrib/ec2-testing/src/java/voldemort/utils/impl/SshClusterStarter.java
@@ -39,7 +39,6 @@
  * We set the node ID specific to each server from the command line vs. storing
  * it in the server.properties file.
  * 
- * @author Kirk True
  */
 
 public class SshClusterStarter extends CommandLineRemoteOperation implements ClusterStarter {
diff --git a/contrib/ec2-testing/src/java/voldemort/utils/impl/SshClusterStopper.java b/contrib/ec2-testing/src/java/voldemort/utils/impl/SshClusterStopper.java
index 4114a9d5e1..56249a8acf 100644
--- a/contrib/ec2-testing/src/java/voldemort/utils/impl/SshClusterStopper.java
+++ b/contrib/ec2-testing/src/java/voldemort/utils/impl/SshClusterStopper.java
@@ -34,7 +34,6 @@
  * SshClusterStopper is an implementation of ClusterStopper that essentially
  * just SSH's into all of the machines and runs voldemort-stop.sh.
  * 
- * @author Kirk True
  */
 
 public class SshClusterStopper extends CommandLineRemoteOperation implements ClusterStopper {
diff --git a/contrib/ec2-testing/src/java/voldemort/utils/impl/SshRemoteTest.java b/contrib/ec2-testing/src/java/voldemort/utils/impl/SshRemoteTest.java
index e40f8c3980..f5145b579c 100644
--- a/contrib/ec2-testing/src/java/voldemort/utils/impl/SshRemoteTest.java
+++ b/contrib/ec2-testing/src/java/voldemort/utils/impl/SshRemoteTest.java
@@ -35,7 +35,6 @@
  * to voldemort.performance.RemoteTest (AKA voldemort-remote-test.sh) on all of
  * the machines provided.
  * 
- * @author Kirk True
  */
 
 public class SshRemoteTest extends CommandLineRemoteOperation implements RemoteTest {
diff --git a/contrib/ec2-testing/src/java/voldemort/utils/impl/StdOutCommandOutputListener.java b/contrib/ec2-testing/src/java/voldemort/utils/impl/StdOutCommandOutputListener.java
index b82d6b92e3..d3453303b6 100644
--- a/contrib/ec2-testing/src/java/voldemort/utils/impl/StdOutCommandOutputListener.java
+++ b/contrib/ec2-testing/src/java/voldemort/utils/impl/StdOutCommandOutputListener.java
@@ -20,7 +20,6 @@
  * StdOutCommandOutputListener simply takes the output from the remote system
  * and logs it using System.out/System.err.
  * 
- * @author Kirk True
  */
 
 public class StdOutCommandOutputListener extends DelegatingCommandOutputListener {
diff --git a/contrib/ec2-testing/src/java/voldemort/utils/impl/TypicaEc2Connection.java b/contrib/ec2-testing/src/java/voldemort/utils/impl/TypicaEc2Connection.java
index d789b68713..1b11d864cc 100644
--- a/contrib/ec2-testing/src/java/voldemort/utils/impl/TypicaEc2Connection.java
+++ b/contrib/ec2-testing/src/java/voldemort/utils/impl/TypicaEc2Connection.java
@@ -37,7 +37,6 @@
  * TypicaEc2Connection implements the Ec2Connection interface using the Typica
  * library (http://code.google.com/p/typica/) for EC2 access.
  * 
- * @author Kirk True
  */
 
 public class TypicaEc2Connection implements Ec2Connection {
@@ -267,4 +266,4 @@ private HostNamePair getHostNamePair(Instance instance) {
         return new HostNamePair(externalHostName, internalHostName);
     }
 
-}
\ No newline at end of file
+}
diff --git a/contrib/ec2-testing/src/java/voldemort/utils/impl/UnixCommand.java b/contrib/ec2-testing/src/java/voldemort/utils/impl/UnixCommand.java
index 3e63e6d943..2effdce807 100644
--- a/contrib/ec2-testing/src/java/voldemort/utils/impl/UnixCommand.java
+++ b/contrib/ec2-testing/src/java/voldemort/utils/impl/UnixCommand.java
@@ -27,7 +27,6 @@
 /**
  * A wrapper for executing a UNIX command.
  * 
- * @author Jay Kreps
  */
 
 public class UnixCommand {
diff --git a/contrib/ec2-testing/test/voldemort/utils/Ec2FailureDetectorTest.java b/contrib/ec2-testing/test/voldemort/utils/Ec2FailureDetectorTest.java
index 32374d5364..44bff93296 100644
--- a/contrib/ec2-testing/test/voldemort/utils/Ec2FailureDetectorTest.java
+++ b/contrib/ec2-testing/test/voldemort/utils/Ec2FailureDetectorTest.java
@@ -60,7 +60,6 @@
  * There are quite a few properties that are needed which are provided for these
  * tests to run. Please see {@link Ec2RemoteTestConfig} for details.
  * 
- * @author Kirk True
  */
 
 public class Ec2FailureDetectorTest {
@@ -289,7 +288,6 @@ private String getRandomHostName() {
      * </tr>
      * </table>
      * 
-     * @author Kirk True
      */
 
     private static class Ec2FailureDetectorTestConfig extends Ec2RemoteTestConfig {
@@ -315,4 +313,4 @@ protected List<String> getRequiredPropertyNames() {
 
     }
 
-}
\ No newline at end of file
+}
diff --git a/contrib/ec2-testing/test/voldemort/utils/Ec2GossipTest.java b/contrib/ec2-testing/test/voldemort/utils/Ec2GossipTest.java
index 3630029d51..7a8a9063b1 100644
--- a/contrib/ec2-testing/test/voldemort/utils/Ec2GossipTest.java
+++ b/contrib/ec2-testing/test/voldemort/utils/Ec2GossipTest.java
@@ -37,7 +37,6 @@
 
 /**
  *
- * @author afeinberg
  */
 public class Ec2GossipTest {
     private static Ec2GossipTestConfig ec2GossipTestConfig;
diff --git a/contrib/ec2-testing/test/voldemort/utils/Ec2RebalanceTest.java b/contrib/ec2-testing/test/voldemort/utils/Ec2RebalanceTest.java
index d24c39435b..01215fba04 100644
--- a/contrib/ec2-testing/test/voldemort/utils/Ec2RebalanceTest.java
+++ b/contrib/ec2-testing/test/voldemort/utils/Ec2RebalanceTest.java
@@ -44,7 +44,6 @@
 import voldemort.versioning.Versioned;
 
 /**
- * @author afeinberg
  */
 public class Ec2RebalanceTest extends AbstractRebalanceTest {
 
diff --git a/contrib/ec2-testing/test/voldemort/utils/Ec2RemoteTestConfig.java b/contrib/ec2-testing/test/voldemort/utils/Ec2RemoteTestConfig.java
index c55398815c..c9288fa486 100644
--- a/contrib/ec2-testing/test/voldemort/utils/Ec2RemoteTestConfig.java
+++ b/contrib/ec2-testing/test/voldemort/utils/Ec2RemoteTestConfig.java
@@ -107,7 +107,6 @@
  * </tr>
  * </table>
  * 
- * @author Kirk True
  */
 
 public class Ec2RemoteTestConfig extends RemoteTestConfig {
diff --git a/contrib/ec2-testing/test/voldemort/utils/Ec2SmokeTest.java b/contrib/ec2-testing/test/voldemort/utils/Ec2SmokeTest.java
index f2d253f4d7..59e1b256dc 100644
--- a/contrib/ec2-testing/test/voldemort/utils/Ec2SmokeTest.java
+++ b/contrib/ec2-testing/test/voldemort/utils/Ec2SmokeTest.java
@@ -46,7 +46,6 @@
  * There are quite a few properties that are needed which are provided for these
  * tests to run. Please see {@link Ec2SmokeTestConfig} for details.
  * 
- * @author Kirk True
  */
 
 public class Ec2SmokeTest {
@@ -152,7 +151,6 @@ public void testTemporaryNodeOffline() throws Exception {
      * </tr>
      * </table>
      * 
-     * @author Kirk True
      */
 
     private static class Ec2SmokeTestConfig extends Ec2RemoteTestConfig {
diff --git a/contrib/hadoop-store-builder/src/java/voldemort/store/readonly/benchmark/BuildTestStore.java b/contrib/hadoop-store-builder/src/java/voldemort/store/readonly/benchmark/BuildTestStore.java
index f1777d8799..04d6a43fa0 100644
--- a/contrib/hadoop-store-builder/src/java/voldemort/store/readonly/benchmark/BuildTestStore.java
+++ b/contrib/hadoop-store-builder/src/java/voldemort/store/readonly/benchmark/BuildTestStore.java
@@ -39,7 +39,6 @@
 /**
  * Build a test store from the generated data
  * 
- * @author jay
  * 
  */
 public class BuildTestStore extends Configured implements Tool {
diff --git a/contrib/hadoop-store-builder/src/java/voldemort/store/readonly/benchmark/GenerateData.java b/contrib/hadoop-store-builder/src/java/voldemort/store/readonly/benchmark/GenerateData.java
index a5558dc083..d1de334120 100644
--- a/contrib/hadoop-store-builder/src/java/voldemort/store/readonly/benchmark/GenerateData.java
+++ b/contrib/hadoop-store-builder/src/java/voldemort/store/readonly/benchmark/GenerateData.java
@@ -47,7 +47,6 @@
  * data as values. This data is output as a SequenceFile where the key is the
  * given key, and the value is the produced value.
  * 
- * @author jay
  * 
  */
 public class GenerateData extends Configured implements Tool {
diff --git a/contrib/hadoop-store-builder/src/java/voldemort/store/readonly/fetcher/ConfigurableSocketFactory.java b/contrib/hadoop-store-builder/src/java/voldemort/store/readonly/fetcher/ConfigurableSocketFactory.java
index 882bcc62b9..503f697731 100644
--- a/contrib/hadoop-store-builder/src/java/voldemort/store/readonly/fetcher/ConfigurableSocketFactory.java
+++ b/contrib/hadoop-store-builder/src/java/voldemort/store/readonly/fetcher/ConfigurableSocketFactory.java
@@ -18,7 +18,6 @@
  * size. This is necessary for good performance over a higher latency link such
  * as between datacenters.
  * 
- * @author jay
  * 
  */
 class ConfigurableSocketFactory extends SocketFactory implements Configurable {
@@ -91,4 +90,4 @@ private Socket applySettings(Socket s) throws IOException {
         return s;
     }
 
-}
\ No newline at end of file
+}
diff --git a/contrib/hadoop-store-builder/src/java/voldemort/store/readonly/fetcher/HdfsFetcher.java b/contrib/hadoop-store-builder/src/java/voldemort/store/readonly/fetcher/HdfsFetcher.java
index 98d27aa39e..59e943d215 100644
--- a/contrib/hadoop-store-builder/src/java/voldemort/store/readonly/fetcher/HdfsFetcher.java
+++ b/contrib/hadoop-store-builder/src/java/voldemort/store/readonly/fetcher/HdfsFetcher.java
@@ -46,7 +46,6 @@
 /**
  * A fetcher that fetches the store files from HDFS
  * 
- * @author jay
  * 
  */
 public class HdfsFetcher implements FileFetcher {
diff --git a/contrib/hadoop-store-builder/src/java/voldemort/store/readonly/mr/AbstractHadoopStoreBuilderMapper.java b/contrib/hadoop-store-builder/src/java/voldemort/store/readonly/mr/AbstractHadoopStoreBuilderMapper.java
index 8640adc40f..cff81d42a6 100644
--- a/contrib/hadoop-store-builder/src/java/voldemort/store/readonly/mr/AbstractHadoopStoreBuilderMapper.java
+++ b/contrib/hadoop-store-builder/src/java/voldemort/store/readonly/mr/AbstractHadoopStoreBuilderMapper.java
@@ -43,7 +43,6 @@
  * The values given by makeKey and makeValue will then be serialized with the
  * appropriate voldemort Serializer.
  * 
- * @author bbansal, jay
  * 
  */
 public abstract class AbstractHadoopStoreBuilderMapper<K, V> extends
diff --git a/contrib/hadoop-store-builder/src/java/voldemort/store/readonly/mr/AbstractStoreBuilderConfigurable.java b/contrib/hadoop-store-builder/src/java/voldemort/store/readonly/mr/AbstractStoreBuilderConfigurable.java
index 04bdb0b495..11059cc845 100644
--- a/contrib/hadoop-store-builder/src/java/voldemort/store/readonly/mr/AbstractStoreBuilderConfigurable.java
+++ b/contrib/hadoop-store-builder/src/java/voldemort/store/readonly/mr/AbstractStoreBuilderConfigurable.java
@@ -32,7 +32,6 @@
  * A base class with basic configuration values shared by all the mapper,
  * reducer, and partitioner
  * 
- * @author jay
  * 
  */
 public class AbstractStoreBuilderConfigurable {
diff --git a/contrib/hadoop-store-builder/src/java/voldemort/store/readonly/mr/HadoopStoreBuilder.java b/contrib/hadoop-store-builder/src/java/voldemort/store/readonly/mr/HadoopStoreBuilder.java
index 38ffb305e7..dd99f9154e 100644
--- a/contrib/hadoop-store-builder/src/java/voldemort/store/readonly/mr/HadoopStoreBuilder.java
+++ b/contrib/hadoop-store-builder/src/java/voldemort/store/readonly/mr/HadoopStoreBuilder.java
@@ -42,7 +42,6 @@
 /**
  * Builds a read-only voldemort store as a hadoop job from the given input data.
  * 
- * @author bbansal, jay
  */
 public class HadoopStoreBuilder {
 
diff --git a/contrib/hadoop-store-builder/src/java/voldemort/store/readonly/mr/HadoopStoreBuilderPartitioner.java b/contrib/hadoop-store-builder/src/java/voldemort/store/readonly/mr/HadoopStoreBuilderPartitioner.java
index f349eed787..f458366fad 100644
--- a/contrib/hadoop-store-builder/src/java/voldemort/store/readonly/mr/HadoopStoreBuilderPartitioner.java
+++ b/contrib/hadoop-store-builder/src/java/voldemort/store/readonly/mr/HadoopStoreBuilderPartitioner.java
@@ -26,7 +26,6 @@
  * A Partitioner that splits data so that all data for the same nodeId, chunkId
  * combination ends up in the same reduce (and hence in the same store chunk)
  * 
- * @author bbansal, jay
  * 
  */
 public class HadoopStoreBuilderPartitioner extends AbstractStoreBuilderConfigurable implements
diff --git a/contrib/hadoop-store-builder/src/java/voldemort/store/readonly/mr/HadoopStoreBuilderReducer.java b/contrib/hadoop-store-builder/src/java/voldemort/store/readonly/mr/HadoopStoreBuilderReducer.java
index f851717454..db2b49ea1b 100644
--- a/contrib/hadoop-store-builder/src/java/voldemort/store/readonly/mr/HadoopStoreBuilderReducer.java
+++ b/contrib/hadoop-store-builder/src/java/voldemort/store/readonly/mr/HadoopStoreBuilderReducer.java
@@ -38,7 +38,6 @@
 /**
  * Take key md5s and value bytes and build a read-only store from these values
  * 
- * @author bbansal, jay
  * 
  */
 public class HadoopStoreBuilderReducer extends AbstractStoreBuilderConfigurable implements
diff --git a/contrib/hadoop-store-builder/src/java/voldemort/store/readonly/mr/HadoopStoreJobRunner.java b/contrib/hadoop-store-builder/src/java/voldemort/store/readonly/mr/HadoopStoreJobRunner.java
index 88f4eb358f..d158e593de 100644
--- a/contrib/hadoop-store-builder/src/java/voldemort/store/readonly/mr/HadoopStoreJobRunner.java
+++ b/contrib/hadoop-store-builder/src/java/voldemort/store/readonly/mr/HadoopStoreJobRunner.java
@@ -40,7 +40,6 @@
  * A runner class to facitilate the launching of HadoopStoreBuilder from the
  * command-line.
  * 
- * @author elias
  * 
  */
 public class HadoopStoreJobRunner extends Configured implements Tool {
diff --git a/contrib/hadoop-store-builder/test/voldemort/store/readonly/fetcher/HdfsFetcherTest.java b/contrib/hadoop-store-builder/test/voldemort/store/readonly/fetcher/HdfsFetcherTest.java
index b9b0963ad5..f3377248df 100644
--- a/contrib/hadoop-store-builder/test/voldemort/store/readonly/fetcher/HdfsFetcherTest.java
+++ b/contrib/hadoop-store-builder/test/voldemort/store/readonly/fetcher/HdfsFetcherTest.java
@@ -30,7 +30,6 @@
 /**
  * Tests for the HDFS-based fetcher
  * 
- * @author jay
  * 
  */
 public class HdfsFetcherTest extends TestCase {
diff --git a/contrib/hadoop-store-builder/test/voldemort/store/readonly/mr/HadoopStoreBuilderTest.java b/contrib/hadoop-store-builder/test/voldemort/store/readonly/mr/HadoopStoreBuilderTest.java
index bc4e9113b8..e6a103133f 100644
--- a/contrib/hadoop-store-builder/test/voldemort/store/readonly/mr/HadoopStoreBuilderTest.java
+++ b/contrib/hadoop-store-builder/test/voldemort/store/readonly/mr/HadoopStoreBuilderTest.java
@@ -52,7 +52,6 @@
  * will be only one hence we will see only one node files irrespective of
  * cluster details.</strong>
  * 
- * @author bbansal, jay
  * 
  */
 public class HadoopStoreBuilderTest extends TestCase {
diff --git a/contrib/mongodb/src/java/voldemort/serialization/mongodb/MongoDBDocSerializer.java b/contrib/mongodb/src/java/voldemort/serialization/mongodb/MongoDBDocSerializer.java
index 2da1e40535..f3ba4017cf 100644
--- a/contrib/mongodb/src/java/voldemort/serialization/mongodb/MongoDBDocSerializer.java
+++ b/contrib/mongodb/src/java/voldemort/serialization/mongodb/MongoDBDocSerializer.java
@@ -27,7 +27,6 @@
 /**
  * Serializer for working with MongoDB Doc objects
  * 
- * @author geir
  */
 public class MongoDBDocSerializer implements Serializer<Doc> {
 
diff --git a/contrib/mongodb/src/java/voldemort/serialization/mongodb/MongoDBSerializationFactory.java b/contrib/mongodb/src/java/voldemort/serialization/mongodb/MongoDBSerializationFactory.java
index b1283f9543..7d74dfefae 100644
--- a/contrib/mongodb/src/java/voldemort/serialization/mongodb/MongoDBSerializationFactory.java
+++ b/contrib/mongodb/src/java/voldemort/serialization/mongodb/MongoDBSerializationFactory.java
@@ -8,7 +8,6 @@
  * Serializer factory that handles MongoDB serialization as well as normal
  * serializers
  * 
- * @author jay
  * 
  */
 public class MongoDBSerializationFactory extends DefaultSerializerFactory {
diff --git a/contrib/mongodb/src/java/voldemort/store/mongodb/MongoDBStorageConfiguration.java b/contrib/mongodb/src/java/voldemort/store/mongodb/MongoDBStorageConfiguration.java
index 333e2e3852..3d7924bee0 100644
--- a/contrib/mongodb/src/java/voldemort/store/mongodb/MongoDBStorageConfiguration.java
+++ b/contrib/mongodb/src/java/voldemort/store/mongodb/MongoDBStorageConfiguration.java
@@ -27,7 +27,6 @@
 /**
  * Basic StorageConfiguration implementation for MongoDBStorageEngine
  * 
- * @author geir
  */
 public class MongoDBStorageConfiguration implements StorageConfiguration {
 
diff --git a/contrib/mongodb/src/java/voldemort/store/mongodb/MongoDBStorageEngine.java b/contrib/mongodb/src/java/voldemort/store/mongodb/MongoDBStorageEngine.java
index ea4336bd46..a71731969d 100644
--- a/contrib/mongodb/src/java/voldemort/store/mongodb/MongoDBStorageEngine.java
+++ b/contrib/mongodb/src/java/voldemort/store/mongodb/MongoDBStorageEngine.java
@@ -85,7 +85,6 @@
  * buffer management. Both that and performance are next to be fixed.
  * </p>
  * 
- * @author geir
  */
 public class MongoDBStorageEngine implements StorageEngine<ByteArray, byte[]> {
 
diff --git a/contrib/mongodb/test/voldemort/store/mongodb/MongoDBStorageEngineTest.java b/contrib/mongodb/test/voldemort/store/mongodb/MongoDBStorageEngineTest.java
index 69d5916a85..45c2090d92 100644
--- a/contrib/mongodb/test/voldemort/store/mongodb/MongoDBStorageEngineTest.java
+++ b/contrib/mongodb/test/voldemort/store/mongodb/MongoDBStorageEngineTest.java
@@ -40,7 +40,6 @@
  * made assumptions about key and value types rather than defer to getValues()
  * and getKeys()
  * 
- * @author geir
  */
 public class MongoDBStorageEngineTest extends AbstractStoreTest<ByteArray, byte[]> {
 
diff --git a/src/java/voldemort/ClusterViewer.java b/src/java/voldemort/ClusterViewer.java
index e6f03b54e4..4812ba6744 100644
--- a/src/java/voldemort/ClusterViewer.java
+++ b/src/java/voldemort/ClusterViewer.java
@@ -25,7 +25,6 @@
 /**
  * Inspect a cluster configuration to determine whether it can be rebalanced to a target cluster geometry.
  *
- * @author afeinberg
  */
 public class ClusterViewer {
 
diff --git a/src/java/voldemort/VoldemortApplicationException.java b/src/java/voldemort/VoldemortApplicationException.java
index 1c4cd3eae7..fa12db9df6 100644
--- a/src/java/voldemort/VoldemortApplicationException.java
+++ b/src/java/voldemort/VoldemortApplicationException.java
@@ -6,7 +6,6 @@
  * These exceptions are thrown by Voldemort servers to voldemort client for some
  * special handling.
  * 
- * @author bbansal
  * 
  */
 public class VoldemortApplicationException extends VoldemortException {
diff --git a/src/java/voldemort/VoldemortClientShell.java b/src/java/voldemort/VoldemortClientShell.java
index 714c253386..bfde423333 100644
--- a/src/java/voldemort/VoldemortClientShell.java
+++ b/src/java/voldemort/VoldemortClientShell.java
@@ -43,7 +43,6 @@
 /**
  * A toy shell to interact with the server via the command line
  * 
- * @author jay
  * 
  */
 public class VoldemortClientShell {
diff --git a/src/java/voldemort/VoldemortException.java b/src/java/voldemort/VoldemortException.java
index ccf9f88f5b..54a9a883fd 100644
--- a/src/java/voldemort/VoldemortException.java
+++ b/src/java/voldemort/VoldemortException.java
@@ -19,7 +19,6 @@
 /**
  * Base exception that all other Voldemort exceptions extend.
  * 
- * @author jay
  * 
  */
 public class VoldemortException extends RuntimeException {
diff --git a/src/java/voldemort/annotations/concurrency/Immutable.java b/src/java/voldemort/annotations/concurrency/Immutable.java
index b84f46aea1..fc734a173e 100644
--- a/src/java/voldemort/annotations/concurrency/Immutable.java
+++ b/src/java/voldemort/annotations/concurrency/Immutable.java
@@ -19,7 +19,6 @@
 /**
  * Claims that a given class is immutable
  * 
- * @author jay
  * 
  */
 public @interface Immutable {
diff --git a/src/java/voldemort/annotations/concurrency/LockedBy.java b/src/java/voldemort/annotations/concurrency/LockedBy.java
index 8f8ff57213..a32ac696b3 100644
--- a/src/java/voldemort/annotations/concurrency/LockedBy.java
+++ b/src/java/voldemort/annotations/concurrency/LockedBy.java
@@ -19,7 +19,6 @@
 /**
  * Indicates the lock that protects a given variable
  * 
- * @author jay
  * 
  */
 public @interface LockedBy {
diff --git a/src/java/voldemort/annotations/concurrency/NotThreadsafe.java b/src/java/voldemort/annotations/concurrency/NotThreadsafe.java
index 041a1ca699..0de9b9b501 100644
--- a/src/java/voldemort/annotations/concurrency/NotThreadsafe.java
+++ b/src/java/voldemort/annotations/concurrency/NotThreadsafe.java
@@ -20,7 +20,6 @@
  * Indicates that a class is not threadsafe, or tells implementors of an
  * interface that their class need not be threadsafe
  * 
- * @author jay
  * 
  */
 public @interface NotThreadsafe {
diff --git a/src/java/voldemort/annotations/concurrency/Threadsafe.java b/src/java/voldemort/annotations/concurrency/Threadsafe.java
index a26a8e4a3f..0a441db4db 100644
--- a/src/java/voldemort/annotations/concurrency/Threadsafe.java
+++ b/src/java/voldemort/annotations/concurrency/Threadsafe.java
@@ -20,7 +20,6 @@
  * Claims that a class is threadsafe or admonishes implementors of an interface
  * to ensure that their implementation is threadsafe.
  * 
- * @author jay
  * 
  */
 public @interface Threadsafe {
diff --git a/src/java/voldemort/annotations/jmx/JmxManaged.java b/src/java/voldemort/annotations/jmx/JmxManaged.java
index d17624ae4c..a6812eb062 100644
--- a/src/java/voldemort/annotations/jmx/JmxManaged.java
+++ b/src/java/voldemort/annotations/jmx/JmxManaged.java
@@ -24,7 +24,6 @@
 /**
  * Mark the annotated class for management via JMX
  * 
- * @author jay
  * 
  */
 @Retention(RetentionPolicy.RUNTIME)
diff --git a/src/java/voldemort/annotations/jmx/JmxOperation.java b/src/java/voldemort/annotations/jmx/JmxOperation.java
index 28da2889a5..3897a45fc0 100644
--- a/src/java/voldemort/annotations/jmx/JmxOperation.java
+++ b/src/java/voldemort/annotations/jmx/JmxOperation.java
@@ -26,7 +26,6 @@
 /**
  * Mark the given method as accessible from JMX
  * 
- * @author jay
  * 
  */
 @Retention(RetentionPolicy.RUNTIME)
diff --git a/src/java/voldemort/annotations/jmx/JmxParam.java b/src/java/voldemort/annotations/jmx/JmxParam.java
index 2001d08570..e420fa6279 100644
--- a/src/java/voldemort/annotations/jmx/JmxParam.java
+++ b/src/java/voldemort/annotations/jmx/JmxParam.java
@@ -24,7 +24,6 @@
 /**
  * Mark the given parameter as accessible from JMX
  * 
- * @author jay
  * 
  */
 @Retention(RetentionPolicy.RUNTIME)
diff --git a/src/java/voldemort/client/AbstractStoreClientFactory.java b/src/java/voldemort/client/AbstractStoreClientFactory.java
index aec354a98f..be3da174a3 100644
--- a/src/java/voldemort/client/AbstractStoreClientFactory.java
+++ b/src/java/voldemort/client/AbstractStoreClientFactory.java
@@ -66,7 +66,6 @@
  * A base class for various {@link voldemort.client.StoreClientFactory
  * StoreClientFactory} implementations
  * 
- * @author jay
  * 
  */
 public abstract class AbstractStoreClientFactory implements StoreClientFactory {
diff --git a/src/java/voldemort/client/BootstrapFailureException.java b/src/java/voldemort/client/BootstrapFailureException.java
index 5b469c15ba..cf6bcac0c6 100644
--- a/src/java/voldemort/client/BootstrapFailureException.java
+++ b/src/java/voldemort/client/BootstrapFailureException.java
@@ -23,7 +23,6 @@
  * (e.g. because none of the given nodes could be connected to). This is
  * generally an unrecoverable failure.
  * 
- * @author jay
  * 
  */
 public class BootstrapFailureException extends VoldemortException {
@@ -44,4 +43,4 @@ public BootstrapFailureException(Throwable cause) {
         super(cause);
     }
 
-}
\ No newline at end of file
+}
diff --git a/src/java/voldemort/client/ClientConfig.java b/src/java/voldemort/client/ClientConfig.java
index 63e1f88b4c..d0025ff18b 100644
--- a/src/java/voldemort/client/ClientConfig.java
+++ b/src/java/voldemort/client/ClientConfig.java
@@ -32,7 +32,6 @@
 /**
  * A configuration object that holds configuration parameters for the client.
  * 
- * @author jay
  * 
  */
 public class ClientConfig {
diff --git a/src/java/voldemort/client/ClientThreadPool.java b/src/java/voldemort/client/ClientThreadPool.java
index 2fdbf964d9..cd0155eec0 100644
--- a/src/java/voldemort/client/ClientThreadPool.java
+++ b/src/java/voldemort/client/ClientThreadPool.java
@@ -27,7 +27,6 @@
 /**
  * A thread pool with a more convenient constructor and some jmx monitoring
  * 
- * @author jay
  * 
  */
 @JmxManaged(description = "A voldemort client thread pool")
diff --git a/src/java/voldemort/client/DefaultStoreClient.java b/src/java/voldemort/client/DefaultStoreClient.java
index 6eedf4e8cc..1928857936 100644
--- a/src/java/voldemort/client/DefaultStoreClient.java
+++ b/src/java/voldemort/client/DefaultStoreClient.java
@@ -47,7 +47,6 @@
  * you get back from a {@link voldemort.client.StoreClientFactory
  * StoreClientFactory}
  * 
- * @author jay
  * 
  * @param <K> The key type
  * @param <V> The value type
diff --git a/src/java/voldemort/client/HttpStoreClientFactory.java b/src/java/voldemort/client/HttpStoreClientFactory.java
index b77e74b141..831b5f2942 100644
--- a/src/java/voldemort/client/HttpStoreClientFactory.java
+++ b/src/java/voldemort/client/HttpStoreClientFactory.java
@@ -47,7 +47,6 @@
  * A {@link voldemort.client.StoreClientFactory StoreClientFactory} that creates
  * a remote client that connects and bootstraps itself via HTTP.
  * 
- * @author jay
  * 
  */
 public class HttpStoreClientFactory extends AbstractStoreClientFactory {
diff --git a/src/java/voldemort/client/MockStoreClientFactory.java b/src/java/voldemort/client/MockStoreClientFactory.java
index f45339ed48..49b70d3e38 100644
--- a/src/java/voldemort/client/MockStoreClientFactory.java
+++ b/src/java/voldemort/client/MockStoreClientFactory.java
@@ -36,7 +36,6 @@
  * A store client that produces non-persistent, in-memory stores. This is useful
  * for unit testing.
  * 
- * @author jay
  * 
  */
 @SuppressWarnings("unchecked")
diff --git a/src/java/voldemort/client/RoutingTier.java b/src/java/voldemort/client/RoutingTier.java
index bcd24c18ec..f464da52fc 100644
--- a/src/java/voldemort/client/RoutingTier.java
+++ b/src/java/voldemort/client/RoutingTier.java
@@ -19,7 +19,6 @@
 /**
  * Enumerates different routing strategies. Currently just server and client.
  * 
- * @author jay
  * 
  */
 public enum RoutingTier {
diff --git a/src/java/voldemort/client/SocketStoreClientFactory.java b/src/java/voldemort/client/SocketStoreClientFactory.java
index fbad10552c..3f45215b5e 100644
--- a/src/java/voldemort/client/SocketStoreClientFactory.java
+++ b/src/java/voldemort/client/SocketStoreClientFactory.java
@@ -43,7 +43,6 @@
  * {@link voldemort.client.StoreClient StoreClient} instances for different
  * stores.
  * 
- * @author jay
  * 
  */
 public class SocketStoreClientFactory extends AbstractStoreClientFactory {
diff --git a/src/java/voldemort/client/StoreClient.java b/src/java/voldemort/client/StoreClient.java
index 685f20d656..7fc4785d15 100644
--- a/src/java/voldemort/client/StoreClient.java
+++ b/src/java/voldemort/client/StoreClient.java
@@ -29,7 +29,6 @@
  * The user-facing interface to a Voldemort store. Gives basic put/get/delete
  * plus helper functions.
  * 
- * @author jay
  * 
  * @param <K> The type of the key being stored
  * @param <V> The type of the value being stored
diff --git a/src/java/voldemort/client/StoreClientFactory.java b/src/java/voldemort/client/StoreClientFactory.java
index 88c0de2907..cb22d49171 100644
--- a/src/java/voldemort/client/StoreClientFactory.java
+++ b/src/java/voldemort/client/StoreClientFactory.java
@@ -30,7 +30,6 @@
  * 
  * {@link voldemort.client.StoreClient StoreClient}
  * 
- * @author jay
  * 
  */
 public interface StoreClientFactory {
@@ -88,4 +87,4 @@ public <K, V> StoreClient<K, V> getStoreClient(String storeName,
 
     public FailureDetector getFailureDetector();
 
-}
\ No newline at end of file
+}
diff --git a/src/java/voldemort/client/UpdateAction.java b/src/java/voldemort/client/UpdateAction.java
index e371cf312b..4cb99cd947 100644
--- a/src/java/voldemort/client/UpdateAction.java
+++ b/src/java/voldemort/client/UpdateAction.java
@@ -23,7 +23,6 @@
  * 
  * The update action must be idempotent since it may be called multiple times.
  * 
- * @author jay
  * 
  */
 public abstract class UpdateAction<K, V> {
diff --git a/src/java/voldemort/client/protocol/RequestFormat.java b/src/java/voldemort/client/protocol/RequestFormat.java
index bb2f2c7b3a..e454ed0cbf 100644
--- a/src/java/voldemort/client/protocol/RequestFormat.java
+++ b/src/java/voldemort/client/protocol/RequestFormat.java
@@ -33,7 +33,6 @@
  * companion class on the server side is
  * {@link voldemort.server.protocol.RequestHandler}
  * 
- * @author jay
  * 
  */
 public interface RequestFormat {
diff --git a/src/java/voldemort/client/protocol/RequestFormatFactory.java b/src/java/voldemort/client/protocol/RequestFormatFactory.java
index 6d4fd22444..e0c13d6f06 100644
--- a/src/java/voldemort/client/protocol/RequestFormatFactory.java
+++ b/src/java/voldemort/client/protocol/RequestFormatFactory.java
@@ -23,7 +23,6 @@
  * A factory for producing the appropriate client request format given a
  * {@link voldemort.client.protocol.RequestFormatType}
  * 
- * @author jay
  * 
  */
 public class RequestFormatFactory {
diff --git a/src/java/voldemort/client/protocol/RequestFormatType.java b/src/java/voldemort/client/protocol/RequestFormatType.java
index 2533fbfc06..fb9a8ca0cf 100644
--- a/src/java/voldemort/client/protocol/RequestFormatType.java
+++ b/src/java/voldemort/client/protocol/RequestFormatType.java
@@ -19,7 +19,6 @@
 /**
  * An enumeration of request serialization types
  * 
- * @author jay
  * 
  */
 public enum RequestFormatType {
diff --git a/src/java/voldemort/client/protocol/VoldemortFilter.java b/src/java/voldemort/client/protocol/VoldemortFilter.java
index 9ac77857e3..11f88ea9ed 100644
--- a/src/java/voldemort/client/protocol/VoldemortFilter.java
+++ b/src/java/voldemort/client/protocol/VoldemortFilter.java
@@ -29,7 +29,6 @@
  * JVM. please make sure to make the class either public or a static inner class
  * so that it can be loaded w/o parent object if needed. </i>
  * 
- * @author bbansal
  */
 public interface VoldemortFilter {
 
diff --git a/src/java/voldemort/client/protocol/admin/AdminClient.java b/src/java/voldemort/client/protocol/admin/AdminClient.java
index 788f7bf673..7f1a624cd0 100644
--- a/src/java/voldemort/client/protocol/admin/AdminClient.java
+++ b/src/java/voldemort/client/protocol/admin/AdminClient.java
@@ -86,7 +86,6 @@
  * (presently in development).</li>
  * </ul>
  * 
- * @author afeinberg,bbansal
  */
 public class AdminClient {
 
diff --git a/src/java/voldemort/client/protocol/admin/AdminClientConfig.java b/src/java/voldemort/client/protocol/admin/AdminClientConfig.java
index b003e74f9b..656bc1eeba 100644
--- a/src/java/voldemort/client/protocol/admin/AdminClientConfig.java
+++ b/src/java/voldemort/client/protocol/admin/AdminClientConfig.java
@@ -7,7 +7,6 @@
 /**
  * Client Configuration properties for {@link AdminClient}
  * 
- * @author bbansal
  * 
  */
 public class AdminClientConfig {
diff --git a/src/java/voldemort/client/protocol/pb/ProtoBuffClientRequestFormat.java b/src/java/voldemort/client/protocol/pb/ProtoBuffClientRequestFormat.java
index 3c3603d7ae..b112489298 100644
--- a/src/java/voldemort/client/protocol/pb/ProtoBuffClientRequestFormat.java
+++ b/src/java/voldemort/client/protocol/pb/ProtoBuffClientRequestFormat.java
@@ -44,7 +44,6 @@
 /**
  * The client side of the protocol buffers request format
  * 
- * @author jay
  * 
  */
 public class ProtoBuffClientRequestFormat implements RequestFormat {
diff --git a/src/java/voldemort/client/protocol/pb/ProtoUtils.java b/src/java/voldemort/client/protocol/pb/ProtoUtils.java
index ed9e0bd555..f3fe3b98a6 100644
--- a/src/java/voldemort/client/protocol/pb/ProtoUtils.java
+++ b/src/java/voldemort/client/protocol/pb/ProtoUtils.java
@@ -39,7 +39,6 @@
  * Helper functions for serializing or deserializing client requests in protocol
  * buffers
  * 
- * @author jay
  * 
  */
 public class ProtoUtils {
diff --git a/src/java/voldemort/client/protocol/vold/VoldemortNativeClientRequestFormat.java b/src/java/voldemort/client/protocol/vold/VoldemortNativeClientRequestFormat.java
index f92f4edfa6..1aed210ccb 100644
--- a/src/java/voldemort/client/protocol/vold/VoldemortNativeClientRequestFormat.java
+++ b/src/java/voldemort/client/protocol/vold/VoldemortNativeClientRequestFormat.java
@@ -39,7 +39,6 @@
  * The {@link voldemort.client.protocol.RequestFormat} for a low-overhead custom
  * binary protocol
  * 
- * @author jay
  * 
  */
 public class VoldemortNativeClientRequestFormat implements RequestFormat {
diff --git a/src/java/voldemort/client/rebalance/RebalanceClusterBuilder.java b/src/java/voldemort/client/rebalance/RebalanceClusterBuilder.java
index 7b43a54fdc..9df46816bd 100644
--- a/src/java/voldemort/client/rebalance/RebalanceClusterBuilder.java
+++ b/src/java/voldemort/client/rebalance/RebalanceClusterBuilder.java
@@ -25,7 +25,6 @@
  * Most of the logic resides in {@link voldemort.client.rebalance.RebalanceClusterTool}, see that class for
  * more documentation.
  * 
- * @author afeinberg
  */
 public class RebalanceClusterBuilder {
     private final Cluster cluster;
diff --git a/src/java/voldemort/client/rebalance/RebalanceClusterTool.java b/src/java/voldemort/client/rebalance/RebalanceClusterTool.java
index 75e2f9cd3e..89fa2bf400 100644
--- a/src/java/voldemort/client/rebalance/RebalanceClusterTool.java
+++ b/src/java/voldemort/client/rebalance/RebalanceClusterTool.java
@@ -13,7 +13,6 @@
 /**
  * Tools to manipulate cluster geometries and verify them for correctness, reliability and efficiency.
  *
- * @author afeinberg
  */
 public class RebalanceClusterTool {
 
diff --git a/src/java/voldemort/cluster/Cluster.java b/src/java/voldemort/cluster/Cluster.java
index e4e85c95e6..6dbe538ddd 100644
--- a/src/java/voldemort/cluster/Cluster.java
+++ b/src/java/voldemort/cluster/Cluster.java
@@ -35,7 +35,6 @@
 /**
  * A representation of the voldemort cluster
  * 
- * @author jay
  * 
  */
 @Threadsafe
diff --git a/src/java/voldemort/cluster/Node.java b/src/java/voldemort/cluster/Node.java
index 4f9ddff56d..ab949ffbc1 100644
--- a/src/java/voldemort/cluster/Node.java
+++ b/src/java/voldemort/cluster/Node.java
@@ -31,7 +31,6 @@
 /**
  * A node in the voldemort cluster
  * 
- * @author jay
  * 
  */
 @Threadsafe
diff --git a/src/java/voldemort/cluster/failuredetector/AbstractFailureDetector.java b/src/java/voldemort/cluster/failuredetector/AbstractFailureDetector.java
index d2a087b66a..87c98e8dd6 100644
--- a/src/java/voldemort/cluster/failuredetector/AbstractFailureDetector.java
+++ b/src/java/voldemort/cluster/failuredetector/AbstractFailureDetector.java
@@ -33,7 +33,6 @@
  * AbstractFailureDetector serves as a building block for FailureDetector
  * implementations.
  * 
- * @author Kirk True
  */
 
 public abstract class AbstractFailureDetector implements FailureDetector {
diff --git a/src/java/voldemort/cluster/failuredetector/AsyncRecoveryFailureDetector.java b/src/java/voldemort/cluster/failuredetector/AsyncRecoveryFailureDetector.java
index 3c936b95e7..fd1c2c649b 100644
--- a/src/java/voldemort/cluster/failuredetector/AsyncRecoveryFailureDetector.java
+++ b/src/java/voldemort/cluster/failuredetector/AsyncRecoveryFailureDetector.java
@@ -34,7 +34,6 @@
  * may take several seconds. Rather than cause the thread to block, we perform
  * this check in a background thread.
  * 
- * @author Kirk True
  */
 
 @JmxManaged(description = "Detects the availability of the nodes on which a Voldemort cluster runs")
diff --git a/src/java/voldemort/cluster/failuredetector/BannagePeriodFailureDetector.java b/src/java/voldemort/cluster/failuredetector/BannagePeriodFailureDetector.java
index 15d1dc90db..b8143e1ce7 100644
--- a/src/java/voldemort/cluster/failuredetector/BannagePeriodFailureDetector.java
+++ b/src/java/voldemort/cluster/failuredetector/BannagePeriodFailureDetector.java
@@ -42,8 +42,6 @@
  * available for access, the caller will then invoke recordSuccess and the node
  * will be marked available in the truest sense of the word.
  * 
- * @author jay
- * @author Kirk True
  * 
  * @see VoldemortConfig#getFailureDetectorBannagePeriod
  * @see ClientConfig#getFailureDetectorBannagePeriod
diff --git a/src/java/voldemort/cluster/failuredetector/BasicStoreVerifier.java b/src/java/voldemort/cluster/failuredetector/BasicStoreVerifier.java
index 94c6e3483e..5f10b188b7 100644
--- a/src/java/voldemort/cluster/failuredetector/BasicStoreVerifier.java
+++ b/src/java/voldemort/cluster/failuredetector/BasicStoreVerifier.java
@@ -28,7 +28,6 @@
  * already present at the time of FailureDetector implementation creation. This
  * is usually (always) in the case of tests rather than running "live."
  * 
- * @author Kirk True
  */
 
 public class BasicStoreVerifier<K, V> implements StoreVerifier {
diff --git a/src/java/voldemort/cluster/failuredetector/ClientStoreVerifier.java b/src/java/voldemort/cluster/failuredetector/ClientStoreVerifier.java
index 4546b7b4b7..740fccd701 100644
--- a/src/java/voldemort/cluster/failuredetector/ClientStoreVerifier.java
+++ b/src/java/voldemort/cluster/failuredetector/ClientStoreVerifier.java
@@ -34,7 +34,6 @@
  * implementations {@link SocketStoreClientFactory} and
  * {@link HttpStoreClientFactory}.
  * 
- * @author Kirk True
  */
 
 public abstract class ClientStoreVerifier<K, V> implements StoreVerifier {
diff --git a/src/java/voldemort/cluster/failuredetector/FailureDetector.java b/src/java/voldemort/cluster/failuredetector/FailureDetector.java
index fc8b7565fb..21ed12a749 100644
--- a/src/java/voldemort/cluster/failuredetector/FailureDetector.java
+++ b/src/java/voldemort/cluster/failuredetector/FailureDetector.java
@@ -64,8 +64,6 @@
  * recordException and recordSuccess should (not must) provide some input to the
  * internal algorithm.
  * 
- * @author jay
- * @author Kirk True
  * 
  * @see RoutedStore
  */
diff --git a/src/java/voldemort/cluster/failuredetector/FailureDetectorConfig.java b/src/java/voldemort/cluster/failuredetector/FailureDetectorConfig.java
index aad6e85574..38777c9261 100644
--- a/src/java/voldemort/cluster/failuredetector/FailureDetectorConfig.java
+++ b/src/java/voldemort/cluster/failuredetector/FailureDetectorConfig.java
@@ -37,7 +37,6 @@
  * {@link FailureDetectorUtils}'s {@link FailureDetectorUtils#create create}
  * method to create a full-blown {@link FailureDetector} instance.
  * 
- * @author Kirk True
  */
 
 public class FailureDetectorConfig {
diff --git a/src/java/voldemort/cluster/failuredetector/FailureDetectorListener.java b/src/java/voldemort/cluster/failuredetector/FailureDetectorListener.java
index 1d5257933a..354a1084eb 100644
--- a/src/java/voldemort/cluster/failuredetector/FailureDetectorListener.java
+++ b/src/java/voldemort/cluster/failuredetector/FailureDetectorListener.java
@@ -28,7 +28,6 @@
  * implementation properly implements the hashCode/equals methods to ensure
  * adding and removing instances from the FailureDetector work as expected.
  * 
- * @author Kirk True
  * 
  * @see FailureDetector#addFailureDetectorListener
  * @see FailureDetector#removeFailureDetectorListener
diff --git a/src/java/voldemort/cluster/failuredetector/FailureDetectorUtils.java b/src/java/voldemort/cluster/failuredetector/FailureDetectorUtils.java
index 629d9533ef..66adee86c0 100644
--- a/src/java/voldemort/cluster/failuredetector/FailureDetectorUtils.java
+++ b/src/java/voldemort/cluster/failuredetector/FailureDetectorUtils.java
@@ -23,7 +23,6 @@
  * FailureDetectorUtils serves as a factory for creating a FailureDetector
  * implementation.
  * 
- * @author Kirk True
  */
 
 public class FailureDetectorUtils {
diff --git a/src/java/voldemort/cluster/failuredetector/NodeStatus.java b/src/java/voldemort/cluster/failuredetector/NodeStatus.java
index af0cfbab8b..591131540b 100644
--- a/src/java/voldemort/cluster/failuredetector/NodeStatus.java
+++ b/src/java/voldemort/cluster/failuredetector/NodeStatus.java
@@ -23,7 +23,6 @@
  * 
  * Operations on this class are not atomic, but that is okay.
  * 
- * @author jay
  * 
  */
 class NodeStatus {
diff --git a/src/java/voldemort/cluster/failuredetector/NoopFailureDetector.java b/src/java/voldemort/cluster/failuredetector/NoopFailureDetector.java
index 70174b1be3..9148ebe5ca 100644
--- a/src/java/voldemort/cluster/failuredetector/NoopFailureDetector.java
+++ b/src/java/voldemort/cluster/failuredetector/NoopFailureDetector.java
@@ -23,7 +23,6 @@
  * NoopFailureDetector is used for testing classes which don't actually need a
  * working FailureDetector ;)
  * 
- * @author Kirk True
  */
 
 public class NoopFailureDetector implements FailureDetector {
diff --git a/src/java/voldemort/cluster/failuredetector/ServerStoreVerifier.java b/src/java/voldemort/cluster/failuredetector/ServerStoreVerifier.java
index 557e7c33d5..fbca70a163 100644
--- a/src/java/voldemort/cluster/failuredetector/ServerStoreVerifier.java
+++ b/src/java/voldemort/cluster/failuredetector/ServerStoreVerifier.java
@@ -33,7 +33,6 @@
  * client lifecycle that it can be provided, so it is performed on demand using
  * the {@link StoreRepository}.
  * 
- * @author Kirk True
  */
 
 public class ServerStoreVerifier implements StoreVerifier {
diff --git a/src/java/voldemort/cluster/failuredetector/StoreVerifier.java b/src/java/voldemort/cluster/failuredetector/StoreVerifier.java
index 9bf25e932f..0309649411 100644
--- a/src/java/voldemort/cluster/failuredetector/StoreVerifier.java
+++ b/src/java/voldemort/cluster/failuredetector/StoreVerifier.java
@@ -32,7 +32,6 @@
  * This is used by some FailureDetector implementations to attempt contact with
  * the node before marking said node as available.
  * 
- * @author Kirk True
  */
 
 public interface StoreVerifier {
diff --git a/src/java/voldemort/cluster/failuredetector/ThresholdFailureDetector.java b/src/java/voldemort/cluster/failuredetector/ThresholdFailureDetector.java
index a1b02136e9..abab89bad7 100644
--- a/src/java/voldemort/cluster/failuredetector/ThresholdFailureDetector.java
+++ b/src/java/voldemort/cluster/failuredetector/ThresholdFailureDetector.java
@@ -56,7 +56,6 @@
  * success threshold) overshadowing a subsequent stream of 10,000,000 failures
  * because this is only 10% of the total and above a given threshold.
  * 
- * @author Kirk True
  */
 
 @JmxManaged(description = "Detects the availability of the nodes on which a Voldemort cluster runs")
diff --git a/src/java/voldemort/routing/ConsistentRoutingStrategy.java b/src/java/voldemort/routing/ConsistentRoutingStrategy.java
index dc3409f8af..75310f7274 100644
--- a/src/java/voldemort/routing/ConsistentRoutingStrategy.java
+++ b/src/java/voldemort/routing/ConsistentRoutingStrategy.java
@@ -41,7 +41,6 @@
  * A preference list of nodes to route to is created by taking the partition
  * into which the key hashes, and then taking the next N nodes on the ring.
  * 
- * @author jay
  * 
  */
 public class ConsistentRoutingStrategy implements RoutingStrategy {
diff --git a/src/java/voldemort/routing/RouteToAllStrategy.java b/src/java/voldemort/routing/RouteToAllStrategy.java
index d877ca7532..cdbf7c3313 100644
--- a/src/java/voldemort/routing/RouteToAllStrategy.java
+++ b/src/java/voldemort/routing/RouteToAllStrategy.java
@@ -27,7 +27,6 @@
 /**
  * A routing strategy which just routes each request to all the nodes given
  * 
- * @author jay
  * 
  */
 public class RouteToAllStrategy implements RoutingStrategy {
diff --git a/src/java/voldemort/routing/RoutingStrategy.java b/src/java/voldemort/routing/RoutingStrategy.java
index 97247b8a45..b251b46f7d 100644
--- a/src/java/voldemort/routing/RoutingStrategy.java
+++ b/src/java/voldemort/routing/RoutingStrategy.java
@@ -26,7 +26,6 @@
  * servers. The preference list is the order under which operations will be
  * completed in the absence of failures.
  * 
- * @author jay
  * 
  */
 public interface RoutingStrategy {
diff --git a/src/java/voldemort/routing/RoutingStrategyFactory.java b/src/java/voldemort/routing/RoutingStrategyFactory.java
index 49411128d5..991f286378 100644
--- a/src/java/voldemort/routing/RoutingStrategyFactory.java
+++ b/src/java/voldemort/routing/RoutingStrategyFactory.java
@@ -8,7 +8,6 @@
  * A factory that gets the appropriate {@link RoutingStrategy} for a given
  * {@link RoutingStrategyType}.
  * 
- * @author bbansal
  * 
  */
 public class RoutingStrategyFactory {
diff --git a/src/java/voldemort/routing/RoutingStrategyType.java b/src/java/voldemort/routing/RoutingStrategyType.java
index 64c641a1db..679e5e3cc2 100644
--- a/src/java/voldemort/routing/RoutingStrategyType.java
+++ b/src/java/voldemort/routing/RoutingStrategyType.java
@@ -3,7 +3,6 @@
 /**
  * An enumeration of RoutingStrategies type
  * 
- * @author bbansal
  * 
  */
 public class RoutingStrategyType {
diff --git a/src/java/voldemort/serialization/DefaultSerializerFactory.java b/src/java/voldemort/serialization/DefaultSerializerFactory.java
index ba29fb4d81..f1ba735617 100644
--- a/src/java/voldemort/serialization/DefaultSerializerFactory.java
+++ b/src/java/voldemort/serialization/DefaultSerializerFactory.java
@@ -32,7 +32,6 @@
  * Factory that maps serialization strings to serializers. Used to get a
  * Serializer from config serializer description.
  * 
- * @author jay
  * 
  */
 public class DefaultSerializerFactory implements SerializerFactory {
diff --git a/src/java/voldemort/serialization/IdentitySerializer.java b/src/java/voldemort/serialization/IdentitySerializer.java
index e0eb029a0d..a4eb2046b9 100644
--- a/src/java/voldemort/serialization/IdentitySerializer.java
+++ b/src/java/voldemort/serialization/IdentitySerializer.java
@@ -21,7 +21,6 @@
  * A Serializer implmentation that does nothing at all, just maps byte arrays to
  * identical byte arrays
  * 
- * @author jay
  * 
  */
 public class IdentitySerializer implements Serializer<byte[]> {
diff --git a/src/java/voldemort/serialization/ObjectSerializer.java b/src/java/voldemort/serialization/ObjectSerializer.java
index 3d80b06153..1d9d12958f 100644
--- a/src/java/voldemort/serialization/ObjectSerializer.java
+++ b/src/java/voldemort/serialization/ObjectSerializer.java
@@ -26,7 +26,6 @@
  * Transform java objects into bytes using java's built in serialization
  * mechanism
  * 
- * @author jay
  * 
  * @param <T> The type of the object
  */
diff --git a/src/java/voldemort/serialization/SerializationException.java b/src/java/voldemort/serialization/SerializationException.java
index e1b1570ece..4684df4086 100644
--- a/src/java/voldemort/serialization/SerializationException.java
+++ b/src/java/voldemort/serialization/SerializationException.java
@@ -23,7 +23,6 @@
  * 
  * This is a user-initiated failure.
  * 
- * @author jay
  * 
  */
 public class SerializationException extends VoldemortException {
diff --git a/src/java/voldemort/serialization/Serializer.java b/src/java/voldemort/serialization/Serializer.java
index 963978c0c6..2306840731 100644
--- a/src/java/voldemort/serialization/Serializer.java
+++ b/src/java/voldemort/serialization/Serializer.java
@@ -19,7 +19,6 @@
 /**
  * Map objects to byte arrays and back again
  * 
- * @author jay
  * 
  * @param <T> The type of the object that is mapped by this serializer
  */
diff --git a/src/java/voldemort/serialization/SerializerDefinition.java b/src/java/voldemort/serialization/SerializerDefinition.java
index 717e73497b..64addb5167 100644
--- a/src/java/voldemort/serialization/SerializerDefinition.java
+++ b/src/java/voldemort/serialization/SerializerDefinition.java
@@ -27,7 +27,6 @@
 /**
  * A SerializerDefinition holds all the meta information for a serializer.
  * 
- * @author jay
  * 
  */
 public class SerializerDefinition {
diff --git a/src/java/voldemort/serialization/SerializerFactory.java b/src/java/voldemort/serialization/SerializerFactory.java
index 464277b420..5deb3e4a86 100644
--- a/src/java/voldemort/serialization/SerializerFactory.java
+++ b/src/java/voldemort/serialization/SerializerFactory.java
@@ -19,11 +19,10 @@
 /**
  * A Serializer factory creates serializers from a serializer definition
  * 
- * @author jay
  * 
  */
 public interface SerializerFactory {
 
     public abstract Serializer<?> getSerializer(SerializerDefinition serializerDef);
 
-}
\ No newline at end of file
+}
diff --git a/src/java/voldemort/serialization/SlopSerializer.java b/src/java/voldemort/serialization/SlopSerializer.java
index 9540d9889f..486ba1f7bb 100644
--- a/src/java/voldemort/serialization/SlopSerializer.java
+++ b/src/java/voldemort/serialization/SlopSerializer.java
@@ -29,7 +29,6 @@
 /**
  * A Serializer for writing Slops
  * 
- * @author jay
  * 
  */
 public class SlopSerializer implements Serializer<Slop> {
diff --git a/src/java/voldemort/serialization/StringSerializer.java b/src/java/voldemort/serialization/StringSerializer.java
index 3244bf7b53..b407e3ee06 100644
--- a/src/java/voldemort/serialization/StringSerializer.java
+++ b/src/java/voldemort/serialization/StringSerializer.java
@@ -21,7 +21,6 @@
 /**
  * A Serializer that serializes strings
  * 
- * @author jay
  * 
  */
 public class StringSerializer implements Serializer<String> {
diff --git a/src/java/voldemort/serialization/VersionedSerializer.java b/src/java/voldemort/serialization/VersionedSerializer.java
index eae20faff9..b34df914b4 100644
--- a/src/java/voldemort/serialization/VersionedSerializer.java
+++ b/src/java/voldemort/serialization/VersionedSerializer.java
@@ -25,7 +25,6 @@
  * A Serializer that removes the Versioned wrapper and delegates to a
  * user-supplied serializer to deal with the remaining bytes
  * 
- * @author jay
  * 
  * @param <T> The Versioned type
  */
diff --git a/src/java/voldemort/serialization/json/JsonReader.java b/src/java/voldemort/serialization/json/JsonReader.java
index daa750d057..006d08368c 100644
--- a/src/java/voldemort/serialization/json/JsonReader.java
+++ b/src/java/voldemort/serialization/json/JsonReader.java
@@ -28,7 +28,6 @@
 /**
  * Read in JSON objects from a java.io.Reader
  * 
- * @author jay
  * 
  */
 public class JsonReader {
diff --git a/src/java/voldemort/serialization/json/JsonTypeDefinition.java b/src/java/voldemort/serialization/json/JsonTypeDefinition.java
index d6779d078e..d2dae62c89 100644
--- a/src/java/voldemort/serialization/json/JsonTypeDefinition.java
+++ b/src/java/voldemort/serialization/json/JsonTypeDefinition.java
@@ -30,7 +30,6 @@
 /**
  * A Java collections object that represents the expected type
  * 
- * @author jay
  * 
  */
 public class JsonTypeDefinition implements Serializable {
diff --git a/src/java/voldemort/serialization/json/JsonTypeSerializer.java b/src/java/voldemort/serialization/json/JsonTypeSerializer.java
index 7eeb561396..5c362947d4 100644
--- a/src/java/voldemort/serialization/json/JsonTypeSerializer.java
+++ b/src/java/voldemort/serialization/json/JsonTypeSerializer.java
@@ -40,7 +40,6 @@
  * Official motto of this class: "I fought the static type system, and the type
  * system won."
  * 
- * @author jay
  * 
  */
 public class JsonTypeSerializer implements Serializer<Object> {
diff --git a/src/java/voldemort/serialization/json/JsonTypes.java b/src/java/voldemort/serialization/json/JsonTypes.java
index 4cae766af2..007496d4b3 100644
--- a/src/java/voldemort/serialization/json/JsonTypes.java
+++ b/src/java/voldemort/serialization/json/JsonTypes.java
@@ -21,7 +21,6 @@
 /**
  * An enum of JsonTypes (for convenience)
  * 
- * @author jay
  * 
  */
 public enum JsonTypes {
diff --git a/src/java/voldemort/serialization/json/JsonWriter.java b/src/java/voldemort/serialization/json/JsonWriter.java
index a23a32fe14..2ec7b4c9be 100644
--- a/src/java/voldemort/serialization/json/JsonWriter.java
+++ b/src/java/voldemort/serialization/json/JsonWriter.java
@@ -26,7 +26,6 @@
 /**
  * Writes JSON Objects as String recognized by {@link JsonReader}
  * 
- * @author bbansal
  * 
  */
 public class JsonWriter {
diff --git a/src/java/voldemort/server/AbstractService.java b/src/java/voldemort/server/AbstractService.java
index b774b854c4..63bd46cbbf 100644
--- a/src/java/voldemort/server/AbstractService.java
+++ b/src/java/voldemort/server/AbstractService.java
@@ -29,7 +29,6 @@
 /**
  * A helper template for implementing VoldemortService
  * 
- * @author jay
  * 
  */
 public abstract class AbstractService implements VoldemortService {
diff --git a/src/java/voldemort/server/AbstractSocketService.java b/src/java/voldemort/server/AbstractSocketService.java
index 6a8c1b1e61..8369dad293 100644
--- a/src/java/voldemort/server/AbstractSocketService.java
+++ b/src/java/voldemort/server/AbstractSocketService.java
@@ -24,7 +24,6 @@
  * AbstractSocketService abstracts the different implementations so that we can
  * use this common super class by various callers.
  * 
- * @author Kirk True
  */
 
 @JmxManaged(description = "A server that handles remote operations on stores via TCP/IP.")
@@ -75,4 +74,4 @@ protected void enableJmx(Object obj) {
             JmxUtils.registerMbean(serviceName, obj);
     }
 
-}
\ No newline at end of file
+}
diff --git a/src/java/voldemort/server/ServiceType.java b/src/java/voldemort/server/ServiceType.java
index 219d56fc84..c2a6a47646 100644
--- a/src/java/voldemort/server/ServiceType.java
+++ b/src/java/voldemort/server/ServiceType.java
@@ -3,7 +3,6 @@
 /**
  * The various types of voldemort services
  * 
- * @author jay
  * 
  */
 public enum ServiceType {
diff --git a/src/java/voldemort/server/StoreRepository.java b/src/java/voldemort/server/StoreRepository.java
index 0f941dffa2..3fca4fd937 100644
--- a/src/java/voldemort/server/StoreRepository.java
+++ b/src/java/voldemort/server/StoreRepository.java
@@ -30,7 +30,6 @@
  * individual nodes.</li>
  * </ol>
  * 
- * @author jay
  * 
  */
 @Threadsafe
diff --git a/src/java/voldemort/server/UnableUpdateMetadataException.java b/src/java/voldemort/server/UnableUpdateMetadataException.java
index 15e02cc9f9..3ce823c793 100644
--- a/src/java/voldemort/server/UnableUpdateMetadataException.java
+++ b/src/java/voldemort/server/UnableUpdateMetadataException.java
@@ -19,7 +19,6 @@
 /**
  * Thrown when a server is not able to update metadata as requested.
  * 
- * @author bbansal
  * 
  */
 public class UnableUpdateMetadataException extends RuntimeException {
diff --git a/src/java/voldemort/server/VoldemortConfig.java b/src/java/voldemort/server/VoldemortConfig.java
index 4448d6d4d0..786b898773 100644
--- a/src/java/voldemort/server/VoldemortConfig.java
+++ b/src/java/voldemort/server/VoldemortConfig.java
@@ -42,7 +42,6 @@
 /**
  * Configuration parameters for the voldemort server.
  * 
- * @author jay
  * 
  */
 public class VoldemortConfig implements Serializable {
diff --git a/src/java/voldemort/server/VoldemortJsvcDaemon.java b/src/java/voldemort/server/VoldemortJsvcDaemon.java
index 068b331828..2065b42824 100644
--- a/src/java/voldemort/server/VoldemortJsvcDaemon.java
+++ b/src/java/voldemort/server/VoldemortJsvcDaemon.java
@@ -34,7 +34,6 @@
  * See <a href="http://commons.apache.org/daemon/jsvc.html">Commons Daemon</a>
  * documentation for more info.
  * 
- * @author Eric Evans <eevans@racklabs.com>
  * 
  */
 public class VoldemortJsvcDaemon {
diff --git a/src/java/voldemort/server/VoldemortServer.java b/src/java/voldemort/server/VoldemortServer.java
index 27d6943c6e..66e8b51f4e 100644
--- a/src/java/voldemort/server/VoldemortServer.java
+++ b/src/java/voldemort/server/VoldemortServer.java
@@ -57,7 +57,6 @@
  * 
  * It can be embedded or run directly via it's main method.
  * 
- * @author jay
  * 
  */
 public class VoldemortServer extends AbstractService {
diff --git a/src/java/voldemort/server/VoldemortService.java b/src/java/voldemort/server/VoldemortService.java
index ef78f66226..c85726366b 100644
--- a/src/java/voldemort/server/VoldemortService.java
+++ b/src/java/voldemort/server/VoldemortService.java
@@ -19,7 +19,6 @@
 /**
  * A service that runs in the voldemort server
  * 
- * @author jay
  * 
  */
 public interface VoldemortService {
diff --git a/src/java/voldemort/server/gossip/GossipService.java b/src/java/voldemort/server/gossip/GossipService.java
index 872a96ea93..588c71d28a 100644
--- a/src/java/voldemort/server/gossip/GossipService.java
+++ b/src/java/voldemort/server/gossip/GossipService.java
@@ -10,7 +10,6 @@
 import voldemort.utils.RebalanceUtils;
 
 /**
- * @author afeinberg
  */
 @JmxManaged(description = "Epidemic (gossip) protocol for propagating state/configuration to the cluster.")
 public class GossipService extends AbstractService {
diff --git a/src/java/voldemort/server/gossip/Gossiper.java b/src/java/voldemort/server/gossip/Gossiper.java
index 8d568a16e6..556e4be994 100644
--- a/src/java/voldemort/server/gossip/Gossiper.java
+++ b/src/java/voldemort/server/gossip/Gossiper.java
@@ -14,7 +14,6 @@
 import voldemort.versioning.Versioned;
 
 /**
- * @author afeinberg
  * 
  *         Implementation of a gossip (epidemic) protocol for metadata. The algorithm is
  *         fairly simple. Until the service is stopped on a node, that node will:
diff --git a/src/java/voldemort/server/http/HttpService.java b/src/java/voldemort/server/http/HttpService.java
index cf45af7348..75931d9a97 100644
--- a/src/java/voldemort/server/http/HttpService.java
+++ b/src/java/voldemort/server/http/HttpService.java
@@ -43,7 +43,6 @@
 /**
  * An embedded http server that uses jetty
  * 
- * @author jay
  * 
  */
 @JmxManaged(description = "A store connector that serves remote clients via HTTP.")
diff --git a/src/java/voldemort/server/http/StoreServlet.java b/src/java/voldemort/server/http/StoreServlet.java
index 47c910083c..e9ab6eb18d 100644
--- a/src/java/voldemort/server/http/StoreServlet.java
+++ b/src/java/voldemort/server/http/StoreServlet.java
@@ -38,7 +38,6 @@
  * Handles requests from HttpStores and multiplexes them to the appropriate
  * sub-store for actual storage
  * 
- * @author jay
  * 
  */
 public class StoreServlet extends HttpServlet {
diff --git a/src/java/voldemort/server/http/VoldemortServletContextListener.java b/src/java/voldemort/server/http/VoldemortServletContextListener.java
index ed0105b6d0..cc90b0ce92 100644
--- a/src/java/voldemort/server/http/VoldemortServletContextListener.java
+++ b/src/java/voldemort/server/http/VoldemortServletContextListener.java
@@ -30,7 +30,6 @@
  * A helper class that loads the Voldemort server by bootstrapping from the
  * VOLDEMORT_HOME environment variable.
  * 
- * @author jay
  * 
  */
 public class VoldemortServletContextListener implements ServletContextListener {
diff --git a/src/java/voldemort/server/http/gui/AdminServlet.java b/src/java/voldemort/server/http/gui/AdminServlet.java
index 2943748f84..4375ae37a1 100644
--- a/src/java/voldemort/server/http/gui/AdminServlet.java
+++ b/src/java/voldemort/server/http/gui/AdminServlet.java
@@ -33,7 +33,6 @@
 /**
  * Main servlet for the admin interface
  * 
- * @author jay
  * 
  */
 public class AdminServlet extends HttpServlet {
diff --git a/src/java/voldemort/server/http/gui/QueryServlet.java b/src/java/voldemort/server/http/gui/QueryServlet.java
index 9a5dceebe4..8f7fe21ac7 100644
--- a/src/java/voldemort/server/http/gui/QueryServlet.java
+++ b/src/java/voldemort/server/http/gui/QueryServlet.java
@@ -42,7 +42,6 @@
  * 
  * http://code.google.com/p/project-voldemort/issues/detail?id=61
  * 
- * @author jay
  * 
  */
 @SuppressWarnings("all")
diff --git a/src/java/voldemort/server/http/gui/ReadOnlyStoreManagementServlet.java b/src/java/voldemort/server/http/gui/ReadOnlyStoreManagementServlet.java
index 8557a918cd..f0145555ea 100644
--- a/src/java/voldemort/server/http/gui/ReadOnlyStoreManagementServlet.java
+++ b/src/java/voldemort/server/http/gui/ReadOnlyStoreManagementServlet.java
@@ -54,7 +54,6 @@
  * data=data-file-url</li>
  * </ol>
  * 
- * @author jay
  * 
  */
 public class ReadOnlyStoreManagementServlet extends HttpServlet {
diff --git a/src/java/voldemort/server/http/gui/VelocityEngine.java b/src/java/voldemort/server/http/gui/VelocityEngine.java
index 02bad58a88..df15ae8ea1 100644
--- a/src/java/voldemort/server/http/gui/VelocityEngine.java
+++ b/src/java/voldemort/server/http/gui/VelocityEngine.java
@@ -32,7 +32,6 @@
  * Wrapper class that abstracts some of the configuration details and wraps some
  * irritating exceptions.
  * 
- * @author jay
  * 
  */
 public class VelocityEngine {
diff --git a/src/java/voldemort/server/jmx/JmxService.java b/src/java/voldemort/server/jmx/JmxService.java
index b9156d7069..fbae2ab4d3 100644
--- a/src/java/voldemort/server/jmx/JmxService.java
+++ b/src/java/voldemort/server/jmx/JmxService.java
@@ -42,7 +42,6 @@
 /**
  * A service that manages JMX registration
  * 
- * @author jay
  * 
  */
 @JmxManaged(description = "The JMX service")
diff --git a/src/java/voldemort/server/niosocket/AsyncRequestHandler.java b/src/java/voldemort/server/niosocket/AsyncRequestHandler.java
index 193433ae0a..1c992bad50 100644
--- a/src/java/voldemort/server/niosocket/AsyncRequestHandler.java
+++ b/src/java/voldemort/server/niosocket/AsyncRequestHandler.java
@@ -51,7 +51,6 @@
  * as well as determining when all the data needed for the request has been
  * read.
  * 
- * @author Kirk True
  * 
  * @see voldemort.server.protocol.RequestHandler
  */
diff --git a/src/java/voldemort/server/niosocket/NioSocketService.java b/src/java/voldemort/server/niosocket/NioSocketService.java
index 2039b84c35..6796e8a0f5 100644
--- a/src/java/voldemort/server/niosocket/NioSocketService.java
+++ b/src/java/voldemort/server/niosocket/NioSocketService.java
@@ -51,7 +51,6 @@
  * some of the NIO frameworks to handle this more cleanly, efficiently, and to
  * handle corner cases.
  * 
- * @author Kirk True
  * 
  * @see voldemort.server.socket.SocketService
  */
diff --git a/src/java/voldemort/server/niosocket/SelectorManager.java b/src/java/voldemort/server/niosocket/SelectorManager.java
index afb32a6e91..af8fd25b9a 100644
--- a/src/java/voldemort/server/niosocket/SelectorManager.java
+++ b/src/java/voldemort/server/niosocket/SelectorManager.java
@@ -91,7 +91,6 @@
  * connections and SelectorManager A with none. There's no provision to
  * re-balance the remaining requests evenly.
  * 
- * @author Kirk True
  */
 
 public class SelectorManager implements Runnable {
diff --git a/src/java/voldemort/server/protocol/AbstractRequestHandler.java b/src/java/voldemort/server/protocol/AbstractRequestHandler.java
index ef0d0e8dc0..4b20ee1150 100644
--- a/src/java/voldemort/server/protocol/AbstractRequestHandler.java
+++ b/src/java/voldemort/server/protocol/AbstractRequestHandler.java
@@ -11,7 +11,6 @@
  * A base class with a few helper fields for writing a
  * {@link voldemort.server.protocol.RequestHandler}
  * 
- * @author jay
  * 
  */
 public abstract class AbstractRequestHandler implements RequestHandler {
diff --git a/src/java/voldemort/server/protocol/RequestHandler.java b/src/java/voldemort/server/protocol/RequestHandler.java
index f96981a625..64eca7a1c5 100644
--- a/src/java/voldemort/server/protocol/RequestHandler.java
+++ b/src/java/voldemort/server/protocol/RequestHandler.java
@@ -24,7 +24,6 @@
 /**
  * A request handler that answers client requests in some given format
  * 
- * @author jay
  * 
  */
 public interface RequestHandler {
diff --git a/src/java/voldemort/server/protocol/RequestHandlerFactory.java b/src/java/voldemort/server/protocol/RequestHandlerFactory.java
index 9b8cdc930f..63735dfb8e 100644
--- a/src/java/voldemort/server/protocol/RequestHandlerFactory.java
+++ b/src/java/voldemort/server/protocol/RequestHandlerFactory.java
@@ -6,7 +6,6 @@
  * A factory that gets the appropriate request handler for a given
  * {@link voldemort.client.RequestFormatType}.
  * 
- * @author jay
  * 
  */
 public interface RequestHandlerFactory {
diff --git a/src/java/voldemort/server/protocol/SocketRequestHandlerFactory.java b/src/java/voldemort/server/protocol/SocketRequestHandlerFactory.java
index d1dc8b0f4f..a8854901d2 100644
--- a/src/java/voldemort/server/protocol/SocketRequestHandlerFactory.java
+++ b/src/java/voldemort/server/protocol/SocketRequestHandlerFactory.java
@@ -17,7 +17,6 @@
  * A factory that gets the appropriate request handler for a given
  * {@link voldemort.client.protocol.RequestFormatType}.
  * 
- * @author jay
  * 
  */
 public class SocketRequestHandlerFactory implements RequestHandlerFactory {
diff --git a/src/java/voldemort/server/protocol/StreamRequestHandler.java b/src/java/voldemort/server/protocol/StreamRequestHandler.java
index 3eed8e0f30..39b1ecbe57 100644
--- a/src/java/voldemort/server/protocol/StreamRequestHandler.java
+++ b/src/java/voldemort/server/protocol/StreamRequestHandler.java
@@ -11,7 +11,6 @@
  * executing handleRequest until it returns
  * {@link StreamRequestHandlerState#COMPLETE}.
  * 
- * @author Kirk True
  */
 
 public interface StreamRequestHandler {
diff --git a/src/java/voldemort/server/protocol/admin/AdminServiceRequestHandler.java b/src/java/voldemort/server/protocol/admin/AdminServiceRequestHandler.java
index 68c6db54a4..339110ba21 100644
--- a/src/java/voldemort/server/protocol/admin/AdminServiceRequestHandler.java
+++ b/src/java/voldemort/server/protocol/admin/AdminServiceRequestHandler.java
@@ -66,7 +66,6 @@
 /**
  * Protocol buffers implementation of a {@link RequestHandler}
  * 
- * @author afeinberg
  */
 public class AdminServiceRequestHandler implements RequestHandler {
 
diff --git a/src/java/voldemort/server/protocol/admin/AsyncOperation.java b/src/java/voldemort/server/protocol/admin/AsyncOperation.java
index 010a6bd0e5..7fbe309be9 100644
--- a/src/java/voldemort/server/protocol/admin/AsyncOperation.java
+++ b/src/java/voldemort/server/protocol/admin/AsyncOperation.java
@@ -4,7 +4,6 @@
 import voldemort.annotations.jmx.JmxOperation;
 
 /**
- * @author afeinberg
  */
 public abstract class AsyncOperation implements Runnable {
 
diff --git a/src/java/voldemort/server/protocol/admin/AsyncOperationRepository.java b/src/java/voldemort/server/protocol/admin/AsyncOperationRepository.java
index a988cec4d4..b69e123e9c 100644
--- a/src/java/voldemort/server/protocol/admin/AsyncOperationRepository.java
+++ b/src/java/voldemort/server/protocol/admin/AsyncOperationRepository.java
@@ -10,7 +10,6 @@
  * TODO: replace {@link org.apache.commons.collections.map.LRUMap} with one based on {@link java.util.LinkedHashMap}.
  * TODO: rename this to something more sensible (AsyncOperationMap/Cache?)
  * 
- * @author afeinberg
  */
 public class AsyncOperationRepository extends LRUMap {
 
diff --git a/src/java/voldemort/server/protocol/admin/AsyncOperationRunner.java b/src/java/voldemort/server/protocol/admin/AsyncOperationRunner.java
index 1448bd3030..fd1f23a9e8 100644
--- a/src/java/voldemort/server/protocol/admin/AsyncOperationRunner.java
+++ b/src/java/voldemort/server/protocol/admin/AsyncOperationRunner.java
@@ -19,7 +19,6 @@
  * TODO: requesting a unique id, then creating an operation with that id seems like a bad API design.
  * TODO: rename to something more sensible (AsyncOperationService?)
  *
- * @author afeinberg
  */
 @JmxManaged(description = "Asynchronous operation execution")
 public class AsyncOperationRunner extends AbstractService {
diff --git a/src/java/voldemort/server/protocol/admin/AsyncOperationStatus.java b/src/java/voldemort/server/protocol/admin/AsyncOperationStatus.java
index f0c430b3ed..506cd50dbc 100644
--- a/src/java/voldemort/server/protocol/admin/AsyncOperationStatus.java
+++ b/src/java/voldemort/server/protocol/admin/AsyncOperationStatus.java
@@ -3,7 +3,6 @@
 import java.util.concurrent.atomic.AtomicBoolean;
 
 /**
- * @author afeinberg
  */
 public class AsyncOperationStatus {
 
diff --git a/src/java/voldemort/server/protocol/pb/ProtoBuffRequestHandler.java b/src/java/voldemort/server/protocol/pb/ProtoBuffRequestHandler.java
index c02ceab287..343add81e1 100644
--- a/src/java/voldemort/server/protocol/pb/ProtoBuffRequestHandler.java
+++ b/src/java/voldemort/server/protocol/pb/ProtoBuffRequestHandler.java
@@ -30,7 +30,6 @@
 /**
  * A Protocol Buffers request handler
  * 
- * @author jay
  * 
  */
 public class ProtoBuffRequestHandler extends AbstractRequestHandler {
diff --git a/src/java/voldemort/server/protocol/vold/VoldemortNativeRequestHandler.java b/src/java/voldemort/server/protocol/vold/VoldemortNativeRequestHandler.java
index ee89d4e46a..e788261157 100644
--- a/src/java/voldemort/server/protocol/vold/VoldemortNativeRequestHandler.java
+++ b/src/java/voldemort/server/protocol/vold/VoldemortNativeRequestHandler.java
@@ -29,7 +29,6 @@
 /**
  * Server-side request handler for voldemort native client protocol
  * 
- * @author jay
  * 
  */
 public class VoldemortNativeRequestHandler extends AbstractRequestHandler implements RequestHandler {
diff --git a/src/java/voldemort/server/rebalance/RebalancerService.java b/src/java/voldemort/server/rebalance/RebalancerService.java
index b8326ea4c1..71ec13766e 100644
--- a/src/java/voldemort/server/rebalance/RebalancerService.java
+++ b/src/java/voldemort/server/rebalance/RebalancerService.java
@@ -11,7 +11,6 @@
 import voldemort.store.metadata.MetadataStore;
 
 /**
- * @author bbansal
  */
 @JmxManaged(description = "Rebalancer service to check if server is in rebalancing state and attempt rebalancing periodically.")
 public class RebalancerService extends AbstractService {
diff --git a/src/java/voldemort/server/scheduler/DataCleanupJob.java b/src/java/voldemort/server/scheduler/DataCleanupJob.java
index 7e12fe39f3..f8c10844d5 100644
--- a/src/java/voldemort/server/scheduler/DataCleanupJob.java
+++ b/src/java/voldemort/server/scheduler/DataCleanupJob.java
@@ -32,7 +32,6 @@
 /**
  * Expire old data
  * 
- * @author jay
  * 
  */
 public class DataCleanupJob<K, V> implements Runnable {
diff --git a/src/java/voldemort/server/scheduler/RebalancingJob.java b/src/java/voldemort/server/scheduler/RebalancingJob.java
index 32f6de4891..7c49b9ba41 100644
--- a/src/java/voldemort/server/scheduler/RebalancingJob.java
+++ b/src/java/voldemort/server/scheduler/RebalancingJob.java
@@ -36,7 +36,6 @@
  * does not, it does a PUT on the key to assure that it is written to its proper
  * home and then deletes it from the local node.
  * 
- * @author jay
  * 
  */
 public class RebalancingJob implements Runnable {
diff --git a/src/java/voldemort/server/scheduler/SchedulerService.java b/src/java/voldemort/server/scheduler/SchedulerService.java
index f475efde09..ff71ba3230 100644
--- a/src/java/voldemort/server/scheduler/SchedulerService.java
+++ b/src/java/voldemort/server/scheduler/SchedulerService.java
@@ -31,7 +31,6 @@
 /**
  * The voldemort scheduler
  * 
- * @author jay
  * 
  */
 @JmxManaged(description = "A service that runs scheduled jobs.")
diff --git a/src/java/voldemort/server/scheduler/SlopPusherJob.java b/src/java/voldemort/server/scheduler/SlopPusherJob.java
index 2c500ba49e..602d3d86f9 100644
--- a/src/java/voldemort/server/scheduler/SlopPusherJob.java
+++ b/src/java/voldemort/server/scheduler/SlopPusherJob.java
@@ -34,7 +34,6 @@
  * A task which goes through the slop table and attempts to push out all the
  * slop to its rightful owner node
  * 
- * @author jay
  * 
  */
 public class SlopPusherJob implements Runnable {
@@ -106,4 +105,4 @@ else if(slop.getOperation() == Operation.DELETE)
                            + slopsPushed + " succeeded.");
     }
 
-}
\ No newline at end of file
+}
diff --git a/src/java/voldemort/server/socket/SocketServer.java b/src/java/voldemort/server/socket/SocketServer.java
index f841ba2279..af995528b7 100644
--- a/src/java/voldemort/server/socket/SocketServer.java
+++ b/src/java/voldemort/server/socket/SocketServer.java
@@ -46,7 +46,6 @@
 /**
  * A simple socket-based server for serving voldemort requests
  * 
- * @author jay
  * 
  */
 @JmxManaged
diff --git a/src/java/voldemort/server/socket/SocketServerSession.java b/src/java/voldemort/server/socket/SocketServerSession.java
index 39d7b6b726..978cc9ee09 100644
--- a/src/java/voldemort/server/socket/SocketServerSession.java
+++ b/src/java/voldemort/server/socket/SocketServerSession.java
@@ -28,7 +28,6 @@
  * object, which will choose an appropriate request handler to handle the actual
  * request/response.
  * 
- * @author jay
  * 
  */
 public class SocketServerSession implements Runnable {
@@ -153,4 +152,4 @@ public void close() throws IOException {
         this.isClosed = true;
         this.socket.close();
     }
-}
\ No newline at end of file
+}
diff --git a/src/java/voldemort/server/socket/SocketService.java b/src/java/voldemort/server/socket/SocketService.java
index 0c3f64037c..c8c7fd3085 100644
--- a/src/java/voldemort/server/socket/SocketService.java
+++ b/src/java/voldemort/server/socket/SocketService.java
@@ -24,7 +24,6 @@
 /**
  * The VoldemortService that loads up the socket server
  * 
- * @author jay
  */
 
 public class SocketService extends AbstractSocketService {
@@ -63,4 +62,4 @@ protected void startInner() {
     protected void stopInner() {
         this.server.shutdown();
     }
-}
\ No newline at end of file
+}
diff --git a/src/java/voldemort/server/storage/StorageService.java b/src/java/voldemort/server/storage/StorageService.java
index a812c05cfd..677bef0b6e 100644
--- a/src/java/voldemort/server/storage/StorageService.java
+++ b/src/java/voldemort/server/storage/StorageService.java
@@ -93,7 +93,6 @@
 /**
  * The service responsible for managing all storage types
  * 
- * @author jay
  * 
  */
 @JmxManaged(description = "Start and stop all stores.")
diff --git a/src/java/voldemort/store/DelegatingStore.java b/src/java/voldemort/store/DelegatingStore.java
index 7baa75831a..56818fb697 100644
--- a/src/java/voldemort/store/DelegatingStore.java
+++ b/src/java/voldemort/store/DelegatingStore.java
@@ -30,7 +30,6 @@
  * Convenient for decorating a store and overriding only certain methods to add
  * behavior.
  * 
- * @author jay
  * 
  */
 public class DelegatingStore<K, V> implements Store<K, V> {
diff --git a/src/java/voldemort/store/ErrorCodeMapper.java b/src/java/voldemort/store/ErrorCodeMapper.java
index 66dca52b67..bfedbfa466 100644
--- a/src/java/voldemort/store/ErrorCodeMapper.java
+++ b/src/java/voldemort/store/ErrorCodeMapper.java
@@ -32,7 +32,6 @@
 /**
  * Map error codes to exceptions and vice versa
  * 
- * @author jay
  * 
  */
 public class ErrorCodeMapper {
diff --git a/src/java/voldemort/store/InsufficientOperationalNodesException.java b/src/java/voldemort/store/InsufficientOperationalNodesException.java
index f0db48dde8..2d635d9259 100644
--- a/src/java/voldemort/store/InsufficientOperationalNodesException.java
+++ b/src/java/voldemort/store/InsufficientOperationalNodesException.java
@@ -24,7 +24,6 @@
 /**
  * Thrown if an operation fails due to too few reachable nodes.
  * 
- * @author jay
  * 
  */
 public class InsufficientOperationalNodesException extends VoldemortException {
diff --git a/src/java/voldemort/store/InvalidMetadataException.java b/src/java/voldemort/store/InvalidMetadataException.java
index e5360e8e47..72293a0a38 100644
--- a/src/java/voldemort/store/InvalidMetadataException.java
+++ b/src/java/voldemort/store/InvalidMetadataException.java
@@ -23,7 +23,6 @@
  * configuration/ Stores Configuration) at client is not in sync with this store
  * metadata.
  * 
- * @author bbansal
  * 
  */
 public class InvalidMetadataException extends VoldemortApplicationException {
diff --git a/src/java/voldemort/store/NoSuchCapabilityException.java b/src/java/voldemort/store/NoSuchCapabilityException.java
index fc872b39c4..e5dcad1f95 100644
--- a/src/java/voldemort/store/NoSuchCapabilityException.java
+++ b/src/java/voldemort/store/NoSuchCapabilityException.java
@@ -8,7 +8,6 @@
  * 
  * @see voldemort.store.StoreCapabilityType
  * 
- * @author jay
  * 
  */
 public class NoSuchCapabilityException extends VoldemortException {
diff --git a/src/java/voldemort/store/PersistenceFailureException.java b/src/java/voldemort/store/PersistenceFailureException.java
index 2927c593c4..09196d458c 100644
--- a/src/java/voldemort/store/PersistenceFailureException.java
+++ b/src/java/voldemort/store/PersistenceFailureException.java
@@ -21,7 +21,6 @@
 /**
  * Thrown by the StorageEngine if storage fails
  * 
- * @author jay
  * 
  */
 public class PersistenceFailureException extends VoldemortException {
diff --git a/src/java/voldemort/store/StorageConfiguration.java b/src/java/voldemort/store/StorageConfiguration.java
index 69748372c6..fb1ce468c9 100644
--- a/src/java/voldemort/store/StorageConfiguration.java
+++ b/src/java/voldemort/store/StorageConfiguration.java
@@ -29,7 +29,6 @@
  * indignity of having a StorageEngineFactoryFactory to handle the mapping of
  * store type => factory. And we can't have that.
  * 
- * @author jay
  * 
  */
 public interface StorageConfiguration {
diff --git a/src/java/voldemort/store/StorageEngine.java b/src/java/voldemort/store/StorageEngine.java
index 4cc1e3d8f1..f5397e9362 100644
--- a/src/java/voldemort/store/StorageEngine.java
+++ b/src/java/voldemort/store/StorageEngine.java
@@ -36,7 +36,6 @@
  * 
  * A hash value can be produced for known subtrees of a StorageEngine
  * 
- * @author jay
  * 
  * @param <K> The type of the key being stored
  * @param <V> The type of the value being stored
diff --git a/src/java/voldemort/store/StorageInitializationException.java b/src/java/voldemort/store/StorageInitializationException.java
index f5a7959303..8621ca58d8 100644
--- a/src/java/voldemort/store/StorageInitializationException.java
+++ b/src/java/voldemort/store/StorageInitializationException.java
@@ -22,7 +22,6 @@
  * This exception indicates that the server was unable to initialize on or more
  * storage services or stores within a service.
  * 
- * @author jay
  * 
  */
 public class StorageInitializationException extends VoldemortException {
diff --git a/src/java/voldemort/store/Store.java b/src/java/voldemort/store/Store.java
index bfedb85357..10fa1870ac 100644
--- a/src/java/voldemort/store/Store.java
+++ b/src/java/voldemort/store/Store.java
@@ -31,7 +31,6 @@
  * Note that certain operations rely on the correct implementation of equals and
  * hashCode for the key. As such, arrays as keys should be avoided.
  * 
- * @author jay
  * 
  */
 @Threadsafe
diff --git a/src/java/voldemort/store/StoreDefinition.java b/src/java/voldemort/store/StoreDefinition.java
index 49a98fc0c0..c6dba3356e 100644
--- a/src/java/voldemort/store/StoreDefinition.java
+++ b/src/java/voldemort/store/StoreDefinition.java
@@ -28,7 +28,6 @@
 /**
  * The configuration information for a store.
  * 
- * @author jay
  * 
  */
 public class StoreDefinition implements Serializable {
diff --git a/src/java/voldemort/store/StoreDefinitionBuilder.java b/src/java/voldemort/store/StoreDefinitionBuilder.java
index e661ecbeea..ccc4ba6910 100644
--- a/src/java/voldemort/store/StoreDefinitionBuilder.java
+++ b/src/java/voldemort/store/StoreDefinitionBuilder.java
@@ -9,7 +9,6 @@
  * A simple builder class to avoid having 10k constructor parameters in store
  * definitions
  * 
- * @author jay
  * 
  */
 public class StoreDefinitionBuilder {
diff --git a/src/java/voldemort/store/StoreOperationFailureException.java b/src/java/voldemort/store/StoreOperationFailureException.java
index 4834f9e115..a44f4b5af8 100644
--- a/src/java/voldemort/store/StoreOperationFailureException.java
+++ b/src/java/voldemort/store/StoreOperationFailureException.java
@@ -21,7 +21,6 @@
 /**
  * Thrown to indicate the failure of some store operation (put, get, delete)
  * 
- * @author jay
  * 
  */
 public class StoreOperationFailureException extends VoldemortException {
diff --git a/src/java/voldemort/store/StoreUtils.java b/src/java/voldemort/store/StoreUtils.java
index 56881b1079..530b6c0c32 100644
--- a/src/java/voldemort/store/StoreUtils.java
+++ b/src/java/voldemort/store/StoreUtils.java
@@ -43,7 +43,6 @@
 /**
  * Check that the given key is valid
  * 
- * @author jay
  * 
  */
 public class StoreUtils {
diff --git a/src/java/voldemort/store/UnknownFailure.java b/src/java/voldemort/store/UnknownFailure.java
index 004aee4442..2152550b0b 100644
--- a/src/java/voldemort/store/UnknownFailure.java
+++ b/src/java/voldemort/store/UnknownFailure.java
@@ -21,7 +21,6 @@
 /**
  * When we don't know what the hell happened, call it one of these.
  * 
- * @author jay
  * 
  */
 public class UnknownFailure extends VoldemortException {
diff --git a/src/java/voldemort/store/UnreachableStoreException.java b/src/java/voldemort/store/UnreachableStoreException.java
index 8fa1bc4f32..7bbc85233a 100644
--- a/src/java/voldemort/store/UnreachableStoreException.java
+++ b/src/java/voldemort/store/UnreachableStoreException.java
@@ -22,7 +22,6 @@
  * Indicates that the given store cannot be reached (say, due to network
  * failure).
  * 
- * @author jay
  * 
  */
 public class UnreachableStoreException extends VoldemortException {
diff --git a/src/java/voldemort/store/bdb/BdbStorageConfiguration.java b/src/java/voldemort/store/bdb/BdbStorageConfiguration.java
index 715929d728..79cd66baf0 100644
--- a/src/java/voldemort/store/bdb/BdbStorageConfiguration.java
+++ b/src/java/voldemort/store/bdb/BdbStorageConfiguration.java
@@ -37,7 +37,6 @@
  * The configuration that is shared between berkeley db instances. This includes
  * the db environment and the configuration
  * 
- * @author jay
  * 
  */
 public class BdbStorageConfiguration implements StorageConfiguration {
diff --git a/src/java/voldemort/store/bdb/BdbStorageEngine.java b/src/java/voldemort/store/bdb/BdbStorageEngine.java
index e8ac0565a4..b73ade5d02 100644
--- a/src/java/voldemort/store/bdb/BdbStorageEngine.java
+++ b/src/java/voldemort/store/bdb/BdbStorageEngine.java
@@ -62,7 +62,6 @@
 /**
  * A store that uses BDB for persistence
  * 
- * @author jay
  * 
  */
 public class BdbStorageEngine implements StorageEngine<ByteArray, byte[]> {
diff --git a/src/java/voldemort/store/compress/lzf/ChunkEncoder.java b/src/java/voldemort/store/compress/lzf/ChunkEncoder.java
index 623af7a074..823df31d29 100644
--- a/src/java/voldemort/store/compress/lzf/ChunkEncoder.java
+++ b/src/java/voldemort/store/compress/lzf/ChunkEncoder.java
@@ -22,8 +22,6 @@
  * implementation by Thomas (which itself was inspired by original C code by
  * Marc A Lehmann)
  * 
- * @author Thomas Mueller
- * @author Tatu Saloranta
  */
 public class ChunkEncoder {
 
diff --git a/src/java/voldemort/store/compress/lzf/LZF.java b/src/java/voldemort/store/compress/lzf/LZF.java
index f3ad2b171f..78019f8763 100644
--- a/src/java/voldemort/store/compress/lzf/LZF.java
+++ b/src/java/voldemort/store/compress/lzf/LZF.java
@@ -22,7 +22,6 @@
 /**
  * Simple command-line utility that can be used for testing LZF compression.
  * 
- * @author Tatu Saloranta
  */
 public class LZF {
 
diff --git a/src/java/voldemort/store/compress/lzf/LZFChunk.java b/src/java/voldemort/store/compress/lzf/LZFChunk.java
index 928dd727ab..e33f5c0919 100644
--- a/src/java/voldemort/store/compress/lzf/LZFChunk.java
+++ b/src/java/voldemort/store/compress/lzf/LZFChunk.java
@@ -18,7 +18,6 @@
  * Helper class used to store LZF encoded segments (compressed and
  * non-compressed) that can be sequenced to produce LZF files/streams.
  * 
- * @author Tatu Saloranta
  */
 public class LZFChunk {
 
diff --git a/src/java/voldemort/store/compress/lzf/LZFDecoder.java b/src/java/voldemort/store/compress/lzf/LZFDecoder.java
index b60ce121de..6ca0a36c52 100644
--- a/src/java/voldemort/store/compress/lzf/LZFDecoder.java
+++ b/src/java/voldemort/store/compress/lzf/LZFDecoder.java
@@ -24,8 +24,6 @@
  * implementation by Thomas (which itself was inspired by original C code by
  * Marc A Lehmann)
  * 
- * @author Thomas Mueller
- * @author tsaloranta@gmail.com
  */
 public class LZFDecoder {
 
diff --git a/src/java/voldemort/store/compress/lzf/LZFEncoder.java b/src/java/voldemort/store/compress/lzf/LZFEncoder.java
index 78dd5c29d8..f82257089f 100644
--- a/src/java/voldemort/store/compress/lzf/LZFEncoder.java
+++ b/src/java/voldemort/store/compress/lzf/LZFEncoder.java
@@ -24,8 +24,6 @@
  * implementation by Thomas (which itself was inspired by original C code by
  * Marc A Lehmann)
  * 
- * @author Thomas Mueller
- * @author tsaloranta@gmail.com
  */
 public class LZFEncoder {
 
diff --git a/src/java/voldemort/store/configuration/ConfigurationStorageEngine.java b/src/java/voldemort/store/configuration/ConfigurationStorageEngine.java
index 9142a123ae..301f1dda0c 100644
--- a/src/java/voldemort/store/configuration/ConfigurationStorageEngine.java
+++ b/src/java/voldemort/store/configuration/ConfigurationStorageEngine.java
@@ -43,7 +43,6 @@
  * A FileSystem based Storage Engine to persist configuration metadata.<br>
  * <imp>Used only by {@link MetadataStore}</imp><br>
  * 
- * @author bbansal
  * 
  */
 public class ConfigurationStorageEngine implements StorageEngine<String, String> {
diff --git a/src/java/voldemort/store/gzip/GzipStore.java b/src/java/voldemort/store/gzip/GzipStore.java
index 87f8d35e57..c6756417a9 100644
--- a/src/java/voldemort/store/gzip/GzipStore.java
+++ b/src/java/voldemort/store/gzip/GzipStore.java
@@ -32,7 +32,6 @@
 /**
  * A Store decorator that gzips and ungzips its contents as it stores them
  * 
- * @author jay
  * 
  */
 public class GzipStore<K> extends DelegatingStore<K, byte[]> implements Store<K, byte[]> {
diff --git a/src/java/voldemort/store/http/HttpResponseCodeErrorMapper.java b/src/java/voldemort/store/http/HttpResponseCodeErrorMapper.java
index ec38d4d79d..df8189cd35 100644
--- a/src/java/voldemort/store/http/HttpResponseCodeErrorMapper.java
+++ b/src/java/voldemort/store/http/HttpResponseCodeErrorMapper.java
@@ -28,7 +28,6 @@
  * You must add matching entries in both mapResponseCodeToError and
  * mapErrorToResponseCode
  * 
- * @author jay
  * 
  */
 public class HttpResponseCodeErrorMapper {
@@ -62,7 +61,6 @@ public void throwError(int responseCode, String message) {
     /**
      * A struct to hold the response code and response text for an HTTP error.
      * 
-     * @author jay
      * 
      */
     public static final class ResponseCode {
diff --git a/src/java/voldemort/store/http/HttpStore.java b/src/java/voldemort/store/http/HttpStore.java
index 482248cb66..f34a524dc3 100644
--- a/src/java/voldemort/store/http/HttpStore.java
+++ b/src/java/voldemort/store/http/HttpStore.java
@@ -46,7 +46,6 @@
  * A remote store client that transmits operations via HTTP and interacts with
  * the VoldemortHttpServer.
  * 
- * @author jay
  */
 public class HttpStore implements Store<ByteArray, byte[]> {
 
diff --git a/src/java/voldemort/store/invalidmetadata/InvalidMetadataCheckingStore.java b/src/java/voldemort/store/invalidmetadata/InvalidMetadataCheckingStore.java
index 2d64624a3f..3a510cc83e 100644
--- a/src/java/voldemort/store/invalidmetadata/InvalidMetadataCheckingStore.java
+++ b/src/java/voldemort/store/invalidmetadata/InvalidMetadataCheckingStore.java
@@ -33,7 +33,6 @@
  * inner store, and throws {@link InvalidMetadataException} if a client requests
  * a partition which is not or should not be available at this node.
  * 
- * @author bbansal
  * 
  */
 public class InvalidMetadataCheckingStore extends DelegatingStore<ByteArray, byte[]> {
diff --git a/src/java/voldemort/store/logging/LoggingStore.java b/src/java/voldemort/store/logging/LoggingStore.java
index db1ea66498..6ca59f6469 100644
--- a/src/java/voldemort/store/logging/LoggingStore.java
+++ b/src/java/voldemort/store/logging/LoggingStore.java
@@ -32,7 +32,6 @@
 /**
  * A store wrapper that handles debug logging.
  * 
- * @author jay
  * 
  */
 public class LoggingStore<K, V> extends DelegatingStore<K, V> {
diff --git a/src/java/voldemort/store/memory/CacheStorageConfiguration.java b/src/java/voldemort/store/memory/CacheStorageConfiguration.java
index 2454844bf8..9174121879 100644
--- a/src/java/voldemort/store/memory/CacheStorageConfiguration.java
+++ b/src/java/voldemort/store/memory/CacheStorageConfiguration.java
@@ -32,7 +32,6 @@
  * collections ReferenceMap with Soft references on both keys and values. This
  * behaves like a cache, discarding values when under memory pressure.
  * 
- * @author jay
  * 
  */
 public class CacheStorageConfiguration implements StorageConfiguration {
diff --git a/src/java/voldemort/store/memory/InMemoryStorageConfiguration.java b/src/java/voldemort/store/memory/InMemoryStorageConfiguration.java
index 0fc219c5cb..852937b4ab 100644
--- a/src/java/voldemort/store/memory/InMemoryStorageConfiguration.java
+++ b/src/java/voldemort/store/memory/InMemoryStorageConfiguration.java
@@ -28,7 +28,6 @@
 /**
  * A storage engine that uses a java.util.ConcurrentHashMap to hold the entries
  * 
- * @author jay
  * 
  */
 public class InMemoryStorageConfiguration implements StorageConfiguration {
diff --git a/src/java/voldemort/store/memory/InMemoryStorageEngine.java b/src/java/voldemort/store/memory/InMemoryStorageEngine.java
index 1f62eb888f..dbdb46eef8 100644
--- a/src/java/voldemort/store/memory/InMemoryStorageEngine.java
+++ b/src/java/voldemort/store/memory/InMemoryStorageEngine.java
@@ -41,8 +41,6 @@
 /**
  * A simple non-persistent, in-memory store. Useful for unit testing.
  * 
- * @author jay
- * @author dain
  * 
  */
 public class InMemoryStorageEngine<K, V> implements StorageEngine<K, V> {
diff --git a/src/java/voldemort/store/metadata/MetadataStore.java b/src/java/voldemort/store/metadata/MetadataStore.java
index 15334066cf..3044fd6843 100644
--- a/src/java/voldemort/store/metadata/MetadataStore.java
+++ b/src/java/voldemort/store/metadata/MetadataStore.java
@@ -62,7 +62,6 @@
  * Metadata Store keeps a in memory write-through-cache for performance.
  * 
  * 
- * @author bbansal
  * 
  */
 public class MetadataStore implements StorageEngine<ByteArray, byte[]> {
diff --git a/src/java/voldemort/store/mysql/MysqlStorageEngine.java b/src/java/voldemort/store/mysql/MysqlStorageEngine.java
index 0b3fb6eb82..3c05fbd878 100644
--- a/src/java/voldemort/store/mysql/MysqlStorageEngine.java
+++ b/src/java/voldemort/store/mysql/MysqlStorageEngine.java
@@ -47,7 +47,6 @@
 /**
  * A StorageEngine that uses Mysql for persistence
  * 
- * @author jay
  * 
  */
 public class MysqlStorageEngine implements StorageEngine<ByteArray, byte[]> {
diff --git a/src/java/voldemort/store/readonly/BinarySearchStrategy.java b/src/java/voldemort/store/readonly/BinarySearchStrategy.java
index 2a01636a6f..eb97ac4743 100644
--- a/src/java/voldemort/store/readonly/BinarySearchStrategy.java
+++ b/src/java/voldemort/store/readonly/BinarySearchStrategy.java
@@ -8,7 +8,6 @@
  * A search strategy that does a simple binary search into the buffer to find
  * the key
  * 
- * @author jay
  * 
  */
 public class BinarySearchStrategy implements SearchStrategy {
diff --git a/src/java/voldemort/store/readonly/ChunkedFileSet.java b/src/java/voldemort/store/readonly/ChunkedFileSet.java
index 1d0e2b90b1..80dc231af8 100644
--- a/src/java/voldemort/store/readonly/ChunkedFileSet.java
+++ b/src/java/voldemort/store/readonly/ChunkedFileSet.java
@@ -18,7 +18,6 @@
 /**
  * A set of chunked data and index files for a read-only store
  * 
- * @author jay
  * 
  */
 public class ChunkedFileSet {
diff --git a/src/java/voldemort/store/readonly/ExternalSorter.java b/src/java/voldemort/store/readonly/ExternalSorter.java
index 0fff4bfb1f..75053f3170 100644
--- a/src/java/voldemort/store/readonly/ExternalSorter.java
+++ b/src/java/voldemort/store/readonly/ExternalSorter.java
@@ -52,7 +52,6 @@
  * Do an external sort on data coming from an input iterator and produce a new
  * iterator over the values in sorted order
  * 
- * @author jay
  * 
  * @param <V> The type of value being sorted
  */
diff --git a/src/java/voldemort/store/readonly/FileFetcher.java b/src/java/voldemort/store/readonly/FileFetcher.java
index 7d0700f42d..7e8afa2309 100644
--- a/src/java/voldemort/store/readonly/FileFetcher.java
+++ b/src/java/voldemort/store/readonly/FileFetcher.java
@@ -11,7 +11,6 @@
  * All implementations must provide a public constructor that takes
  * VoldemortConfig as a parameter.
  * 
- * @author jay
  * 
  */
 public interface FileFetcher {
diff --git a/src/java/voldemort/store/readonly/InterpolationSearchStrategy.java b/src/java/voldemort/store/readonly/InterpolationSearchStrategy.java
index 483b581de0..498d2f0377 100644
--- a/src/java/voldemort/store/readonly/InterpolationSearchStrategy.java
+++ b/src/java/voldemort/store/readonly/InterpolationSearchStrategy.java
@@ -10,7 +10,6 @@
  * strategy depends entirely on the uniform distribution of the keys that is
  * guaranteed by the md5 hash.
  * 
- * @author jay
  * 
  */
 public class InterpolationSearchStrategy implements SearchStrategy {
diff --git a/src/java/voldemort/store/readonly/JsonStoreBuilder.java b/src/java/voldemort/store/readonly/JsonStoreBuilder.java
index c233dc7e9d..c05d143893 100644
--- a/src/java/voldemort/store/readonly/JsonStoreBuilder.java
+++ b/src/java/voldemort/store/readonly/JsonStoreBuilder.java
@@ -60,7 +60,6 @@
 /**
  * Build a read-only store from given input.
  * 
- * @author jay
  * 
  */
 public class JsonStoreBuilder {
diff --git a/src/java/voldemort/store/readonly/ReadOnlyStorageEngine.java b/src/java/voldemort/store/readonly/ReadOnlyStorageEngine.java
index f2364782d7..0415412d39 100644
--- a/src/java/voldemort/store/readonly/ReadOnlyStorageEngine.java
+++ b/src/java/voldemort/store/readonly/ReadOnlyStorageEngine.java
@@ -51,7 +51,6 @@
 /**
  * A read-only store that fronts a big file
  * 
- * @author jay
  * 
  */
 public class ReadOnlyStorageEngine implements StorageEngine<ByteArray, byte[]> {
diff --git a/src/java/voldemort/store/readonly/SearchStrategy.java b/src/java/voldemort/store/readonly/SearchStrategy.java
index 46208dc61f..bd0a7300cb 100644
--- a/src/java/voldemort/store/readonly/SearchStrategy.java
+++ b/src/java/voldemort/store/readonly/SearchStrategy.java
@@ -6,7 +6,6 @@
  * A way to search for a key in a file of sorted 16 byte keys and 4 byte
  * position offsets
  * 
- * @author jay
  * 
  */
 public interface SearchStrategy {
diff --git a/src/java/voldemort/store/readonly/StoreSwapper.java b/src/java/voldemort/store/readonly/StoreSwapper.java
index 1e9f09500a..6a90929d1d 100644
--- a/src/java/voldemort/store/readonly/StoreSwapper.java
+++ b/src/java/voldemort/store/readonly/StoreSwapper.java
@@ -38,7 +38,6 @@
  * A helper class to invoke the FETCH and SWAP operations on a remote store via
  * HTTP.
  * 
- * @author jay
  * 
  */
 public class StoreSwapper {
diff --git a/src/java/voldemort/store/readonly/StringSorter.java b/src/java/voldemort/store/readonly/StringSorter.java
index a64f1e7c83..61c477b8f4 100644
--- a/src/java/voldemort/store/readonly/StringSorter.java
+++ b/src/java/voldemort/store/readonly/StringSorter.java
@@ -30,7 +30,6 @@
 /**
  * Perform an external sort on the lines of the file
  * 
- * @author jay
  * 
  */
 public class StringSorter {
diff --git a/src/java/voldemort/store/rebalancing/RedirectingStore.java b/src/java/voldemort/store/rebalancing/RedirectingStore.java
index 81debb6092..0ab2b53346 100644
--- a/src/java/voldemort/store/rebalancing/RedirectingStore.java
+++ b/src/java/voldemort/store/rebalancing/RedirectingStore.java
@@ -51,7 +51,6 @@
  * ignoring any {@link ObsoleteVersionException} and then serve the client
  * requests.
  * 
- * @author bbansal
  * 
  */
 public class RedirectingStore extends DelegatingStore<ByteArray, byte[]> {
diff --git a/src/java/voldemort/store/routed/NodeValue.java b/src/java/voldemort/store/routed/NodeValue.java
index 8256549a0a..3b3b854dc3 100644
--- a/src/java/voldemort/store/routed/NodeValue.java
+++ b/src/java/voldemort/store/routed/NodeValue.java
@@ -28,7 +28,6 @@
  * A wrapper around a node id, key and value. This class represents one
  * key/value as fetched from a single server.
  * 
- * @author jay
  * 
  * @param <K> The type of the key
  * @param <V> The type of the value
@@ -90,4 +89,4 @@ public boolean equals(Object o) {
         return getNodeId() == v.getNodeId() && Objects.equal(getKey(), v.getKey())
                && Objects.equal(getVersion(), v.getVersion());
     }
-}
\ No newline at end of file
+}
diff --git a/src/java/voldemort/store/routed/ReadRepairer.java b/src/java/voldemort/store/routed/ReadRepairer.java
index 642fece4ce..45667e44da 100644
--- a/src/java/voldemort/store/routed/ReadRepairer.java
+++ b/src/java/voldemort/store/routed/ReadRepairer.java
@@ -38,7 +38,6 @@
  * 
  * This class computes the set of repairs that need to be made.
  * 
- * @author jay
  * 
  * @param <K> The class of the key in the fetch
  * @param <V> The class of the value in the fetch
diff --git a/src/java/voldemort/store/routed/RoutedStore.java b/src/java/voldemort/store/routed/RoutedStore.java
index d16338ae73..b4857b3e1a 100644
--- a/src/java/voldemort/store/routed/RoutedStore.java
+++ b/src/java/voldemort/store/routed/RoutedStore.java
@@ -67,7 +67,6 @@
 /**
  * A Store which multiplexes requests to different internal Stores
  * 
- * @author jay
  * 
  */
 public class RoutedStore implements Store<ByteArray, byte[]> {
diff --git a/src/java/voldemort/store/serialized/SerializingStorageEngine.java b/src/java/voldemort/store/serialized/SerializingStorageEngine.java
index 5983fc23ea..fe207f4b3d 100644
--- a/src/java/voldemort/store/serialized/SerializingStorageEngine.java
+++ b/src/java/voldemort/store/serialized/SerializingStorageEngine.java
@@ -28,7 +28,6 @@
  * A StorageEngine that handles serialization to bytes, transforming each
  * request to a request to StorageEngine<byte[],byte[]>
  * 
- * @author jay
  * 
  * @param <K> The key type
  * @param <V> The value type
diff --git a/src/java/voldemort/store/serialized/SerializingStore.java b/src/java/voldemort/store/serialized/SerializingStore.java
index 28c0569061..2b2107a754 100644
--- a/src/java/voldemort/store/serialized/SerializingStore.java
+++ b/src/java/voldemort/store/serialized/SerializingStore.java
@@ -36,7 +36,6 @@
 /**
  * A store that transforms requests to a Store<ByteArray,byte[]> to a Store<K,V>
  * 
- * @author jay
  * 
  * @param <K> The type of the key being stored
  * @param <V> The type of the value being stored
diff --git a/src/java/voldemort/store/slop/Slop.java b/src/java/voldemort/store/slop/Slop.java
index 9d9769cefa..57f8595d41 100644
--- a/src/java/voldemort/store/slop/Slop.java
+++ b/src/java/voldemort/store/slop/Slop.java
@@ -28,7 +28,6 @@
 /**
  * Represents an undelivered operation to a store.
  * 
- * @author jay
  * 
  */
 public class Slop {
diff --git a/src/java/voldemort/store/slop/SlopDetectingStore.java b/src/java/voldemort/store/slop/SlopDetectingStore.java
index 26dbe37f0c..84b263b61a 100644
--- a/src/java/voldemort/store/slop/SlopDetectingStore.java
+++ b/src/java/voldemort/store/slop/SlopDetectingStore.java
@@ -38,7 +38,6 @@
  * 
  * @see voldemort.server.scheduler.SlopPusherJob
  * 
- * @author jay
  * 
  */
 public class SlopDetectingStore extends DelegatingStore<ByteArray, byte[]> {
diff --git a/src/java/voldemort/store/slop/SloppyStore.java b/src/java/voldemort/store/slop/SloppyStore.java
index 0ce434a5a1..0edb6b69a3 100644
--- a/src/java/voldemort/store/slop/SloppyStore.java
+++ b/src/java/voldemort/store/slop/SloppyStore.java
@@ -51,7 +51,6 @@
  * 
  * @see voldemort.server.scheduler.SlopPusherJob
  * 
- * @author jay
  * 
  */
 public class SloppyStore extends DelegatingStore<ByteArray, byte[]> {
diff --git a/src/java/voldemort/store/socket/SocketAndStreams.java b/src/java/voldemort/store/socket/SocketAndStreams.java
index ec49a35dd8..947d155de6 100644
--- a/src/java/voldemort/store/socket/SocketAndStreams.java
+++ b/src/java/voldemort/store/socket/SocketAndStreams.java
@@ -29,7 +29,6 @@
  * A wrapper class that wraps a socket with its DataInputStream and
  * DataOutputStream
  * 
- * @author jay
  * 
  */
 public class SocketAndStreams {
diff --git a/src/java/voldemort/store/socket/SocketDestination.java b/src/java/voldemort/store/socket/SocketDestination.java
index 52065e133c..4e11b6c6ba 100644
--- a/src/java/voldemort/store/socket/SocketDestination.java
+++ b/src/java/voldemort/store/socket/SocketDestination.java
@@ -24,7 +24,6 @@
 /**
  * A host + port + protocol
  * 
- * @author jay
  * 
  */
 public class SocketDestination {
diff --git a/src/java/voldemort/store/socket/SocketPool.java b/src/java/voldemort/store/socket/SocketPool.java
index c2bb148033..82fe0ddc8c 100644
--- a/src/java/voldemort/store/socket/SocketPool.java
+++ b/src/java/voldemort/store/socket/SocketPool.java
@@ -34,7 +34,6 @@
  * translates exceptions and delegates to apache commons pool as well as
  * providing some JMX access.
  * 
- * @author jay
  * 
  */
 @JmxManaged(description = "Voldemort socket pool.")
diff --git a/src/java/voldemort/store/socket/SocketResourceFactory.java b/src/java/voldemort/store/socket/SocketResourceFactory.java
index fc7fa5c470..027e3e8c06 100644
--- a/src/java/voldemort/store/socket/SocketResourceFactory.java
+++ b/src/java/voldemort/store/socket/SocketResourceFactory.java
@@ -34,7 +34,6 @@
 /**
  * A Factory for creating sockets
  * 
- * @author jay
  * 
  */
 public class SocketResourceFactory implements ResourceFactory<SocketDestination, SocketAndStreams> {
diff --git a/src/java/voldemort/store/socket/SocketStore.java b/src/java/voldemort/store/socket/SocketStore.java
index 6eb4d8cc40..ad6a50bea2 100644
--- a/src/java/voldemort/store/socket/SocketStore.java
+++ b/src/java/voldemort/store/socket/SocketStore.java
@@ -42,7 +42,6 @@
  * The client implementation of a socket store--translates each request into a
  * network operation to be handled by the socket server on the other side.
  * 
- * @author jay
  * 
  */
 public class SocketStore implements Store<ByteArray, byte[]> {
diff --git a/src/java/voldemort/store/stats/DataSetStats.java b/src/java/voldemort/store/stats/DataSetStats.java
index 52a8090e26..d03cdb44c3 100644
--- a/src/java/voldemort/store/stats/DataSetStats.java
+++ b/src/java/voldemort/store/stats/DataSetStats.java
@@ -5,7 +5,6 @@
 /**
  * Statistics about the keys and values in a store
  * 
- * @author jay
  * 
  */
 public class DataSetStats {
diff --git a/src/java/voldemort/store/stats/RequestCounter.java b/src/java/voldemort/store/stats/RequestCounter.java
index 3502f9510a..204ad9a179 100644
--- a/src/java/voldemort/store/stats/RequestCounter.java
+++ b/src/java/voldemort/store/stats/RequestCounter.java
@@ -8,7 +8,6 @@
  * A thread-safe request counter that calculates throughput for a specified
  * duration of time.
  * 
- * @author elias, gmj
  * 
  */
 public class RequestCounter {
@@ -136,4 +135,4 @@ public double getAverageTimeNS() {
             return count > 0 ? 1f * totalTimeNS / count : -0f;
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/java/voldemort/store/stats/StatTrackingStore.java b/src/java/voldemort/store/stats/StatTrackingStore.java
index 0ac597e365..331640b00c 100644
--- a/src/java/voldemort/store/stats/StatTrackingStore.java
+++ b/src/java/voldemort/store/stats/StatTrackingStore.java
@@ -33,7 +33,6 @@
 /**
  * A store wrapper that tracks basic usage statistics
  * 
- * @author jay
  * 
  */
 public class StatTrackingStore<K, V> extends DelegatingStore<K, V> {
diff --git a/src/java/voldemort/store/stats/StoreStats.java b/src/java/voldemort/store/stats/StoreStats.java
index ce77318d60..d7dbb4efce 100644
--- a/src/java/voldemort/store/stats/StoreStats.java
+++ b/src/java/voldemort/store/stats/StoreStats.java
@@ -7,7 +7,6 @@
 /**
  * Some convenient statistics to track about the store
  * 
- * @author jay
  * 
  */
 public class StoreStats {
diff --git a/src/java/voldemort/store/stats/StoreStatsJmx.java b/src/java/voldemort/store/stats/StoreStatsJmx.java
index 7f854082e3..277fa5d680 100644
--- a/src/java/voldemort/store/stats/StoreStatsJmx.java
+++ b/src/java/voldemort/store/stats/StoreStatsJmx.java
@@ -8,7 +8,6 @@
 /**
  * A wrapper class to expose store stats via JMX
  * 
- * @author jay
  * 
  */
 @JmxManaged
diff --git a/src/java/voldemort/store/versioned/InconsistencyResolvingStore.java b/src/java/voldemort/store/versioned/InconsistencyResolvingStore.java
index 90b32f05c7..a9ded3256d 100644
--- a/src/java/voldemort/store/versioned/InconsistencyResolvingStore.java
+++ b/src/java/voldemort/store/versioned/InconsistencyResolvingStore.java
@@ -29,7 +29,6 @@
 /**
  * A Store that uses a InconsistencyResolver to eliminate some duplicates.
  * 
- * @author jay
  * 
  */
 /*
diff --git a/src/java/voldemort/store/versioned/VersionIncrementingStore.java b/src/java/voldemort/store/versioned/VersionIncrementingStore.java
index 410993936d..ead331e647 100644
--- a/src/java/voldemort/store/versioned/VersionIncrementingStore.java
+++ b/src/java/voldemort/store/versioned/VersionIncrementingStore.java
@@ -28,7 +28,6 @@
  * A wrapper that increments the version on the value for puts and delegates all
  * other operations
  * 
- * @author jay
  * 
  * @param <K> The key type
  * @param <V> The value type
diff --git a/src/java/voldemort/store/views/AbstractViewTransformation.java b/src/java/voldemort/store/views/AbstractViewTransformation.java
index 19ed04eb7e..63837f7491 100644
--- a/src/java/voldemort/store/views/AbstractViewTransformation.java
+++ b/src/java/voldemort/store/views/AbstractViewTransformation.java
@@ -6,7 +6,6 @@
  * A view that fails all operations. Override one of the methods to add either
  * reads or writes.
  * 
- * @author jay
  * 
  * @param <K> The type of the key
  * @param <V> The type of objects in the view
diff --git a/src/java/voldemort/store/views/UnsupportedViewOperationException.java b/src/java/voldemort/store/views/UnsupportedViewOperationException.java
index e519701b6c..1ecd178df8 100644
--- a/src/java/voldemort/store/views/UnsupportedViewOperationException.java
+++ b/src/java/voldemort/store/views/UnsupportedViewOperationException.java
@@ -5,7 +5,6 @@
 /**
  * Error indicating a write operation on a read-only view or vice-versa
  * 
- * @author jay
  * 
  */
 public class UnsupportedViewOperationException extends VoldemortApplicationException {
diff --git a/src/java/voldemort/store/views/View.java b/src/java/voldemort/store/views/View.java
index 325bd6df43..81963be74c 100644
--- a/src/java/voldemort/store/views/View.java
+++ b/src/java/voldemort/store/views/View.java
@@ -11,7 +11,6 @@
  * unimplemented method should throw an
  * {@link voldemort.store.views.UnsupportedViewOperationException}.
  * 
- * @author jay
  * 
  * @param <K> The type of the key
  * @param <V> The type of things in the view
diff --git a/src/java/voldemort/store/views/ViewStorageEngine.java b/src/java/voldemort/store/views/ViewStorageEngine.java
index 24fe263adf..fa3bf02615 100644
--- a/src/java/voldemort/store/views/ViewStorageEngine.java
+++ b/src/java/voldemort/store/views/ViewStorageEngine.java
@@ -23,7 +23,6 @@
 /**
  * Views are transformations of other stores
  * 
- * @author jay
  * 
  */
 @Experimental
diff --git a/src/java/voldemort/utils/ByteBufferBackedInputStream.java b/src/java/voldemort/utils/ByteBufferBackedInputStream.java
index 0c63936449..aeddbe62b0 100644
--- a/src/java/voldemort/utils/ByteBufferBackedInputStream.java
+++ b/src/java/voldemort/utils/ByteBufferBackedInputStream.java
@@ -31,7 +31,6 @@
  * methods for the underlying buffer should it need to expand and contract on
  * reuse.
  * 
- * @author Kirk True
  */
 
 @NotThreadsafe
diff --git a/src/java/voldemort/utils/ByteBufferBackedOutputStream.java b/src/java/voldemort/utils/ByteBufferBackedOutputStream.java
index 262d7c6764..df09221836 100644
--- a/src/java/voldemort/utils/ByteBufferBackedOutputStream.java
+++ b/src/java/voldemort/utils/ByteBufferBackedOutputStream.java
@@ -37,7 +37,6 @@
  * expansion. Additionally, some callers might wish to "un-expand" the buffer
  * back to a more reasonable size after use.
  * 
- * @author Kirk True
  */
 
 @NotThreadsafe
diff --git a/src/java/voldemort/utils/ByteUtils.java b/src/java/voldemort/utils/ByteUtils.java
index f435171e7f..1767af318f 100644
--- a/src/java/voldemort/utils/ByteUtils.java
+++ b/src/java/voldemort/utils/ByteUtils.java
@@ -28,7 +28,6 @@
 /**
  * Utility functions for munging on bytes
  * 
- * @author jay
  * 
  */
 public class ByteUtils {
diff --git a/src/java/voldemort/utils/ClosableIterator.java b/src/java/voldemort/utils/ClosableIterator.java
index 59ef762959..ed92026708 100644
--- a/src/java/voldemort/utils/ClosableIterator.java
+++ b/src/java/voldemort/utils/ClosableIterator.java
@@ -21,7 +21,6 @@
 /**
  * An iterator that must be closed after use
  * 
- * @author jay
  * 
  * @param <T> The type being iterated over
  */
diff --git a/src/java/voldemort/utils/CmdUtils.java b/src/java/voldemort/utils/CmdUtils.java
index d81f13b9ad..32a0673f78 100644
--- a/src/java/voldemort/utils/CmdUtils.java
+++ b/src/java/voldemort/utils/CmdUtils.java
@@ -10,7 +10,6 @@
  * Helper functions for command line parsing. Because jopt-simple is a little
  * too simple.
  * 
- * @author jay
  * 
  */
 public class CmdUtils {
diff --git a/src/java/voldemort/utils/ConstantHashFunction.java b/src/java/voldemort/utils/ConstantHashFunction.java
index 94a72fae45..70db1d8a0b 100644
--- a/src/java/voldemort/utils/ConstantHashFunction.java
+++ b/src/java/voldemort/utils/ConstantHashFunction.java
@@ -20,7 +20,6 @@
  * A hash function that always hashes everything to the same value. Useful for
  * testing purposes.
  * 
- * @author jay
  * 
  */
 public class ConstantHashFunction implements HashFunction {
diff --git a/src/java/voldemort/utils/DaemonThreadFactory.java b/src/java/voldemort/utils/DaemonThreadFactory.java
index fe765d0bea..d5009ec59e 100644
--- a/src/java/voldemort/utils/DaemonThreadFactory.java
+++ b/src/java/voldemort/utils/DaemonThreadFactory.java
@@ -7,7 +7,6 @@
  * A thread factory that sets the threads to run as daemons. (Otherwise things
  * that embed the threadpool can't shut themselves down).
  * 
- * @author jay
  * 
  */
 public class DaemonThreadFactory implements ThreadFactory {
diff --git a/src/java/voldemort/utils/DefaultIterable.java b/src/java/voldemort/utils/DefaultIterable.java
index ce430d74bf..5249967d2f 100644
--- a/src/java/voldemort/utils/DefaultIterable.java
+++ b/src/java/voldemort/utils/DefaultIterable.java
@@ -23,7 +23,6 @@
 /**
  * An iterable that always produces the given iterator
  * 
- * @author jay
  * 
  */
 public class DefaultIterable<V> implements Iterable<V> {
diff --git a/src/java/voldemort/utils/DirectoryIterator.java b/src/java/voldemort/utils/DirectoryIterator.java
index 1847372e4b..a83ee93a8c 100644
--- a/src/java/voldemort/utils/DirectoryIterator.java
+++ b/src/java/voldemort/utils/DirectoryIterator.java
@@ -12,7 +12,6 @@
  * An iterator over all the files contained in a set of directories, including
  * any subdirectories
  * 
- * @author jay
  * 
  */
 @NotThreadsafe
diff --git a/src/java/voldemort/utils/EventThrottler.java b/src/java/voldemort/utils/EventThrottler.java
index b0791044a4..9f68543e3d 100644
--- a/src/java/voldemort/utils/EventThrottler.java
+++ b/src/java/voldemort/utils/EventThrottler.java
@@ -16,7 +16,6 @@
  * This is generalized IoThrottler as it existed before, you can use it to
  * throttle on Bytes read/write,number of entries scanned etc.
  * 
- * @author jay
  * 
  */
 @NotThreadsafe
diff --git a/src/java/voldemort/utils/FnvHashFunction.java b/src/java/voldemort/utils/FnvHashFunction.java
index b4d7835c36..adc3d9acc9 100644
--- a/src/java/voldemort/utils/FnvHashFunction.java
+++ b/src/java/voldemort/utils/FnvHashFunction.java
@@ -22,7 +22,6 @@
  * hash = basis for each octet_of_data to be hashed hash = hash * FNV_prime hash
  * = hash xor octet_of_data return hash
  * 
- * @author jay
  * 
  */
 public class FnvHashFunction implements HashFunction {
diff --git a/src/java/voldemort/utils/HashFunction.java b/src/java/voldemort/utils/HashFunction.java
index 337c01a5cc..2891204bdb 100644
--- a/src/java/voldemort/utils/HashFunction.java
+++ b/src/java/voldemort/utils/HashFunction.java
@@ -19,7 +19,6 @@
 /**
  * A hash function for bytes, determinisitically maps bytes into ints
  * 
- * @author jay
  * 
  */
 public interface HashFunction {
diff --git a/src/java/voldemort/utils/JmxUtils.java b/src/java/voldemort/utils/JmxUtils.java
index d03ae222a4..87cb62423c 100644
--- a/src/java/voldemort/utils/JmxUtils.java
+++ b/src/java/voldemort/utils/JmxUtils.java
@@ -61,7 +61,6 @@
  * annotations in Java 6, but we don't want to require Java 6 just for our own
  * convenience. Hence reinventing the wheel.
  * 
- * @author jay
  * 
  */
 public class JmxUtils {
diff --git a/src/java/voldemort/utils/NetworkClassLoader.java b/src/java/voldemort/utils/NetworkClassLoader.java
index 17cd9cbc6c..ce26c74180 100644
--- a/src/java/voldemort/utils/NetworkClassLoader.java
+++ b/src/java/voldemort/utils/NetworkClassLoader.java
@@ -28,7 +28,6 @@
  * User Defined Functions (Filter API) on the server side w/o needing to add jar
  * on each server.
  * 
- * @author bbansal
  * 
  */
 public class NetworkClassLoader extends ClassLoader {
diff --git a/src/java/voldemort/utils/Props.java b/src/java/voldemort/utils/Props.java
index c656148c7e..4c1920b0c2 100644
--- a/src/java/voldemort/utils/Props.java
+++ b/src/java/voldemort/utils/Props.java
@@ -36,7 +36,6 @@
  * A less fucked properties class - Implements Map instead of extending HashMap
  * - Hash helpers for getting typed values
  * 
- * @author jay
  * 
  */
 @NotThreadsafe
diff --git a/src/java/voldemort/utils/RebalanceUtils.java b/src/java/voldemort/utils/RebalanceUtils.java
index cb29de6387..2f5d1763a5 100644
--- a/src/java/voldemort/utils/RebalanceUtils.java
+++ b/src/java/voldemort/utils/RebalanceUtils.java
@@ -25,7 +25,6 @@
  * functions are not utils function but are forced move here to allow more
  * granular unit testing.
  * 
- * @author bbansal
  * 
  */
 public class RebalanceUtils {
diff --git a/src/java/voldemort/utils/ReflectUtils.java b/src/java/voldemort/utils/ReflectUtils.java
index b736622b54..d5ea9784e6 100644
--- a/src/java/voldemort/utils/ReflectUtils.java
+++ b/src/java/voldemort/utils/ReflectUtils.java
@@ -23,7 +23,6 @@
 /**
  * Utilities for reflection
  * 
- * @author jay
  * 
  */
 public class ReflectUtils {
diff --git a/src/java/voldemort/utils/StringOutputStream.java b/src/java/voldemort/utils/StringOutputStream.java
index ef4936d6d4..c80918af41 100644
--- a/src/java/voldemort/utils/StringOutputStream.java
+++ b/src/java/voldemort/utils/StringOutputStream.java
@@ -22,7 +22,6 @@
 /**
  * A simple string Output Stream.
  * 
- * @author bbansal
  * 
  */
 public class StringOutputStream extends OutputStream {
diff --git a/src/java/voldemort/utils/SystemTime.java b/src/java/voldemort/utils/SystemTime.java
index c7eb60a538..bd6a576828 100644
--- a/src/java/voldemort/utils/SystemTime.java
+++ b/src/java/voldemort/utils/SystemTime.java
@@ -21,7 +21,6 @@
 /**
  * Time implementation that just reads from the system clock
  * 
- * @author jay
  * 
  */
 public class SystemTime implements Time {
diff --git a/src/java/voldemort/utils/Time.java b/src/java/voldemort/utils/Time.java
index 20659d6367..8b5e407f86 100644
--- a/src/java/voldemort/utils/Time.java
+++ b/src/java/voldemort/utils/Time.java
@@ -21,7 +21,6 @@
 /**
  * The interface to time itself. Oh wow, your head totally just exploded.
  * 
- * @author jay
  * 
  */
 public interface Time {
diff --git a/src/java/voldemort/utils/UndefinedPropertyException.java b/src/java/voldemort/utils/UndefinedPropertyException.java
index 9033b1d605..c38ee1ad8e 100644
--- a/src/java/voldemort/utils/UndefinedPropertyException.java
+++ b/src/java/voldemort/utils/UndefinedPropertyException.java
@@ -19,7 +19,6 @@
 /**
  * Thrown when a required property is not present
  * 
- * @author jay
  * 
  */
 public class UndefinedPropertyException extends ConfigurationException {
diff --git a/src/java/voldemort/utils/Utils.java b/src/java/voldemort/utils/Utils.java
index c3904b3a97..c1e5cce332 100644
--- a/src/java/voldemort/utils/Utils.java
+++ b/src/java/voldemort/utils/Utils.java
@@ -30,7 +30,6 @@
 /**
  * Helper functions FTW!
  * 
- * @author jay
  * 
  */
 public class Utils {
diff --git a/src/java/voldemort/utils/VoldemortAdminClientShell.java b/src/java/voldemort/utils/VoldemortAdminClientShell.java
index 60cc986f4d..dedfb78528 100644
--- a/src/java/voldemort/utils/VoldemortAdminClientShell.java
+++ b/src/java/voldemort/utils/VoldemortAdminClientShell.java
@@ -16,7 +16,6 @@
 /**
  * Toy shell for voldemort admin client
  *
- * @author afeinberg
  */
 public class VoldemortAdminClientShell extends VoldemortClientShell {
     private static final String PROMPT = "> ";
diff --git a/src/java/voldemort/utils/WriteThroughCache.java b/src/java/voldemort/utils/WriteThroughCache.java
index a4c07a7936..35b540e5f2 100644
--- a/src/java/voldemort/utils/WriteThroughCache.java
+++ b/src/java/voldemort/utils/WriteThroughCache.java
@@ -25,7 +25,6 @@
  * Extends Java HashMap {@link HashMap} as a Write through cache <br>
  * provide a hook to write custom write back strategies
  * 
- * @author bbansal
  * 
  */
 public abstract class WriteThroughCache<K, V> extends Hashtable<K, V> {
@@ -67,4 +66,4 @@ synchronized public V put(K key, V value) {
                                          + ") in write through cache", e);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/java/voldemort/utils/pool/ExcessiveInvalidResourcesException.java b/src/java/voldemort/utils/pool/ExcessiveInvalidResourcesException.java
index 70519e38d3..051e7fc99f 100644
--- a/src/java/voldemort/utils/pool/ExcessiveInvalidResourcesException.java
+++ b/src/java/voldemort/utils/pool/ExcessiveInvalidResourcesException.java
@@ -4,7 +4,6 @@
  * Indicates that we have exceeded the maximum number of successive invalid
  * resources that can be created in a single checkout.
  * 
- * @author jay
  * 
  */
 public class ExcessiveInvalidResourcesException extends RuntimeException {
diff --git a/src/java/voldemort/utils/pool/ResourceFactory.java b/src/java/voldemort/utils/pool/ResourceFactory.java
index 84b23dd708..4edc7d6c79 100644
--- a/src/java/voldemort/utils/pool/ResourceFactory.java
+++ b/src/java/voldemort/utils/pool/ResourceFactory.java
@@ -3,7 +3,6 @@
 /**
  * Basic interface for poolable Object Factory
  * 
- * @author bbansal
  * 
  */
 public interface ResourceFactory<K, V> {
diff --git a/src/java/voldemort/utils/pool/ResourcePoolConfig.java b/src/java/voldemort/utils/pool/ResourcePoolConfig.java
index e5c319e85a..f292b736b4 100644
--- a/src/java/voldemort/utils/pool/ResourcePoolConfig.java
+++ b/src/java/voldemort/utils/pool/ResourcePoolConfig.java
@@ -5,7 +5,6 @@
 /**
  * Resource pool config class.
  * 
- * @author bbansal
  * 
  */
 public class ResourcePoolConfig {
diff --git a/src/java/voldemort/versioning/ArbitraryInconsistencyResolver.java b/src/java/voldemort/versioning/ArbitraryInconsistencyResolver.java
index 2493581984..da60f6fff2 100644
--- a/src/java/voldemort/versioning/ArbitraryInconsistencyResolver.java
+++ b/src/java/voldemort/versioning/ArbitraryInconsistencyResolver.java
@@ -23,7 +23,6 @@
  * An inconsistency resolution strategy that always prefers the first of the two
  * objects.
  * 
- * @author jay
  * 
  */
 public class ArbitraryInconsistencyResolver<T> implements InconsistencyResolver<T> {
diff --git a/src/java/voldemort/versioning/ChainedResolver.java b/src/java/voldemort/versioning/ChainedResolver.java
index 56117f9889..fd0acc11f7 100644
--- a/src/java/voldemort/versioning/ChainedResolver.java
+++ b/src/java/voldemort/versioning/ChainedResolver.java
@@ -25,7 +25,6 @@
  * Apply the given inconsistency resolvers in order until there are 1 or fewer
  * items left.
  * 
- * @author jay
  * 
  */
 public class ChainedResolver<T> implements InconsistencyResolver<T> {
diff --git a/src/java/voldemort/versioning/ClockEntry.java b/src/java/voldemort/versioning/ClockEntry.java
index dbe8d56ae4..481026cfa3 100644
--- a/src/java/voldemort/versioning/ClockEntry.java
+++ b/src/java/voldemort/versioning/ClockEntry.java
@@ -25,7 +25,6 @@
  * version from a specific machine, the VectorClock keeps track of the complete
  * system version, which will consist of many individual Version objects.
  * 
- * @author jay
  * 
  */
 @NotThreadsafe
diff --git a/src/java/voldemort/versioning/FailingInconsistencyResolver.java b/src/java/voldemort/versioning/FailingInconsistencyResolver.java
index c4d8d4121e..dfa91f605b 100644
--- a/src/java/voldemort/versioning/FailingInconsistencyResolver.java
+++ b/src/java/voldemort/versioning/FailingInconsistencyResolver.java
@@ -22,7 +22,6 @@
  * An inconsistency resolver that does not attempt to resolve inconsistencies,
  * but instead just throws an exception if one should occur.
  * 
- * @author jay
  */
 public class FailingInconsistencyResolver<T> implements InconsistencyResolver<T> {
 
diff --git a/src/java/voldemort/versioning/InconsistencyResolver.java b/src/java/voldemort/versioning/InconsistencyResolver.java
index a91ef3c6e3..e5e03a29a1 100644
--- a/src/java/voldemort/versioning/InconsistencyResolver.java
+++ b/src/java/voldemort/versioning/InconsistencyResolver.java
@@ -23,7 +23,6 @@
  * Applications can implement this to provide a method for reconciling conflicts
  * that cannot be resolved simply by the version information.
  * 
- * @author jay
  * 
  */
 public interface InconsistencyResolver<T> {
diff --git a/src/java/voldemort/versioning/InconsistentDataException.java b/src/java/voldemort/versioning/InconsistentDataException.java
index 93690b0698..499018387e 100644
--- a/src/java/voldemort/versioning/InconsistentDataException.java
+++ b/src/java/voldemort/versioning/InconsistentDataException.java
@@ -24,7 +24,6 @@
  * Thrown when multiple inconsistent values are found and no resolution strategy
  * resolves the problem
  * 
- * @author jay
  * 
  */
 public class InconsistentDataException extends VoldemortException {
diff --git a/src/java/voldemort/versioning/MergingInconsistencyResolver.java b/src/java/voldemort/versioning/MergingInconsistencyResolver.java
index 7b38590365..c8339cc942 100644
--- a/src/java/voldemort/versioning/MergingInconsistencyResolver.java
+++ b/src/java/voldemort/versioning/MergingInconsistencyResolver.java
@@ -23,7 +23,6 @@
 /**
  * A strategy based on merging the objects in the list
  * 
- * @author jay
  * 
  */
 public class MergingInconsistencyResolver<T> implements InconsistencyResolver<Versioned<T>> {
diff --git a/src/java/voldemort/versioning/ObjectMerger.java b/src/java/voldemort/versioning/ObjectMerger.java
index 22d8e92122..4f69fc482a 100644
--- a/src/java/voldemort/versioning/ObjectMerger.java
+++ b/src/java/voldemort/versioning/ObjectMerger.java
@@ -19,7 +19,6 @@
 /**
  * A method for merging two objects
  * 
- * @author jay
  * 
  */
 public interface ObjectMerger<T> {
diff --git a/src/java/voldemort/versioning/ObsoleteVersionException.java b/src/java/voldemort/versioning/ObsoleteVersionException.java
index d09c8ca30c..3c8347daad 100644
--- a/src/java/voldemort/versioning/ObsoleteVersionException.java
+++ b/src/java/voldemort/versioning/ObsoleteVersionException.java
@@ -24,7 +24,6 @@
  * application-level error, and indicates the application has attempted to write
  * stale data.
  * 
- * @author jay
  * 
  */
 public class ObsoleteVersionException extends VoldemortApplicationException {
diff --git a/src/java/voldemort/versioning/Occured.java b/src/java/voldemort/versioning/Occured.java
index 47621e28f1..f1a8a2fb66 100644
--- a/src/java/voldemort/versioning/Occured.java
+++ b/src/java/voldemort/versioning/Occured.java
@@ -20,7 +20,6 @@
  * The result of comparing two times--either t1 is BEFORE t2, t1 is AFTER t2, or
  * t1 happens CONCURRENTLY to t2.
  * 
- * @author jay
  * 
  */
 public enum Occured {
diff --git a/src/java/voldemort/versioning/TimeBasedInconsistencyResolver.java b/src/java/voldemort/versioning/TimeBasedInconsistencyResolver.java
index 9fba5a1a4c..ded077bc55 100644
--- a/src/java/voldemort/versioning/TimeBasedInconsistencyResolver.java
+++ b/src/java/voldemort/versioning/TimeBasedInconsistencyResolver.java
@@ -22,7 +22,6 @@
 /**
  * Resolve inconsistencies based on timestamp in the vector clock
  * 
- * @author jay
  * 
  * @param <T> The type f the versioned object
  */
diff --git a/src/java/voldemort/versioning/VectorClock.java b/src/java/voldemort/versioning/VectorClock.java
index 49c84d3ed6..80ceafe594 100644
--- a/src/java/voldemort/versioning/VectorClock.java
+++ b/src/java/voldemort/versioning/VectorClock.java
@@ -31,7 +31,6 @@
  * means implicitly all the versions are at zero, but we only actually store
  * those greater than zero.
  * 
- * @author jay
  * 
  */
 @NotThreadsafe
diff --git a/src/java/voldemort/versioning/VectorClockInconsistencyResolver.java b/src/java/voldemort/versioning/VectorClockInconsistencyResolver.java
index 76c83c90eb..7411a0786e 100644
--- a/src/java/voldemort/versioning/VectorClockInconsistencyResolver.java
+++ b/src/java/voldemort/versioning/VectorClockInconsistencyResolver.java
@@ -25,7 +25,6 @@
  * An inconsistency resolver that uses the object VectorClocks leaving only a
  * set of concurrent versions remaining.
  * 
- * @author jay
  * 
  */
 public class VectorClockInconsistencyResolver<T> implements InconsistencyResolver<Versioned<T>> {
diff --git a/src/java/voldemort/versioning/Version.java b/src/java/voldemort/versioning/Version.java
index 5d66bc76dc..affc83ddf9 100644
--- a/src/java/voldemort/versioning/Version.java
+++ b/src/java/voldemort/versioning/Version.java
@@ -24,7 +24,6 @@
  * confusing, because the numeric codes are easily confused, and because
  * concurrent versions are not necessarily "equal" in the normal sense.
  * 
- * @author jay
  * 
  */
 public interface Version {
diff --git a/src/java/voldemort/versioning/Versioned.java b/src/java/voldemort/versioning/Versioned.java
index 0e6254c55a..48dd7b474d 100644
--- a/src/java/voldemort/versioning/Versioned.java
+++ b/src/java/voldemort/versioning/Versioned.java
@@ -26,7 +26,6 @@
 /**
  * A wrapper for an object that adds a Version.
  * 
- * @author jay
  * 
  */
 public final class Versioned<T> implements Serializable {
diff --git a/src/java/voldemort/xml/ClusterMapper.java b/src/java/voldemort/xml/ClusterMapper.java
index 1ad1d1a988..a11231c230 100644
--- a/src/java/voldemort/xml/ClusterMapper.java
+++ b/src/java/voldemort/xml/ClusterMapper.java
@@ -47,7 +47,6 @@
 /**
  * Parse a cluster xml file
  * 
- * @author jay
  * 
  */
 public class ClusterMapper {
diff --git a/src/java/voldemort/xml/StoreDefinitionsMapper.java b/src/java/voldemort/xml/StoreDefinitionsMapper.java
index 99d448bf47..357ba13407 100644
--- a/src/java/voldemort/xml/StoreDefinitionsMapper.java
+++ b/src/java/voldemort/xml/StoreDefinitionsMapper.java
@@ -55,7 +55,6 @@
 /**
  * Parses a stores.xml file
  * 
- * @author jay
  * 
  */
 public class StoreDefinitionsMapper {
diff --git a/test/common/voldemort/Attempt.java b/test/common/voldemort/Attempt.java
index 5815207a81..b5fd64ca64 100644
--- a/test/common/voldemort/Attempt.java
+++ b/test/common/voldemort/Attempt.java
@@ -1,7 +1,6 @@
 package voldemort;
 
 /**
- * @author afeinberg
  */
 public interface Attempt {
     public void checkCondition() throws Exception, AssertionError;
diff --git a/test/common/voldemort/MutableStoreVerifier.java b/test/common/voldemort/MutableStoreVerifier.java
index b79d3e34bd..99926a591f 100644
--- a/test/common/voldemort/MutableStoreVerifier.java
+++ b/test/common/voldemort/MutableStoreVerifier.java
@@ -20,7 +20,6 @@
  * availability discovery to fail (which we want to be able to control for our
  * tests).
  * 
- * @author Kirk True
  */
 
 public class MutableStoreVerifier extends BasicStoreVerifier<ByteArray, byte[]> {
diff --git a/test/common/voldemort/ServerTestUtils.java b/test/common/voldemort/ServerTestUtils.java
index 1a40fe2f52..551f9181dd 100644
--- a/test/common/voldemort/ServerTestUtils.java
+++ b/test/common/voldemort/ServerTestUtils.java
@@ -73,7 +73,6 @@
 /**
  * Helper functions for testing with real server implementations
  * 
- * @author jay
  * 
  */
 public class ServerTestUtils {
diff --git a/test/common/voldemort/StaticStoreClientFactory.java b/test/common/voldemort/StaticStoreClientFactory.java
index 2ad0492dc9..3c3c1cf4a9 100644
--- a/test/common/voldemort/StaticStoreClientFactory.java
+++ b/test/common/voldemort/StaticStoreClientFactory.java
@@ -24,7 +24,6 @@
  * This is intended to help simultate things like MetadataExceptions which may
  * require having an out-of-date Store.
  * 
- * @author jay
  * 
  */
 public class StaticStoreClientFactory implements StoreClientFactory {
diff --git a/test/common/voldemort/TestUtils.java b/test/common/voldemort/TestUtils.java
index e31014f4e6..3de7782295 100644
--- a/test/common/voldemort/TestUtils.java
+++ b/test/common/voldemort/TestUtils.java
@@ -53,7 +53,6 @@
 /**
  * Helper utilities for tests
  * 
- * @author jay
  * 
  */
 public class TestUtils {
diff --git a/test/common/voldemort/store/DoNothingStore.java b/test/common/voldemort/store/DoNothingStore.java
index a5f5da70e6..8ce43d84da 100644
--- a/test/common/voldemort/store/DoNothingStore.java
+++ b/test/common/voldemort/store/DoNothingStore.java
@@ -27,7 +27,6 @@
 /**
  * A store that does no Harm :)
  * 
- * @author bbansal
  * 
  */
 public class DoNothingStore<K, V> implements Store<K, V> {
diff --git a/test/common/voldemort/store/FailingStore.java b/test/common/voldemort/store/FailingStore.java
index 2bf6b2aca0..386059bc51 100644
--- a/test/common/voldemort/store/FailingStore.java
+++ b/test/common/voldemort/store/FailingStore.java
@@ -27,7 +27,6 @@
 /**
  * A store that always throws an exception for every operation
  * 
- * @author jay
  * 
  */
 public class FailingStore<K, V> implements Store<K, V> {
diff --git a/test/common/voldemort/utils/ServerJVMTestUtils.java b/test/common/voldemort/utils/ServerJVMTestUtils.java
index 399c8da1c1..e53cead944 100644
--- a/test/common/voldemort/utils/ServerJVMTestUtils.java
+++ b/test/common/voldemort/utils/ServerJVMTestUtils.java
@@ -20,7 +20,6 @@
 /**
  * Helper function to start/stop manage a Voldemort Server in a JVM.
  * 
- * @author bbansal
  * 
  */
 public class ServerJVMTestUtils {
diff --git a/test/integration/voldemort/InMemoryMultiThreadedTest.java b/test/integration/voldemort/InMemoryMultiThreadedTest.java
index 149e739a2b..30aee6e1d0 100644
--- a/test/integration/voldemort/InMemoryMultiThreadedTest.java
+++ b/test/integration/voldemort/InMemoryMultiThreadedTest.java
@@ -26,7 +26,6 @@
 /**
  * Test the InMemoryStorageEngine with threads
  * 
- * @author jay
  * 
  */
 public class InMemoryMultiThreadedTest {
diff --git a/test/integration/voldemort/MultithreadedStressTest.java b/test/integration/voldemort/MultithreadedStressTest.java
index 7d6416ce61..31ce09d70a 100644
--- a/test/integration/voldemort/MultithreadedStressTest.java
+++ b/test/integration/voldemort/MultithreadedStressTest.java
@@ -29,7 +29,6 @@
 /**
  * Big honkin multithreaded stress test
  * 
- * @author jay
  * 
  */
 public class MultithreadedStressTest {
diff --git a/test/integration/voldemort/ReadJson.java b/test/integration/voldemort/ReadJson.java
index 00dbd94181..c0a652a970 100644
--- a/test/integration/voldemort/ReadJson.java
+++ b/test/integration/voldemort/ReadJson.java
@@ -23,7 +23,6 @@
 import voldemort.utils.Utils;
 
 /**
- * @author jay
  * 
  */
 public class ReadJson {
diff --git a/test/integration/voldemort/TestClientShutdown.java b/test/integration/voldemort/TestClientShutdown.java
index 052b3bb385..61a0d5bf10 100644
--- a/test/integration/voldemort/TestClientShutdown.java
+++ b/test/integration/voldemort/TestClientShutdown.java
@@ -26,7 +26,6 @@
  * Code to test that the client shuts down gracefully. If this program doesn't
  * exit immediately that is bad
  * 
- * @author jay
  * 
  */
 public class TestClientShutdown {
diff --git a/test/integration/voldemort/performance/BdbGrowth.java b/test/integration/voldemort/performance/BdbGrowth.java
index 7ce64b38ce..ad4af1e481 100644
--- a/test/integration/voldemort/performance/BdbGrowth.java
+++ b/test/integration/voldemort/performance/BdbGrowth.java
@@ -32,7 +32,6 @@
 import com.sleepycat.je.EnvironmentConfig;
 
 /**
- * @author jay
  * 
  */
 public class BdbGrowth {
@@ -150,4 +149,4 @@ public Object call() throws Exception {
         System.exit(0);
     }
 
-}
\ No newline at end of file
+}
diff --git a/test/integration/voldemort/performance/MysqlBench.java b/test/integration/voldemort/performance/MysqlBench.java
index 219c25c791..156ec7ac43 100644
--- a/test/integration/voldemort/performance/MysqlBench.java
+++ b/test/integration/voldemort/performance/MysqlBench.java
@@ -40,7 +40,6 @@
 /**
  * A simple MySQL benchmark
  * 
- * @author jay
  * 
  */
 public class MysqlBench {
diff --git a/test/integration/voldemort/performance/MysqlGrowth.java b/test/integration/voldemort/performance/MysqlGrowth.java
index 231add7998..b8011e0adf 100644
--- a/test/integration/voldemort/performance/MysqlGrowth.java
+++ b/test/integration/voldemort/performance/MysqlGrowth.java
@@ -33,7 +33,6 @@
  * create table test_table (key_ varchar(200) primary key, value_ varchar(200))
  * engine=InnoDB;
  * 
- * @author jay
  * 
  */
 public class MysqlGrowth {
diff --git a/test/integration/voldemort/performance/RemoteDataGenerator.java b/test/integration/voldemort/performance/RemoteDataGenerator.java
index 7ec7de27cf..bfcfdb352e 100644
--- a/test/integration/voldemort/performance/RemoteDataGenerator.java
+++ b/test/integration/voldemort/performance/RemoteDataGenerator.java
@@ -14,7 +14,6 @@
 import java.util.Random;
 
 /**
- * @author afeinber
  * Generate data pseudo-random data with desired parameters on a remote cluster
  */
 public class RemoteDataGenerator {
diff --git a/test/integration/voldemort/store/noop/NoopStorageConfiguration.java b/test/integration/voldemort/store/noop/NoopStorageConfiguration.java
index 90ec8a524a..df3e446f94 100644
--- a/test/integration/voldemort/store/noop/NoopStorageConfiguration.java
+++ b/test/integration/voldemort/store/noop/NoopStorageConfiguration.java
@@ -31,7 +31,6 @@
  * 
  * b) use "noop" as the store type in stores.xml
  * 
- * @author geir
  * 
  */
 public class NoopStorageConfiguration implements StorageConfiguration {
diff --git a/test/integration/voldemort/store/pausable/PausableStorageConfiguration.java b/test/integration/voldemort/store/pausable/PausableStorageConfiguration.java
index 93f9522a4a..ae5d476122 100644
--- a/test/integration/voldemort/store/pausable/PausableStorageConfiguration.java
+++ b/test/integration/voldemort/store/pausable/PausableStorageConfiguration.java
@@ -9,7 +9,6 @@
 /**
  * The storage configuration for the PausableStorageEngine
  * 
- * @author jay
  * 
  */
 public class PausableStorageConfiguration implements StorageConfiguration {
diff --git a/test/integration/voldemort/store/pausable/PausableStorageEngine.java b/test/integration/voldemort/store/pausable/PausableStorageEngine.java
index f02c4bac4b..f91141e3bf 100644
--- a/test/integration/voldemort/store/pausable/PausableStorageEngine.java
+++ b/test/integration/voldemort/store/pausable/PausableStorageEngine.java
@@ -20,7 +20,6 @@
  * paused all operations on the store will block indefinitely. The methods to
  * pause and unpause are also exposed through JMX.
  * 
- * @author jay
  * 
  * @param <K> The type of the key
  * @param <V> The type of the value
diff --git a/test/unit/voldemort/client/AbstractStoreClientFactoryTest.java b/test/unit/voldemort/client/AbstractStoreClientFactoryTest.java
index b330aaea73..3ed171e520 100644
--- a/test/unit/voldemort/client/AbstractStoreClientFactoryTest.java
+++ b/test/unit/voldemort/client/AbstractStoreClientFactoryTest.java
@@ -35,7 +35,6 @@
 import voldemort.xml.ClusterMapper;
 
 /**
- * @author jay
  * 
  */
 public abstract class AbstractStoreClientFactoryTest extends TestCase {
diff --git a/test/unit/voldemort/client/AdminServiceBasicTest.java b/test/unit/voldemort/client/AdminServiceBasicTest.java
index d1f631570b..775d0b63a7 100644
--- a/test/unit/voldemort/client/AdminServiceBasicTest.java
+++ b/test/unit/voldemort/client/AdminServiceBasicTest.java
@@ -58,7 +58,6 @@
 import com.google.common.collect.AbstractIterator;
 
 /**
- * @author afeinberg, bbansal
  */
 @RunWith(Parameterized.class)
 public class AdminServiceBasicTest extends TestCase {
diff --git a/test/unit/voldemort/client/AdminServiceFailureTest.java b/test/unit/voldemort/client/AdminServiceFailureTest.java
index def451df30..da4a8f1916 100644
--- a/test/unit/voldemort/client/AdminServiceFailureTest.java
+++ b/test/unit/voldemort/client/AdminServiceFailureTest.java
@@ -41,7 +41,6 @@
 /**
  * Test to check streaming behavior under failure.
  * 
- * @author bbansal
  * 
  */
 @RunWith(Parameterized.class)
diff --git a/test/unit/voldemort/client/AdminServiceFilterTest.java b/test/unit/voldemort/client/AdminServiceFilterTest.java
index 9bac6c3579..12fd77f4a0 100644
--- a/test/unit/voldemort/client/AdminServiceFilterTest.java
+++ b/test/unit/voldemort/client/AdminServiceFilterTest.java
@@ -47,7 +47,6 @@
  * 
  * Check the Filter class parameter in AdminServer stream API's <br>
  * 
- * @author bbansal
  * 
  */
 @RunWith(Parameterized.class)
diff --git a/test/unit/voldemort/client/AdminServiceMultiJVMTest.java b/test/unit/voldemort/client/AdminServiceMultiJVMTest.java
index 1b2232d359..7578a2340c 100644
--- a/test/unit/voldemort/client/AdminServiceMultiJVMTest.java
+++ b/test/unit/voldemort/client/AdminServiceMultiJVMTest.java
@@ -44,7 +44,6 @@
 /**
  * Multiple JVM test for {@link AbstractAdminServiceFilterTest}
  * 
- * @author bbansal
  */
 @RunWith(Parameterized.class)
 public class AdminServiceMultiJVMTest extends AbstractAdminServiceFilterTest {
diff --git a/test/unit/voldemort/client/HttpStoreClientFactoryTest.java b/test/unit/voldemort/client/HttpStoreClientFactoryTest.java
index a3e2e5723f..d64bb00e5d 100644
--- a/test/unit/voldemort/client/HttpStoreClientFactoryTest.java
+++ b/test/unit/voldemort/client/HttpStoreClientFactoryTest.java
@@ -27,7 +27,6 @@
 import voldemort.store.http.HttpStore;
 
 /**
- * @author jay
  * 
  */
 public class HttpStoreClientFactoryTest extends AbstractStoreClientFactoryTest {
diff --git a/test/unit/voldemort/client/SocketStoreClientFactoryTest.java b/test/unit/voldemort/client/SocketStoreClientFactoryTest.java
index 1513b35aac..b7b8336e8f 100644
--- a/test/unit/voldemort/client/SocketStoreClientFactoryTest.java
+++ b/test/unit/voldemort/client/SocketStoreClientFactoryTest.java
@@ -34,7 +34,6 @@
 import voldemort.server.AbstractSocketService;
 
 /**
- * @author jay
  * 
  */
 
diff --git a/test/unit/voldemort/client/rebalance/RebalanceTest.java b/test/unit/voldemort/client/rebalance/RebalanceTest.java
index 5a6ad69fdb..e3fc972a0d 100644
--- a/test/unit/voldemort/client/rebalance/RebalanceTest.java
+++ b/test/unit/voldemort/client/rebalance/RebalanceTest.java
@@ -24,7 +24,6 @@
  * Start VoldemortServer locally using ServerTestUtils and run rebalancing
  * tests.
  * 
- * @author bbansal
  * 
  */
 @RunWith(Parameterized.class)
@@ -80,4 +79,4 @@ protected void stopServer(List<Integer> nodesToStop) throws IOException {
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/test/unit/voldemort/routing/PartitionedRoutingStrategyTest.java b/test/unit/voldemort/routing/PartitionedRoutingStrategyTest.java
index fa193d211e..08bbdea316 100644
--- a/test/unit/voldemort/routing/PartitionedRoutingStrategyTest.java
+++ b/test/unit/voldemort/routing/PartitionedRoutingStrategyTest.java
@@ -19,7 +19,6 @@
 import junit.framework.TestCase;
 
 /**
- * @author jay
  * 
  */
 public class PartitionedRoutingStrategyTest extends TestCase {
diff --git a/test/unit/voldemort/serialization/json/JsonBackwardsCompatibilityTest.java b/test/unit/voldemort/serialization/json/JsonBackwardsCompatibilityTest.java
index 369379b7e3..0c60b212d7 100644
--- a/test/unit/voldemort/serialization/json/JsonBackwardsCompatibilityTest.java
+++ b/test/unit/voldemort/serialization/json/JsonBackwardsCompatibilityTest.java
@@ -20,7 +20,6 @@
  * A test that the json serialization remains compatible with older serialized
  * data
  * 
- * @author jay
  * 
  */
 public class JsonBackwardsCompatibilityTest extends TestCase {
diff --git a/test/unit/voldemort/serialization/json/JsonReaderTest.java b/test/unit/voldemort/serialization/json/JsonReaderTest.java
index 615a99273e..cf87bd2813 100644
--- a/test/unit/voldemort/serialization/json/JsonReaderTest.java
+++ b/test/unit/voldemort/serialization/json/JsonReaderTest.java
@@ -27,7 +27,6 @@
 import com.google.common.collect.ImmutableMap;
 
 /**
- * @author jay
  * 
  */
 public class JsonReaderTest extends TestCase {
diff --git a/test/unit/voldemort/serialization/json/JsonTypeSerializerTest.java b/test/unit/voldemort/serialization/json/JsonTypeSerializerTest.java
index 6583d19cc7..6ba54926e3 100644
--- a/test/unit/voldemort/serialization/json/JsonTypeSerializerTest.java
+++ b/test/unit/voldemort/serialization/json/JsonTypeSerializerTest.java
@@ -36,7 +36,6 @@
 /**
  * TODO: cases to consider: null values? extra bytes?
  * 
- * @author jay
  * 
  */
 @SuppressWarnings("unchecked")
diff --git a/test/unit/voldemort/server/EndToEndTest.java b/test/unit/voldemort/server/EndToEndTest.java
index 8b4b9a2382..6ae8c22fbc 100644
--- a/test/unit/voldemort/server/EndToEndTest.java
+++ b/test/unit/voldemort/server/EndToEndTest.java
@@ -23,7 +23,6 @@
 /**
  * Provides an unmocked end to end unit test of a Voldemort cluster.
  *
- * @author afeinberg
  */
 @RunWith(Parameterized.class)
 public class EndToEndTest {
diff --git a/test/unit/voldemort/server/ServiceTest.java b/test/unit/voldemort/server/ServiceTest.java
index e2d2e88172..8c04c298db 100644
--- a/test/unit/voldemort/server/ServiceTest.java
+++ b/test/unit/voldemort/server/ServiceTest.java
@@ -19,7 +19,6 @@
 import junit.framework.TestCase;
 
 /**
- * @author jay
  * 
  */
 public class ServiceTest extends TestCase {
diff --git a/test/unit/voldemort/server/gossip/GossiperTest.java b/test/unit/voldemort/server/gossip/GossiperTest.java
index 2469975a9f..a97268f4fa 100644
--- a/test/unit/voldemort/server/gossip/GossiperTest.java
+++ b/test/unit/voldemort/server/gossip/GossiperTest.java
@@ -30,7 +30,6 @@
 import voldemort.versioning.Versioned;
 
 /**
- * @author afeinberg
  */
 @RunWith(Parameterized.class)
 public class GossiperTest extends TestCase {
diff --git a/test/unit/voldemort/server/protocol/admin/AsyncOperationTest.java b/test/unit/voldemort/server/protocol/admin/AsyncOperationTest.java
index 86a7a182bf..098906d396 100644
--- a/test/unit/voldemort/server/protocol/admin/AsyncOperationTest.java
+++ b/test/unit/voldemort/server/protocol/admin/AsyncOperationTest.java
@@ -13,7 +13,6 @@
 import voldemort.utils.SystemTime;
 
 /**
- * @author afeinberg
  */
 public class AsyncOperationTest extends TestCase {
 
diff --git a/test/unit/voldemort/server/socket/SocketPoolTest.java b/test/unit/voldemort/server/socket/SocketPoolTest.java
index 5c773a0f87..67696ca42b 100644
--- a/test/unit/voldemort/server/socket/SocketPoolTest.java
+++ b/test/unit/voldemort/server/socket/SocketPoolTest.java
@@ -40,7 +40,6 @@
 /**
  * Tests for the socket pooling
  * 
- * @author jay
  * 
  */
 @RunWith(Parameterized.class)
diff --git a/test/unit/voldemort/server/storage/StorageServiceTest.java b/test/unit/voldemort/server/storage/StorageServiceTest.java
index 63697bbfd6..f51ceebc6f 100644
--- a/test/unit/voldemort/server/storage/StorageServiceTest.java
+++ b/test/unit/voldemort/server/storage/StorageServiceTest.java
@@ -17,7 +17,6 @@
 /**
  * Test that the storage service is able to load all stores.
  * 
- * @author jay
  * 
  */
 public class StorageServiceTest extends TestCase {
diff --git a/test/unit/voldemort/store/AbstractByteArrayStoreTest.java b/test/unit/voldemort/store/AbstractByteArrayStoreTest.java
index 6a705749c3..3af795f7ca 100644
--- a/test/unit/voldemort/store/AbstractByteArrayStoreTest.java
+++ b/test/unit/voldemort/store/AbstractByteArrayStoreTest.java
@@ -25,7 +25,6 @@
 import com.google.common.collect.Lists;
 
 /**
- * @author jay
  * 
  */
 public abstract class AbstractByteArrayStoreTest extends AbstractStoreTest<ByteArray, byte[]> {
diff --git a/test/unit/voldemort/store/bdb/BdbSplitStorageEngineTest.java b/test/unit/voldemort/store/bdb/BdbSplitStorageEngineTest.java
index 9a131c3942..4b85874e4f 100644
--- a/test/unit/voldemort/store/bdb/BdbSplitStorageEngineTest.java
+++ b/test/unit/voldemort/store/bdb/BdbSplitStorageEngineTest.java
@@ -38,7 +38,6 @@
 /**
  * checks that
  * 
- * @author bbansal
  * 
  */
 public class BdbSplitStorageEngineTest extends TestCase {
diff --git a/test/unit/voldemort/store/http/HttpStoreTest.java b/test/unit/voldemort/store/http/HttpStoreTest.java
index 1bd7d40855..5b55706416 100644
--- a/test/unit/voldemort/store/http/HttpStoreTest.java
+++ b/test/unit/voldemort/store/http/HttpStoreTest.java
@@ -38,7 +38,6 @@
 /**
  * Tests of HTTP store against the HTTP server
  * 
- * @author jay
  * 
  */
 public class HttpStoreTest extends AbstractByteArrayStoreTest {
diff --git a/test/unit/voldemort/store/invalidmetadata/InvalidMetadataCheckingStoreTest.java b/test/unit/voldemort/store/invalidmetadata/InvalidMetadataCheckingStoreTest.java
index ac304e3e73..56a8b910f2 100644
--- a/test/unit/voldemort/store/invalidmetadata/InvalidMetadataCheckingStoreTest.java
+++ b/test/unit/voldemort/store/invalidmetadata/InvalidMetadataCheckingStoreTest.java
@@ -36,7 +36,6 @@
 import voldemort.versioning.Versioned;
 
 /**
- * @author bbansal
  * 
  */
 public class InvalidMetadataCheckingStoreTest extends TestCase {
diff --git a/test/unit/voldemort/store/invalidmetadata/ServerSideRoutingTest.java b/test/unit/voldemort/store/invalidmetadata/ServerSideRoutingTest.java
index a0ae29849d..8ade2f2ce7 100644
--- a/test/unit/voldemort/store/invalidmetadata/ServerSideRoutingTest.java
+++ b/test/unit/voldemort/store/invalidmetadata/ServerSideRoutingTest.java
@@ -40,7 +40,6 @@
  * InvalidMetadata can cause trouble for server side routing by not allowing
  * requests from random partitions on a server.
  * 
- * @author bbansal
  * 
  */
 public class ServerSideRoutingTest extends TestCase {
diff --git a/test/unit/voldemort/store/logging/LoggingStoreTest.java b/test/unit/voldemort/store/logging/LoggingStoreTest.java
index d75b3742c4..d0ca6a17e7 100644
--- a/test/unit/voldemort/store/logging/LoggingStoreTest.java
+++ b/test/unit/voldemort/store/logging/LoggingStoreTest.java
@@ -23,7 +23,6 @@
 import voldemort.store.memory.InMemoryStorageEngine;
 
 /**
- * @author jay
  * 
  */
 public class LoggingStoreTest extends AbstractStoreTest<String, String> {
diff --git a/test/unit/voldemort/store/memory/CacheStorageEngineTest.java b/test/unit/voldemort/store/memory/CacheStorageEngineTest.java
index 4e8c91c659..884e96c74c 100644
--- a/test/unit/voldemort/store/memory/CacheStorageEngineTest.java
+++ b/test/unit/voldemort/store/memory/CacheStorageEngineTest.java
@@ -27,7 +27,6 @@
  * Does all the normal tests but also uses a high memory pressure test to make
  * sure that values are collected.
  * 
- * @author jay
  * 
  */
 public class CacheStorageEngineTest extends InMemoryStorageEngineTest {
diff --git a/test/unit/voldemort/store/readonly/SearchStrategyTest.java b/test/unit/voldemort/store/readonly/SearchStrategyTest.java
index 821453e7ff..cc800bde28 100644
--- a/test/unit/voldemort/store/readonly/SearchStrategyTest.java
+++ b/test/unit/voldemort/store/readonly/SearchStrategyTest.java
@@ -21,7 +21,6 @@
 /**
  * A base test for testing search strategies for the read-only store
  * 
- * @author jay
  * 
  */
 @RunWith(Parameterized.class)
diff --git a/test/unit/voldemort/store/rebalancing/RedirectingStoreTest.java b/test/unit/voldemort/store/rebalancing/RedirectingStoreTest.java
index 94666b6a6c..5af58405e5 100644
--- a/test/unit/voldemort/store/rebalancing/RedirectingStoreTest.java
+++ b/test/unit/voldemort/store/rebalancing/RedirectingStoreTest.java
@@ -56,7 +56,6 @@
 import voldemort.versioning.Versioned;
 
 /**
- * @author bbansal
  * 
  */
 @RunWith(Parameterized.class)
diff --git a/test/unit/voldemort/store/routed/ReadRepairerTest.java b/test/unit/voldemort/store/routed/ReadRepairerTest.java
index bd453070d1..ae9d9ad8a7 100644
--- a/test/unit/voldemort/store/routed/ReadRepairerTest.java
+++ b/test/unit/voldemort/store/routed/ReadRepairerTest.java
@@ -63,7 +63,6 @@
 import com.google.common.collect.Sets;
 
 /**
- * @author jay
  * 
  */
 @SuppressWarnings("unchecked")
diff --git a/test/unit/voldemort/store/routed/RoutedStoreTest.java b/test/unit/voldemort/store/routed/RoutedStoreTest.java
index 56a8858727..135f07b0a7 100644
--- a/test/unit/voldemort/store/routed/RoutedStoreTest.java
+++ b/test/unit/voldemort/store/routed/RoutedStoreTest.java
@@ -76,7 +76,6 @@
 /**
  * Basic tests for RoutedStore
  * 
- * @author jay
  * 
  */
 @RunWith(Parameterized.class)
diff --git a/test/unit/voldemort/store/serialized/SerializingStoreTest.java b/test/unit/voldemort/store/serialized/SerializingStoreTest.java
index 0b852a4606..b0c802e2c6 100644
--- a/test/unit/voldemort/store/serialized/SerializingStoreTest.java
+++ b/test/unit/voldemort/store/serialized/SerializingStoreTest.java
@@ -25,7 +25,6 @@
 import voldemort.utils.ByteArray;
 
 /**
- * @author jay
  * 
  */
 public class SerializingStoreTest extends AbstractStoreTest<String, String> {
diff --git a/test/unit/voldemort/store/socket/AbstractSocketStoreTest.java b/test/unit/voldemort/store/socket/AbstractSocketStoreTest.java
index 079c960ff7..963756ae00 100644
--- a/test/unit/voldemort/store/socket/AbstractSocketStoreTest.java
+++ b/test/unit/voldemort/store/socket/AbstractSocketStoreTest.java
@@ -44,7 +44,6 @@
 /**
  * A base-socket store test that works with any store RequestFormat
  * 
- * @author jay
  * 
  */
 public abstract class AbstractSocketStoreTest extends AbstractByteArrayStoreTest {
diff --git a/test/unit/voldemort/store/socket/ProtocolBuffersSocketStoreTest.java b/test/unit/voldemort/store/socket/ProtocolBuffersSocketStoreTest.java
index c7d05bd041..0f0ae140b1 100644
--- a/test/unit/voldemort/store/socket/ProtocolBuffersSocketStoreTest.java
+++ b/test/unit/voldemort/store/socket/ProtocolBuffersSocketStoreTest.java
@@ -12,7 +12,6 @@
 /**
  * Protocol buffers socket store tests
  * 
- * @author jay
  * 
  */
 
diff --git a/test/unit/voldemort/store/socket/VoldemortNativeSocketStoreTest.java b/test/unit/voldemort/store/socket/VoldemortNativeSocketStoreTest.java
index ce0996c2a5..0e78361da0 100644
--- a/test/unit/voldemort/store/socket/VoldemortNativeSocketStoreTest.java
+++ b/test/unit/voldemort/store/socket/VoldemortNativeSocketStoreTest.java
@@ -12,7 +12,6 @@
 /**
  * Voldemort native socket store tests
  * 
- * @author jay
  * 
  */
 
diff --git a/test/unit/voldemort/store/views/UpperCaseView.java b/test/unit/voldemort/store/views/UpperCaseView.java
index bb2a7b07bc..01bb3a3aea 100644
--- a/test/unit/voldemort/store/views/UpperCaseView.java
+++ b/test/unit/voldemort/store/views/UpperCaseView.java
@@ -5,7 +5,6 @@
 /**
  * A simple test view that translates all reads into uppercase
  * 
- * @author jay
  * 
  */
 public class UpperCaseView implements View<String, String, String> {
diff --git a/test/unit/voldemort/store/views/ViewStorageEngineTest.java b/test/unit/voldemort/store/views/ViewStorageEngineTest.java
index a20903c73b..fa194befb9 100644
--- a/test/unit/voldemort/store/views/ViewStorageEngineTest.java
+++ b/test/unit/voldemort/store/views/ViewStorageEngineTest.java
@@ -17,7 +17,6 @@
 /**
  * Test cases for views
  * 
- * @author jay
  * 
  */
 public class ViewStorageEngineTest extends TestCase {
diff --git a/test/unit/voldemort/versioning/ClockEntryTest.java b/test/unit/voldemort/versioning/ClockEntryTest.java
index e6e30d6e4d..e69cdab49e 100644
--- a/test/unit/voldemort/versioning/ClockEntryTest.java
+++ b/test/unit/voldemort/versioning/ClockEntryTest.java
@@ -19,7 +19,6 @@
 import junit.framework.TestCase;
 
 /**
- * @author jay
  * 
  */
 public class ClockEntryTest extends TestCase {
diff --git a/test/unit/voldemort/versioning/VectorClockTest.java b/test/unit/voldemort/versioning/VectorClockTest.java
index 08c23ffba5..f0909562d6 100644
--- a/test/unit/voldemort/versioning/VectorClockTest.java
+++ b/test/unit/voldemort/versioning/VectorClockTest.java
@@ -25,7 +25,6 @@
 /**
  * VectorClock tests
  * 
- * @author jay
  * 
  */
 public class VectorClockTest extends TestCase {