Removed extra variables not needed anymore in CryptBucketType. Also moved the choice of AES engines to CryptBucketType.