fix unreachable code (tooltip)
more cleanup