tooltips code cleanup (removed commented code)