> Not sure. But would avoid general restructuring in this stage of OC6... Put it on my ToDO list to check after OC6

I'm not talking about any restructuring - I just detected an odd pattern (which might be intended).
In other functions the parameter $userId is not used and in contrary here it is used.

To me this is an indication that there might be something forgotten .... if not I'm totally fine