r10961: remove unused variables (patch from Jason Mader)