Yep, Just wait until they are about to fall off and dispose of them.
A slight touch is all that is needed to take off a dead leaf.
Wait till that point or you will cause further damage.
This is because the leaf still has a little "juice" left in it.
And if you remove it, the plant will just start taking it from the next leaf!!
Some growers keep trying to fight the yellowing all the way through.
They end up with extremely harsh buds that likely fizzle and pop.(You've been warned)
You still have some time to go, so I think it would be best for your to up the Nitrogen as I stated before.
Fact is, your plant is nearing the end of it's life and it's putting everything into those flowers in hopes of receiving pollen for the next generation.
Even if that means sucking her own leaves dry!!
I'm sure somebody else can concur.......