Can we have a better name for our old tip-remove? TIP_REMOVE vs TIP_REMOVE_SEARCH sound not readable!