Excluding devices to create pure Z-Wave plus network?

I have a new Z-wave network consisting mostly of Fibaro Dimmer 2 z-wave dimmers, being controlled by an Aeotec stick plugged into a Windows PC running Hassio on Virtualbox.

I thought the whole network was Z-wave plus, but I realised I’ve got a few FIbaro RGBW controllers in there which are not Z-Wave plus. It seems the new Z-Wave plus RGBW Controller 2 units came out just after I bought mine.

I want to test network performance of a pure Z-Wave plus network. Is this just a question of removing those non- Zwave plus RGBW controllers from the network, and then things should perform at Zwave plus level? I have some network issues which I am wondering whether this might solve.