Minor code cleanup
Deprecate xval bench in favour of imc