(#2242) - remove custom events dep