Cleaned out tooltips for merge with development