I don't think we need this function anymore. I'll check if we can remove it.