Add mouseEventData to mouse handler as param and remove commented code