diff --git a/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.hotel.search/src/main/java/org/springframework/samples/springtravel/hotel/search/HotelSearchAgent.java b/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.hotel.search/src/main/java/org/springframework/samples/springtravel/hotel/search/HotelSearchAgent.java
index 8880a9fd..017ac867 100644
--- a/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.hotel.search/src/main/java/org/springframework/samples/springtravel/hotel/search/HotelSearchAgent.java
+++ b/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.hotel.search/src/main/java/org/springframework/samples/springtravel/hotel/search/HotelSearchAgent.java
@@ -16,13 +16,4 @@ public interface HotelSearchAgent {
 	 */
 	public List<Hotel> findHotels(SearchCriteria criteria);
 
-	/**
-	 * Find hotels by their identifier.
-	 * 
-	 * @param id
-	 *            the hotel id
-	 * @return the hotel
-	 */
-	public Hotel findHotelById(Long id);
-
 }
diff --git a/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.hotel.search/src/main/java/org/springframework/samples/springtravel/hotel/search/impl/JpaHotelSearchAgent.java b/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.hotel.search/src/main/java/org/springframework/samples/springtravel/hotel/search/impl/JpaHotelSearchAgent.java
index 339b4bf7..cc41997b 100644
--- a/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.hotel.search/src/main/java/org/springframework/samples/springtravel/hotel/search/impl/JpaHotelSearchAgent.java
+++ b/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.hotel.search/src/main/java/org/springframework/samples/springtravel/hotel/search/impl/JpaHotelSearchAgent.java
@@ -43,9 +43,4 @@ public class JpaHotelSearchAgent implements HotelSearchAgent {
 		return hotels;
 	}
 
-	@Transactional(readOnly = true)
-	public Hotel findHotelById(Long id) {
-		return em.find(Hotel.class, id);
-	}
-
 }
\ No newline at end of file
diff --git a/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.resource/src/main/resources/META-INF/spring/module-context.xml b/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.resource/src/main/resources/META-INF/spring/module-context.xml
index 8ce51564..fe89fd05 100644
--- a/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.resource/src/main/resources/META-INF/spring/module-context.xml
+++ b/spring-webflow-samples/spring-travel-platform/org.springframework.samples.springtravel.resource/src/main/resources/META-INF/spring/module-context.xml
@@ -6,9 +6,6 @@
 
 	<!-- Deploys a in-memory "booking" datasource populated; can easily swap out-->
 	<bean id="dataSource" class="org.apache.commons.dbcp.BasicDataSource" destroy-method="close">
-		<description>
-			commons-dbcp based datasource as org.springframework.jdbc.datasource.DriverManagerDataSource is not supported under osgi
-		</description>
 		<property name="driverClassName" value="org.hsqldb.jdbcDriver" />
 		<property name="url" value="jdbc:hsqldb:mem:booking" />
 		<property name="username" value="sa" />