GeneratedOrderForm removal