venud_hfi: clean up after merge of cm-11.0