@AdrienGiboire should we remove this?