Issue: event node tpl cleanup