[TASK] Remove unneeded variable assignments