===> Cleaning for highlight-3.44