got rid of ri_cal, recurrence rules, all that