holoirc: multiple cleanups