remove encrypted, add crypto