holoirc: some cleanups