minor cleanup in crypto-lib