Still cleanup the buffer configuration.