Remove duplicate bufferlist storage. Only use object