EncryptionUtil class clean-up