Fix routing helper... Add CombinedCalendar link removal to paranoid cleanup callbacks