refactor, remove useless buffers

ping @crosbymichael @unclejack