add support of unprotected private keys + unit tests + cleaning