remove usage of java map