Removed Thrift dependencies