Add support for certified public services.
Remove unused import.