* changes: Using proper key for removing from map. Removing wrong equals method in comparator.
f126ad3b