===> Cleaning for joker-1.6.0