We should keep it for match play so it's more fair for the other player. But I think it should be removed when playing alone.
Thanks
Rob