[#30479] Cleanup of unused variables (Fix #950)