Finish adequate buffer
Remove old code