remove deprecated method
Change LinkedHashMap to Map