Removed dependance on Google API client libraries