foo

Change-Id: Ie10713c79fd793b52da23cde2a1e15c34507337c
More work on purging of old data.

Change-Id: I207b63c835e4e3bda7c4166a032792db19b587e5