===> Cleaning for drill-1.7.1