remove double calls to map entries