Get rid of sbuffer stuff for real