holoirc: more cleanups