Remove Buffer requirements