Small amount of crypto cleanup.