#1640: Increase limit. Adjust delete conditions.