removed fixed type Event ...

and changed to calendar_types.