diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/templates/entities/OrderElementTemplate.java b/navalplanner-business/src/main/java/org/navalplanner/business/templates/entities/OrderElementTemplate.java
index 099bd4bbe..48637490d 100644
--- a/navalplanner-business/src/main/java/org/navalplanner/business/templates/entities/OrderElementTemplate.java
+++ b/navalplanner-business/src/main/java/org/navalplanner/business/templates/entities/OrderElementTemplate.java
@@ -56,10 +56,10 @@ import org.navalplanner.business.orders.entities.SchedulingState;
 import org.navalplanner.business.orders.entities.SchedulingState.ITypeChangedListener;
 import org.navalplanner.business.orders.entities.SchedulingState.Type;
 import org.navalplanner.business.qualityforms.entities.QualityForm;
-import org.navalplanner.business.templates.daos.IOrderElementTemplateDAO;
 import org.navalplanner.business.requirements.entities.CriterionRequirement;
 import org.navalplanner.business.requirements.entities.DirectCriterionRequirement;
 import org.navalplanner.business.requirements.entities.IndirectCriterionRequirement;
+import org.navalplanner.business.templates.daos.IOrderElementTemplateDAO;
 import org.navalplanner.business.trees.ITreeNode;
 
 /**
@@ -270,8 +270,6 @@ public abstract class OrderElementTemplate extends BaseEntity implements
         }
     }
 
-    public abstract OrderElement createElement();
-
     public abstract OrderElement createElement(OrderLineGroup parent);
 
     public SchedulingState getSchedulingState() {
diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/templates/entities/OrderLineGroupTemplate.java b/navalplanner-business/src/main/java/org/navalplanner/business/templates/entities/OrderLineGroupTemplate.java
index b494f66e2..d8cff728f 100644
--- a/navalplanner-business/src/main/java/org/navalplanner/business/templates/entities/OrderLineGroupTemplate.java
+++ b/navalplanner-business/src/main/java/org/navalplanner/business/templates/entities/OrderLineGroupTemplate.java
@@ -260,13 +260,6 @@ public class OrderLineGroupTemplate extends OrderElementTemplate implements
         }
     }
 
-    @Override
-    public OrderLineGroup createElement() {
-        OrderLineGroup orderLineGroup = OrderLineGroup.create();
-        orderLineGroup.initializeTemplate(this);
-        return setupGroupParts(setupSchedulingStateType(orderLineGroup));
-    }
-
     @Override
     public OrderElement createElement(OrderLineGroup parent) {
         OrderLineGroup result = setupSchedulingStateType(OrderLineGroup
diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/templates/entities/OrderLineTemplate.java b/navalplanner-business/src/main/java/org/navalplanner/business/templates/entities/OrderLineTemplate.java
index 0e51d3d61..6c930cf96 100644
--- a/navalplanner-business/src/main/java/org/navalplanner/business/templates/entities/OrderLineTemplate.java
+++ b/navalplanner-business/src/main/java/org/navalplanner/business/templates/entities/OrderLineTemplate.java
@@ -34,8 +34,6 @@ import org.navalplanner.business.orders.entities.HoursGroup;
 import org.navalplanner.business.orders.entities.OrderElement;
 import org.navalplanner.business.orders.entities.OrderLine;
 import org.navalplanner.business.orders.entities.OrderLineGroup;
-import org.navalplanner.business.requirements.entities.CriterionRequirement;
-import org.navalplanner.business.requirements.entities.DirectCriterionRequirement;
 
 /**
  * @author Óscar González Fernández <ogonzalez@igalia.com>
@@ -109,12 +107,6 @@ public class OrderLineTemplate extends OrderElementTemplate {
         return true;
     }
 
-    @Override
-    public OrderLine createElement() {
-        return setupElementParts(setupSchedulingStateType(OrderLine
-                .createOrderLineWithUnfixedPercentage(getWorkHours())));
-    }
-
     @Override
     public OrderElement createElement(OrderLineGroup parent) {
         OrderLine line = setupSchedulingStateType(OrderLine
diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/templates/entities/OrderTemplate.java b/navalplanner-business/src/main/java/org/navalplanner/business/templates/entities/OrderTemplate.java
index 9dd28880e..53dd2a5fe 100644
--- a/navalplanner-business/src/main/java/org/navalplanner/business/templates/entities/OrderTemplate.java
+++ b/navalplanner-business/src/main/java/org/navalplanner/business/templates/entities/OrderTemplate.java
@@ -50,7 +50,7 @@ public class OrderTemplate extends OrderLineGroupTemplate {
         throw new UnsupportedOperationException();
     }
 
-    public Order createElement() {
+    public Order createOrder() {
         Order order = Order.create();
         order.setInitDate(today());
         order.setCalendar(calendar);
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderModel.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderModel.java
index c7447b2be..81c266141 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderModel.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderModel.java
@@ -420,13 +420,13 @@ public class OrderModel implements IOrderModel {
     }
 
     private Order createOrderFrom(OrderTemplate template) {
-        return (Order) createOrderElementFrom(null, template);
+        return template.createOrder();
     }
 
     private OrderElement createOrderElementFrom(OrderLineGroup parent,
             OrderElementTemplate template) {
-        return (parent != null) ? template.createElement(parent) : template
-                .createElement();
+        Validate.notNull(parent);
+        return template.createElement(parent);
     }
 
     private void setDefaultOrderCode() throws ConcurrentModificationException {