Fix to use of wrong collection type.
Removed dead code.
Minor cleanup to Negotiate class.