Clean up unused and duplicate collection code.
Move comment.