Simplify, cleanup calendar data transitions