removed some latent references to hashmap_ng