Get rid of get_key_and_value*