rename and remove click handler