Revert "Omni Performance Control"

This reverts commit 2feb764b0e116df751ec7692d2a734b1edda3ffe.