Make confidential and remove unused fields.