holoirc: more cleanups and refactoring

* also remove dependency on lombok