Remove unused variables from previous iteration of OHC