Most APIs in libCom are still marked with this, it's not clear if removing them will be a problem or not.