diff --git a/modules/spatial/base/src/java/org/apache/lucene/spatial/base/context/SpatialContextFactory.java b/modules/spatial/base/src/java/org/apache/lucene/spatial/base/context/SpatialContextFactory.java
index 8ebed98d525..ca59d78ca68 100644
--- a/modules/spatial/base/src/java/org/apache/lucene/spatial/base/context/SpatialContextFactory.java
+++ b/modules/spatial/base/src/java/org/apache/lucene/spatial/base/context/SpatialContextFactory.java
@@ -26,8 +26,6 @@ import java.util.Map;
 
 /**
  * Factory for a SpatialContext.
- * is 
- * @author dsmiley
  */
 public abstract class SpatialContextFactory {
   protected Map<String, String> args;
diff --git a/modules/spatial/base/src/java/org/apache/lucene/spatial/base/context/simple/SimpleSpatialContextFactory.java b/modules/spatial/base/src/java/org/apache/lucene/spatial/base/context/simple/SimpleSpatialContextFactory.java
index 2ace22399f7..850b158af83 100644
--- a/modules/spatial/base/src/java/org/apache/lucene/spatial/base/context/simple/SimpleSpatialContextFactory.java
+++ b/modules/spatial/base/src/java/org/apache/lucene/spatial/base/context/simple/SimpleSpatialContextFactory.java
@@ -20,9 +20,7 @@ package org.apache.lucene.spatial.base.context.simple;
 import org.apache.lucene.spatial.base.context.SpatialContext;
 import org.apache.lucene.spatial.base.context.SpatialContextFactory;
 
-/**
-* @author dsmiley
-*/
+
 public class SimpleSpatialContextFactory extends SpatialContextFactory {
   @Override
   protected SpatialContext newSpatialContext() {
diff --git a/modules/spatial/base/src/java/org/apache/lucene/spatial/base/distance/AbstractDistanceCalculator.java b/modules/spatial/base/src/java/org/apache/lucene/spatial/base/distance/AbstractDistanceCalculator.java
index e07598e6565..c71c5812be0 100644
--- a/modules/spatial/base/src/java/org/apache/lucene/spatial/base/distance/AbstractDistanceCalculator.java
+++ b/modules/spatial/base/src/java/org/apache/lucene/spatial/base/distance/AbstractDistanceCalculator.java
@@ -19,9 +19,7 @@ package org.apache.lucene.spatial.base.distance;
 
 import org.apache.lucene.spatial.base.shape.Point;
 
-/**
- * @author David Smiley - dsmiley@mitre.org
- */
+
 public abstract class AbstractDistanceCalculator implements DistanceCalculator {
 
   @Override
diff --git a/modules/spatial/base/src/java/org/apache/lucene/spatial/base/distance/GeodesicSphereDistCalc.java b/modules/spatial/base/src/java/org/apache/lucene/spatial/base/distance/GeodesicSphereDistCalc.java
index 304fcc9fd7b..fe96f916f66 100644
--- a/modules/spatial/base/src/java/org/apache/lucene/spatial/base/distance/GeodesicSphereDistCalc.java
+++ b/modules/spatial/base/src/java/org/apache/lucene/spatial/base/distance/GeodesicSphereDistCalc.java
@@ -25,7 +25,6 @@ import static java.lang.Math.toRadians;
 
 /**
  * A base class for a Distance Calculator that assumes a spherical earth model.
- * @author dsmiley
  */
 public abstract class GeodesicSphereDistCalc extends AbstractDistanceCalculator {
   protected final double radius;
diff --git a/modules/spatial/base/src/java/org/apache/lucene/spatial/base/prefix/SpatialPrefixTreeFactory.java b/modules/spatial/base/src/java/org/apache/lucene/spatial/base/prefix/SpatialPrefixTreeFactory.java
index 56c6b42a12b..0f24f9e1248 100644
--- a/modules/spatial/base/src/java/org/apache/lucene/spatial/base/prefix/SpatialPrefixTreeFactory.java
+++ b/modules/spatial/base/src/java/org/apache/lucene/spatial/base/prefix/SpatialPrefixTreeFactory.java
@@ -25,9 +25,7 @@ import org.apache.lucene.spatial.base.prefix.quad.QuadPrefixTree;
 
 import java.util.Map;
 
-/**
- * @author dsmiley
- */
+
 public abstract class SpatialPrefixTreeFactory {
 
   private static final double DEFAULT_GEO_MAX_DETAIL_KM = 0.001;//1m
diff --git a/modules/spatial/base/src/java/org/apache/lucene/spatial/base/shape/simple/GeoCircleImpl.java b/modules/spatial/base/src/java/org/apache/lucene/spatial/base/shape/simple/GeoCircleImpl.java
index 8ac353d7b71..b53909ec22f 100644
--- a/modules/spatial/base/src/java/org/apache/lucene/spatial/base/shape/simple/GeoCircleImpl.java
+++ b/modules/spatial/base/src/java/org/apache/lucene/spatial/base/shape/simple/GeoCircleImpl.java
@@ -22,9 +22,7 @@ import org.apache.lucene.spatial.base.shape.SpatialRelation;
 import org.apache.lucene.spatial.base.shape.Point;
 import org.apache.lucene.spatial.base.shape.Rectangle;
 
-/**
- * @author David Smiley - dsmiley@mitre.org
- */
+
 public class GeoCircleImpl extends CircleImpl {
   private final double distDEG;// [0 TO 180]
   private final GeoCircleImpl inverseCircle;//when distance reaches > 1/2 way around the world, cache the inverse.
diff --git a/modules/spatial/strategy/src/test/org/apache/lucene/spatial/base/context/SpatialContextFactoryTest.java b/modules/spatial/strategy/src/test/org/apache/lucene/spatial/base/context/SpatialContextFactoryTest.java
index a3457775bcc..70f24722e8b 100644
--- a/modules/spatial/strategy/src/test/org/apache/lucene/spatial/base/context/SpatialContextFactoryTest.java
+++ b/modules/spatial/strategy/src/test/org/apache/lucene/spatial/base/context/SpatialContextFactoryTest.java
@@ -28,9 +28,7 @@ import java.util.Map;
 
 import static junit.framework.Assert.assertEquals;
 
-/**
- * @author dsmiley
- */
+
 public class SpatialContextFactoryTest {
   public static final String PROP = "SpatialContextFactory";
 
diff --git a/modules/spatial/strategy/src/test/org/apache/lucene/spatial/base/distance/TestDistances.java b/modules/spatial/strategy/src/test/org/apache/lucene/spatial/base/distance/TestDistances.java
index 77005481775..31dc02c5b79 100644
--- a/modules/spatial/strategy/src/test/org/apache/lucene/spatial/base/distance/TestDistances.java
+++ b/modules/spatial/strategy/src/test/org/apache/lucene/spatial/base/distance/TestDistances.java
@@ -26,9 +26,7 @@ import org.apache.lucene.util.LuceneTestCase;
 import org.junit.Before;
 import org.junit.Test;
 
-/**
- * @author David Smiley - dsmiley@mitre.org
- */
+
 public class TestDistances extends LuceneTestCase {
 
   //NOTE!  These are sometimes modified by tests.
diff --git a/modules/spatial/strategy/src/test/org/apache/lucene/spatial/base/prefix/SpatialPrefixTreeTest.java b/modules/spatial/strategy/src/test/org/apache/lucene/spatial/base/prefix/SpatialPrefixTreeTest.java
index 77fdcd210fb..ad8100655d8 100644
--- a/modules/spatial/strategy/src/test/org/apache/lucene/spatial/base/prefix/SpatialPrefixTreeTest.java
+++ b/modules/spatial/strategy/src/test/org/apache/lucene/spatial/base/prefix/SpatialPrefixTreeTest.java
@@ -27,9 +27,7 @@ import org.junit.Test;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 
-/**
- * @author David Smiley - dsmiley@mitre.org
- */
+
 public class SpatialPrefixTreeTest {
 
   //TODO plug in others and test them
diff --git a/modules/spatial/strategy/src/test/org/apache/lucene/spatial/base/shape/AbstractTestShapes.java b/modules/spatial/strategy/src/test/org/apache/lucene/spatial/base/shape/AbstractTestShapes.java
index 276f4cc200d..454307a3b61 100644
--- a/modules/spatial/strategy/src/test/org/apache/lucene/spatial/base/shape/AbstractTestShapes.java
+++ b/modules/spatial/strategy/src/test/org/apache/lucene/spatial/base/shape/AbstractTestShapes.java
@@ -26,9 +26,7 @@ import java.util.Random;
 
 import static org.apache.lucene.spatial.base.shape.SpatialRelation.*;
 
-/**
- * @author David Smiley - dsmiley@mitre.org
- */
+
 public abstract class AbstractTestShapes extends LuceneTestCase {
 
   protected SpatialContext ctx;
diff --git a/modules/spatial/strategy/src/test/org/apache/lucene/spatial/base/shape/TestShapes2D.java b/modules/spatial/strategy/src/test/org/apache/lucene/spatial/base/shape/TestShapes2D.java
index ac5f17c4dd4..785f86465c8 100644
--- a/modules/spatial/strategy/src/test/org/apache/lucene/spatial/base/shape/TestShapes2D.java
+++ b/modules/spatial/strategy/src/test/org/apache/lucene/spatial/base/shape/TestShapes2D.java
@@ -26,9 +26,7 @@ import static org.apache.lucene.spatial.base.shape.SpatialRelation.*;
 import static org.junit.Assert.*;
 import static org.junit.Assert.assertEquals;
 
-/**
- * @author dsmiley
- */
+
 public class TestShapes2D extends AbstractTestShapes {
 
   @Override
diff --git a/modules/spatial/strategy/src/test/org/apache/lucene/spatial/base/shape/TestShapesGeo.java b/modules/spatial/strategy/src/test/org/apache/lucene/spatial/base/shape/TestShapesGeo.java
index 23481a57e83..747ab01a613 100644
--- a/modules/spatial/strategy/src/test/org/apache/lucene/spatial/base/shape/TestShapesGeo.java
+++ b/modules/spatial/strategy/src/test/org/apache/lucene/spatial/base/shape/TestShapesGeo.java
@@ -26,9 +26,7 @@ import org.junit.Test;
 
 import static org.apache.lucene.spatial.base.shape.SpatialRelation.*;
 
-/**
- * @author David Smiley - dsmiley@mitre.org
- */
+
 public class TestShapesGeo extends AbstractTestShapes {
 
   @Test