Cleaned up CryptBucket