diff --git a/acmeair-services-wxs/src/main/resources/objectgrid.xml b/acmeair-services-wxs/src/main/resources/objectgrid.xml
index b3392b85..d5d7a09f 100644
--- a/acmeair-services-wxs/src/main/resources/objectgrid.xml
+++ b/acmeair-services-wxs/src/main/resources/objectgrid.xml
@@ -13,18 +13,19 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 **************************************************************************** -->
+<?xml version="1.0" encoding="UTF-8"?>
 <objectGridConfig xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
  xsi:schemaLocation="http://ibm.com/ws/objectgrid/config ../objectGrid.xsd"
  xmlns="http://ibm.com/ws/objectgrid/config">
 
     <objectGrids>
         <objectGrid name="AcmeGrid">
-            <backingMap name="AirportCodeMapping" copyMode="COPY_TO_BYTES" pluginCollectionRef="AirportCodeMappingPlugins"/>
-            <backingMap name="Booking" copyMode="COPY_TO_BYTES" pluginCollectionRef="BookingPlugins"/>
-            <backingMap name="Customer" copyMode="COPY_TO_BYTES" pluginCollectionRef="CustomerPlugins"/>
-            <backingMap name="CustomerSession" copyMode="COPY_TO_BYTES" pluginCollectionRef="CustomerSessionPlugins"/>
-            <backingMap name="Flight" copyMode="COPY_TO_BYTES" pluginCollectionRef="FlightPlugins"/>
-            <backingMap name="FlightSegment" copyMode="COPY_TO_BYTES" pluginCollectionRef="FlightSegmentPlugins"/>
+            <backingMap name="AirportCodeMapping" copyMode="COPY_TO_BYTES" />
+            <backingMap name="Booking" copyMode="COPY_TO_BYTES" />
+            <backingMap name="Customer" copyMode="COPY_TO_BYTES" />
+            <backingMap name="CustomerSession" copyMode="COPY_TO_BYTES" />
+            <backingMap name="Flight" copyMode="COPY_TO_BYTES" />
+            <backingMap name="FlightSegment" copyMode="COPY_TO_BYTES" />
             
 	        <querySchema>
 				<mapSchemas>
@@ -38,60 +39,4 @@
 			</querySchema>	
         </objectGrid>
     </objectGrids>
-
-	<backingMapPluginCollections>
-		<backingMapPluginCollection id="AirportCodeMappingPlugins">
-		    <!-- There is no such need as there is no findByAirportName defined --> 
-			<!--bean id="MapIndexPlugin" className="com.ibm.websphere.objectgrid.plugins.index.HashIndex">
-				<property name="Name" type="java.lang.String" value="AirportCodeMapping_airportName" />
-				<property name="AttributeName" type="java.lang.String" value="airportName" />
-			</bean-->
-		</backingMapPluginCollection>
-		<backingMapPluginCollection id="BookingPlugins">
-		    <!-- To support findByCustomerId(String customerId); --> 
-			<bean id="MapIndexPlugin" className="com.ibm.websphere.objectgrid.plugins.index.HashIndex">
-				<property name="Name" type="java.lang.String" value="Booking_customerId" />
-				<property name="AttributeName" type="java.lang.String" value="customerId" />
-			</bean>
-		</backingMapPluginCollection>
-		<backingMapPluginCollection id="CustomerPlugins">
-		    <!-- There is no such need as there is no findByStatus defined --> 
-			<!--bean id="MapIndexPlugin" className="com.ibm.websphere.objectgrid.plugins.index.HashIndex">
-				<property name="Name" type="java.lang.String" value="Customer_status" />
-				<property name="AttributeName" type="java.lang.String" value="status" />
-			</bean-->
-		</backingMapPluginCollection>
-		<backingMapPluginCollection id="CustomerSessionPlugins">
-		    <!-- To support findByCustomerId(String customerId); The method is not used any more--> 
-			<!--bean id="MapIndexPlugin" className="com.ibm.websphere.objectgrid.plugins.index.HashIndex">
-				<property name="Name" type="java.lang.String" value="CustomerSession_customerId" />
-				<property name="AttributeName" type="java.lang.String" value="customerid" />
-			</bean-->
-		</backingMapPluginCollection>
-		<backingMapPluginCollection id="FlightPlugins">
-		    <!-- To support findByFlightSegmentIdAndScheduledDepartureTime(String flightSegmentId, Date scheduledDepartureDate); --> 
-			<bean id="MapIndexPlugin" className="com.ibm.websphere.objectgrid.plugins.index.HashIndex">
-				<property name="Name" type="java.lang.String" value="Flight_flightSegmentIdAndScheduledDepartureTime" />
-				<property name="AttributeName" type="java.lang.String" value="scheduledDepartureTime,flightSegmentId" />
-			</bean>
-		</backingMapPluginCollection>
-		<backingMapPluginCollection id="FlightSegmentPlugins">
-		    <!-- To support findByDestPort(String destPort) --> 
-			<!--bean id="MapIndexPlugin" className="com.ibm.websphere.objectgrid.plugins.index.HashIndex">
-				<property name="Name" type="java.lang.String" value="FlightSegment_destPort" />
-				<property name="AttributeName" type="java.lang.String" value="destPort" />
-			</bean-->
-		    <!-- To support findByOriginPort(String originPort) --> 
-			<bean id="MapIndexPlugin" className="com.ibm.websphere.objectgrid.plugins.index.HashIndex">
-				<property name="Name" type="java.lang.String" value="FlightSegment_originPort" />
-				<property name="AttributeName" type="java.lang.String" value="originPort" />
-			</bean>
-		    <!-- To support findByOriginPortAndDestPort(String originPort, String destPort) --> 
-			<bean id="MapIndexPlugin" className="com.ibm.websphere.objectgrid.plugins.index.HashIndex">
-				<property name="Name" type="java.lang.String" value="FlightSegment_originPortAndDestPort" />
-				<property name="AttributeName" type="java.lang.String" value="destPort,originPort" />
-			</bean>
-		</backingMapPluginCollection>
-	</backingMapPluginCollections>
- 
 </objectGridConfig>