===> Cleaning for himalaya-2.1.0