Fix target removal