Index: src/java/org/apache/lucene/search/Similarity.java
===================================================================
--- src/java/org/apache/lucene/search/Similarity.java	(revision 916396)
+++ src/java/org/apache/lucene/search/Similarity.java	(working copy)
@@ -858,7 +858,7 @@
    * @return An implementation dependent float to be used as a scoring factor
    *
    */
-  // nocommit -- swtich to BytesRef
+  // TODO -- switch to BytesRef
   public float scorePayload(int docId, String fieldName, int start, int end, byte [] payload, int offset, int length)
   {
     return 1;
Index: src/java/org/apache/lucene/search/AutomatonQuery.java
===================================================================
--- src/java/org/apache/lucene/search/AutomatonQuery.java	(revision 916396)
+++ src/java/org/apache/lucene/search/AutomatonQuery.java	(working copy)
@@ -80,7 +80,7 @@
     // matches all possible strings
     if (BasicOperations.isTotal(automaton)) {
       final Terms terms = MultiFields.getTerms(reader, getField());
-      // nocommit -- should we just return null?  singleton?
+      // TODO -- should we just return null?  singleton?
       return (terms != null) ? terms.iterator() : TermsEnum.EMPTY;
     }
     
Index: src/java/org/apache/lucene/index/codecs/pulsing/PulsingPostingsWriterImpl.java
===================================================================
--- src/java/org/apache/lucene/index/codecs/pulsing/PulsingPostingsWriterImpl.java	(revision 916405)
+++ src/java/org/apache/lucene/index/codecs/pulsing/PulsingPostingsWriterImpl.java	(working copy)
@@ -52,9 +52,6 @@
   // Starts a new term
   FieldInfo fieldInfo;
 
-  // nocommit
-  String desc;
-
   /** @lucene.experimental */
   public static class Document {
     int docID;
Index: src/java/org/apache/lucene/util/BytesRef.java
===================================================================
--- src/java/org/apache/lucene/util/BytesRef.java	(revision 916396)
+++ src/java/org/apache/lucene/util/BytesRef.java	(working copy)
@@ -68,8 +68,6 @@
    * unpaired surrogates or U+FFFF.
    */
   public void copy(CharSequence text) {
-    // nocommit -- remove this paranoia
-    assert UnicodeUtil.validUTF16String(text);
     if (bytes == null)
       bytes = new byte[10];
     UnicodeUtil.UTF16toUTF8(text, 0, text.length(), this);
@@ -96,8 +94,7 @@
     return new BytesRef(this);
   }
 
-  public boolean startsWith(BytesRef other, int pos) {
-    // nocommit: maybe this one shouldn't be public...
+  private boolean startsWith(BytesRef other, int pos) {
     if (pos < 0 || length - pos < other.length) {
       return false;
     }