===> Cleaning for drill-1.6.8