Cleanup of tooltip generation