optimize and rename removeEvent