Cleaning up some of the event calendar stuff