Remove EncryptedField stuff