removed bad event handling