rm unused event
small updates