PIM-1113: Fix CS removing useless variable