Check block files after removing.
Remove data and undo files at the same time, if possible, or the older of them, if they're different.
Merge branch 'autoprune' into testing