Revert "new OO"

This reverts commit c1bfdaa2d09fcd67c06474fbade7ead24cffd91a.