more o-o conversion and cleanup