diff --git a/spring-integration-samples/cafe/src/main/java/org/springframework/integration/samples/cafe/xml/DrinkRouter.java b/spring-integration-samples/cafe/src/main/java/org/springframework/integration/samples/cafe/xml/DrinkRouter.java
deleted file mode 100644
index 1d699b4bb5..0000000000
--- a/spring-integration-samples/cafe/src/main/java/org/springframework/integration/samples/cafe/xml/DrinkRouter.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Copyright 2002-2008 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.integration.samples.cafe.xml;
-
-import org.springframework.integration.samples.cafe.OrderItem;
-
-/**
- * @author Mark Fisher
- */
-public class DrinkRouter {
-
-	public String resolveOrderItemChannel(OrderItem orderItem) {
-		return (orderItem.isIced()) ? "coldDrinks" : "hotDrinks";
-	}
-
-}
diff --git a/spring-integration-samples/cafe/src/main/java/org/springframework/integration/samples/cafe/xml/OrderSplitter.java b/spring-integration-samples/cafe/src/main/java/org/springframework/integration/samples/cafe/xml/OrderSplitter.java
deleted file mode 100644
index 2ccd60b9b1..0000000000
--- a/spring-integration-samples/cafe/src/main/java/org/springframework/integration/samples/cafe/xml/OrderSplitter.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Copyright 2002-2008 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.integration.samples.cafe.xml;
-
-import java.util.List;
-
-import org.springframework.integration.samples.cafe.Order;
-import org.springframework.integration.samples.cafe.OrderItem;
-
-/**
- * @author Mark Fisher
- */
-public class OrderSplitter {
-
-	public List<OrderItem> split(Order order) {
-		return order.getItems();
-	}
-
-}
diff --git a/spring-integration-samples/cafe/src/main/java/org/springframework/integration/samples/cafe/xml/cafeDemo.xml b/spring-integration-samples/cafe/src/main/java/org/springframework/integration/samples/cafe/xml/cafeDemo.xml
index fa2e904413..614d6d2895 100644
--- a/spring-integration-samples/cafe/src/main/java/org/springframework/integration/samples/cafe/xml/cafeDemo.xml
+++ b/spring-integration-samples/cafe/src/main/java/org/springframework/integration/samples/cafe/xml/cafeDemo.xml
@@ -13,14 +13,10 @@
 	<gateway id="cafe" service-interface="org.springframework.integration.samples.cafe.Cafe"/>
 
 	<channel id="orders"/>
-	<splitter input-channel="orders" method="split" output-channel="drinks">
-		<beans:bean class="org.springframework.integration.samples.cafe.xml.OrderSplitter"/>
-	</splitter>
+	<splitter input-channel="orders" expression="payload.items" output-channel="drinks"/>
 
 	<channel id="drinks"/>
-	<router input-channel="drinks"  method="resolveOrderItemChannel">
-		<beans:bean class="org.springframework.integration.samples.cafe.xml.DrinkRouter"/>
-	</router>
+	<router input-channel="drinks"  expression="payload.iced ? 'coldDrinks' : 'hotDrinks'"/>
 
 	<channel id="coldDrinks">
 		<queue capacity="10"/>