[FOLLOWUP][TASK] Remove unnecessary usage of the encryption key