fix create buf
cleanup