removed unnessessary events listeners