===> Cleaning for shorten-3.6.1