Clean-up a few areas
Remove buffer pooling