[michael] Calendar event cleanup refactor