Can we delete this function now?