Remove event-stream dependency