Get rid of old vCalendar/vComponent code.  Add commented alternative for XML escaping.