diff --git a/spring-data-mongodb-cross-store/pom.xml b/spring-data-mongodb-cross-store/pom.xml
index e0db5fa7e..006da6900 100644
--- a/spring-data-mongodb-cross-store/pom.xml
+++ b/spring-data-mongodb-cross-store/pom.xml
@@ -212,8 +212,8 @@
               <artifactId>spring-data-commons-aspects</artifactId>
             </aspectLibrary> -->
           </aspectLibraries>
-          <source>1.6</source>
-          <target>1.6</target>
+          <source>1.5</source>
+          <target>1.5</target>
         </configuration>
       </plugin>
     </plugins>
diff --git a/spring-data-mongodb-cross-store/src/main/java/org/springframework/data/persistence/document/DocumentBackedTransactionSynchronization.java b/spring-data-mongodb-cross-store/src/main/java/org/springframework/data/persistence/document/DocumentBackedTransactionSynchronization.java
index 4b0f887b5..4cd477100 100644
--- a/spring-data-mongodb-cross-store/src/main/java/org/springframework/data/persistence/document/DocumentBackedTransactionSynchronization.java
+++ b/spring-data-mongodb-cross-store/src/main/java/org/springframework/data/persistence/document/DocumentBackedTransactionSynchronization.java
@@ -23,14 +23,12 @@ public class DocumentBackedTransactionSynchronization implements TransactionSync
 		this.entity = entity;
 	}
 	
-	@Override
 	public void afterCommit() {
 		log.debug("After Commit called for " + entity);
 		changeSetPersister.persistState(entity, entity.getChangeSet());
 		changeSetTxStatus = 0;
 	}
 
-	@Override
 	public void afterCompletion(int status) {
 		log.debug("After Completion called with status = " + status);
 		if (changeSetTxStatus == 0) {
@@ -45,24 +43,19 @@ public class DocumentBackedTransactionSynchronization implements TransactionSync
 		}
 	}
 
-	@Override
 	public void beforeCommit(boolean readOnly) {
 	}
 
-	@Override
 	public void beforeCompletion() {
 	}
 
-	@Override
 	public void flush() {
 	}
 
-	@Override
 	public void resume() {
 		throw new IllegalStateException("ChangedSetBackedTransactionSynchronization does not support transaction suspension currently.");
 	}
 
-	@Override
 	public void suspend() {
 		throw new IllegalStateException("ChangedSetBackedTransactionSynchronization does not support transaction suspension currently.");
 	}
diff --git a/spring-data-mongodb-cross-store/src/main/java/org/springframework/data/persistence/document/mongo/MongoChangeSetPersister.java b/spring-data-mongodb-cross-store/src/main/java/org/springframework/data/persistence/document/mongo/MongoChangeSetPersister.java
index 46038202a..2cdad4a7d 100644
--- a/spring-data-mongodb-cross-store/src/main/java/org/springframework/data/persistence/document/mongo/MongoChangeSetPersister.java
+++ b/spring-data-mongodb-cross-store/src/main/java/org/springframework/data/persistence/document/mongo/MongoChangeSetPersister.java
@@ -43,7 +43,6 @@ public class MongoChangeSetPersister implements ChangeSetPersister<Object> {
   }
 
 
-  @Override
   public void getPersistentState(Class<? extends ChangeSetBacked> entityClass,
       Object id, final ChangeSet changeSet) 
       throws DataAccessException, NotFoundException {
@@ -62,7 +61,6 @@ public class MongoChangeSetPersister implements ChangeSetPersister<Object> {
       log.debug("Loading MongoDB data for " + dbk);
     }
     mongoTemplate.execute(collName, new CollectionCallback<Object>() {
-      @Override
       public Object doInCollection(DBCollection collection)
           throws MongoException, DataAccessException {
         for (DBObject dbo : collection.find(dbk)) {
@@ -90,7 +88,6 @@ public class MongoChangeSetPersister implements ChangeSetPersister<Object> {
     });
   }
 
-  @Override
   public Object getPersistentId(ChangeSetBacked entity, ChangeSet cs) throws DataAccessException {
     log.debug("getPersistentId called on " + entity);
     if (entityManagerFactory == null) {
@@ -100,7 +97,6 @@ public class MongoChangeSetPersister implements ChangeSetPersister<Object> {
     return o;
   }
 
-  @Override
   public Object persistState(ChangeSetBacked entity, ChangeSet cs) throws DataAccessException {
     if (cs == null) {
       log.debug("Flush: changeset was null, nothing to flush.");
@@ -125,7 +121,6 @@ public class MongoChangeSetPersister implements ChangeSetPersister<Object> {
         dbQuery.put(ENTITY_FIELD_NAME, key);
         DBObject dbId = mongoTemplate.execute(collName,
             new CollectionCallback<DBObject>() {
-              @Override
               public DBObject doInCollection(DBCollection collection)
                   throws MongoException, DataAccessException {
                 return collection.findOne(dbQuery);
@@ -136,7 +131,6 @@ public class MongoChangeSetPersister implements ChangeSetPersister<Object> {
             log.debug("Flush: removing: " + dbQuery);
           }
           mongoTemplate.execute(collName, new CollectionCallback<Object>() {
-            @Override
             public Object doInCollection(DBCollection collection)
                 throws MongoException, DataAccessException {
               collection.remove(dbQuery);
@@ -156,7 +150,6 @@ public class MongoChangeSetPersister implements ChangeSetPersister<Object> {
             dbDoc.put("_id", dbId.get("_id"));
           }
           mongoTemplate.execute(collName, new CollectionCallback<Object>() {
-            @Override
             public Object doInCollection(DBCollection collection)
                 throws MongoException, DataAccessException {
               collection.save(dbDoc);