Removed unneeded TreeMap