Remove calls to save buffer