diff --git a/src/java/org/apache/poi/hpsf/package.html b/src/java/org/apache/poi/hpsf/package.html
index f5cfe430cf..028495999a 100644
--- a/src/java/org/apache/poi/hpsf/package.html
+++ b/src/java/org/apache/poi/hpsf/package.html
@@ -88,11 +88,6 @@
     the hassle of first finding out what the title's property ID is and then
     using this ID to get the property's value.</p>
 
-   <p>Writing properties can be done with the classes
-    {@link org.apache.poi.hpsf.MutablePropertySet}, {@link
-    org.apache.poi.hpsf.MutableSection}, and {@link
-    org.apache.poi.hpsf.MutableProperty}.</p>
-
    <p>Public documentation from Microsoft can be found in the  <a 
     href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/stg/stg/properties_and_property_sets.asp"
     target="_blank">appropriate section of the MSDN Library</a>.</p>
diff --git a/src/java/org/apache/poi/ss/format/CellFormat.java b/src/java/org/apache/poi/ss/format/CellFormat.java
index 8ac8075166..832c793dd1 100644
--- a/src/java/org/apache/poi/ss/format/CellFormat.java
+++ b/src/java/org/apache/poi/ss/format/CellFormat.java
@@ -81,8 +81,7 @@ import org.apache.poi.util.LocaleUtil;
  *  to look these up into Java Locales if desired.
  * <p>
  * In addition to these, there is a general format that is used when no format
- * is specified.  This formatting is presented by the {@link #GENERAL_FORMAT}
- * object.
+ * is specified.
  * 
  * TODO Merge this with {@link DataFormatter} so we only have one set of
  *  code for formatting numbers.