===> Cleaning for ts-0.7.0