Removed dependency on Google APIs