Got rid of useless event