Metrics, better route combinations and cleanup