Reorganize OVR info for better cache coherency
Cleanup