removed unnecessary events