diff --git a/ofborg/src/bin/builder.rs b/ofborg/src/bin/builder.rs
index 5f964d1..e55bfaa 100644
--- a/ofborg/src/bin/builder.rs
+++ b/ofborg/src/bin/builder.rs
@@ -39,7 +39,6 @@ fn main() {
             auto_delete: false,
             no_wait: false,
             internal: false,
-            arguments: None,
         })
         .unwrap();
 
@@ -52,7 +51,6 @@ fn main() {
                 exclusive: false,
                 auto_delete: false,
                 no_wait: false,
-                arguments: None,
             })
             .unwrap()
             .queue
@@ -67,7 +65,6 @@ fn main() {
                 exclusive: true,
                 auto_delete: true,
                 no_wait: false,
-                arguments: None,
             })
             .unwrap()
             .queue
@@ -79,7 +76,6 @@ fn main() {
             exchange: "build-jobs".to_owned(),
             routing_key: None,
             no_wait: false,
-            arguments: None,
         })
         .unwrap();
 
@@ -98,7 +94,6 @@ fn main() {
                 no_ack: false,
                 no_wait: false,
                 exclusive: false,
-                arguments: None,
             },
         )
         .unwrap();
diff --git a/ofborg/src/bin/evaluation-filter.rs b/ofborg/src/bin/evaluation-filter.rs
index 73415a3..823fc9e 100644
--- a/ofborg/src/bin/evaluation-filter.rs
+++ b/ofborg/src/bin/evaluation-filter.rs
@@ -27,7 +27,6 @@ fn main() {
             auto_delete: false,
             no_wait: false,
             internal: false,
-            arguments: None,
         })
         .unwrap();
 
@@ -39,7 +38,6 @@ fn main() {
             exclusive: false,
             auto_delete: false,
             no_wait: false,
-            arguments: None,
         })
         .unwrap();
 
@@ -51,7 +49,6 @@ fn main() {
             exclusive: false,
             auto_delete: false,
             no_wait: false,
-            arguments: None,
         })
         .unwrap();
 
@@ -61,7 +58,6 @@ fn main() {
             exchange: "github-events".to_owned(),
             routing_key: Some("pull_request.nixos/nixpkgs".to_owned()),
             no_wait: false,
-            arguments: None,
         })
         .unwrap();
 
@@ -78,7 +74,6 @@ fn main() {
                 no_ack: false,
                 no_wait: false,
                 exclusive: false,
-                arguments: None,
             },
         )
         .unwrap();
diff --git a/ofborg/src/bin/github-comment-filter.rs b/ofborg/src/bin/github-comment-filter.rs
index d7d2ebd..2fb2804 100644
--- a/ofborg/src/bin/github-comment-filter.rs
+++ b/ofborg/src/bin/github-comment-filter.rs
@@ -26,7 +26,6 @@ fn main() {
             auto_delete: false,
             no_wait: false,
             internal: false,
-            arguments: None,
         })
         .unwrap();
 
@@ -39,7 +38,6 @@ fn main() {
             auto_delete: false,
             no_wait: false,
             internal: false,
-            arguments: None,
         })
         .unwrap();
 
@@ -51,7 +49,6 @@ fn main() {
             exclusive: false,
             auto_delete: false,
             no_wait: false,
-            arguments: None,
         })
         .unwrap();
 
@@ -61,7 +58,6 @@ fn main() {
             exchange: "github-events".to_owned(),
             routing_key: Some("issue_comment.*".to_owned()),
             no_wait: false,
-            arguments: None,
         })
         .unwrap();
 
@@ -79,7 +75,6 @@ fn main() {
                 no_ack: false,
                 no_wait: false,
                 exclusive: false,
-                arguments: None,
             },
         )
         .unwrap();
diff --git a/ofborg/src/bin/github-comment-poster.rs b/ofborg/src/bin/github-comment-poster.rs
index 3faf332..45bca60 100644
--- a/ofborg/src/bin/github-comment-poster.rs
+++ b/ofborg/src/bin/github-comment-poster.rs
@@ -23,7 +23,6 @@ fn main() {
             auto_delete: false,
             no_wait: false,
             internal: false,
-            arguments: None,
         })
         .unwrap();
 
@@ -35,7 +34,6 @@ fn main() {
             exclusive: false,
             auto_delete: false,
             no_wait: false,
-            arguments: None,
         })
         .unwrap();
 
@@ -45,7 +43,6 @@ fn main() {
             exchange: "build-results".to_owned(),
             routing_key: None,
             no_wait: false,
-            arguments: None,
         })
         .unwrap();
 
@@ -62,7 +59,6 @@ fn main() {
                 no_ack: false,
                 no_wait: false,
                 exclusive: false,
-                arguments: None,
             },
         )
         .unwrap();
diff --git a/ofborg/src/bin/log-message-collector.rs b/ofborg/src/bin/log-message-collector.rs
index 6047240..9ea6616 100644
--- a/ofborg/src/bin/log-message-collector.rs
+++ b/ofborg/src/bin/log-message-collector.rs
@@ -25,7 +25,6 @@ fn main() {
             auto_delete: false,
             no_wait: false,
             internal: false,
-            arguments: None,
         })
         .unwrap();
 
@@ -37,7 +36,6 @@ fn main() {
             exclusive: true,
             auto_delete: true,
             no_wait: false,
-            arguments: None,
         })
         .unwrap()
         .queue;
@@ -48,7 +46,6 @@ fn main() {
             exchange: "logs".to_owned(),
             routing_key: Some("*.*".to_owned()),
             no_wait: false,
-            arguments: None,
         })
         .unwrap();
 
@@ -65,7 +62,6 @@ fn main() {
                 no_ack: false,
                 no_wait: false,
                 exclusive: false,
-                arguments: None,
             },
         )
         .unwrap();
diff --git a/ofborg/src/bin/mass-rebuilder.rs b/ofborg/src/bin/mass-rebuilder.rs
index f074749..7b14ea6 100644
--- a/ofborg/src/bin/mass-rebuilder.rs
+++ b/ofborg/src/bin/mass-rebuilder.rs
@@ -61,7 +61,6 @@ fn main() {
             exclusive: false,
             auto_delete: false,
             no_wait: false,
-            arguments: None,
         })
         .unwrap();
 
@@ -76,7 +75,6 @@ fn main() {
                 no_ack: false,
                 no_wait: false,
                 exclusive: false,
-                arguments: None,
             },
         )
         .unwrap();
diff --git a/ofborg/src/bin/stats.rs b/ofborg/src/bin/stats.rs
index 99bf464..273c08e 100644
--- a/ofborg/src/bin/stats.rs
+++ b/ofborg/src/bin/stats.rs
@@ -35,7 +35,6 @@ fn main() {
             auto_delete: false,
             no_wait: false,
             internal: false,
-            arguments: None,
         })
         .unwrap();
 
@@ -47,7 +46,6 @@ fn main() {
             exclusive: false,
             auto_delete: false,
             no_wait: false,
-            arguments: None,
         })
         .unwrap();
 
@@ -57,7 +55,6 @@ fn main() {
             exchange: "stats".to_owned(),
             routing_key: None,
             no_wait: false,
-            arguments: None,
         })
         .unwrap();
 
@@ -72,7 +69,6 @@ fn main() {
                 no_ack: false,
                 no_wait: false,
                 exclusive: false,
-                arguments: None,
             },
         )
         .unwrap();
diff --git a/ofborg/src/easyamqp.rs b/ofborg/src/easyamqp.rs
index 412d753..02f13a8 100644
--- a/ofborg/src/easyamqp.rs
+++ b/ofborg/src/easyamqp.rs
@@ -41,10 +41,6 @@ pub struct ConsumeConfig {
     /// complete the method it will raise a channel or connection
     /// exception.
     pub no_wait: bool,
-
-    ///  A set of arguments for the consume. The syntax and semantics
-    /// of these arguments depends on the server implementation.
-    pub arguments: Option<amqp::Table>,
 }
 
 pub struct BindQueueConfig {
@@ -88,10 +84,6 @@ pub struct BindQueueConfig {
     /// complete the method it will raise a channel or connection
     /// exception.
     pub no_wait: bool,
-
-    ///  A set of arguments for the binding. The syntax and semantics
-    ///  of these arguments depends on the exchange class.
-    pub arguments: Option<amqp::Table>,
 }
 
 pub enum ExchangeType {
@@ -192,11 +184,6 @@ pub struct ExchangeConfig {
     /// complete the method it will raise a channel or connection
     /// exception.
     pub no_wait: bool,
-
-    /// A set of arguments for the declaration. The syntax and
-    /// semantics of these arguments depends on the server
-    /// implementation.
-    pub arguments: Option<amqp::Table>,
 }
 
 pub struct QueueConfig {
@@ -274,11 +261,6 @@ pub struct QueueConfig {
     /// complete the method it will raise a channel or connection
     /// exception.
     pub no_wait: bool,
-
-    /// A set of arguments for the declaration. The syntax and
-    /// semantics of these arguments depends on the server
-    /// implementation.
-    pub arguments: Option<amqp::Table>,
 }
 
 pub fn session_from_config(config: &RabbitMQConfig) -> Result<amqp::Session, amqp::AMQPError> {
@@ -348,7 +330,7 @@ impl TypedWrappers for amqp::Channel {
             config.no_ack,
             config.exclusive,
             config.no_wait,
-            config.arguments.unwrap_or_else(amqp::Table::new),
+            amqp::Table::new(),
         )
     }
 
@@ -364,7 +346,7 @@ impl TypedWrappers for amqp::Channel {
             config.auto_delete,
             config.internal,
             config.no_wait,
-            config.arguments.unwrap_or_else(amqp::Table::new),
+            amqp::Table::new(),
         )
     }
 
@@ -379,7 +361,7 @@ impl TypedWrappers for amqp::Channel {
             config.exclusive,
             config.auto_delete,
             config.no_wait,
-            config.arguments.unwrap_or_else(amqp::Table::new),
+            amqp::Table::new(),
         )
     }
 
@@ -392,7 +374,7 @@ impl TypedWrappers for amqp::Channel {
             config.exchange,
             config.routing_key.unwrap_or_else(|| "".to_owned()),
             config.no_wait,
-            config.arguments.unwrap_or_else(amqp::Table::new),
+            amqp::Table::new(),
         )
     }
 }