Remove extra friendly lookup