Fixed method to remove events when done