removed unecessary events handlers