[Florin_Andrei]

Some cleanup needs to happen, when the dust settles.

It's just not clear to me who, or what, will do it.