Added CommentDiscussion.

Package cleanup.