removed hashmap