Remove Buffer structs