[PATCH PM-QA v2 11/25] Remove unused variables and rename some