chore(tooltip,modal): cleanup