Remove Google-Apps dependency