Remove extra trailing '-' in metric name