Cleanups for click tooltip