That’s right, the Open GL clacker thing no longer exists, so as you correctly point out, now it’s all about the render viewport option. If you don’t want stuff like rigs to appear, you can always turn off the overlays:

You can also turn on or off any object type from these options here:
