More O.vol cleanup