cleaned up some more x509 references