framework: remove useless lines and add event types