More work on purging of old data.

Change-Id: I341cda3a60e559f566c5e2dabee7e2aa3218973c