Removed event dispatch function to prevent double event notifications