[TASK] Remove unused variables