DRILL-1141 cleanup