diff --git a/modules/src/main/java/org/archive/modules/CrawlURI.java b/modules/src/main/java/org/archive/modules/CrawlURI.java
index 46a935b2..92d2870f 100644
--- a/modules/src/main/java/org/archive/modules/CrawlURI.java
+++ b/modules/src/main/java/org/archive/modules/CrawlURI.java
@@ -31,9 +31,6 @@ import static org.archive.modules.CoreAttributeConstants.A_HTTP_RESPONSE_HEADERS
 import static org.archive.modules.CoreAttributeConstants.A_NONFATAL_ERRORS;
 import static org.archive.modules.CoreAttributeConstants.A_PREREQUISITE_URI;
 import static org.archive.modules.CoreAttributeConstants.A_SOURCE_TAG;
-import static org.archive.modules.CoreAttributeConstants.A_SUBMIT_DATA;
-import static org.archive.modules.CoreAttributeConstants.A_SUBMIT_ENCTYPE;
-import static org.archive.modules.CoreAttributeConstants.A_WARC_RESPONSE_HEADERS;
 import static org.archive.modules.SchedulingConstants.NORMAL;
 import static org.archive.modules.fetcher.FetchStatusCodes.S_BLOCKED_BY_CUSTOM_PROCESSOR;
 import static org.archive.modules.fetcher.FetchStatusCodes.S_BLOCKED_BY_USER;
@@ -76,7 +73,6 @@ import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
-import java.util.concurrent.CopyOnWriteArrayList;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
@@ -248,15 +244,6 @@ implements Reporter, Serializable, OverlayContext, Comparable<CrawlURI> {
      * buggy
      */
     protected long ordinal;
-    
-    /**
-     * Array to hold keys of data members that persist across URI processings.
-     * Any key mentioned in this list will not be cleared out at the end
-     * of a pass down the processing chain.
-     */
-    private static final Collection<String> persistentKeys
-     = new CopyOnWriteArrayList<String>(
-            new String [] {A_CREDENTIALS_KEY, A_HTTP_AUTH_CHALLENGES, A_SUBMIT_DATA, A_WARC_RESPONSE_HEADERS, A_ANNOTATIONS, A_SUBMIT_ENCTYPE});
 
     /** maximum length for pathFromSeed/hopsPath; longer truncated with leading counter **/ 
     private static final int MAX_HOPS_DISPLAYED = 50;
@@ -875,8 +862,6 @@ implements Reporter, Serializable, OverlayContext, Comparable<CrawlURI> {
         this.contentLength = UNCALCULATED;
         // Clear 'links extracted' flag.
         this.linkExtractorFinished = false;
-        // Clean the data map of all but registered permanent members.
-        this.data = getPersistentDataMap();
         
         extraInfo = null;
         outLinks = null;
@@ -886,23 +871,6 @@ implements Reporter, Serializable, OverlayContext, Comparable<CrawlURI> {
         // XXX er uh surprised this wasn't here before?
         fetchType = FetchType.UNKNOWN;
     }
-    
-    public Map<String,Object> getPersistentDataMap() {
-        if (data == null) {
-            return null;
-        }
-        Map<String,Object> result = new HashMap<String,Object>(getData());
-        Set<String> retain = new HashSet<String>(persistentKeys);
-        
-        if (containsDataKey(A_HERITABLE_KEYS)) {
-            @SuppressWarnings("unchecked")
-            HashSet<String> heritable = (HashSet<String>)getData().get(A_HERITABLE_KEYS);
-            retain.addAll(heritable);
-        }
-        
-        result.keySet().retainAll(retain);
-        return result;
-    }
 
     /**
      * @return Credential avatars.  Null if none set.
@@ -1132,39 +1100,6 @@ implements Reporter, Serializable, OverlayContext, Comparable<CrawlURI> {
         }
         return (UURI)getData().get(A_HTML_BASE);
     }
-    
-    public static Collection<String> getPersistentDataKeys() {
-        return persistentKeys;
-    }
-
-    /**
-     * Add the key of  items you want to persist across
-     * processings.
-     * @param s Key to add.
-     */
-    public void addPersistentDataMapKey(String s) {
-        if (!persistentKeys.contains(s)) {
-            addDataPersistentMember(s);
-        }
-    }
-    
-    /**
-     * Add the key of data map items you want to persist across
-     * processings.
-     * @param key Key to add.
-     */
-    public static void addDataPersistentMember(String key) {
-        persistentKeys.add(key);
-    }
-    
-    /**
-     * Remove the key from those data map members persisted. 
-     * @param key Key to remove.
-     * @return True if list contained the element.
-     */
-    public static boolean removeDataPersistentMember(String key) {
-        return persistentKeys.remove(key);
-    }
 
     private void writeObject(ObjectOutputStream stream) throws IOException {
         stream.defaultWriteObject();
@@ -1782,9 +1717,7 @@ implements Reporter, Serializable, OverlayContext, Comparable<CrawlURI> {
         return containsDataKey(A_FORCE_RETIRE) 
          && (Boolean)getData().get(A_FORCE_RETIRE);
     }
-    
-    
-    
+
     protected JSONObject extraInfo;
 
     public JSONObject getExtraInfo() {
diff --git a/modules/src/main/java/org/archive/modules/recrawl/FetchHistoryProcessor.java b/modules/src/main/java/org/archive/modules/recrawl/FetchHistoryProcessor.java
index 7bcd5ccf..889fa05c 100644
--- a/modules/src/main/java/org/archive/modules/recrawl/FetchHistoryProcessor.java
+++ b/modules/src/main/java/org/archive/modules/recrawl/FetchHistoryProcessor.java
@@ -67,7 +67,6 @@ public class FetchHistoryProcessor extends Processor {
     @Override
     protected void innerProcess(CrawlURI puri) throws InterruptedException {
         CrawlURI curi = (CrawlURI) puri;
-        curi.addPersistentDataMapKey(A_FETCH_HISTORY);
         HashMap<String, Object> latestFetch = new HashMap<String, Object>();
 
         // save status
diff --git a/modules/src/main/java/org/archive/modules/recrawl/PersistLogProcessor.java b/modules/src/main/java/org/archive/modules/recrawl/PersistLogProcessor.java
index d03cb5af..f5dada4d 100644
--- a/modules/src/main/java/org/archive/modules/recrawl/PersistLogProcessor.java
+++ b/modules/src/main/java/org/archive/modules/recrawl/PersistLogProcessor.java
@@ -96,7 +96,7 @@ implements Checkpointable, Lifecycle {
     protected void innerProcess(CrawlURI curi) {
         log.writeLine(persistKeyFor(curi), " ", 
                 new String(Base64.encodeBase64(
-                        SerializationUtils.serialize((Serializable)curi.getPersistentDataMap()))));      
+                        SerializationUtils.serialize((Serializable)curi.getData()))));
     }
     
     public void startCheckpoint(Checkpoint checkpointInProgress) {}
diff --git a/modules/src/main/java/org/archive/modules/recrawl/PersistStoreProcessor.java b/modules/src/main/java/org/archive/modules/recrawl/PersistStoreProcessor.java
index 9bb7da92..73468c3b 100644
--- a/modules/src/main/java/org/archive/modules/recrawl/PersistStoreProcessor.java
+++ b/modules/src/main/java/org/archive/modules/recrawl/PersistStoreProcessor.java
@@ -40,7 +40,7 @@ public class PersistStoreProcessor extends PersistOnlineProcessor
     
     @Override
     protected void innerProcess(CrawlURI curi) throws InterruptedException {
-        store.put(persistKeyFor(curi),curi.getPersistentDataMap());
+        store.put(persistKeyFor(curi), curi.getData());
     }
 
     @Override