diff --git a/etc/deploy-jndi-config.xml b/etc/deploy-jndi-config.xml
index cc43f76..b356bc7 100755
--- a/etc/deploy-jndi-config.xml
+++ b/etc/deploy-jndi-config.xml
@@ -23,7 +23,7 @@
 		<environment name="registrationURI" value="http://...."
 			type="java.lang.String" override="false" />
 
-		<environment name="resourceExpirationTimeInMillis" value="600000"
+		<environment name="resourceExpirationTimeInMillis" value="240000"
 			type="java.lang.String" override="false" />
 
 		<environment name="deleteRPsOnStartup" value="true"
diff --git a/src/org/gcube/informationsystem/collector/impl/state/ICAggregatorRemoveCallback.java b/src/org/gcube/informationsystem/collector/impl/state/ICAggregatorRemoveCallback.java
index e05405c..8ed7cb6 100755
--- a/src/org/gcube/informationsystem/collector/impl/state/ICAggregatorRemoveCallback.java
+++ b/src/org/gcube/informationsystem/collector/impl/state/ICAggregatorRemoveCallback.java
@@ -58,7 +58,7 @@ public class ICAggregatorRemoveCallback implements AggregatorServiceGroupEntryRe
 
 	// delete the resource from the database
 	try {
-	    State.getDataManager().retrieveAndDeleteResourceFromID(res.getID());
+	    //State.getDataManager().retrieveAndDeleteResourceFromID(res.getID());
 	} catch (Exception e) {
 	    logger.error("Unable to remove resource: " + res.getID(), e);
 	}