Revert "OC version 1"

This reverts commit 1776cd7a1d643a27247279bea5ba8da621492fb5.