OO cleanup.