diff --git a/CHANGES.rst b/CHANGES.rst
index b57a225..02f359d 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -4,6 +4,9 @@ Changelog
 2.4.8 (unreleased)
 ------------------
 
+- Remove discussion.css
+  [pbauer]
+
 - Fix reply button not showing up since it uses a hide class which needs
   to be removed instead of a display value
   [ichim-david]
@@ -15,6 +18,7 @@ Changelog
 - Tweak discussions.css styles to better live with plonetheme.barcelonata
   [ichim-david]
 
+
 2.4.6 (2015-09-14)
 ------------------
 
diff --git a/plone/app/discussion/browser/configure.zcml b/plone/app/discussion/browser/configure.zcml
index 45ca2a0..acb6839 100644
--- a/plone/app/discussion/browser/configure.zcml
+++ b/plone/app/discussion/browser/configure.zcml
@@ -144,13 +144,6 @@
         layer="..interfaces.IDiscussionLayer"
         />
 
-    <!-- Resource directory for stylesheets -->
-    <browser:resourceDirectory
-        name="plone.app.discussion.stylesheets"
-        directory="stylesheets"
-        layer="..interfaces.IDiscussionLayer"
-        />
-
     <!-- Control panel -->
     <browser:page
         name="discussion-controlpanel"
diff --git a/plone/app/discussion/browser/stylesheets/discussion.css b/plone/app/discussion/browser/stylesheets/discussion.css
deleted file mode 100644
index b24d119..0000000
--- a/plone/app/discussion/browser/stylesheets/discussion.css
+++ /dev/null
@@ -1,226 +0,0 @@
-/* plone.app.discussion stylesheet */
-
-.discussion .hide {
-    display: none;
-}
-
-
-/* Comments Viewlet
-   -------------------------------------------------------------------------- */
-
-.discussion,
-#commenting {
-    /* Clear "float: left" from "manage portlets" div above the
-       comment viewlet. This will get fixed in the next Plone 4
-       release. */
-    clear: both;
-}
-
-.comment {
-}
-
-.commentImage {
-    float: left;
-    margin-right: 0.5em;
-    height: 3.5em;
-}
-
-.commentImage a:link {
-    /* Override the default bottom border of links in Plone 4. */
-    border: 0px;
-}
-
-.commentImage img {
-
-}
-
-.commentDate {
-    display: block;
-    font-size: 85%;
-    color: #76797C;
-}
-
-.commentBody {
-    clear: both;
-    margin: 1em 0;
-    padding: 1em;
-    overflow: auto;
-    border: 1px solid #ccc;
-}
-
-.commentBody p {
-    float: left;
- }
-
-.discussion .documentByLine {
-    font-weight: normal;
-}
-.commentActions {
-    float: right;
-    text-align: right;
-}
-
-.discussion .discreet {
-    color: #666666;
-    font-size: 85%;
-}
-.loginbutton {
-    margin-bottom: 1.25em;
-}
-
-.commentactionsform {
-    display: inline;
-    margin-left: 6px;
-}
-
-.replyTreeLevel0 {
-    margin-left: 0em;
-}
-.replyTreeLevel1 {
-    margin-left: 1em;
-}
-.replyTreeLevel2 {
-    margin-left: 2em;
-}
-.replyTreeLevel3 {
-    margin-left: 3em;
-}
-.replyTreeLevel4 {
-    margin-left: 4em;
-}
-.replyTreeLevel5 {
-    margin-left: 5em;
-}
-.replyTreeLevel6 {
-    margin-left: 6em;
-}
-.replyTreeLevel7 {
-    margin-left: 7em;
-}
-.replyTreeLevel8 {
-    margin-left: 8em;
-}
-.replyTreeLevel9 {
-    margin-left: 9em;
-}
-.replyTreeLevel10 {
-    margin-left: 10em;
-}
-.defaultuserimg {
-    border: 0;
-}
-
-
-/* Reply Form
-   -------------------------------------------------------------------------- */
-
-.reply fieldset {
-    /* Fix bouncing fieldset when reply form is shown. */
-    margin: 0 !important;
-}
-
-.reply .text-widget {
-    /* Make sure the input fields are always below the label. This sometimes
-     * break when the reply form is copied from the main comment form.
-     */
-    display: block;
-}
-
-.reply-to-comment-button {
-   /* Hide the reply-to-comment button and show it only if Javascript
-    * is enabled. Since the reply functions rely on jQuery.
-    */
-    display: none;
-}
-
-.cancelreplytocomment {
-    /* Hide the cancel button in the comment form, show it only in the reply form
-     * in order to close it.
-     */
-    display: none;
-}
-
-
-/* Moderation View
-   -------------------------------------------------------------------------- */
-
-#bulkactions {
-    text-align: left;
-}
-
-#dobulkaction {
-    margin: 0.3em 0;
-}
-
-.comment-publish-button {
-    float: left;
-    margin-right: 0.5em;
-}
-
-.comment-delete-button {
-    float: left;
-}
-
-#review-comments {
-    margin: 0;
-    width: 100%;
-}
-#review-comments tbody tr {
-    vertical-align: top
-}
-
-#fieldset-moderate-comments {
-    padding: 2em 1em;
-}
-
-/* Discussion Control Panel
-   -------------------------------------------------------------------------- */
-
-.template-discussion-controlpanel .unclickable,
-.template-discussion-settings .unclickable {
-    opacity: 0.6;
-    filter: alpha(opacity = 50);
-}
-
-/* Plone 4 Styles
-   -------------------------------------------------------------------------- */
-
-/* These styles are only applied for Plone 4, since Plone 3.x does
-    not have a .row class for portal-column-content. */
-
-.row #dobulkaction {
-    margin: 0;
-}
-
-.row #commenting .formControls {
-    margin: 0;
-}
-
-.row #commenting textarea,
-.row .discussion textarea {
-    font: 100% Monaco, "Courier New", Courier, monospace;
-    width: 100%;
-}
-
-.row #commenting fieldset,
-.row .discussion fieldset {
-    border: 0.1em solid #329fd7;
-    border-style: solid none none none;
-}
-
-.row #commenting legend,
-.row .discussion legend {
-    padding: 0.5em 0.5em 0.5em 0;
-    font-weight: normal;
-}
-
-.row #commenting label,
-.row .discussion label {
-    font-weight:bold;
-}
-
-/* editing comments */
-
-.overlay-edit-comment textarea {
-    height: 10em;
-}
diff --git a/plone/app/discussion/profiles/default/cssregistry.xml b/plone/app/discussion/profiles/default/cssregistry.xml
deleted file mode 100644
index 6a13601..0000000
--- a/plone/app/discussion/profiles/default/cssregistry.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0"?>
-<object name="portal_css">
- <stylesheet
-     id="++resource++plone.app.discussion.stylesheets/discussion.css"
-     insert-after="forms.css"
-     />
-</object>