remove unnecessary buffer-izing