holoirc: some more cleanups