removed some google-specific stuff