Remove Thrift dependency for the AG