removed event listening code