Added reaper for old keys

Merge that purge.