clean up some gplay services code