That might be true from a story point of view but the real world reason played a bigger part. They started putting John under a balaclava more and more in later seasons so a stunt actor could do the part.

The reason was Jim Caivezel often went over zealous and started hurting the crew while doing action scenes. This is not even half of it.

There is a podcast that detailed all the happened behind the scenes.

There is a very good reason why John’s screen time was reduced. The reason is that Jim Caivezel was often a gigantic asshole on set and a hazard to boot.

I was quite sorry to hear about this afterwards.

That Morocco scored themselves.

Did you mean Tokyo? Hiroshima was not firebombed if I recall.