fix: remove event dispatchment