issue #30 Removing Encryption is not seamless