Removing the dependency of OAuth