Remove tooltips
Add extra conditionals