remove oauth2client dependency
clean up code