[cyril] removed coupling with HexaCore.