Some more cleanup Turns out the fix for clearing buffers somehow got undone which explains all the strange behavior I was seeing