Remove usage of ConcurrentHashMap for mappings