More STATCrypto cleanup.