diff --git a/helloworld/src/main/java/org/springframework/amqp/helloworld/ConsumerConfiguration.java b/helloworld/src/main/java/org/springframework/amqp/helloworld/ConsumerConfiguration.java
index 65dfa94..30e41d4 100644
--- a/helloworld/src/main/java/org/springframework/amqp/helloworld/ConsumerConfiguration.java
+++ b/helloworld/src/main/java/org/springframework/amqp/helloworld/ConsumerConfiguration.java
@@ -12,7 +12,7 @@ public class ConsumerConfiguration extends RabbitConfiguration {
 	public SimpleMessageListenerContainer listenerContainer() {
 		SimpleMessageListenerContainer container = new SimpleMessageListenerContainer();
 		container.setConnectionFactory(connectionFactory());
-		container.setQueueName(helloWorldQueue.getName());
+		container.setQueueName(this.helloWorldQueueName);
 		container.setMessageListener(new MessageListenerAdapter(new HelloWorldHandler()));
 		return container;
 	}
diff --git a/helloworld/src/main/java/org/springframework/amqp/helloworld/RabbitConfiguration.java b/helloworld/src/main/java/org/springframework/amqp/helloworld/RabbitConfiguration.java
index c0f5d6d..89abccb 100644
--- a/helloworld/src/main/java/org/springframework/amqp/helloworld/RabbitConfiguration.java
+++ b/helloworld/src/main/java/org/springframework/amqp/helloworld/RabbitConfiguration.java
@@ -1,20 +1,17 @@
 package org.springframework.amqp.helloworld;
 
-import javax.annotation.PostConstruct;
-
 import org.springframework.amqp.core.Queue;
 import org.springframework.amqp.rabbit.config.AbstractRabbitConfiguration;
 import org.springframework.amqp.rabbit.connection.CachingConnectionFactory;
 import org.springframework.amqp.rabbit.connection.ConnectionFactory;
 import org.springframework.amqp.rabbit.core.RabbitTemplate;
-
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
 @Configuration
 public class RabbitConfiguration extends AbstractRabbitConfiguration {
 
-	protected Queue helloWorldQueue = new Queue("hello.world.queue");
+	protected final String helloWorldQueueName = "hello.world.queue";
 	
 	@Bean
 	public ConnectionFactory connectionFactory() {
@@ -28,24 +25,16 @@ public class RabbitConfiguration extends AbstractRabbitConfiguration {
 	public RabbitTemplate rabbitTemplate() {
 		RabbitTemplate template = new RabbitTemplate(connectionFactory());
 		//The routing key is set to the name of the queue by the broker for the default exchange.
-		template.setRoutingKey(helloWorldQueue.getName());
+		template.setRoutingKey(this.helloWorldQueueName);
 		//Where we will synchronously receive messages from
-		template.setQueue(helloWorldQueue.getName());
+		template.setQueue(this.helloWorldQueueName);
 		return template;
 	}
-	
-	@PostConstruct
-	@SuppressWarnings("unused")
-	private void configureBroker() {
-		declare(helloWorldQueue);
-	}
-	
-	/*
+
 	@Bean
-	public Queue helloWorldQueue()
-	{
-		return declare(helloWorldQueue);
-	}*/
+	public Queue helloWorldQueue() {
+		return new Queue(this.helloWorldQueueName);
+	}
 
 	/*
 	//Each queue is bound to the default direct exchange
diff --git a/stocks/src/main/java/org/springframework/amqp/rabbit/stocks/config/AbstractStockAppRabbitConfiguration.java b/stocks/src/main/java/org/springframework/amqp/rabbit/stocks/config/AbstractStockAppRabbitConfiguration.java
index e49b077..3ca0ff1 100644
--- a/stocks/src/main/java/org/springframework/amqp/rabbit/stocks/config/AbstractStockAppRabbitConfiguration.java
+++ b/stocks/src/main/java/org/springframework/amqp/rabbit/stocks/config/AbstractStockAppRabbitConfiguration.java
@@ -52,8 +52,6 @@ public abstract class AbstractStockAppRabbitConfiguration extends AbstractRabbit
 	 */
 	protected static String STOCK_REQUEST_ROUTING_KEY = STOCK_REQUEST_QUEUE_NAME;
 	
-	//protected static TopicExchange MARKET_DATA_EXCHANGE = new TopicExchange(MARKET_DATA_EXCHANGE_NAME);
-
 
 	protected abstract void configureRabbitTemplate(RabbitTemplate template);
 
@@ -80,19 +78,9 @@ public abstract class AbstractStockAppRabbitConfiguration extends AbstractRabbit
 		return new JsonMessageConverter();
 	}
 	
-	
-//	@PostConstruct
-//	public void declareExchange()
-//	{
-//		declare(this.MARKET_DATA_EXCHANGE);
-//	}
-	
-	
 	@Bean
 	public TopicExchange marketDataExchange() {
-		return declare(new TopicExchange(MARKET_DATA_EXCHANGE_NAME));
+		return new TopicExchange(MARKET_DATA_EXCHANGE_NAME);
 	}
-	
-
 
 }
diff --git a/stocks/src/main/java/org/springframework/amqp/rabbit/stocks/config/client/RabbitClientConfiguration.java b/stocks/src/main/java/org/springframework/amqp/rabbit/stocks/config/client/RabbitClientConfiguration.java
index 9b89dd7..e0b45a1 100644
--- a/stocks/src/main/java/org/springframework/amqp/rabbit/stocks/config/client/RabbitClientConfiguration.java
+++ b/stocks/src/main/java/org/springframework/amqp/rabbit/stocks/config/client/RabbitClientConfiguration.java
@@ -114,7 +114,7 @@ public class RabbitClientConfiguration extends AbstractStockAppRabbitConfigurati
 	 */	
 	@Bean
 	public Binding marketDataBinding() {
-		return declare(new Binding(marketDataQueue(), marketDataExchange(), marketDataRoutingKey));
+		return new Binding(marketDataQueue(), marketDataExchange(), marketDataRoutingKey);
 	
 		// Using BindingBuilder
 		//return declareBinding(from(marketDataQueue()).to(marketDataExchange()).with(marketDataRoutingKey));
@@ -128,5 +128,4 @@ public class RabbitClientConfiguration extends AbstractStockAppRabbitConfigurati
 		return randomNameQueueDefinition();		
 	}
 
-
 }
diff --git a/stocks/src/main/java/org/springframework/amqp/rabbit/stocks/config/server/RabbitServerConfiguration.java b/stocks/src/main/java/org/springframework/amqp/rabbit/stocks/config/server/RabbitServerConfiguration.java
index 3de9745..6201ce1 100644
--- a/stocks/src/main/java/org/springframework/amqp/rabbit/stocks/config/server/RabbitServerConfiguration.java
+++ b/stocks/src/main/java/org/springframework/amqp/rabbit/stocks/config/server/RabbitServerConfiguration.java
@@ -45,9 +45,7 @@ public class RabbitServerConfiguration extends AbstractStockAppRabbitConfigurati
 	 */
 	@Bean
 	public Queue stockRequestQueue() {		
-		return declare(new Queue(STOCK_REQUEST_QUEUE_NAME));	
+		return new Queue(STOCK_REQUEST_QUEUE_NAME);	
 	}
-	
-	
 
 }