[PATCH 2/8] Remove unused variables