Fix Common Name matching
Remove unused import