Stop highlighting Entity

[feefladder]

So I have something I want to be pickable, but later on I want it to stop being pickable. Here is the minimal code example, a cube that stops being pickable, quite like:

//! A minimal example of how to add picking support to your bevy app.

use bevy::prelude::*;
use bevy_mod_picking::prelude::*;
use highlight::InitialHighlight;

#[derive(Event)]
pub struct UnpickEvent(Entity);

impl From<ListenerInput<Pointer<Click>>> for UnpickEvent {
    fn from(value: ListenerInput<Pointer<Click>>) -> Self {
        UnpickEvent(value.target)
    }
}

fn main() {
    App::new()
        .add_plugins(DefaultPlugins.set(low_latency_window_plugin()))
        // All you need to do is add the picking plugin, with your backend of choice enabled in the
        // cargo features. By default, the bevy_mod_raycast backend is enabled via the
        // `backend_raycast` feature.
        .add_plugins(DefaultPickingPlugins)
        .insert_resource(DebugPickingMode::Normal)
        .add_systems(Startup, setup)
        .add_event::<UnpickEvent>()
        .add_systems(Update, handle_clicks.run_if(on_event::<UnpickEvent>()))
        .run();
}

fn setup(
    mut commands: Commands,
    mut meshes: ResMut<Assets<Mesh>>,
    mut materials: ResMut<Assets<StandardMaterial>>,
) {
    commands.spawn((
        PbrBundle {
            mesh: meshes.add(Cuboid::default()),
            material: materials.add(Color::srgb(0.8, 0.7, 0.6)),
            transform: Transform::from_xyz(0.0, 0.5, 0.0),
            ..default()
        },
        // PickHighlight::default(),
        On::<Pointer<Click>>::send_event::<UnpickEvent>(),
    ));

    // display
    commands.spawn(PointLightBundle {
        point_light: PointLight {
            shadows_enabled: true,
            ..default()
        },
        transform: Transform::from_xyz(4.0, 8.0, -4.0),
        ..default()
    });
    commands.spawn((Camera3dBundle {
        transform: Transform::from_xyz(3.0, 3.0, 3.0).looking_at(Vec3::ZERO, Vec3::Y),
        ..default()
    },));
}



fn handle_clicks(mut commands: Commands, world: &World, mut ev_unpick: EventReader<UnpickEvent>) {
    for unpick in ev_unpick.read() {
        info!("{:#?}", world.inspect_entity(unpick.0));
        let mut tg_commands = commands.entity(unpick.0);
        // What magic to do here so it stops highlighting?
        tg_commands.remove::<On::<Pointer<Click>>>(); // this stops the event firing, but still highlights on hover etc.
        // tg_commands.remove::<PickHighlight>();
        // tg_commands.remove::<PickingInteraction>();
        // tg_commands.remove::<InitialHighlight<StandardMaterial>>();
    }
}