remove breaking events code