Removed unused EventStream handler