diff --git a/torque/plugin.jelly b/torque/plugin.jelly
index 2dcbb8ff..e2903d82 100644
--- a/torque/plugin.jelly
+++ b/torque/plugin.jelly
@@ -40,7 +40,7 @@
 
          Note: I have no idea why this file is not already processed by the plugin..
       -->
-    <property file="${maven.home}/plugins/maven-torque-plugin-3.1-dev/plugin.properties"/>
+    <property file="${maven.home}/plugins/maven-torque-plugin-3.1/plugin.properties"/>
 
     <!-- Define all of the tasks -->
     <taskdef
@@ -97,9 +97,7 @@
 
     <j:choose>
       <j:when test="${torque.internal.sql.uptodate}">
-        <echo>
-          Schema files have not changed since last generation.
-        </echo>
+        <echo>Schema files have not changed since last generation.</echo>
       </j:when>
       <j:otherwise>
         <attainGoal name="torque:sql-generate"/>
@@ -131,15 +129,6 @@
     name="torque:sql-generate"
     prereqs="torque:init">
 
-    <echo>
-      +------------------------------------------+
-      |                                          |
-      | Generating SQL for YOUR Torque project!  |
-      | Woo hoo!                                 |
-      |                                          |
-      +------------------------------------------+
-    </echo>
-
     <j:choose>
       <j:when test="${torque.useClasspath}">
         <torque-sql
@@ -192,10 +181,8 @@
     prereqs="torque:init, torque:om-check">
 
     <j:choose>
-      <j:when test="torque.internal.om.uptodate">
-        <echo>
-          Schema files have not changed since last generation.
-        </echo>
+      <j:when test="${torque.internal.om.uptodate}">
+        <echo>Schema files have not changed since last generation.</echo>
       </j:when>
       <j:otherwise>
         <attainGoal name="torque:om-generate"/>
@@ -227,15 +214,6 @@
     name="torque:om-generate"
     prereqs="torque:init">
 
-    <echo>
-      +------------------------------------------+
-      |                                          |
-      | Generating Peer-based Object Model for   |
-      | YOUR Torque project! Woo hoo!            |
-      |                                          |
-      +------------------------------------------+
-    </echo>
-
     <j:choose>
       <j:when test="${torque.useClasspath}">
         <torque-data-model
@@ -282,15 +260,6 @@
     description="Generates the DATA DTD for your project"
     prereqs="torque:init">
 
-    <echo>
-      +-----------------------------------------------+
-      |                                               |
-      | Generating Data DTD for YOUR Torque project!  |
-      | Woo hoo!                                      |
-      |                                               |
-      +-----------------------------------------------+
-    </echo>
-
     <torque-data-model
       contextProperties="${torque.contextProperties}"
       controlTemplate="${torque.template.dataDtd}"
@@ -312,15 +281,6 @@
     description="dump data from database into xml file"
     prereqs="torque:init">
 
-    <echo>
-      +-----------------------------------------------+
-      |                                               |
-      | Dumping the data from database into XML       |
-      | Woo hoo!                                      |
-      |                                               |
-      +-----------------------------------------------+
-    </echo>
-
     <torque-data-dump
       contextProperties="${torque.contextProperties}"
       controlTemplate="${torque.template.dataDump}"
@@ -347,15 +307,6 @@
     description="generates sql from data xml"
     prereqs="torque:init">
 
-    <echo>
-      +-----------------------------------------------+
-      |                                               |
-      | Generating SQL from data XML !                |
-      | Woo hoo!                                      |
-      |                                               |
-      +-----------------------------------------------+
-    </echo>
-
     <torque-data-sql
       contextProperties="${torque.contextProperties}"
       controlTemplate="${torque.template.dataSql}"
@@ -439,15 +390,6 @@
     description="Generates documentation for your datamodel"
     prereqs="torque:init">
 
-    <echo>
-      +------------------------------------------+
-      |                                          |
-      | Generating docs for YOUR datamodel!      |
-      | Woo hoo!                                 |
-      |                                          |
-      +------------------------------------------+
-    </echo>
-
     <torque-doc
       contextProperties="${torque.contextProperties}"
       controlTemplate="${torque.template.doc}"
@@ -474,15 +416,6 @@
     description="jdbc to xml"
     prereqs="torquwe:init">
 
-    <echo>
-      +-----------------------------------------------+
-      |                                               |
-      | Generating XML from JDBC connection !         |
-      | Woo hoo!                                      |
-      |                                               |
-      +-----------------------------------------------+
-    </echo>
-
     <torque-jdbc-transform
       dbDriver="${torque.database.driver}"
       dbPassword="${torque.database.password}"
@@ -526,15 +459,6 @@
     description="generates initialization sql for ID Broker"
     prereqs="torque:init">
 
-    <echo>
-      +------------------------------------------+
-      |                                          |
-      | Generating initialization SQL            |
-      | for ID Broker system!                    |
-      |                                          |
-      +------------------------------------------+
-    </echo>
-
     <torque-sql
       contextProperties="${torque.contextProperties}"
       controlTemplate="${torque.template.idTable}"
@@ -585,15 +509,6 @@
     prereqs="check-om-zip"
     description="Moves source om files to separate jar and out of the source tree">
 
-    <echo>
-      +------------------------------------------+
-      |                                          |
-      | Zipping the Object Model files for YOUR  |
-      | Torque project! Woo hoo!                 |
-      |                                          |
-      +------------------------------------------+
-    </echo>
-
     <!-- Perform the package to path converison. -->
     <torque-package-to-path
       name="torque.internal.omzip.packagePath"
@@ -715,14 +630,6 @@
     description="Generates the repository for ojb (experimental)"
     prereqs="torque:init">
 
-    <echo>
-      +------------------------------------------+
-      |                                          |
-      | Generating OJB repository                |
-      |                                          |
-      +------------------------------------------+
-    </echo>
-
     <torque-data-model
       contextProperties="${torque.contextProperties}"
       controlTemplate="${torque.template.ojb}"
@@ -746,14 +653,6 @@
     description="Generates an object model for ojb (experimental)"
     prereqs="torque:init">
 
-    <echo>
-      +------------------------------------------+
-      |                                          |
-      | Generating OJB model                     |
-      |                                          |
-      +------------------------------------------+
-    </echo>
-
     <torque-data-model
       contextProperties="${torque.contextProperties}"
       controlTemplate="${torque.template.ojbModel}"