discover: Remove unnecessary event passing