Fixes cleanup not working with certain recurrence rules