===> Cleaning for drill-1.8.3