Fix some brakeman vulnerability reports, more cleanup on CalendarController