OVS review

No GetInstance()