add GData, Remove gtm_oauth2 (duplicated)