removed oauth conflicts