holoirc: comply with new relay stuff and cleanup