Revert "CPU UC/OC"

This reverts commit 7be21dcd6114ed96825254a042acdc449ed2b586.