MinorGeneralCleanup removed unused variables.