===> Cleaning for buffer-1.17