Remove commented CV code