Remove onnecessary dependency on OAuth