diff --git a/src/chash.erl b/src/chash.erl
index 222de8eca..c7f1a343b 100644
--- a/src/chash.erl
+++ b/src/chash.erl
@@ -36,7 +36,6 @@
 
 -module(chash).
 
-%% documentation satus: done
 
 -export([contains_name/2, fresh/2, lookup/2, key_of/1,
          members/1, merge_rings/2, next_index/2, nodes/1,
diff --git a/src/chashbin.erl b/src/chashbin.erl
index 9e4c26a2d..1e8d1e47d 100644
--- a/src/chashbin.erl
+++ b/src/chashbin.erl
@@ -23,7 +23,6 @@
 %% -------------------------------------------------------------------
 -module(chashbin).
 
-%% documentation status : done
 
 -export([create/1, to_chash/1, to_list/1,
          to_list_filter/2, responsible_index/2,
diff --git a/src/riak_core.erl b/src/riak_core.erl
index 60b2394ae..be9591828 100644
--- a/src/riak_core.erl
+++ b/src/riak_core.erl
@@ -21,7 +21,6 @@
 %% -------------------------------------------------------------------
 -module(riak_core).
 
-%% documentation status: done
 
 -export([stop/0, stop/1, join/1, join/4, staged_join/1,
          remove/1, down/1, leave/0, remove_from_cluster/1]).
diff --git a/src/riak_core_apl.erl b/src/riak_core_apl.erl
index 6078b2bf1..a352d54f0 100644
--- a/src/riak_core_apl.erl
+++ b/src/riak_core_apl.erl
@@ -24,7 +24,6 @@
 %% -------------------------------------------------------------------
 -module(riak_core_apl).
 
-%% documentation status: done
 
 -export([active_owners/1, active_owners/2, get_apl/3,
          get_apl/4, get_apl_ann/2, get_apl_ann/3, get_apl_ann/4,
diff --git a/src/riak_core_app.erl b/src/riak_core_app.erl
index 07bd6f6e3..bec9e2726 100644
--- a/src/riak_core_app.erl
+++ b/src/riak_core_app.erl
@@ -22,7 +22,6 @@
 
 -module(riak_core_app).
 
-%% documentation status: done
 
 -behaviour(application).
 
diff --git a/src/riak_core_claim.erl b/src/riak_core_claim.erl
index 8e3072444..46d57b16d 100644
--- a/src/riak_core_claim.erl
+++ b/src/riak_core_claim.erl
@@ -49,8 +49,6 @@
 
 -module(riak_core_claim).
 
-%% documentation status: done
-
 -type ring() :: riak_core_ring:riak_core_ring().
 
 -export([claim/1, claim/3, claim_until_balanced/2,
diff --git a/src/riak_core_handoff_listener.erl b/src/riak_core_handoff_listener.erl
index 0cc7d67e8..ec1a12249 100644
--- a/src/riak_core_handoff_listener.erl
+++ b/src/riak_core_handoff_listener.erl
@@ -24,8 +24,6 @@
 
 -module(riak_core_handoff_listener).
 
-%% documentation status: done.
-
 -behaviour(gen_nb_server).
 
 -export([start_link/0]).
diff --git a/src/riak_core_handoff_listener_sup.erl b/src/riak_core_handoff_listener_sup.erl
index 3a4bcd0ad..40b5b6f9f 100644
--- a/src/riak_core_handoff_listener_sup.erl
+++ b/src/riak_core_handoff_listener_sup.erl
@@ -20,8 +20,6 @@
 
 -module(riak_core_handoff_listener_sup).
 
-%% documentation status: done
-
 -behaviour(supervisor).
 
 %% beahvior functions
diff --git a/src/riak_core_handoff_manager.erl b/src/riak_core_handoff_manager.erl
index a65b8fe52..d563b60da 100644
--- a/src/riak_core_handoff_manager.erl
+++ b/src/riak_core_handoff_manager.erl
@@ -15,8 +15,6 @@
 %% Copyright (c) 2007-2012 Basho Technologies, Inc.  All Rights Reserved.
 -module(riak_core_handoff_manager).
 
-%% documentation status: done
-
 -behaviour(gen_server).
 
 %% gen_server api
diff --git a/src/riak_core_handoff_receiver.erl b/src/riak_core_handoff_receiver.erl
index 408bb9646..c74edb387 100644
--- a/src/riak_core_handoff_receiver.erl
+++ b/src/riak_core_handoff_receiver.erl
@@ -22,8 +22,6 @@
 
 -module(riak_core_handoff_receiver).
 
-%% documentation status: done
-
 -include("riak_core_handoff.hrl").
 
 -behaviour(gen_server).
diff --git a/src/riak_core_handoff_receiver_sup.erl b/src/riak_core_handoff_receiver_sup.erl
index c72f2ebb7..9203de019 100644
--- a/src/riak_core_handoff_receiver_sup.erl
+++ b/src/riak_core_handoff_receiver_sup.erl
@@ -20,8 +20,6 @@
 
 -module(riak_core_handoff_receiver_sup).
 
-%% documentation status: done
-
 -behaviour(supervisor).
 
 %% beahvior functions
diff --git a/src/riak_core_handoff_sender.erl b/src/riak_core_handoff_sender.erl
index 3a300a752..cac970454 100644
--- a/src/riak_core_handoff_sender.erl
+++ b/src/riak_core_handoff_sender.erl
@@ -22,8 +22,6 @@
 
 -module(riak_core_handoff_sender).
 
-%% documentation status: done
-
 -export([start_link/4]).
 
 -include("riak_core_vnode.hrl").
diff --git a/src/riak_core_handoff_sender_sup.erl b/src/riak_core_handoff_sender_sup.erl
index 4e832f5cf..9334f59ec 100644
--- a/src/riak_core_handoff_sender_sup.erl
+++ b/src/riak_core_handoff_sender_sup.erl
@@ -20,8 +20,6 @@
 
 -module(riak_core_handoff_sender_sup).
 
-%% documentation status: done
-
 -behaviour(supervisor).
 
 %% callbacks
diff --git a/src/riak_core_handoff_sup.erl b/src/riak_core_handoff_sup.erl
index 392d78e3c..a458c2999 100644
--- a/src/riak_core_handoff_sup.erl
+++ b/src/riak_core_handoff_sup.erl
@@ -20,8 +20,6 @@
 
 -module(riak_core_handoff_sup).
 
-%% documentation status: done
-
 -behaviour(supervisor).
 
 %% beahvior functions
diff --git a/src/riak_core_ring.erl b/src/riak_core_ring.erl
index 81f2a4848..feafec328 100644
--- a/src/riak_core_ring.erl
+++ b/src/riak_core_ring.erl
@@ -28,8 +28,6 @@
 
 -module(riak_core_ring).
 
-%% documentation status: done
-
 -export([all_members/1, all_owners/1, all_preflists/2,
          diff_nodes/2, equal_rings/2, fresh/0, fresh/1, fresh/2,
          get_meta/2, index_owner/2, my_indices/1,