removed non functional event handling