[TASK] Remove unused local variables