===> Cleaning for himalaya-0.7.1