Remove unnecessary event handler removal