diff --git a/flow/src/org/labkey/flow/controllers/compensation/showCompensation.jsp b/flow/src/org/labkey/flow/controllers/compensation/showCompensation.jsp
index a4d1c37fc..a8e0ef9de 100644
--- a/flow/src/org/labkey/flow/controllers/compensation/showCompensation.jsp
+++ b/flow/src/org/labkey/flow/controllers/compensation/showCompensation.jsp
@@ -15,7 +15,6 @@
  * limitations under the License.
  */
 %>
-<%@ page import="org.labkey.api.announcements.DiscussionService" %>
 <%@ page import="org.labkey.api.security.permissions.UpdatePermission" %>
 <%@ page import="org.labkey.api.util.HtmlString" %>
 <%@ page import="org.labkey.api.view.ActionURL" %>
@@ -25,10 +24,10 @@
 <%@ page import="org.labkey.flow.controllers.FlowParam" %>
 <%@ page import="org.labkey.flow.controllers.well.WellController" %>
 <%@ page import="org.labkey.flow.data.FlowCompensationMatrix" %>
-<%@ page import="org.labkey.flow.data.FlowDataType"%>
+<%@ page import="org.labkey.flow.data.FlowDataType" %>
 <%@ page import="org.labkey.flow.data.FlowRun"%>
 <%@ page import="org.labkey.flow.data.FlowWell"%>
-<%@ page import="org.labkey.flow.view.SetCommentView" %>
+<%@ page import="org.labkey.flow.view.SetCommentView"%>
 <%@ page import="org.labkey.flow.view.SetGraphSizeView" %>
 <%@ page import="java.text.DecimalFormat" %>
 <%@ page import="java.util.HashMap" %>
@@ -192,17 +191,3 @@
 </table>
 <% } %>
 <%=link("Download", flowComp.urlDownload()).nofollow()%><br>
-<%
-    DiscussionService service = DiscussionService.get();
-    if (service != null)
-    {
-        DiscussionService.DiscussionView discussion = service.getDiscussionArea(
-                getViewContext(),
-                flowComp.getLSID(),
-                flowComp.urlShow(),
-                "Discussion of " + flowComp.getLabel(),
-                false, true);
-        if (discussion != null)
-            include(discussion, out);
-    }
-%>
diff --git a/flow/src/org/labkey/flow/controllers/executescript/showScript.jsp b/flow/src/org/labkey/flow/controllers/executescript/showScript.jsp
index b54f1bf33..15dde7fe1 100644
--- a/flow/src/org/labkey/flow/controllers/executescript/showScript.jsp
+++ b/flow/src/org/labkey/flow/controllers/executescript/showScript.jsp
@@ -16,7 +16,6 @@
  */
 %>
 <%@ page import="org.labkey.api.action.NullSafeBindException" %>
-<%@ page import="org.labkey.api.announcements.DiscussionService" %>
 <%@ page import="org.labkey.api.data.CompareType" %>
 <%@ page import="org.labkey.api.data.Table" %>
 <%@ page import="org.labkey.api.query.FieldKey" %>
@@ -92,19 +91,3 @@ The analysis section describes which gates in the analysis, as well as the stati
     }
 } %>
 </div>
-
-<%
-    DiscussionService service = DiscussionService.get();
-    if (service != null)
-    {
-        DiscussionService.DiscussionView discussion = service.getDiscussionArea(
-                context,
-                script.getLSID(),
-                script.urlShow(),
-                "Discussion of " + script.getLabel(),
-                false, true);
-        if (discussion != null)
-            include(discussion, out);
-    }
-%>
-
diff --git a/flow/src/org/labkey/flow/controllers/run/showRun.jsp b/flow/src/org/labkey/flow/controllers/run/showRun.jsp
index a50cecd9a..000d29682 100644
--- a/flow/src/org/labkey/flow/controllers/run/showRun.jsp
+++ b/flow/src/org/labkey/flow/controllers/run/showRun.jsp
@@ -16,11 +16,10 @@
  */
 %>
 <%@ page buffer="none" %>
-<%@ page import="org.labkey.api.announcements.DiscussionService" %>
-<%@ page import="org.labkey.api.attachments.Attachment"%>
+<%@ page import="org.labkey.api.attachments.Attachment" %>
 <%@ page import="org.labkey.api.data.Container"%>
 <%@ page import="org.labkey.api.data.ContainerManager"%>
-<%@ page import="org.labkey.api.exp.api.ExperimentUrls" %>
+<%@ page import="org.labkey.api.exp.api.ExperimentUrls"%>
 <%@ page import="org.labkey.api.portal.ProjectUrls" %>
 <%@ page import="org.labkey.api.security.User" %>
 <%@ page import="org.labkey.api.security.permissions.UpdatePermission" %>
@@ -38,7 +37,6 @@
 <%@ page import="org.labkey.flow.data.FlowRun" %>
 <%@ page import="org.labkey.flow.view.FlowQueryView" %>
 <%@ page import="org.labkey.flow.view.SetCommentView" %>
-<%@ page import="java.util.Map" %>
 <%@ page extends="org.labkey.api.jsp.JspBase" %>
 <%@ taglib prefix="labkey" uri="http://www.labkey.org/taglib" %>
 <%!
@@ -115,25 +113,11 @@
         %><%=link("Download Analysis zip", run.urlFor(RunController.ExportAnalysis.class).addParameter("selectionType", "runs")).nofollow()%><br><%
     }
 
-
     for (Attachment a : run.getAttachments())
     {
         %><div>
         <a href="<%=h(run.getAttachmentDownloadURL(a))%>"><i class="<%=h(Attachment.getFileIconFontCls(a.getName()))%>"></i> <%=h(a.getName())%></a>
         </div><%
     }
-
-    DiscussionService service = DiscussionService.get();
-    if (service != null)
-    {
-        DiscussionService.DiscussionView discussion = service.getDiscussionArea(
-                getViewContext(),
-                run.getLSID(),
-                run.urlShow(),
-                "Discussion of " + run.getLabel(),
-                false, true);
-        if (discussion != null)
-            include(discussion, out);
-    }
 %>
 </p>
diff --git a/flow/src/org/labkey/flow/controllers/well/showWell.jsp b/flow/src/org/labkey/flow/controllers/well/showWell.jsp
index f64f73fd1..b8b8cd348 100644
--- a/flow/src/org/labkey/flow/controllers/well/showWell.jsp
+++ b/flow/src/org/labkey/flow/controllers/well/showWell.jsp
@@ -15,7 +15,6 @@
  * limitations under the License.
  */
 %>
-<%@ page import="org.labkey.api.announcements.DiscussionService" %>
 <%@ page import="org.labkey.api.exp.OntologyManager" %>
 <%@ page import="org.labkey.api.exp.api.ExpMaterial" %>
 <%@ page import="org.labkey.api.exp.api.ExperimentUrls" %>
@@ -26,7 +25,8 @@
 <%@ page import="org.labkey.api.security.User" %>
 <%@ page import="org.labkey.api.security.permissions.ReadPermission" %>
 <%@ page import="org.labkey.api.security.permissions.UpdatePermission" %>
-<%@ page import="org.labkey.api.util.DateUtil"%>
+<%@ page import="org.labkey.api.util.DateUtil" %>
+<%@ page import="org.labkey.api.util.JavaScriptFragment"%>
 <%@ page import="org.labkey.api.util.PageFlowUtil" %>
 <%@ page import="org.labkey.api.util.Tuple3" %>
 <%@ page import="org.labkey.api.util.URIUtil" %>
@@ -58,7 +58,6 @@
 <%@ page import="java.util.Map" %>
 <%@ page import="java.util.regex.Matcher" %>
 <%@ page import="java.util.regex.Pattern" %>
-<%@ page import="org.labkey.api.util.JavaScriptFragment" %>
 <%@ page extends="org.labkey.flow.controllers.well.WellController.Page" %>
 <%@ taglib prefix="labkey" uri="http://www.labkey.org/taglib" %>
 <%!
@@ -592,22 +591,7 @@ if (getRun() != null)
     %><%=link("Experiment Run Graph Details", urlProvider(ExperimentUrls.class).getRunGraphDetailURL(getRun().getExperimentRun(), well.getData()))%><br><%
 }
 
-%></p><%
-
-    DiscussionService service = DiscussionService.get();
-    if (service != null)
-    {
-        DiscussionService.DiscussionView discussion = service.getDiscussionArea(
-                getViewContext(),
-                well.getLSID(),
-                well.urlShow(),
-                "Discussion of " + well.getLabel(),
-                false, true);
-        if (discussion != null)
-            include(discussion, out);
-    }
-%>
-
+%></p>
 
 <%!
 boolean canReadPipelineFiles(User user, PipeRoot root)