Start removing OAuth refs