===> Cleaning for highway-1.1.0