Remove event references from parser class