Update samples to remove unnecessary event handler