getting rid of hashmap