remove more old metric mappings code