diff --git a/plone/app/discussion/browser/comments.old.pt b/plone/app/discussion/browser/comments.old.pt
deleted file mode 100644
index eee4e60..0000000
--- a/plone/app/discussion/browser/comments.old.pt
+++ /dev/null
@@ -1,338 +0,0 @@
-<tal:block define="userHasReplyPermission view/can_reply;
-                   isDiscussionAllowed view/is_discussion_allowed;
-                   isAnonymousDiscussionAllowed view/anonymous_discussion_allowed;
-                   isAnon view/is_anonymous;
-                   canManage view/can_manage;
-                   replies python:view.get_replies(canManage);
-                   showCommenterImage view/show_commenter_image;
-                   errors options/state/getErrors|nothing;
-                   wtool context/@@plone_tools/workflow"
-           tal:condition="isDiscussionAllowed"
-           i18n:domain="plone">
-
-    <div class="reply"
-         tal:condition="python:isAnon and not isAnonymousDiscussionAllowed">
-        <form tal:attributes="action view/login_action">
-            <input class="standalone"
-                   style="margin-bottom: 1.25em;"
-                   type="submit"
-                   value="Log in to add comments"
-                   i18n:attributes="value label_login_to_add_comments;"
-                   />
-        </form>
-    </div>
-
-    <div class="discussion"
-         tal:condition="python:replies or (userHasReplyPermission and isDiscussionAllowed) or (isAnon and not userHasReplyPermission and isDiscussionAllowed)">
-        <tal:getreplies repeat="reply_dict replies">
-
-            <div class="comment"
-                 tal:define="reply reply_dict/comment;
-                             depth reply_dict/depth|python:0;
-                             creator reply/Creator;
-                             author_home_url python:view.get_commenter_home_url(username=reply.author_username);
-                             portrait_url python:view.get_commenter_portrait(reply.author_username);
-                             anonymous_creator python:creator in ('Anonymous User', '');
-                             published python:wtool.getInfoFor(reply, 'review_state') == 'published';"
-                 tal:attributes="class python:'comment replyTreeLevel'+str(depth);
-                                 style string:margin-left: ${depth}em;
-                                 id string:${reply/id}"
-                 tal:condition="python:canManage or published">
-
-                <div class="commentImage" tal:condition="showCommenterImage">
-
-                    <a href="" tal:condition="not:isAnon"
-                               tal:attributes="href author_home_url">
-                         <img src="defaultUser.gif"
-                              alt=""
-                              border="0"
-                              width="75"
-                              tal:attributes="src portrait_url;
-                                              alt reply/creator" />
-                    </a>
-                    <img src="defaultUser.gif"
-                         alt=""
-                         border="0"
-                         width="75"
-                         tal:condition="isAnon"
-                         tal:attributes="src portrait_url;
-                                         alt reply/creator" />
-                </div>
-
-                <h3>
-                    <a name="comments" tal:attributes="name reply/title">
-                    <span tal:replace="reply/title">Comment title</span>
-                    </a>
-                </h3>
-
-                <div class="documentByLine">
-                        <tal:posted i18n:translate="label_comment_by">Posted by</tal:posted>
-                        <tal:name>
-                            <a href=""
-                               tal:condition="not:isAnon"
-                               tal:content="creator"
-                               tal:attributes="href author_home_url">
-                                Poster Name
-                            </a>
-                            <span tal:condition="isAnon"
-                                  tal:replace="creator" />
-                        </tal:name>
-                        <tal:name i18n:translate="label_anonymous_user"
-                                  condition="anonymous_creator">Anonymous User</tal:name>
-                        <tal:at i18n:translate="label_commented_at">at</tal:at>
-                    <span tal:replace="python:view.format_time(reply.modification_date)">8/23/2001 12:40:44 PM</span>
-                </div>
-
-                <div class="commentBody"
-                     tal:content="structure reply/text">
-                     This is the body text of the comment.
-                </div>
-
-                <button style="display: inline;"
-                        class="context reply-to-comment-button allowMultiSubmit"
-                        tal:condition="python:userHasReplyPermission and isDiscussionAllowed or isAnonymousDiscussionAllowed"
-                        i18n:translate="label_reply;">
-                    Reply
-                </button>
-
-                <form name="delete"
-                      action=""
-                      method="post"
-                      style="display: inline;"
-                      tal:condition="view/can_manage"
-                      tal:attributes="action string:${reply/absolute_url}/@@moderate-delete-comment">
-                    <input name="form.button.DeleteComment"
-                           class="destructive"
-                           type="submit"
-                           value="Remove"
-                           i18n:attributes="value label_remove;"
-                           />
-                </form>
-
-                <!-- Workflow actions (e.g. 'publish') -->
-                <form name=""
-                      action=""
-                      method="get"
-                      style="display: inline;"
-                      tal:repeat="action reply_dict/actions|nothing"
-                      tal:attributes="action string:${reply/absolute_url}/@@moderate-publish-comment;
-                                      name action/id">
-                    <input type="hidden" name="workflow_action" tal:attributes="value action/id" />
-                    <input name="form.button.PublishComment"
-                           class="context"
-                           type="submit"
-                           tal:attributes="value action/title"
-                           />
-                </form>
-
-            </div>
-
-        </tal:getreplies>
-    </div>
-
-    <div class="reply"
-         tal:condition="python: isAnon and not isAnonymousDiscussionAllowed and replies">
-        <form tal:attributes="action view/login_action">
-            <input class="standalone"
-                   style="margin-bottom: 1.25em;"
-                   type="submit"
-                   value="Log in to add comments"
-                   i18n:attributes="value label_login_to_add_comments;"
-                   />
-        </form>
-    </div>
-
-    <div id="commenting" class="reply"
-         tal:condition="not:isAnon">
-
-        <fieldset>
-
-            <legend i18n:translate="legend_add_comment">Add comment</legend>
-            <p i18n:translate="description_add_comment">
-                You can add a comment by filling out the form below. Plain text
-                formatting.
-            </p>
-
-            <form name="reply"
-                  action=""
-                  method="get"
-                  tal:attributes="action string:${context/absolute_url}/++conversation++default/@@add-comment">
-
-                <div class="field"
-                     tal:define="error errors/subject|nothing;"
-                     tal:attributes="class python: error and 'field error' or 'field'">
-
-                    <label for="subject" i18n:translate="label_subject">Subject</label>
-
-                    <span class="fieldRequired" title="Required"
-                          i18n:attributes="title title_required;"
-                          i18n:translate="label_required">(Required)</span>
-
-                    <div tal:content="error">Validation error output</div>
-
-                    <input name="subject"
-                           id="subject"
-                           value=""
-                           size="40"
-                           tal:attributes="value request/subject|request/title_override|nothing;" />
-
-                </div>
-
-                <div class="field"
-                     tal:define="error errors/body_text|nothing;"
-                     tal:attributes="class python: error and 'field error' or 'field'">
-
-                    <label for="body_text" i18n:translate="label_comment">Comment</label>
-
-                    <span class="fieldRequired" title="Required"
-                          i18n:attributes="title title_required;"
-                          i18n:translate="label_required">(Required)</span>
-
-                    <div tal:content="error">Validation error output</div>
-
-                    <textarea name="body_text"
-                              id="body_text"
-                              cols="40"
-                              rows="8"
-                              tal:content="request/body_text|request/text_override | nothing"></textarea>
-
-                </div>
-
-                <div class="formControls">
-
-                    <input class="context"
-                           type="submit"
-                           value="Add Comment"
-                           name="form.button.AddComment"
-                           i18n:attributes="value label_add_comment;" />
-
-                    <input class="standalone cancelreplytocomment"
-                           type="submit"
-                           name="form.button.Cancel"
-                           value="Cancel"
-                           i18n:attributes="value label_cancel;" />
-                </div>
-
-                <input type="hidden" name="form.submitted" value="1" />
-
-            </form>
-        </fieldset>
-    </div>
-
-    <div id="commenting" class="reply"
-         tal:condition="python:isAnon and isAnonymousDiscussionAllowed">
-
-        <fieldset>
-
-            <legend i18n:translate="legend_add_comment">Add comment</legend>
-            <p i18n:translate="description_add_comment">
-                You can add a comment by filling out the form below. Plain text
-                formatting.
-            </p>
-
-            <form name="reply"
-                  action=""
-                  method="get"
-                  tal:attributes="action string:${context/absolute_url}/++conversation++default/@@add-comment">
-
-                <div class="field"
-                     tal:define="error errors/subject|nothing;"
-                     tal:attributes="class python: error and 'field error' or 'field'">
-
-                    <label for="author_username" i18n:translate="label_author_username">Author username</label>
-
-                    <span class="fieldRequired" title="Required"
-                          i18n:attributes="title title_required;"
-                          i18n:translate="label_required">(Required)</span>
-
-                    <div tal:content="error">Validation error output</div>
-
-                    <input name="author_username"
-                           id="author_username"
-                           value=""
-                           size="40"
-                           tal:attributes="value request/subject|request/title_override|nothing;" />
-
-                </div>
-
-                <div class="field"
-                     tal:define="error errors/subject|nothing;"
-                     tal:attributes="class python: error and 'field error' or 'field'">
-
-                    <label for="author_email" i18n:translate="label_author_email">Author email</label>
-
-                    <span class="fieldRequired" title="Required"
-                          i18n:attributes="title title_required;"
-                          i18n:translate="label_required">(Required)</span>
-
-                    <div tal:content="error">Validation error output</div>
-
-                    <input name="author_email"
-                           id="author_email"
-                           value=""
-                           size="40"
-                           tal:attributes="value request/subject|request/title_override|nothing;" />
-
-                </div>
-
-                <div class="field"
-                     tal:define="error errors/subject|nothing;"
-                     tal:attributes="class python: error and 'field error' or 'field'">
-
-                    <label for="subject" i18n:translate="label_subject">Subject</label>
-
-                    <span class="fieldRequired" title="Required"
-                          i18n:attributes="title title_required;"
-                          i18n:translate="label_required">(Required)</span>
-
-                    <div tal:content="error">Validation error output</div>
-
-                    <input name="subject"
-                           id="subject"
-                           value=""
-                           size="40"
-                           tal:attributes="value request/subject|request/title_override|nothing;" />
-
-                </div>
-
-                <div class="field"
-                     tal:define="error errors/body_text|nothing;"
-                     tal:attributes="class python: error and 'field error' or 'field'">
-
-                    <label for="body_text" i18n:translate="label_comment">Comment</label>
-
-                    <span class="fieldRequired" title="Required"
-                          i18n:attributes="title title_required;"
-                          i18n:translate="label_required">(Required)</span>
-
-                    <div tal:content="error">Validation error output</div>
-
-                    <textarea name="body_text"
-                              id="body_text"
-                              cols="40"
-                              rows="8"
-                              tal:content="request/body_text|request/text_override | nothing"></textarea>
-
-                </div>
-
-                <div class="formControls">
-
-                    <input class="context"
-                           type="submit"
-                           value="Add Comment"
-                           name="form.button.AddComment"
-                           i18n:attributes="value label_add_comment;" />
-
-                    <input class="standalone cancelreplytocomment"
-                           type="submit"
-                           name="form.button.Cancel"
-                           value="Cancel"
-                           i18n:attributes="value label_cancel;" />
-                </div>
-
-                <input type="hidden" name="form.submitted" value="1" />
-
-            </form>
-        </fieldset>
-    </div>
-</tal:block>
\ No newline at end of file
diff --git a/plone/app/discussion/browser/comments.old.py b/plone/app/discussion/browser/comments.old.py
deleted file mode 100644
index 6f38495..0000000
--- a/plone/app/discussion/browser/comments.old.py
+++ /dev/null
@@ -1,285 +0,0 @@
-from datetime import datetime
-from DateTime import DateTime
-
-from urllib import quote as url_quote
-
-from zope.interface import implements
-
-from zope.component import createObject, getMultiAdapter, queryUtility
-
-from zope.viewlet.interfaces import IViewlet
-
-from Acquisition import aq_inner, aq_parent, aq_base
-
-from AccessControl import getSecurityManager
-
-from Products.Five.browser import BrowserView
-from Products.Five.browser.pagetemplatefile import ViewPageTemplateFile
-
-from Products.CMFCore.utils import getToolByName
-
-from Products.CMFPlone import PloneMessageFactory as _
-from Products.statusmessages.interfaces import IStatusMessage
-
-from plone.registry.interfaces import IRegistry
-
-from plone.app.layout.viewlets.common import ViewletBase
-
-from plone.app.discussion.comment import CommentFactory
-from plone.app.discussion.interfaces import IConversation, IComment, IReplies, IDiscussionSettings
-
-
-
-class View(BrowserView):
-    """Comment View
-    """
-
-    def __call__(self):
-        # Redirect from /path/to/object/++conversation++default/123456789
-        # to /path/to/object#comment-123456789
-        comment_id = aq_parent(self).id
-        #self.request.response.redirect(aq_parent(aq_parent(aq_parent(self))).absolute_url() + '#comment-' + comment_id)
-        self.request.response.redirect(aq_parent(aq_parent(aq_parent(self))).absolute_url() + '#' + comment_id)
-
-class CommentsViewlet(ViewletBase):
-    """Discussion Viewlet
-    """
-
-    implements(IViewlet)
-
-    template = ViewPageTemplateFile('comments.pt')
-
-    def update(self):
-        super(CommentsViewlet, self).update()
-        self.portal_discussion = getToolByName(self.context, 'portal_discussion', None)
-        self.portal_membership = getToolByName(self.context, 'portal_membership', None)
-
-    def can_reply(self):
-        return getSecurityManager().checkPermission('Reply to item', aq_inner(self.context))
-
-    def can_manage(self):
-        return getSecurityManager().checkPermission('Manage portal', aq_inner(self.context))
-
-    def is_discussion_allowed(self):
-        context = aq_inner(self.context)
-        conversation = IConversation(context)
-        return conversation.enabled
-
-    def get_replies(self, workflow_actions=False):
-        context = aq_inner(self.context)
-        conversation = IConversation(context)
-
-        def replies_with_workflow_actions():
-            # Return dict with workflow actions
-            #context = aq_inner(self.context)
-            wf = getToolByName(context, 'portal_workflow')
-
-            for r in conversation.getThreads():
-                comment_obj = r['comment']
-                # list all possible workflow actions
-                actions = [a for a in wf.listActionInfos(object=comment_obj)
-                               if a['category'] == 'workflow' and a['allowed']]
-                r = r.copy()
-                r['actions'] = actions
-                yield r
-
-        # Return all direct replies
-        if conversation.total_comments > 0:
-            if workflow_actions:
-                return replies_with_workflow_actions()
-            else:
-                return conversation.getThreads()
-        else:
-            return None
-
-
-    def get_commenter_home_url(self, username):
-        if username is None:
-            return None
-        else:
-            return "%s/author/%s" % (self.context.portal_url(), username)
-
-    def get_commenter_portrait(self, username):
-
-        if username is None:
-            # return the default user image if no username is given
-            return 'defaultUser.gif'
-        else:
-            portal_membership = getToolByName(self.context, 'portal_membership', None)
-            return portal_membership.getPersonalPortrait(username).absolute_url();
-
-    def anonymous_discussion_allowed(self):
-        # Check if anonymous comments are allowed in the registry
-        registry = queryUtility(IRegistry)
-        settings = registry.forInterface(IDiscussionSettings)
-        return settings.anonymous_comments
-
-    def show_commenter_image(self):
-        # Check if showing commenter image is enabled in the registry
-        registry = queryUtility(IRegistry)
-        settings = registry.forInterface(IDiscussionSettings)
-        return settings.show_commenter_image
-
-    def is_anonymous(self):
-        return self.portal_state.anonymous()
-
-    def login_action(self):
-        return '%s/login_form?came_from=%s' % (self.navigation_root_url, url_quote(self.request.get('URL', '')),)
-
-    def format_time(self, time):
-        # We have to transform Python datetime into Zope DateTime
-        # before we can call toLocalizedTime.
-        util = getToolByName(self.context, 'translation_service')
-        zope_time = DateTime(time.year, time.month, time.day, time.hour, time.minute, time.second)
-        return util.toLocalizedTime(zope_time, long_format=True)
-
-class AddComment(BrowserView):
-    """Add a comment to a conversation
-    """
-
-    def __call__(self):
-
-        if self.request.has_key('form.button.AddComment'):
-
-            context = aq_inner(self.context)
-
-            subject = self.request.get('subject')
-            text = self.request.get('body_text')
-            author_username = self.request.get('author_username')
-            author_email = self.request.get('author_email')
-
-            # Check the form input
-            if author_username == '':
-                IStatusMessage(self.request).addStatusMessage(\
-                    _("Username field is empty."),
-                    type="info")
-                return self.request.response.redirect(aq_parent(aq_inner(context)).absolute_url())
-            if author_email == '':
-                IStatusMessage(self.request).addStatusMessage(\
-                    _("Email field is empty."),
-                    type="info")
-                return self.request.response.redirect(aq_parent(aq_inner(context)).absolute_url())
-            if subject == '':
-                IStatusMessage(self.request).addStatusMessage(\
-                    _("Subject field is empty."),
-                    type="info")
-                return self.request.response.redirect(aq_parent(aq_inner(context)).absolute_url())
-            if text == '':
-                IStatusMessage(self.request).addStatusMessage(\
-                    _("Comment field is empty."),
-                    type="info")
-                return self.request.response.redirect(aq_parent(aq_inner(context)).absolute_url())
-
-            # The add-comment view is called on the conversation object
-            conversation = context
-
-            # Create the comment
-            comment = CommentFactory()
-            comment.title = subject
-            comment.text = text
-
-            portal_membership = getToolByName(context, 'portal_membership')
-
-            if portal_membership.isAnonymousUser():
-                comment.creator = author_username
-                comment.author_name = author_username
-                comment.author_email = author_email
-                comment.creation_date = comment.modification_date = datetime.now()
-            else:
-                member = portal_membership.getAuthenticatedMember()
-                fullname = member.getProperty('fullname')
-                if fullname == '' or None:
-                    comment.creator = member.id
-                else:
-                    comment.creator = fullname
-                comment.author_username = member.getUserName()
-                comment.author_name = member.getProperty('fullname')
-                comment.author_email = member.getProperty('email')
-                comment.creation_date = comment.modification_date = datetime.now()
-
-            # Add comment to the conversation
-            comment_id = conversation.addComment(comment)
-
-            # Redirect to comment (inside a content object page)
-            #self.request.response.redirect(aq_parent(aq_inner(context)).absolute_url() + '#comment-' + str(comment_id))
-            self.request.response.redirect(aq_parent(aq_inner(context)).absolute_url() + '#' + str(comment_id))
-
-class ReplyToComment(BrowserView):
-    """Reply to a comment
-    """
-
-    def __call__(self):
-
-        context = aq_inner(self.context)
-
-        if self.request.has_key('form.button.AddComment'):
-
-            reply_to_comment_id = self.request.get('form.reply_to_comment_id')
-
-            subject = self.request.get('subject')
-            text = self.request.get('body_text')
-            author_username = self.request.get('author_username')
-            author_email = self.request.get('author_email')
-
-            # Check the form input
-            if author_username == '':
-                IStatusMessage(self.request).addStatusMessage(\
-                    _("Username field is empty."),
-                    type="info")
-                return self.request.response.redirect(aq_parent(aq_inner(context)).absolute_url())
-            if author_email == '':
-                IStatusMessage(self.request).addStatusMessage(\
-                    _("Email field is empty."),
-                    type="info")
-                return self.request.response.redirect(aq_parent(aq_inner(context)).absolute_url())
-            if subject == '':
-                IStatusMessage(self.request).addStatusMessage(\
-                    _("Subject field is empty."),
-                    type="info")
-                return self.request.response.redirect(aq_parent(aq_inner(context)).absolute_url())
-            if text == '':
-                IStatusMessage(self.request).addStatusMessage(\
-                    _("Comment field is empty."),
-                    type="info")
-                return self.request.response.redirect(aq_parent(aq_inner(context)).absolute_url())
-
-            # The add-comment view is called on the conversation object
-            conversation = context
-
-            # Fetch the comment we want to reply to
-            comment_to_reply_to = conversation.get(reply_to_comment_id)
-
-            replies = IReplies(comment_to_reply_to)
-
-            # Create the comment
-            comment = CommentFactory()
-            comment.title = subject
-            comment.text = text
-
-            portal_membership = getToolByName(context, 'portal_membership')
-
-            if portal_membership.isAnonymousUser():
-                comment.creator = author_username
-                comment.author_name = author_username
-                comment.author_email = author_email
-                comment.creation_date = comment.modification_date = datetime.now()
-            else:
-                member = portal_membership.getAuthenticatedMember()
-                fullname = member.getProperty('fullname')
-                if fullname == '' or None:
-                    comment.creator = member.id
-                else:
-                    comment.creator = fullname
-                comment.author_username = member.getUserName()
-                comment.author_name = member.getProperty('fullname')
-                comment.author_email = member.getProperty('email')
-                comment.creation_date = comment.modification_date = datetime.now()
-
-            # Add the reply to the comment
-            new_re_id = replies.addComment(comment)
-
-            # Redirect to comment (inside a content object page)
-            #self.request.response.redirect(aq_parent(aq_inner(context)).absolute_url() + '#comment-' + str(reply_to_comment_id))
-            # Todo: Temporarily remove the "#comment-" to fix a bug
-            # in CMFPlone/skins/plone_ecmascript/form_tabbing.js
-            self.request.response.redirect(aq_parent(aq_inner(context)).absolute_url() + '#' + str(reply_to_comment_id))
\ No newline at end of file