add PKCS#11 option
remove unused classes