Remove legacy custom event implementation