Clean up 'guitabtooltip' patch