diff --git a/apps/showcase/quickstart.xml b/apps/showcase/quickstart.xml
index 71357017a..6bb5a9039 100644
--- a/apps/showcase/quickstart.xml
+++ b/apps/showcase/quickstart.xml
@@ -12,7 +12,7 @@
     users who don't have a single directory in their project that
     contains all the libraries they need.
     -->
-    <ideaConfig>../../../xwork/xwork.iml,../../core/struts2-core.iml,../../extras/struts2-extras.iml,struts2-showcase.iml</ideaConfig>
+    <ideaConfig>../../../xwork/xwork.iml,../../core/struts2-core.iml,struts2-showcase.iml</ideaConfig>
 
     <!-- The context in which to deploy the web application -->
     <context>/showcase</context>
@@ -49,7 +49,6 @@
         <dir>src/main/resources</dir>
         <dir>target/classes</dir>
         <dir>../../core/target/classes</dir>
-        <dir>../../extras/target/classes</dir>
     </classDirs>
 
     <!--
diff --git a/apps/showcase/src/main/webapp/integration/modelDriven.jsp b/apps/showcase/src/main/webapp/integration/modelDriven.jsp
index 81f04d2d5..ce7938b59 100644
--- a/apps/showcase/src/main/webapp/integration/modelDriven.jsp
+++ b/apps/showcase/src/main/webapp/integration/modelDriven.jsp
@@ -7,7 +7,7 @@
 </head>
 <body>
 
-<s:form action="saveGangster" method="POST" namespace="/integration">
+<s:form action="saveGangster" namespace="/integration">
     
     <s:textfield 
             label="Gangster Name"
diff --git a/assembly/src/main/assembly/all.xml b/assembly/src/main/assembly/all.xml
index 72d3b9faf..c2a7979a1 100644
--- a/assembly/src/main/assembly/all.xml
+++ b/assembly/src/main/assembly/all.xml
@@ -66,10 +66,6 @@
         <directory>../core/target/site</directory>
         <outputDirectory>docs/struts2-core</outputDirectory>
       </fileSet>
-      <fileSet>
-        <directory>../extras/target/site</directory>
-        <outputDirectory>docs/struts2-extras</outputDirectory>
-      </fileSet>
 
     <!-- Include the source code in the assembly -->
     <fileSet>
diff --git a/core/src/site/site.xml b/core/src/site/site.xml
index 73d4f1030..1c7589d17 100644
--- a/core/src/site/site.xml
+++ b/core/src/site/site.xml
@@ -65,8 +65,8 @@
                     />        
 
             <item
-                    name="Struts Extras API"
-                    href="extras-apidocs/index.html"
+                    name="Struts Plugins API"
+                    href="plugins-apidocs/index.html"
                     />        
 
             <item
diff --git a/core/src/site/xdoc/jxr.xml b/core/src/site/xdoc/jxr.xml
index d4ad547c1..2b6d3edae 100755
--- a/core/src/site/xdoc/jxr.xml
+++ b/core/src/site/xdoc/jxr.xml
@@ -30,9 +30,6 @@ limitations under the License.
             <li>
                <a href="struts-core/jxr.html" target="_blank">
                Struts Core</a></li>
-            <li>
-               <a href="struts-extras/jxr.html" target="_blank">
-               Struts Extras</a></li>
          </ul>
 
        </section>
