Merge "Remove unused import in DeleteHandler"