===> Cleaning for highlight-2.7