Remove buffer, use std::vector