Remove unencrypted properties

Change-Id: I59596be7c7df9151f4966a5051f06bcb087345dd
6 files changed