Revert " add OC features...parts 1.."

This reverts commit 274c0ba5c6d0b7eea5034036c91bcb1e601c7993.

RM