diff --git a/src/java/org/apache/poi/hssf/eventusermodel/AbortableHSSFListener.java b/src/java/org/apache/poi/hssf/eventusermodel/AbortableHSSFListener.java
index befe4b356..8e1c24a4d 100644
--- a/src/java/org/apache/poi/hssf/eventusermodel/AbortableHSSFListener.java
+++ b/src/java/org/apache/poi/hssf/eventusermodel/AbortableHSSFListener.java
@@ -33,8 +33,6 @@ import org.apache.poi.hssf.eventusermodel.HSSFUserException;
  * @see org.apache.poi.hssf.eventusermodel.HSSFEventFactory
  * @see org.apache.poi.hssf.eventusermodel.HSSFRequest
  * @see org.apache.poi.hssf.eventusermodel.HSSFUserException
- *
- * @author Carey Sublette (careysub@earthling.net)
  */
 
 public abstract class AbortableHSSFListener implements HSSFListener
diff --git a/src/java/org/apache/poi/hssf/eventusermodel/HSSFEventFactory.java b/src/java/org/apache/poi/hssf/eventusermodel/HSSFEventFactory.java
index 3b064dc53..45ab8d813 100644
--- a/src/java/org/apache/poi/hssf/eventusermodel/HSSFEventFactory.java
+++ b/src/java/org/apache/poi/hssf/eventusermodel/HSSFEventFactory.java
@@ -33,9 +33,6 @@ import org.apache.poi.poifs.filesystem.POIFSFileSystem;
  * This will cause your file to be processed a record at a time.  Each record with
  * a static id matching one that you have registered in your HSSFRequest will be passed
  * to your associated HSSFListener.
- *
- * @author Andrew C. Oliver (acoliver at apache dot org)
- * @author Carey Sublette  (careysub@earthling.net)
  */
 public class HSSFEventFactory {
 	/** Creates a new instance of HSSFEventFactory */
diff --git a/src/java/org/apache/poi/hssf/eventusermodel/HSSFListener.java b/src/java/org/apache/poi/hssf/eventusermodel/HSSFListener.java
index 51ee0904b..5b9a1597a 100644
--- a/src/java/org/apache/poi/hssf/eventusermodel/HSSFListener.java
+++ b/src/java/org/apache/poi/hssf/eventusermodel/HSSFListener.java
@@ -27,7 +27,6 @@ import org.apache.poi.hssf.record.Record;
  *
  * @see org.apache.poi.hssf.eventusermodel.HSSFEventFactory
  * @see org.apache.poi.hssf.eventusermodel.HSSFRequest
- * @author  acoliver@apache.org
  */
 
 public interface HSSFListener
diff --git a/src/java/org/apache/poi/hssf/eventusermodel/HSSFRequest.java b/src/java/org/apache/poi/hssf/eventusermodel/HSSFRequest.java
index dd30d4ddb..1b36ffd76 100644
--- a/src/java/org/apache/poi/hssf/eventusermodel/HSSFRequest.java
+++ b/src/java/org/apache/poi/hssf/eventusermodel/HSSFRequest.java
@@ -32,8 +32,6 @@ import org.apache.poi.hssf.record.RecordFactory;
  * @see org.apache.poi.hssf.eventusermodel.HSSFEventFactory
  * @see org.apache.poi.hssf.eventusermodel.HSSFListener
  * @see org.apache.poi.hssf.eventusermodel.HSSFUserException
- * @author  Andrew C. Oliver (acoliver at apache dot org)
- * @author Carey Sublette (careysub@earthling.net)
  */
 public class HSSFRequest {
 	private final Map<Short, List<HSSFListener>> _records;
diff --git a/src/java/org/apache/poi/hssf/eventusermodel/HSSFUserException.java b/src/java/org/apache/poi/hssf/eventusermodel/HSSFUserException.java
index 882142c49..8bf74c58e 100644
--- a/src/java/org/apache/poi/hssf/eventusermodel/HSSFUserException.java
+++ b/src/java/org/apache/poi/hssf/eventusermodel/HSSFUserException.java
@@ -31,8 +31,6 @@ package org.apache.poi.hssf.eventusermodel;
  * <p>The HSSF package does not itself throw any of these 
  * exceptions.</p>
  *
- * @author Rainer Klute (klute@rainer-klute.de)
- * @author Carey Sublette (careysub@earthling.net)
  * @version HSSFUserException.java,v 1.0
  * @since 2002-04-19
  */
diff --git a/src/java/org/apache/poi/hssf/model/AbstractShape.java b/src/java/org/apache/poi/hssf/model/AbstractShape.java
index 3441ba9f4..1bfbc26d9 100644
--- a/src/java/org/apache/poi/hssf/model/AbstractShape.java
+++ b/src/java/org/apache/poi/hssf/model/AbstractShape.java
@@ -23,8 +23,6 @@ import org.apache.poi.hssf.usermodel.*;
 
 /**
  * An abstract shape is the lowlevel model for a shape.
- *
- * @author Glen Stampoultzis (glens at apache.org)
  */
 @Deprecated
 public abstract class AbstractShape
diff --git a/src/java/org/apache/poi/hssf/model/ComboboxShape.java b/src/java/org/apache/poi/hssf/model/ComboboxShape.java
index ffca90a79..bad789764 100644
--- a/src/java/org/apache/poi/hssf/model/ComboboxShape.java
+++ b/src/java/org/apache/poi/hssf/model/ComboboxShape.java
@@ -24,8 +24,6 @@ import org.apache.poi.hssf.usermodel.*;
 
 /**
  * Represents a combobox shape.
- * 
- * @author Yegor Kozlov
  */
 @Deprecated
 public class ComboboxShape
@@ -115,4 +113,4 @@ public class ComboboxShape
         return objRecord;
     }
 
-}
\ No newline at end of file
+}
diff --git a/src/java/org/apache/poi/hssf/model/CommentShape.java b/src/java/org/apache/poi/hssf/model/CommentShape.java
index 007a4b736..aa61a3676 100644
--- a/src/java/org/apache/poi/hssf/model/CommentShape.java
+++ b/src/java/org/apache/poi/hssf/model/CommentShape.java
@@ -36,8 +36,6 @@ import org.apache.poi.hssf.usermodel.HSSFShape;
  * Represents a cell comment.
  * This class converts highlevel model data from <code>HSSFComment</code>
  * to low-level records.
- *
- * @author Yegor Kozlov
  */
 @Deprecated
 public final class CommentShape extends TextboxShape {
diff --git a/src/java/org/apache/poi/hssf/model/DrawingManager.java b/src/java/org/apache/poi/hssf/model/DrawingManager.java
index 8229b40a5..5fecaaa52 100644
--- a/src/java/org/apache/poi/hssf/model/DrawingManager.java
+++ b/src/java/org/apache/poi/hssf/model/DrawingManager.java
@@ -25,8 +25,6 @@ import java.util.HashMap;
 
 /**
  * Provides utilities to manage drawing groups.
- *
- * @author Glen Stampoultzis (glens at apache.org)
  */
 public class DrawingManager
 {
diff --git a/src/java/org/apache/poi/hssf/model/DrawingManager2.java b/src/java/org/apache/poi/hssf/model/DrawingManager2.java
index 0d5e34f24..8b2292e95 100644
--- a/src/java/org/apache/poi/hssf/model/DrawingManager2.java
+++ b/src/java/org/apache/poi/hssf/model/DrawingManager2.java
@@ -26,8 +26,6 @@ import java.util.ArrayList;
 
 /**
  * Provides utilities to manage drawing groups.
- *
- * @author Glen Stampoultzis (glens at apache.org)
  */
 public class DrawingManager2
 {
diff --git a/src/java/org/apache/poi/hssf/model/HSSFFormulaParser.java b/src/java/org/apache/poi/hssf/model/HSSFFormulaParser.java
index 6de365043..1f295d0f3 100644
--- a/src/java/org/apache/poi/hssf/model/HSSFFormulaParser.java
+++ b/src/java/org/apache/poi/hssf/model/HSSFFormulaParser.java
@@ -28,8 +28,6 @@ import org.apache.poi.ss.formula.FormulaType;
 
 /**
  * HSSF wrapper for the {@link FormulaParser} and {@link FormulaRenderer}
- *
- * @author Josh Micich
  */
 public final class HSSFFormulaParser {
 
diff --git a/src/java/org/apache/poi/hssf/model/InternalSheet.java b/src/java/org/apache/poi/hssf/model/InternalSheet.java
index c3bf05236..ade41fdb5 100644
--- a/src/java/org/apache/poi/hssf/model/InternalSheet.java
+++ b/src/java/org/apache/poi/hssf/model/InternalSheet.java
@@ -52,12 +52,6 @@ import org.apache.poi.util.POILogger;
  * Kit (Microsoft Press) and the documentation at http://sc.openoffice.org/excelfileformat.pdf
  * before even attempting to use this.
  * <P>
- * @author  Andrew C. Oliver (acoliver at apache dot org)
- * @author  Glen Stampoultzis (glens at apache.org)
- * @author  Shawn Laubach (slaubach at apache dot org) Gridlines, Headers, Footers, PrintSetup, and Setting Default Column Styles
- * @author Jason Height (jheight at chariot dot net dot au) Clone support. DBCell & Index Record writing support
- * @author  Brian Sanders (kestrel at burdell dot org) Active Cell support
- * @author  Jean-Pierre Paris (jean-pierre.paris at m4x dot org) (Just a little)
  *
  * @see org.apache.poi.hssf.model.InternalWorkbook
  * @see org.apache.poi.hssf.usermodel.HSSFSheet
diff --git a/src/java/org/apache/poi/hssf/model/InternalWorkbook.java b/src/java/org/apache/poi/hssf/model/InternalWorkbook.java
index 0a489d29c..24b30180d 100644
--- a/src/java/org/apache/poi/hssf/model/InternalWorkbook.java
+++ b/src/java/org/apache/poi/hssf/model/InternalWorkbook.java
@@ -57,14 +57,6 @@ import org.apache.poi.util.POILogger;
  * Kit (Microsoft Press) and the documentation at http://sc.openoffice.org/excelfileformat.pdf
  * before even attempting to use this.
  *
- *
- * @author  Luc Girardin (luc dot girardin at macrofocus dot com)
- * @author  Sergei Kozello (sergeikozello at mail.ru)
- * @author  Shawn Laubach (slaubach at apache dot org) (Data Formats)
- * @author  Andrew C. Oliver (acoliver at apache dot org)
- * @author  Brian Sanders (bsanders at risklabs dot com) - custom palette
- * @author  Dan Sherman (dsherman at isisph.com)
- * @author  Glen Stampoultzis (glens at apache.org)
  * @see org.apache.poi.hssf.usermodel.HSSFWorkbook
  */
 @Internal
diff --git a/src/java/org/apache/poi/hssf/model/LineShape.java b/src/java/org/apache/poi/hssf/model/LineShape.java
index e4517e4d7..f2c542a32 100644
--- a/src/java/org/apache/poi/hssf/model/LineShape.java
+++ b/src/java/org/apache/poi/hssf/model/LineShape.java
@@ -24,8 +24,6 @@ import org.apache.poi.hssf.usermodel.*;
 
 /**
  * Represents a line shape and creates all the line specific low level records.
- *
- * @author Glen Stampoultzis (glens at apache.org)
  */
 @Deprecated
 public class LineShape
diff --git a/src/java/org/apache/poi/hssf/model/LinkTable.java b/src/java/org/apache/poi/hssf/model/LinkTable.java
index 8a624af73..1cec62de3 100644
--- a/src/java/org/apache/poi/hssf/model/LinkTable.java
+++ b/src/java/org/apache/poi/hssf/model/LinkTable.java
@@ -60,9 +60,6 @@ import org.apache.poi.ss.formula.ptg.*;
  *  <li>zero or one EXTERNSHEET (0x0017) record</li>
  *  <li>zero or more DEFINEDNAME (0x0018) records</li>
  *  </ul>
- *
- *
- * @author Josh Micich
  */
 final class LinkTable {
 
diff --git a/src/java/org/apache/poi/hssf/model/PictureShape.java b/src/java/org/apache/poi/hssf/model/PictureShape.java
index fb5041e21..5976df8ef 100644
--- a/src/java/org/apache/poi/hssf/model/PictureShape.java
+++ b/src/java/org/apache/poi/hssf/model/PictureShape.java
@@ -24,8 +24,6 @@ import org.apache.poi.hssf.usermodel.*;
 
 /**
  * Represents a picture shape and creates all specific low level records.
- *
- * @author Glen Stampoultzis (glens at apache.org)
  */
 public class PictureShape
         extends AbstractShape
diff --git a/src/java/org/apache/poi/hssf/model/RecordOrderer.java b/src/java/org/apache/poi/hssf/model/RecordOrderer.java
index 6ea8ea95b..69e9971fa 100644
--- a/src/java/org/apache/poi/hssf/model/RecordOrderer.java
+++ b/src/java/org/apache/poi/hssf/model/RecordOrderer.java
@@ -76,8 +76,6 @@ import org.apache.poi.hssf.record.pivottable.ViewDefinitionRecord;
  * Finds correct insert positions for records in workbook streams<p/>
  *
  * See OOO excelfileformat.pdf sec. 4.2.5 'Record Order in a BIFF8 Workbook Stream'
- *
- * @author Josh Micich
  */
 final class RecordOrderer {
 
diff --git a/src/java/org/apache/poi/hssf/model/RecordStream.java b/src/java/org/apache/poi/hssf/model/RecordStream.java
index 3fbf96764..d9f04f7e6 100644
--- a/src/java/org/apache/poi/hssf/model/RecordStream.java
+++ b/src/java/org/apache/poi/hssf/model/RecordStream.java
@@ -22,8 +22,6 @@ import java.util.List;
 import org.apache.poi.hssf.record.Record;
 /**
  * Simplifies iteration over a sequence of <tt>Record</tt> objects.
- *
- * @author Josh Micich
  */
 public final class RecordStream {
 
diff --git a/src/java/org/apache/poi/hssf/model/RowBlocksReader.java b/src/java/org/apache/poi/hssf/model/RowBlocksReader.java
index 24498267c..29a4ed22c 100644
--- a/src/java/org/apache/poi/hssf/model/RowBlocksReader.java
+++ b/src/java/org/apache/poi/hssf/model/RowBlocksReader.java
@@ -33,8 +33,6 @@ import org.apache.poi.ss.util.CellReference;
 /**
  * Segregates the 'Row Blocks' section of a single sheet into plain row/cell records and
  * shared formula records.
- *
- * @author Josh Micich
  */
 public final class RowBlocksReader {
 
diff --git a/src/java/org/apache/poi/hssf/model/TextboxShape.java b/src/java/org/apache/poi/hssf/model/TextboxShape.java
index 1b2a154a1..44da1ed3d 100644
--- a/src/java/org/apache/poi/hssf/model/TextboxShape.java
+++ b/src/java/org/apache/poi/hssf/model/TextboxShape.java
@@ -25,8 +25,6 @@ import org.apache.poi.hssf.usermodel.*;
 /**
  * Represents an textbox shape and converts between the highlevel records
  * and lowlevel records for an oval.
- *
- * @author Glen Stampoultzis (glens at apache.org)
  */
 @Deprecated
 public class TextboxShape
diff --git a/src/java/org/apache/poi/hssf/record/CRNRecord.java b/src/java/org/apache/poi/hssf/record/CRNRecord.java
index 6b2c47c54..82db82160 100644
--- a/src/java/org/apache/poi/hssf/record/CRNRecord.java
+++ b/src/java/org/apache/poi/hssf/record/CRNRecord.java
@@ -24,8 +24,6 @@ import org.apache.poi.util.LittleEndianOutput;
  * Title:       CRN(0x005A) <p/>
  * Description: This record stores the contents of an external cell or cell range <p/>
  * REFERENCE:   OOO 5.23<p/>
- *
- * @author josh micich
  */
 public final class CRNRecord extends StandardRecord {
 	public final static short sid = 0x005A;
diff --git a/src/java/org/apache/poi/hssf/record/CalcCountRecord.java b/src/java/org/apache/poi/hssf/record/CalcCountRecord.java
index c36411788..f8b4534bc 100644
--- a/src/java/org/apache/poi/hssf/record/CalcCountRecord.java
+++ b/src/java/org/apache/poi/hssf/record/CalcCountRecord.java
@@ -29,8 +29,6 @@ import org.apache.poi.util.LittleEndianOutput;
  *               changes.  This is essentially a failsafe against an infinate
  *               loop in the event the formulas are not independant. <P>
  * REFERENCE:  PG 292 Microsoft Excel 97 Developer's Kit (ISBN: 1-57231-498-2)<P>
- * @author Andrew C. Oliver (acoliver at apache dot org)
- * @author Jason Height (jheight at chariot dot net dot au)
  * @version 2.0-pre
  * @see org.apache.poi.hssf.record.CalcModeRecord
  */
diff --git a/src/java/org/apache/poi/hssf/record/LabelSSTRecord.java b/src/java/org/apache/poi/hssf/record/LabelSSTRecord.java
index 8f279caf9..e1b4bd20c 100644
--- a/src/java/org/apache/poi/hssf/record/LabelSSTRecord.java
+++ b/src/java/org/apache/poi/hssf/record/LabelSSTRecord.java
@@ -25,8 +25,6 @@ import org.apache.poi.util.LittleEndianOutput;
  * Description:  Refers to a string in the shared string table and is a column
  *               value.  <P>
  * REFERENCE:  PG 325 Microsoft Excel 97 Developer's Kit (ISBN: 1-57231-498-2)<P>
- * @author Andrew C. Oliver (acoliver at apache dot org)
- * @author Jason Height (jheight at chariot dot net dot au)
  */
 public final class LabelSSTRecord extends CellRecord {
     public final static short sid = 0xfd;
diff --git a/src/java/org/apache/poi/hssf/record/PrecisionRecord.java b/src/java/org/apache/poi/hssf/record/PrecisionRecord.java
index db5928c7c..0dede1837 100644
--- a/src/java/org/apache/poi/hssf/record/PrecisionRecord.java
+++ b/src/java/org/apache/poi/hssf/record/PrecisionRecord.java
@@ -26,7 +26,6 @@ import org.apache.poi.util.LittleEndianOutput;
  * Description:  defines whether to store with full precision or what's displayed by the gui
  *               (meaning have really screwed up and skewed figures or only think you do!)<P>
  * REFERENCE:  PG 372 Microsoft Excel 97 Developer's Kit (ISBN: 1-57231-498-2)<P>
- * @author Andrew C. Oliver (acoliver at apache dot org)
  * @version 2.0-pre
  */
 
diff --git a/src/java/org/apache/poi/hssf/record/SSTRecord.java b/src/java/org/apache/poi/hssf/record/SSTRecord.java
index 6b60d75dd..aadd58619 100644
--- a/src/java/org/apache/poi/hssf/record/SSTRecord.java
+++ b/src/java/org/apache/poi/hssf/record/SSTRecord.java
@@ -33,9 +33,6 @@ import org.apache.poi.util.LittleEndianConsts;
  * REFERENCE:    PG 389 Microsoft Excel 97 Developer's Kit (ISBN:
  *               1-57231-498-2)
  * <P>
- * @author Andrew C. Oliver (acoliver at apache dot org)
- * @author Marc Johnson (mjohnson at apache dot org)
- * @author Glen Stampoultzis (glens at apache.org)
  *
  * @see org.apache.poi.hssf.record.LabelSSTRecord
  * @see org.apache.poi.hssf.record.ContinueRecord
diff --git a/src/java/org/apache/poi/hssf/record/UserSViewEnd.java b/src/java/org/apache/poi/hssf/record/UserSViewEnd.java
index 2427729e3..650704bcf 100644
--- a/src/java/org/apache/poi/hssf/record/UserSViewEnd.java
+++ b/src/java/org/apache/poi/hssf/record/UserSViewEnd.java
@@ -22,8 +22,6 @@ import org.apache.poi.util.LittleEndianOutput;
 
 /**
  * The UserSViewEnd record marks the end of the settings for a custom view associated with the sheet
- *
- * @author Yegor Kozlov
  */
 public final class UserSViewEnd extends StandardRecord {
 
@@ -75,4 +73,4 @@ public final class UserSViewEnd extends StandardRecord {
     }
 
     
-}
\ No newline at end of file
+}
diff --git a/src/java/org/apache/poi/hssf/record/WindowProtectRecord.java b/src/java/org/apache/poi/hssf/record/WindowProtectRecord.java
index e6f068850..7d0a4bc02 100644
--- a/src/java/org/apache/poi/hssf/record/WindowProtectRecord.java
+++ b/src/java/org/apache/poi/hssf/record/WindowProtectRecord.java
@@ -26,7 +26,6 @@ import org.apache.poi.util.LittleEndianOutput;
  * Title: Window Protect Record (0x0019) <p/>
  * Description:  flags whether workbook windows are protected<p/>
  * REFERENCE:  PG 424 Microsoft Excel 97 Developer's Kit (ISBN: 1-57231-498-2)<p/>
- * @author Andrew C. Oliver (acoliver at apache dot org)
  */
 public final class WindowProtectRecord extends StandardRecord {
     public final static short sid = 0x0019;
diff --git a/src/java/org/apache/poi/hssf/record/cont/ContinuableRecord.java b/src/java/org/apache/poi/hssf/record/cont/ContinuableRecord.java
index 304805441..468a31754 100644
--- a/src/java/org/apache/poi/hssf/record/cont/ContinuableRecord.java
+++ b/src/java/org/apache/poi/hssf/record/cont/ContinuableRecord.java
@@ -24,8 +24,6 @@ import org.apache.poi.util.LittleEndianOutput;
 
 /**
  * Common superclass of all records that can produce {@link ContinueRecord}s while being serialized.
- *
- * @author Josh Micich
  */
 public abstract class ContinuableRecord extends Record {
 
diff --git a/src/java/org/apache/poi/hssf/record/cont/ContinuableRecordInput.java b/src/java/org/apache/poi/hssf/record/cont/ContinuableRecordInput.java
index 9925ad3eb..739aeacb8 100644
--- a/src/java/org/apache/poi/hssf/record/cont/ContinuableRecordInput.java
+++ b/src/java/org/apache/poi/hssf/record/cont/ContinuableRecordInput.java
@@ -47,8 +47,6 @@ import org.apache.poi.util.LittleEndianInput;
  *   @link org.apache.poi.hssf.record.common.UnicodeString.ExtRst} blocks of a UnicodeString.
  *
  * </p>
- *
- * @author Yegor Kozlov
  */
 public class ContinuableRecordInput implements LittleEndianInput {
     private final RecordInputStream _in;
diff --git a/src/java/org/apache/poi/hssf/record/cont/ContinuableRecordOutput.java b/src/java/org/apache/poi/hssf/record/cont/ContinuableRecordOutput.java
index d26c85dff..a39f1393e 100644
--- a/src/java/org/apache/poi/hssf/record/cont/ContinuableRecordOutput.java
+++ b/src/java/org/apache/poi/hssf/record/cont/ContinuableRecordOutput.java
@@ -26,8 +26,6 @@ import org.apache.poi.util.StringUtil;
  * An augmented {@link LittleEndianOutput} used for serialization of {@link ContinuableRecord}s.
  * This class keeps track of how much remaining space is available in the current BIFF record and
  * can start new {@link ContinueRecord}s as required.
- *
- * @author Josh Micich
  */
 public final class ContinuableRecordOutput implements LittleEndianOutput {
 
diff --git a/src/java/org/apache/poi/hssf/record/cont/UnknownLengthRecordOutput.java b/src/java/org/apache/poi/hssf/record/cont/UnknownLengthRecordOutput.java
index 322a5208f..5e5206ff1 100644
--- a/src/java/org/apache/poi/hssf/record/cont/UnknownLengthRecordOutput.java
+++ b/src/java/org/apache/poi/hssf/record/cont/UnknownLengthRecordOutput.java
@@ -25,8 +25,6 @@ import org.apache.poi.util.LittleEndianOutput;
  * Allows the writing of BIFF records when the 'ushort size' header field is not known in advance.
  * When the client is finished writing data, it calls {@link #terminate()}, at which point this
  * class updates the 'ushort size' with its final value.
- *
- * @author Josh Micich
  */
 final class UnknownLengthRecordOutput implements LittleEndianOutput {
 	private static final int MAX_DATA_SIZE = RecordInputStream.MAX_RECORD_DATA_SIZE;
diff --git a/src/java/org/apache/poi/hssf/record/pivottable/ViewDefinitionRecord.java b/src/java/org/apache/poi/hssf/record/pivottable/ViewDefinitionRecord.java
index 03c2981fb..3c37924f9 100644
--- a/src/java/org/apache/poi/hssf/record/pivottable/ViewDefinitionRecord.java
+++ b/src/java/org/apache/poi/hssf/record/pivottable/ViewDefinitionRecord.java
@@ -25,8 +25,6 @@ import org.apache.poi.util.StringUtil;
 
 /**
  * SXVIEW - View Definition (0x00B0)<br/>
- * 
- * @author Patrick Cheng
  */
 public final class ViewDefinitionRecord extends StandardRecord {
 	public static final short sid = 0x00B0;
diff --git a/src/java/org/apache/poi/hssf/usermodel/HSSFClientAnchor.java b/src/java/org/apache/poi/hssf/usermodel/HSSFClientAnchor.java
index 75f3b4ece..7f4e77b5c 100644
--- a/src/java/org/apache/poi/hssf/usermodel/HSSFClientAnchor.java
+++ b/src/java/org/apache/poi/hssf/usermodel/HSSFClientAnchor.java
@@ -24,8 +24,6 @@ import org.apache.poi.ss.usermodel.ClientAnchor;
 /**
  * A client anchor is attached to an excel worksheet.  It anchors against a
  * top-left and buttom-right cell.
- *
- * @author Glen Stampoultzis (glens at apache.org)
  */
 public final class HSSFClientAnchor extends HSSFAnchor implements ClientAnchor {
 
diff --git a/src/java/org/apache/poi/hssf/util/CellRangeAddress.java b/src/java/org/apache/poi/hssf/util/CellRangeAddress.java
index d2316fe88..a59fa5e60 100644
--- a/src/java/org/apache/poi/hssf/util/CellRangeAddress.java
+++ b/src/java/org/apache/poi/hssf/util/CellRangeAddress.java
@@ -25,7 +25,6 @@ import org.apache.poi.hssf.record.SelectionRecord;
  *
  * Note - {@link SelectionRecord} uses the BIFF5 version of this structure
  * @deprecated use {@link org.apache.poi.ss.util.CellRangeAddress}
- * @author Dragos Buleandra (dragos.buleandra@trade2b.ro)
  */
 public class CellRangeAddress extends org.apache.poi.ss.util.CellRangeAddress {
 
diff --git a/src/java/org/apache/poi/hssf/util/CellRangeAddress8Bit.java b/src/java/org/apache/poi/hssf/util/CellRangeAddress8Bit.java
index cada8bfe5..83f79b996 100644
--- a/src/java/org/apache/poi/hssf/util/CellRangeAddress8Bit.java
+++ b/src/java/org/apache/poi/hssf/util/CellRangeAddress8Bit.java
@@ -26,8 +26,6 @@ import org.apache.poi.util.LittleEndianOutput;
  * See OOO documentation: excelfileformat.pdf sec 2.5.14 - 'Cell Range Address'<p/>
  *
  * Like {@link CellRangeAddress} except column fields are 8-bit.
- *
- * @author Josh Micich
  */
 public final class CellRangeAddress8Bit extends CellRangeAddressBase {
 
diff --git a/src/java/org/apache/poi/hssf/util/CellRangeAddressList.java b/src/java/org/apache/poi/hssf/util/CellRangeAddressList.java
index 6c7a32c51..d715eee43 100644
--- a/src/java/org/apache/poi/hssf/util/CellRangeAddressList.java
+++ b/src/java/org/apache/poi/hssf/util/CellRangeAddressList.java
@@ -31,8 +31,6 @@ import org.apache.poi.hssf.record.RecordInputStream;
  * </p>
  * 
  * @deprecated use {@link org.apache.poi.ss.util.CellRangeAddressList}
- * 
- * @author Dragos Buleandra (dragos.buleandra@trade2b.ro)
  */
 public class CellRangeAddressList extends org.apache.poi.ss.util.CellRangeAddressList {
 	public CellRangeAddressList(int firstRow, int lastRow, int firstCol, int lastCol) {
diff --git a/src/java/org/apache/poi/hssf/util/CellReference.java b/src/java/org/apache/poi/hssf/util/CellReference.java
index af243aafd..ac3e5f388 100644
--- a/src/java/org/apache/poi/hssf/util/CellReference.java
+++ b/src/java/org/apache/poi/hssf/util/CellReference.java
@@ -21,8 +21,6 @@ package org.apache.poi.hssf.util;
  * Common conversion functions between Excel style A1, C27 style
  *  cell references, and POI usermodel style row=0, column=0
  *  style references.
- * @author  Avik Sengupta
- * @author  Dennis Doubleday (patch to seperateRowColumns())
  */
 public final class CellReference extends org.apache.poi.ss.util.CellReference {
     /**
diff --git a/src/java/org/apache/poi/hssf/util/HSSFCellUtil.java b/src/java/org/apache/poi/hssf/util/HSSFCellUtil.java
index da69364ec..342a9307f 100644
--- a/src/java/org/apache/poi/hssf/util/HSSFCellUtil.java
+++ b/src/java/org/apache/poi/hssf/util/HSSFCellUtil.java
@@ -33,8 +33,6 @@ import org.apache.poi.ss.util.CellUtil;
  * exists that meets your needs.  If not, then it will create a new style.  This is to prevent
  * creating too many styles.  there is an upper limit in Excel on the number of styles that
  * can be supported.
- *
- *@author     Eric Pugh epugh@upstate.com
  */
 public final class HSSFCellUtil {
 
diff --git a/src/java/org/apache/poi/hssf/util/HSSFColor.java b/src/java/org/apache/poi/hssf/util/HSSFColor.java
index 617224bdf..c449b656a 100644
--- a/src/java/org/apache/poi/hssf/util/HSSFColor.java
+++ b/src/java/org/apache/poi/hssf/util/HSSFColor.java
@@ -34,9 +34,6 @@ import org.apache.poi.ss.usermodel.Color;
  * color would be represented by Gnumeric.  Having (string) this here is a bit of a
  * collusion of function between HSSF and the HSSFSerializer but I think its
  * a reasonable one in this case.
- *
- * @author  Andrew C. Oliver (acoliver at apache dot org)
- * @author  Brian Sanders (bsanders at risklabs dot com) - full default color palette
  */
 public class HSSFColor implements Color {
     private static Map<Integer,HSSFColor> indexHash; 
diff --git a/src/java/org/apache/poi/hssf/util/HSSFRegionUtil.java b/src/java/org/apache/poi/hssf/util/HSSFRegionUtil.java
index 3e491e7e8..77fac434e 100644
--- a/src/java/org/apache/poi/hssf/util/HSSFRegionUtil.java
+++ b/src/java/org/apache/poi/hssf/util/HSSFRegionUtil.java
@@ -24,8 +24,6 @@ import org.apache.poi.ss.util.CellRangeAddress;
 
 /**
  * Various utility functions that make working with a region of cells easier.
- *
- * @author Eric Pugh epugh@upstate.com
  */
 public final class HSSFRegionUtil {
 
diff --git a/src/java/org/apache/poi/hssf/util/RKUtil.java b/src/java/org/apache/poi/hssf/util/RKUtil.java
index b36166e29..42cdd379b 100644
--- a/src/java/org/apache/poi/hssf/util/RKUtil.java
+++ b/src/java/org/apache/poi/hssf/util/RKUtil.java
@@ -20,10 +20,6 @@ package org.apache.poi.hssf.util;
 /**
  * Utility class for helping convert RK numbers.
  *
- * @author Andrew C. Oliver (acoliver at apache dot org)
- * @author Glen Stampoultzis (glens at apache.org)
- * @author Rolf-J\u00f6rgen Moll
- *
  * @see org.apache.poi.hssf.record.MulRKRecord
  * @see org.apache.poi.hssf.record.RKRecord
  */
diff --git a/src/java/org/apache/poi/hssf/util/Region.java b/src/java/org/apache/poi/hssf/util/Region.java
index 4e417b567..69e23e816 100644
--- a/src/java/org/apache/poi/hssf/util/Region.java
+++ b/src/java/org/apache/poi/hssf/util/Region.java
@@ -23,7 +23,6 @@ package org.apache.poi.hssf.util;
  * that can be used to represent row,col - row,col just as one would use String
  * to represent a string of characters.  Its really only useful for HSSF though.
  *
- * @author  Andrew C. Oliver acoliver at apache dot org
  * @deprecated (Aug-2008) use {@link org.apache.poi.ss.util.CellRangeAddress}
  */
 
diff --git a/src/java/org/apache/poi/ss/formula/OperationEvaluationContext.java b/src/java/org/apache/poi/ss/formula/OperationEvaluationContext.java
index d1407c064..6bf3ed6e3 100644
--- a/src/java/org/apache/poi/ss/formula/OperationEvaluationContext.java
+++ b/src/java/org/apache/poi/ss/formula/OperationEvaluationContext.java
@@ -35,9 +35,6 @@ import org.apache.poi.ss.util.CellReference.NameType;
  * within a formula
  *
  * For POI internal use only
- *
- * @author Josh Micich
- * @author Cédric Walter
  */
 public final class OperationEvaluationContext {
 	public static final FreeRefFunction UDF = UserDefinedFunction.instance;
diff --git a/src/java/org/apache/poi/ss/formula/functions/Countif.java b/src/java/org/apache/poi/ss/formula/functions/Countif.java
index 9a8a03410..c98886433 100644
--- a/src/java/org/apache/poi/ss/formula/functions/Countif.java
+++ b/src/java/org/apache/poi/ss/formula/functions/Countif.java
@@ -41,9 +41,6 @@ import org.apache.poi.ss.usermodel.ErrorConstants;
  *      <tr><th>criteria</th><td>is used to determine which cells to count</td></tr>
  *    </table>
  * </p>
- *
- * @author Josh Micich
- * @author Cedric Walter at innoveo.com
  */
 public final class Countif extends Fixed2ArgFunction {
 
diff --git a/src/java/org/apache/poi/ss/formula/functions/LookupUtils.java b/src/java/org/apache/poi/ss/formula/functions/LookupUtils.java
index f2cc607d0..46db37e04 100644
--- a/src/java/org/apache/poi/ss/formula/functions/LookupUtils.java
+++ b/src/java/org/apache/poi/ss/formula/functions/LookupUtils.java
@@ -34,9 +34,6 @@ import java.util.regex.Pattern;
 
 /**
  * Common functionality used by VLOOKUP, HLOOKUP, LOOKUP and MATCH
- *
- * @author Josh Micich
- * @author Cedric Walter at innoveo.com
  */
 final class LookupUtils {
 
diff --git a/src/java/org/apache/poi/ss/formula/functions/Match.java b/src/java/org/apache/poi/ss/formula/functions/Match.java
index bbcf0e2e6..8534222cf 100644
--- a/src/java/org/apache/poi/ss/formula/functions/Match.java
+++ b/src/java/org/apache/poi/ss/formula/functions/Match.java
@@ -59,10 +59,6 @@ import org.apache.poi.ss.formula.TwoDEval;
  *  numbers (low to high), strings (A to Z), boolean (FALSE to TRUE)<br/>
  *  MATCH() ignores all elements in the lookup_array with a different type to the lookup_value.
  *  Type conversion of the lookup_array elements is never performed.
- *
- *
- * @author Josh Micich
- * @author Cedric Walter at innoveo.com
  */
 public final class Match extends Var2or3ArgFunction {
 
diff --git a/src/java/org/apache/poi/ss/formula/functions/Quotient.java b/src/java/org/apache/poi/ss/formula/functions/Quotient.java
index f05915bce..40d1debd3 100644
--- a/src/java/org/apache/poi/ss/formula/functions/Quotient.java
+++ b/src/java/org/apache/poi/ss/formula/functions/Quotient.java
@@ -36,8 +36,6 @@ import org.apache.poi.ss.formula.eval.*;
  *
  * If either enumerator/denominator is non numeric, QUOTIENT returns the #VALUE! error value.
  * If denominator is equals to zero, QUOTIENT returns the #DIV/0! error value.
- *
- * @author Cédric Walter
  */
 public class Quotient extends Fixed2ArgFunction implements FreeRefFunction {
 
diff --git a/src/java/org/apache/poi/ss/formula/functions/Value.java b/src/java/org/apache/poi/ss/formula/functions/Value.java
index d8bc377f9..09992f32f 100644
--- a/src/java/org/apache/poi/ss/formula/functions/Value.java
+++ b/src/java/org/apache/poi/ss/formula/functions/Value.java
@@ -32,9 +32,6 @@ import org.apache.poi.ss.formula.eval.ValueEval;
  * ignored. Currency symbols and thousands separators are stripped out.
  * Scientific notation is also supported. If the supplied text does not convert
  * properly the result is <b>#VALUE!</b> error. Blank string converts to zero.
- *
- * @author Josh Micich
- * @author Cédric Walter
  */
 public final class Value extends Fixed1ArgFunction {
 
diff --git a/src/java/org/apache/poi/ss/formula/functions/Vlookup.java b/src/java/org/apache/poi/ss/formula/functions/Vlookup.java
index 3ece2f7f6..2f21e21cf 100644
--- a/src/java/org/apache/poi/ss/formula/functions/Vlookup.java
+++ b/src/java/org/apache/poi/ss/formula/functions/Vlookup.java
@@ -36,9 +36,6 @@ import org.apache.poi.ss.formula.TwoDEval;
  * <b>col_index_num</b> a 1 based index specifying which column value of the lookup data will be returned.<br/>
  * <b>range_lookup</b> If TRUE (default), VLOOKUP finds the largest value less than or equal to
  * the lookup_value.  If FALSE, only exact matches will be considered<br/>
- *
- * @author Josh Micich
- * @author Cedric Walter at innoveo.com
  */
 public final class Vlookup extends Var3or4ArgFunction {
 	private static final ValueEval DEFAULT_ARG3 = BoolEval.TRUE;
diff --git a/src/java/org/apache/poi/util/Configurator.java b/src/java/org/apache/poi/util/Configurator.java
index 7269030dd..b1b72590f 100644
--- a/src/java/org/apache/poi/util/Configurator.java
+++ b/src/java/org/apache/poi/util/Configurator.java
@@ -18,11 +18,9 @@ package org.apache.poi.util;
 ==================================================================== */
 
 /**
- *
- * @author Cedric Walter (cedric.walter at innoveo.com)
+ * Helper for fetching int values from system properties
  */
 public class Configurator {
-
     private static POILogger logger = POILogFactory.getLogger(Configurator.class);
 
     public static int getIntValue(String systemProperty, int defaultValue) {
@@ -35,6 +33,4 @@ public class Configurator {
         }
         return result;
     }
-
-
 }
diff --git a/src/testcases/org/apache/poi/ss/formula/functions/BaseTestFunctionsFromSpreadsheet.java b/src/testcases/org/apache/poi/ss/formula/functions/BaseTestFunctionsFromSpreadsheet.java
index 6993e15f0..98169a0c3 100644
--- a/src/testcases/org/apache/poi/ss/formula/functions/BaseTestFunctionsFromSpreadsheet.java
+++ b/src/testcases/org/apache/poi/ss/formula/functions/BaseTestFunctionsFromSpreadsheet.java
@@ -34,8 +34,7 @@ import org.apache.poi.hssf.util.CellReference;
 import org.apache.poi.ss.usermodel.CellValue;
 
 /**
- * @author Josh Micich
- * @author Cedric Walter at innoveo.com
+ * 
  */
 public abstract class BaseTestFunctionsFromSpreadsheet extends TestCase {
 
diff --git a/src/testcases/org/apache/poi/ss/formula/functions/TestCountFuncs.java b/src/testcases/org/apache/poi/ss/formula/functions/TestCountFuncs.java
index 02992fc5d..7184106df 100644
--- a/src/testcases/org/apache/poi/ss/formula/functions/TestCountFuncs.java
+++ b/src/testcases/org/apache/poi/ss/formula/functions/TestCountFuncs.java
@@ -41,9 +41,6 @@ import org.apache.poi.ss.util.CellReference;
 
 /**
  * Test cases for COUNT(), COUNTA() COUNTIF(), COUNTBLANK()
- *
- * @author Josh Micich
- * @author Cedric Walter at innoveo.com
  */
 public final class TestCountFuncs extends TestCase {
 
diff --git a/src/testcases/org/apache/poi/ss/formula/functions/TestIndexFunctionFromSpreadsheet.java b/src/testcases/org/apache/poi/ss/formula/functions/TestIndexFunctionFromSpreadsheet.java
index 6d900e1ef..214e01536 100644
--- a/src/testcases/org/apache/poi/ss/formula/functions/TestIndexFunctionFromSpreadsheet.java
+++ b/src/testcases/org/apache/poi/ss/formula/functions/TestIndexFunctionFromSpreadsheet.java
@@ -19,9 +19,6 @@ package org.apache.poi.ss.formula.functions;
 
 /**
  * Tests INDEX() as loaded from a test data spreadsheet.<p/>
- *
- * @author Josh Micich
- * @author Cedric Walter at innoveo.com
  */
 public final class TestIndexFunctionFromSpreadsheet  extends BaseTestFunctionsFromSpreadsheet {
 
@@ -29,4 +26,4 @@ public final class TestIndexFunctionFromSpreadsheet  extends BaseTestFunctionsFr
     protected String getFilename() {
         return "IndexFunctionTestCaseData.xls";
     }
-}
\ No newline at end of file
+}
diff --git a/src/testcases/org/apache/poi/ss/formula/functions/TestIndirectFunctionFromSpreadsheet.java b/src/testcases/org/apache/poi/ss/formula/functions/TestIndirectFunctionFromSpreadsheet.java
index b777dca8a..3d39308c3 100644
--- a/src/testcases/org/apache/poi/ss/formula/functions/TestIndirectFunctionFromSpreadsheet.java
+++ b/src/testcases/org/apache/poi/ss/formula/functions/TestIndirectFunctionFromSpreadsheet.java
@@ -23,8 +23,6 @@ package org.apache.poi.ss.formula.functions;
  * Tests for bug fixes and specific/tricky behaviour can be found in the corresponding test class
  * (<tt>TestXxxx</tt>) of the target (<tt>Xxxx</tt>) implementor, where execution can be observed
  *  more easily.
- *
- * @author Cédric Walter
  */
 public final class TestIndirectFunctionFromSpreadsheet extends BaseTestFunctionsFromSpreadsheet {
 
diff --git a/src/testcases/org/apache/poi/ss/formula/functions/TestLookupFunctionsFromSpreadsheet.java b/src/testcases/org/apache/poi/ss/formula/functions/TestLookupFunctionsFromSpreadsheet.java
index 09810a8dc..76386e9b6 100644
--- a/src/testcases/org/apache/poi/ss/formula/functions/TestLookupFunctionsFromSpreadsheet.java
+++ b/src/testcases/org/apache/poi/ss/formula/functions/TestLookupFunctionsFromSpreadsheet.java
@@ -27,9 +27,6 @@ package org.apache.poi.ss.formula.functions;
  * Tests for bug fixes and specific/tricky behaviour can be found in the corresponding test class
  * (<tt>TestXxxx</tt>) of the target (<tt>Xxxx</tt>) implementor, where execution can be observed
  *  more easily.
- *
- * @author Josh Micich
- * @author Cedric Walter at innoveo.com
  */
 public final class TestLookupFunctionsFromSpreadsheet extends BaseTestFunctionsFromSpreadsheet {
 
diff --git a/src/testcases/org/apache/poi/ss/formula/functions/TestMatch.java b/src/testcases/org/apache/poi/ss/formula/functions/TestMatch.java
index ee6e45c1f..a2866d4d2 100644
--- a/src/testcases/org/apache/poi/ss/formula/functions/TestMatch.java
+++ b/src/testcases/org/apache/poi/ss/formula/functions/TestMatch.java
@@ -32,9 +32,6 @@ import org.apache.poi.ss.usermodel.CellValue;
 
 /**
  * Test cases for MATCH()
- *
- * @author Josh Micich
- * @author Cedric Walter at innoveo.com
  */
 public final class TestMatch extends TestCase {
 	/** less than or equal to */
diff --git a/src/testcases/org/apache/poi/ss/formula/functions/TestMatchFunctionsFromSpreadsheet.java b/src/testcases/org/apache/poi/ss/formula/functions/TestMatchFunctionsFromSpreadsheet.java
index 29aeec8d1..725946a9e 100644
--- a/src/testcases/org/apache/poi/ss/formula/functions/TestMatchFunctionsFromSpreadsheet.java
+++ b/src/testcases/org/apache/poi/ss/formula/functions/TestMatchFunctionsFromSpreadsheet.java
@@ -25,8 +25,6 @@ package org.apache.poi.ss.formula.functions;
  * Tests for bug fixes and specific/tricky behaviour can be found in the corresponding test class
  * (<tt>TestXxxx</tt>) of the target (<tt>Xxxx</tt>) implementor, where execution can be observed
  *  more easily.
- *
- * @author Cédric Walter
  */
 public final class TestMatchFunctionsFromSpreadsheet extends BaseTestFunctionsFromSpreadsheet {
 
diff --git a/src/testcases/org/apache/poi/ss/formula/functions/TestValue.java b/src/testcases/org/apache/poi/ss/formula/functions/TestValue.java
index 9c778d7e1..fb18a95a6 100644
--- a/src/testcases/org/apache/poi/ss/formula/functions/TestValue.java
+++ b/src/testcases/org/apache/poi/ss/formula/functions/TestValue.java
@@ -26,9 +26,6 @@ import org.apache.poi.ss.formula.eval.ValueEval;
 
 /**
  * Tests for {@link Value}
- *
- * @author Josh Micich
- * @author Cédric Walter
  */
 public final class TestValue extends TestCase {