address pr comments; remove ical dependency