Remove requirement for encryption cipher