remove generic object, use orderId for complex id of the object