add ability to parse event links
remove unused method, remove some repetitive code