Remove some unused TypeKind imports