Add 'calendar' attribute to events and remove some bloat