Removed some libraries, also changed code to use ConcurrentHashMap in place of HashMap