B5.5 indicators staying on

[JayB5UK]

Does this sound like a CCM issue?

I have had this before where a couple of lock / unlock cycles sort it out, but today I tried about 15 - 20 times and no joy.
I have ended up dis-connecting the battery now but am a bit stuck? Tried google and searching on here and not found any info other than a CCM relay problem?

My plenum had a fair amont of water in it but I unblocked that about a year or more ago and this is the only strange issue I have had.

Assuming it is my CCM, what others fit, can see a few types on ebay listed as Passat / Golf but they have different numbers of connectors.