Change some events and remove entity target event