===> Cleaning for trader-7.18