Clean up EventType