Add buffer-move and remove my own util