Re-work retention management.

Ah, testing....