Update data expiration code

- Removed some worthless code that accidentally made it into the
previous commit