Seems unnecessary based on cpp changes