===> Cleaning for tig-0.17