===> Cleaning for gone-1.3.5