Simplify by removing Google oauth