Fix for slow delete / expire